[52/52] fauxton commit: updated refs/heads/master to 2222dcd

[ro...@apache.org]

Ace theme style overrides moved to Fauxton CSS

I originally committed the idle_fingers theme with some custom
style changes in it. This is going to be overridden in Robert's
Ace update ticket: https://github.com/apache/couchdb-fauxton/pull/285

This ticket moves those overridden styles into our own CSS
to prevent this from occurring again.

PR: #285
PR-URL: https://github.com/apache/couchdb-fauxton/pull/285
Reviewed-By: garren smith <ga...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2222dcdd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2222dcdd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2222dcdd

Branch: refs/heads/master
Commit: 2222dcdd5eea062d0e5081b9adcd37757e0776ed
Parents: 067b088
Author: Ben Keen <be...@gmail.com>
Authored: Mon Feb 23 12:24:42 2015 -0800
Committer: Robert Kowalski <ro...@apache.org>
Committed: Mon Mar 23 12:25:18 2015 +0100

----------------------------------------------------------------------
 assets/less/codeeditor.less | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2222dcdd/assets/less/codeeditor.less
----------------------------------------------------------------------
diff --git a/assets/less/codeeditor.less b/assets/less/codeeditor.less
index 35b5386..902e9db 100644
--- a/assets/less/codeeditor.less
+++ b/assets/less/codeeditor.less
@@ -157,6 +157,37 @@
   height: 100% !important;
 }
 
-body .ace-idle-fingers .ace_marker-layer .ace_selection {
-  background: #015F6F;
+/* Ace theme overrides */
+body {
+  .ace-idle-fingers .ace_marker-layer .ace_selection {
+    background: #015F6F;
+  }
+  .ace-idle-fingers .ace_gutter {
+    background: #3A3A3A;
+  }
+  .ace-idle-fingers {
+    background-color: #4d4d4d;
+  }
+  .ace-idle-fingers .ace_cursor {
+    color: #ffffff;
+  }
+  .ace-idle-fingers.ace_multiselect .ace_selection.ace_start {
+    box-shadow: 0 0 3px 0 #4d4d4d;
+  }
+  .ace-idle-fingers .ace_marker-layer .ace_active-line {
+    background: #000000;
+    opacity: 0.4;
+  }
+  .ace-idle-fingers .ace_constant {
+    color: #72cdf4;
+  }
+  .ace-idle-fingers .ace_boolean {
+    color: #ff6532;
+  }
+  .ace-idle-fingers .ace_string {
+    color: #29be9d;
+  }
+  .ace-idle-fingers .ace_collab.ace_user1 {
+    color: #4d4d4d;
+  }
 }