From 5e053ec5872591db55001f9e7ff9832ad6622e1c Mon Sep 17 00:00:00 2001
From: Yuxuan 'fishy' Wang <fishywang@google.com>
Date: Thu, 14 Jul 2016 14:58:21 -0700
Subject: [PATCH] There's only one solarized theme

CodeMirror depends on some special config to make both solarized light
and solarized dark work. Gerrit doesn't support that and they are both
broken.

Consolidate them into a single solarized theme will at least make
solarized-light work.

This (partially) fixes Bug 4267.

Change-Id: Ia577147950a566ed003d0338b57dfba1696ac7f6
---
 .../java/com/google/gerrit/extensions/client/Theme.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java
index c03a684b82..6408f9dbc7 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java
@@ -25,7 +25,7 @@ public enum Theme {
   NEAT,
   NEO,
   PARAISO_LIGHT,
-  SOLARIZED_LIGHT,
+  SOLARIZED,
   TTCN,
   XQ_LIGHT,
   YETI,
@@ -56,7 +56,6 @@ public enum Theme {
   RAILSCASTS,
   RUBYBLUE,
   SETI,
-  SOLARIZED_DARK,
   THE_MATRIX,
   TOMORROW_NIGHT_BRIGHT,
   TOMORROW_NIGHT_EIGHTIES,
@@ -92,7 +91,6 @@ public enum Theme {
       case RAILSCASTS:
       case RUBYBLUE:
       case SETI:
-      case SOLARIZED_DARK:
       case THE_MATRIX:
       case TOMORROW_NIGHT_BRIGHT:
       case TOMORROW_NIGHT_EIGHTIES:
@@ -110,7 +108,7 @@ public enum Theme {
       case NEAT:
       case NEO:
       case PARAISO_LIGHT:
-      case SOLARIZED_LIGHT:
+      case SOLARIZED:
       case TTCN:
       case XQ_LIGHT:
       case YETI: