Skip to content

Commit fd715c8

Browse files
minahleeminahlee
committed
[MINOR] Small ui modification in notebook actionbar
### What is this PR for? Small ui improvements - Change keyboard shortcut icon - Modify commit container style - Change table asc/desc icon - Change interpreter create button font ### What type of PR is it? Improvement ### Screenshots (if appropriate) **Before** <img width="165" alt="screen shot 2016-06-13 at 12 55 41 pm" src="https://cloud.githubusercontent.com/assets/8503346/16021450/aebc14dc-3167-11e6-91d2-32fa8cd607af.png"> **After** <img width="164" alt="screen shot 2016-06-13 at 12 55 54 pm" src="https://cloud.githubusercontent.com/assets/8503346/16021451/b159c86a-3167-11e6-9311-b59cfffb3f6b.png"> **Before** <img width="254" alt="screen shot 2016-06-13 at 1 07 15 pm" src="https://cloud.githubusercontent.com/assets/8503346/16021480/d23661e2-3167-11e6-90f9-44340d5efe8f.png"> **After** <img width="252" alt="screen shot 2016-06-13 at 1 07 26 pm" src="https://cloud.githubusercontent.com/assets/8503346/16021482/d4cf92ac-3167-11e6-95a0-1eb28d0ed325.png"> **Before** <img width="82" alt="screen shot 2016-06-18 at 11 08 20 am" src="https://cloud.githubusercontent.com/assets/8503346/16172808/03295cec-3545-11e6-953a-c2c9a48ca841.png"> **After** <img width="82" alt="screen shot 2016-06-21 at 2 17 38 am" src="https://cloud.githubusercontent.com/assets/8503346/16224348/86c3f73e-3756-11e6-8b50-a4654d738d18.png"> **Before** <img width="383" alt="screen shot 2016-06-14 at 4 43 58 pm" src="https://cloud.githubusercontent.com/assets/8503346/16063627/60bb32de-324f-11e6-88a3-318575dcafc2.png"> **After** <img width="384" alt="screen shot 2016-06-14 at 4 43 20 pm" src="https://cloud.githubusercontent.com/assets/8503346/16063628/653316ba-324f-11e6-92ca-b559b62e234c.png"> **Before** <img width="113" alt="screen shot 2016-06-14 at 9 38 05 pm" src="https://cloud.githubusercontent.com/assets/8503346/16068142/54f5f6d6-3278-11e6-977a-1902a274c1f1.png"> **After** <img width="105" alt="screen shot 2016-06-14 at 9 37 34 pm" src="https://cloud.githubusercontent.com/assets/8503346/16068144/59344c70-3278-11e6-8038-ff3775cc432a.png"> ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? Screenshot needs to be updated Author: Mina Lee <[email protected]> Closes #1006 from minahlee/minor/ui_improve and squashes the following commits: dc6dbe8 [Mina Lee] Change interpreter create button font 72ff26e [Mina Lee] Change table asc desc icon bbca1ba [Mina Lee] Refine version control action UI 68619f8 [Mina Lee] Change keyboard shortcut icon
1 parent 41a7302 commit fd715c8

File tree

4 files changed

+63
-31
lines changed

4 files changed

+63
-31
lines changed

‎zeppelin-web/src/app/interpreter/interpreter.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ <h3 class="new_h3">
1919
Interpreters
2020
</h3>
2121
<div class="pull-right" style="margin-top:10px;">
22-
<span style="cursor:pointer;margin-right:8px;"
22+
<span style="cursor:pointer;margin-right:4px;"
2323
ng-click="showRepositoryInfo = !showRepositoryInfo"
2424
tooltip-placement="bottom" tooltip="Repository information">
2525
<i class="fa fa-cog" ng-style="{color: showRepositoryInfo ? '#3071A9' : 'black' }"></i>
2626
</span>
27-
<span class="btn btn-default fa fa-plus"
28-
ng-click="showAddNewSetting = !showAddNewSetting"
29-
style="margin-right:6px;">
27+
<button class="btn btn-default btn-sm"
28+
ng-click="showAddNewSetting = !showAddNewSetting">
29+
<i class="fa fa-plus"></i>
3030
Create
31-
</span>
31+
</button>
3232
</div>
3333
</div>
3434
</div>

