Repository: incubator-zeppelin Updated Branches: refs/heads/master 3478f960f -> 8c330a487
Fix paragraph actions dropdown styling for Firefox Before on Firefox <img width="235" alt="screen shot 2015-11-26 at 12 39 21 pm" src="https://cloud.githubusercontent.com/assets/2031306/11418764/ff5f1bc6-9448-11e5-9eb6-cf0f6f79be2e.png";> After on Firefox <img width="233" alt="screen shot 2015-11-26 at 2 18 43 pm" src="https://cloud.githubusercontent.com/assets/2031306/11418763/ff5e8d28-9448-11e5-89fb-4302101d9eb1.png";> Author: Renjith Kamath <[email protected]> Closes #478 from r-kamath/firefoxMenuStyleFix and squashes the following commits: 5176869 [Renjith Kamath] Fix paragraph actions dropdown styling for Firefox Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/8c330a48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/8c330a48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/8c330a48 Branch: refs/heads/master Commit: 8c330a4873625ece3060680e9b656745f89bf257 Parents: 3478f96 Author: Renjith Kamath <[email protected]> Authored: Thu Nov 26 14:19:54 2015 +0530 Committer: Lee moon soo <[email protected]> Committed: Sun Nov 29 07:32:47 2015 +0900 ---------------------------------------------------------------------- .../src/app/notebook/paragraph/paragraph.css | 10 +++- .../src/app/notebook/paragraph/paragraph.html | 59 +++++++++----------- 2 files changed, 34 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8c330a48/zeppelin-web/src/app/notebook/paragraph/paragraph.css ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css index 6d413c6..87a3e30 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css @@ -73,7 +73,7 @@ border: 3px solid #DDDDDD; } -.paragraph .paragraphFooter { +.paragraph .paragraphFooter { height: 9px; } @@ -183,6 +183,14 @@ } /* + Paragraph Menu +*/ + +.dropdown-menu > li > a { + cursor: pointer; +} + +/* Paragraph Title */ http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8c330a48/zeppelin-web/src/app/notebook/paragraph/paragraph.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.html b/zeppelin-web/src/app/notebook/paragraph/paragraph.html index 3ad3e31..0edf43e 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.html +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.html @@ -425,59 +425,50 @@ limitations under the License. </span> <ul class="dropdown-menu" role="menu" style="width:200px;"> <li> - <a class="fa fa-arrows-h dropdown"> Width - <form style="display:inline; margin-left:5px;"> - <select ng-model="paragraph.config.colWidth" - class="selectpicker" - ng-change="changeColWidth()" - ng-options="col for col in colWidthOption"></select> - </form> + <a class="dropdown"><span class="fa fa-arrows-h"></span> Width + <form style="display:inline; margin-left:5px;"> + <select ng-model="paragraph.config.colWidth" + class="selectpicker" + ng-change="changeColWidth()" + ng-options="col for col in colWidthOption"></select> + </form> </a> </li> <li> - <a class="icon-arrow-up" style="cursor:pointer" - ng-click="moveUp()"> Move Up</a> + <a ng-click="moveUp()"><span class="icon-arrow-up"></span> Move Up</a> </li> <li> - <a class="icon-arrow-down" style="cursor:pointer" - ng-click="moveDown()"> Move Down</a> + <a ng-click="moveDown()"><span class="icon-arrow-down"></span> Move Down</a> </li> <li> - <a class="icon-plus" style="cursor:pointer" - ng-click="insertNew()"> Insert New</a> + <a ng-click="insertNew()"><span class="icon-plus"></span> Insert New</a> </li> <li> <!-- paragraph handler --> - <a class="fa fa-font" style="cursor:pointer" - ng-click="hideTitle()" - ng-show="paragraph.config.title"> Hide title</a> - <a class="fa fa-font" style="cursor:pointer" - ng-click="showTitle()" - ng-show="!paragraph.config.title"> Show title</a> + <a ng-click="hideTitle()" + ng-show="paragraph.config.title"><span class="fa fa-font"></span> Hide title</a> + <a ng-click="showTitle()" + ng-show="!paragraph.config.title"><span class="fa fa-font"></span> Show title</a> </li> <li> - <a class="fa fa-list-ol" style="cursor:pointer" - ng-click="hideLineNumbers()" - ng-show="paragraph.config.lineNumbers"> Hide line numbers</a> - <a class="fa fa-list-ol" style="cursor:pointer" - ng-click="showLineNumbers()" - ng-show="!paragraph.config.lineNumbers"> Show line numbers</a> + <a ng-click="hideLineNumbers()" + ng-show="paragraph.config.lineNumbers"><span class="fa fa-list-ol"></span> Hide line numbers</a> + <a ng-click="showLineNumbers()" + ng-show="!paragraph.config.lineNumbers"><span class="fa fa-list-ol"></span> Show line numbers</a> </li> <li> - <a class="icon-control-play" style="cursor:pointer" - ng-click="toggleEnableDisable()"> {{paragraph.config.enabled ? "Disable" : "Enable"}} run</a> + <a ng-click="toggleEnableDisable()"><span class="icon-control-play"></span> + {{paragraph.config.enabled ? "Disable" : "Enable"}} run</a> </li> - <li><a class="icon-share-alt" style="cursor:pointer" - ng-click="goToSingleParagraph()"> Link this paragraph</a> + <li> + <a ng-click="goToSingleParagraph()"><span class="icon-share-alt"></span> Link this paragraph</a> </li> <li> - <a class="fa fa-eraser" style="cursor:pointer" - ng-click="clearParagraphOutput()"> Clear output</a> + <a ng-click="clearParagraphOutput()"><span class="fa fa-eraser"></span> Clear output</a> </li> <li> <!-- remove paragraph --> - <a class="fa fa-times" style="cursor:pointer" - ng-click="removeParagraph()"> Remove</a> + <a ng-click="removeParagraph()"><span class="fa fa-times"></span> Remove</a> </li> </ul> </span> @@ -487,5 +478,5 @@ limitations under the License. <div ng-show="!paragraph.config.tableHide && !viewOnly" id="{{paragraph.id}}_executionTime" class="executionTime" ng-bind-html="getExecutionTime()"> </div> </div> - + </div>
![https://cloud.githubusercontent.com/assets/2031306/11418764/ff5f1bc6-9448-11e5-9eb6-cf0f6f79be2e.png"](https://cloud.githubusercontent.com/assets/2031306/11418764/ff5f1bc6-9448-11e5-9eb6-cf0f6f79be2e.png"){kind=link}
![https://cloud.githubusercontent.com/assets/2031306/11418763/ff5e8d28-9448-11e5-89fb-4302101d9eb1.png"](https://cloud.githubusercontent.com/assets/2031306/11418763/ff5e8d28-9448-11e5-89fb-4302101d9eb1.png"){kind=link}