SetTheme on Ace Editor - as a test

Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/de7d0e22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/de7d0e22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/de7d0e22

Branch: refs/heads/master
Commit: de7d0e2216567f054dfe31be03b74ce7d5a55f54
Parents: 7c090fa
Author: Felix Cheung <[email protected]>
Authored: Tue Mar 10 23:21:44 2015 -0700
Committer: Felix Cheung <[email protected]>
Committed: Tue Mar 10 23:21:44 2015 -0700

----------------------------------------------------------------------
 zeppelin-web/app/index.html                       | 2 +-
 zeppelin-web/app/scripts/controllers/paragraph.js | 2 +-
 zeppelin-web/app/styles/notebook.css              | 2 --
 zeppelin-web/bower.json                           | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/de7d0e22/zeppelin-web/app/index.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/app/index.html b/zeppelin-web/app/index.html
index d3b938b..fa013a2 100644
--- a/zeppelin-web/app/index.html
+++ b/zeppelin-web/app/index.html
@@ -124,7 +124,7 @@ limitations under the License.
     <script 
src="bower_components/ace-builds/src-noconflict/mode-markdown.js"></script>
     <script 
src="bower_components/ace-builds/src-noconflict/keybinding-emacs.js"></script>
     <script 
src="bower_components/ace-builds/src-noconflict/ext-language_tools.js"></script>
-    <script 
src="bower_components/ace-builds/src-noconflict/theme-github.js"></script>
+    <script 
src="bower_components/ace-builds/src-noconflict/theme-monokai.js"></script>
     <script src="bower_components/angular-ui-ace/ui-ace.js"></script>
     <script src="bower_components/jquery.scrollTo/jquery.scrollTo.js"></script>
     <script src="bower_components/d3/d3.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/de7d0e22/zeppelin-web/app/scripts/controllers/paragraph.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/app/scripts/controllers/paragraph.js 
b/zeppelin-web/app/scripts/controllers/paragraph.js
index 6124c6f..129a0af 100644
--- a/zeppelin-web/app/scripts/controllers/paragraph.js
+++ b/zeppelin-web/app/scripts/controllers/paragraph.js
@@ -392,7 +392,7 @@ angular.module('zeppelinWebApp')
     if (_editor.container.id !== '{{paragraph.id}}_editor') {
       $scope.editor.renderer.setShowGutter(false);
       $scope.editor.setHighlightActiveLine(false);
-      $scope.editor.setTheme('ace/theme/github');
+      $scope.editor.setTheme('ace/theme/monokai');
       $scope.editor.focus();
       var hight = $scope.editor.getSession().getScreenLength() * 
$scope.editor.renderer.lineHeight + $scope.editor.renderer.scrollBar.getWidth();
       setEditorHeight(_editor.container.id, hight);

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/de7d0e22/zeppelin-web/app/styles/notebook.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/app/styles/notebook.css 
b/zeppelin-web/app/styles/notebook.css
index 5e32448..5480541 100644
--- a/zeppelin-web/app/styles/notebook.css
+++ b/zeppelin-web/app/styles/notebook.css
@@ -51,7 +51,6 @@
 .paragraphAsIframe .editor {
   width: 100%;
   border-left: 4px solid #EEEEEE;
-  background: rgba(255, 255, 255, 0.9);
 }
 
 .paragraphAsIframe .text {
@@ -172,7 +171,6 @@
 .paragraph .editor {
   width: 100%;
   border-left: 4px solid #DDDDDD;
-  background: rgba(255, 255, 255, 0.0);
   margin: 7px 0 2px 0px;
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/de7d0e22/zeppelin-web/bower.json
----------------------------------------------------------------------
diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json
index 8e0ea6b..891dba8 100644
--- a/zeppelin-web/bower.json
+++ b/zeppelin-web/bower.json
@@ -41,7 +41,7 @@
                  "src-noconflict/mode-markdown.js",
                  "src-noconflict/keybinding-emacs.js",
                  "src-noconflict/ext-language_tools.js",
-                 "src-noconflict/theme-github.js"],
+                 "src-noconflict/theme-monokai.js"],
       "version": "1.1.8",
       "name": "ace-builds"
     },

Reply via email to