‎zeppelin-web/src/app/notebook/notebook-actionBar.html‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -61,32 +61,34 @@ <h3>
6161
tooltip-placement="bottom" tooltip="Export the notebook">
6262
<i class="fa fa-download"></i>
6363
</button>
64-
<ul class="dropdown-menu" role="menu" style="width:250px">
65-
<li>
66-
<div class="cron-preset-container">
67-
<div>
68-
<input type="text"
69-
dropdown-input
70-
placeholder="commit message"
71-
id="note.checkpoint.message"
72-
ng-model="note.checkpoint.message"/>
73-
<button type="button"
74-
class="btn btn-default btn-xs"
75-
ng-hide="viewOnly"
76-
ng-click="checkpointNotebook(note.checkpoint.message)"
77-
tooltip-placement="bottom" tooltip="Commit the notebook">Commit
78-
</button>
79-
</div>
64+
<button type="button"
65+
class="btn btn-default btn-xs dropdown-toggle"
66+
ng-hide="viewOnly"
67+
data-toggle="dropdown"
68+
tooltip-placement="bottom" tooltip="Version control">
69+
<i class="fa fa-file-code-o"></i>
70+
</button>
71+
<ul class="dropdown-menu" role="menu" style="width:250px">
72+
<li>
73+
<div class="commit-container">
74+
<div>
75+
<input type="text"
76+
dropdown-input
77+
placeholder="commit message"
78+
id="note.checkpoint.message"
79+
style="width: 145px;"
80+
ng-model="note.checkpoint.message"/>
81+
<button type="button"
82+
class="btn btn-default btn-xs"
83+
ng-hide="viewOnly"
84+
ng-click="checkpointNotebook(note.checkpoint.message)"
85+
style="margin-left: 4px;"
86+
tooltip-placement="bottom" tooltip="Commit the notebook">Commit
87+
</button>
8088
</div>
81-
</li>
82-
</ul>
83-
<button type="button"
84-
class="btn btn-default btn-xs dropdown-toggle"
85-
ng-hide="viewOnly"
86-
data-toggle="dropdown"
87-
tooltip-placement="bottom" tooltip="Version control">
88-
<i class="fa fa-file-code-o"></i>
89-
</button>
89+
</div>
90+
</li>
91+
</ul>
9092
</span>
9193

9294
<!-- put the delete action by itself for your protection -->
@@ -157,7 +159,7 @@ <h3>
157159
data-toggle="modal"
158160
data-target="#shortcutModal"
159161
tooltip-placement="bottom" tooltip="List of shortcut">
160-
<i class="icon-question"></i>
162+
<i class="fa fa-keyboard-o"></i>
161163
</button>
162164
<button type="button"
163165
class="btn btn-default btn-xs"

‎zeppelin-web/src/app/notebook/notebook.css‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,19 @@
210210
border: 0;
211211
}
212212

213+
.commit-container {
214+
padding: 10px 20px 6px 20px;
215+
font-weight: normal;
216+
word-wrap: break-word;
217+
white-space: initial;
218+
}
219+
220+
/* overwrite bootstrap css for version control button */
221+
.btn-group > .btn + .dropdown-toggle {
222+
padding-right: 5px;
223+
padding-left: 5px;
224+
}
225+
213226
.cron-preset-container {
214227
padding: 10px 20px 0 20px;
215228
font-weight: normal;

‎zeppelin-web/src/app/notebook/paragraph/paragraph.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,23 @@ table.dataTable.table-condensed .sorting_desc:after {
422422
border-bottom: 2px solid #CCC;
423423
}
424424

425+
.handsontable .columnSorting.ascending::after {
426+
content: '\f160';
427+
margin-left: 3px;
428+
font-size: 12px;
429+
font-family: FontAwesome;
430+
line-height: 2;
431+
}
432+
433+
.handsontable .columnSorting.descending::after {
434+
content: '\f161';
435+
margin-left: 3px;
436+
font-size: 12px;
437+
margin-left: 3px;
438+
font-family: FontAwesome;
439+
line-height: 2;
440+
}
441+
425442
/*
426443
Pivot CSS
427444
*/

0 commit comments

Comments
 (0)