zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject [48/50] incubator-zeppelin git commit: Remove highlight.js background and also hide Ace editor prig margin (editor.setShowPrintMargin(false) does not work - it will collapse the entire editor)
Date Fri, 20 Mar 2015 18:02:10 GMT
Remove highlight.js background and also hide Ace editor prig margin (editor.setShowPrintMargin(false)
does not work - it will collapse the entire editor)


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

Branch: refs/heads/master
Commit: e18b02f6ac3e91b96497e95075d0d6a8e11d6cf3
Parents: b497f01
Author: Felix Cheung <felixcheung@users.noreply.github.com>
Authored: Mon Mar 16 22:34:54 2015 -0700
Committer: Felix Cheung <felixcheung@users.noreply.github.com>
Committed: Mon Mar 16 22:34:54 2015 -0700

----------------------------------------------------------------------
 STYLE.md                             |  2 ++
 zeppelin-web/app/styles/notebook.css | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/e18b02f6/STYLE.md
----------------------------------------------------------------------
diff --git a/STYLE.md b/STYLE.md
index d76a539..9a0242e 100644
--- a/STYLE.md
+++ b/STYLE.md
@@ -18,6 +18,8 @@ Call setTheme on the editor with the theme path/name.
 #### Style for Markdown Code Blocks
 Highlight.js parses and converts &lt;pre&gt;&lt;code&gt; blocks from markdown4j
into keywords and language syntax with proper styles. It also attempts to infer the best fitting
language if it is not provided. The visual style can be changed by simply including the desired
[stylesheet](https://github.com/components/highlightjs/tree/master/styles) into app/index.html.
See the next section on build.
 
+Note that code block background color is overriden in app/styles/notebook.css (look for .paragraph
.tableDisplay .hljs).
+
 #### Build changes
 bower.json  
 In the override section at the bottom, include the Highlightjs stylesheet (eg. styles/github.css)
 

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/e18b02f6/zeppelin-web/app/styles/notebook.css
----------------------------------------------------------------------
diff --git a/zeppelin-web/app/styles/notebook.css b/zeppelin-web/app/styles/notebook.css
index 2e8f6c9..bf02680 100644
--- a/zeppelin-web/app/styles/notebook.css
+++ b/zeppelin-web/app/styles/notebook.css
@@ -23,6 +23,14 @@
   min-height: 32px;
 }
 
+.paragraph .tableDisplay .hljs {
+  background: none;
+}
+
+.paragraph .ace_print-margin {
+  background: none !important;
+}
+
 .paragraphAsIframe{
   padding: 0px 0px 0px 0px;
   margin-top: -79px;
@@ -208,10 +216,6 @@
 
 .ace_hidden-cursors {opacity:0}
 
-.ace-tm .ace_print-margin {
-  background: none !important;
-}
-
 /** Remove z-index to ace */
 .ace_text-input, .ace_gutter, .ace_layer,
 .emacs-mode, .ace_text-layer, .ace_cursor-layer,


Mime
View raw message