Solve mouse mark (#900)

* merge the 'zeppelin' app.js to 'trunk'. * Change button style of rules (#747) * Add tooltip for action (#765) * Fix #741 Remove the usage of view * change button to phglyphicon, start and stop button combine into one * add tooltip * add tooltip for rules and actions * Change home.html (#786) * Fix #741 Remove the usage of view * change button to phglyphicon, start and stop button combine into one * add tooltip * add tooltip for rules and actions * change home.html * change about smart modal content * Add help for actions (#794) * #778 Add Rule format description on UI (#810) * Fix #741 Remove the usage of view * change button to phglyphicon, start and stop button combine into one * add tooltip * add tooltip for rules and actions * change home.html * change about smart modal content * add help for actions * #778 Add Rule format description on UI * #778 Add Rule format description on UI * #778 Add Rule format description on UI * #778 Add Rule format description on UI * Add SmartNotebook (#831) * Add SmartNotebook * Add SmartNotebook * Fix build bugs and web UI * change the home page. * remove 'zeppelin-web' from 'smart-zeppelin' default module.
Intel-bigdata · Aug 8, 2017 · 8f14420 · 8f14420
1 parent 52e6995
commit 8f14420
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/smart-zeppelin/notebook/2CM9DW8NW/note.json b/smart-zeppelin/notebook/2CM9DW8NW/note.json
@@ -2,7 +2,18 @@
   "paragraphs": [
     {
       "user": "admin",
-      "config": {},
+      "config": {
+        "colWidth": 12.0,
+        "enabled": true,
+        "results": {},
+        "editorSetting": {
+          "language": "markdown",
+          "editOnDblClick": true
+        },
+        "editorMode": "ace/mode/markdown",
+        "editorHide": false,
+        "tableHide": true
+      },
       "settings": {
         "params": {},
         "forms": {}

diff --git a/smart-zeppelin/zeppelin-web/src/app/dashboard/styles/dashboard.css b/smart-zeppelin/zeppelin-web/src/app/dashboard/styles/dashboard.css
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -167,3 +167,9 @@ h4, table > caption {
 .table-no-data-sm .glyphicon {
   margin-right: 6px;
 }
+.progress-tiny {
+  height: 3px;
+  background-color: #ebebeb;
+  padding: 0;
+  margin: 1px 0 0 0;
+}
diff --git a/smart-zeppelin/zeppelin-web/src/index.html b/smart-zeppelin/zeppelin-web/src/index.html
@@ -53,6 +53,8 @@
     <link rel="stylesheet" href="bower_components/vis/dist/vis.css" />
     <link rel="stylesheet" href="bower_components/angular-ui-select/dist/select.css" />
     <!-- endbower -->
+    <link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.css" />
+    <link rel="stylesheet" href="bower_components/select2/dist/css/select2.css" />
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
     <link rel="stylesheet" href="components/navbar/navbar.css" />
@@ -72,10 +74,9 @@
     <link rel="stylesheet" href="fonts/simple-line-icons.css" />
     <link rel="stylesheet" href="fonts/custom-font.css" />
     <link rel="stylesheet" href="fonts/google-fonts.css" />
-    <!--<link rel="stylesheet" href="app/ui-select/0.14.2/dist/select.min.css" />-->
+
     <link rel="stylesheet" href="app/dashboard/styles/dashboard.css" />
     <link rel="stylesheet" href="app/dashboard/styles/bootstrap-override.css" />
-    <link rel="stylesheet" href="app/dashing/dashing.css" />
     <!-- endbuild -->
 
     <link rel="stylesheet" ng-href="assets/styles/looknfeel/{{looknfeel}}.css" />