Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 8f14420

Browse files
authored
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.
1 parent 52e6995 commit 8f14420

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

smart-zeppelin/notebook/2CM9DW8NW/note.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,18 @@
22
"paragraphs": [
33
{
44
"user": "admin",
5-
"config": {},
5+
"config": {
6+
"colWidth": 12.0,
7+
"enabled": true,
8+
"results": {},
9+
"editorSetting": {
10+
"language": "markdown",
11+
"editOnDblClick": true
12+
},
13+
"editorMode": "ace/mode/markdown",
14+
"editorHide": false,
15+
"tableHide": true
16+
},
617
"settings": {
718
"params": {},
819
"forms": {}

smart-zeppelin/zeppelin-web/src/app/dashboard/styles/dashboard.css

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* to you under the Apache License, Version 2.0 (the
77
* "License"); you may not use this file except in compliance
88
* with the License. You may obtain a copy of the License at
9-
*
9+
*
1010
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
11+
*
1212
* Unless required by applicable law or agreed to in writing,
1313
* software distributed under the License is distributed on an
1414
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -167,3 +167,9 @@ h4, table > caption {
167167
.table-no-data-sm .glyphicon {
168168
margin-right: 6px;
169169
}
170+
.progress-tiny {
171+
height: 3px;
172+
background-color: #ebebeb;
173+
padding: 0;
174+
margin: 1px 0 0 0;
175+
}

smart-zeppelin/zeppelin-web/src/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
<link rel="stylesheet" href="bower_components/vis/dist/vis.css" />
5454
<link rel="stylesheet" href="bower_components/angular-ui-select/dist/select.css" />
5555
<!-- endbower -->
56+
<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.css" />
57+
<link rel="stylesheet" href="bower_components/select2/dist/css/select2.css" />
5658
<!-- endbuild -->
5759
<!-- build:css(.tmp) styles/main.css -->
5860
<link rel="stylesheet" href="components/navbar/navbar.css" />
@@ -72,10 +74,9 @@
7274
<link rel="stylesheet" href="fonts/simple-line-icons.css" />
7375
<link rel="stylesheet" href="fonts/custom-font.css" />
7476
<link rel="stylesheet" href="fonts/google-fonts.css" />
75-
<!--<link rel="stylesheet" href="app/ui-select/0.14.2/dist/select.min.css" />-->
77+
7678
<link rel="stylesheet" href="app/dashboard/styles/dashboard.css" />
7779
<link rel="stylesheet" href="app/dashboard/styles/bootstrap-override.css" />
78-
<link rel="stylesheet" href="app/dashing/dashing.css" />
7980
<!-- endbuild -->
8081

8182
<link rel="stylesheet" ng-href="assets/styles/looknfeel/{{looknfeel}}.css" />

0 commit comments

Comments
 (0)