Repository: zeppelin Updated Branches: refs/heads/master 9af85d8cc -> 336d86cdd
[ZEPPELIN-2574] Improve `about` dialog style ### What is this PR for? Improve `about` dialog style. See the attached screenshots. ### What type of PR is it? [Improvement] ### Todos DONE ### What is the Jira issue? [ZEPPELIN-2574](https://issues.apache.org/jira/browse/ZEPPELIN-2574) ### How should this be tested? 1. Build: `mvn clean package -DskipTests; ./bin/zeppelin-daemon.sh restart` 2. Run Zeppelin and open browser: `localhost:8080` 3. Click the `About Zeppelin` button  ### Screenshots (if appropriate) #### Before  #### After  ### Questions: * Does the licenses files need update? - NO * Is there breaking changes for older versions? - NO * Does this needs documentation? - NO Author: 1ambda <[email protected]> Closes #2360 from 1ambda/improve-about-dialgo and squashes the following commits: 5dfc3bd [1ambda] feat: style about dialog 0361918 [1ambda] refactor: Move about related css into navbar.css Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/336d86cd Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/336d86cd Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/336d86cd Branch: refs/heads/master Commit: 336d86cddb7101b1afc87e3c6301cecfab2f3bf0 Parents: 9af85d8 Author: 1ambda <[email protected]> Authored: Sun May 21 09:31:42 2017 +0900 Committer: Lee moon soo <[email protected]> Committed: Thu May 25 15:42:03 2017 +0900 ---------------------------------------------------------------------- zeppelin-web/src/app/home/home.css | 25 ----------- zeppelin-web/src/components/navbar/navbar.css | 48 +++++++++++++++++++++ zeppelin-web/src/components/navbar/navbar.html | 19 ++++---- 3 files changed, 57 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/336d86cd/zeppelin-web/src/app/home/home.css ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/home/home.css b/zeppelin-web/src/app/home/home.css index ce30e66..3be17af 100644 --- a/zeppelin-web/src/app/home/home.css +++ b/zeppelin-web/src/app/home/home.css @@ -824,28 +824,3 @@ This part should be removed when new version of bootstrap handles this issue. .bootstrap-dialog.type-primary .modal-header { background: #3071a9; } - -/* About Zeppelin */ -.about { - height: 200px; - padding: 25px; -} - -.about .logo { - padding-top: 30px; -} - -.about .logo img { - width: 95%; -} - -.about .content { - text-align: center; -} - -.about .content h3 { - font-family: 'Patua One'; - color: #3071A9; - font-size: 30px; - margin: 0 auto; -} http://git-wip-us.apache.org/repos/asf/zeppelin/blob/336d86cd/zeppelin-web/src/components/navbar/navbar.css ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/components/navbar/navbar.css b/zeppelin-web/src/components/navbar/navbar.css index 5592e7d..ebd813c 100644 --- a/zeppelin-web/src/components/navbar/navbar.css +++ b/zeppelin-web/src/components/navbar/navbar.css @@ -41,3 +41,51 @@ } .navbar-fixed-top.headroom--unpinned { top: -100px; } .navbar-fixed-top.headroom--pinned { top: 0; /** `navbar` top */ } + +/* About Dialog */ + +.modal-header-about { + background-color: #3071a9; + border: 2px solid #3071a9; + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} + +.modal-header-about > .close { + color: #cfcfcf; + opacity: 1; +} + +.modal-header-about > .modal-title { + font-weight: 300; + font-size: 20px; + color: #e8e8e8; +} + +.modal-body-about-version { + font-weight: 500; +} + +.modal-body-about { + height: 250px; + padding: 50px; +} + +.modal-body-about .logo { + padding-top: 30px; +} + +.modal-body-about .logo img { + width: 95%; +} + +.modal-body-about .content { + text-align: center; +} + +.modal-body-about .content h3 { + font-family: 'Patua One'; + color: #3071A9; + font-size: 30px; + margin: 0 auto; +} http://git-wip-us.apache.org/repos/asf/zeppelin/blob/336d86cd/zeppelin-web/src/components/navbar/navbar.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html index 2cae91b..a766ea9 100644 --- a/zeppelin-web/src/components/navbar/navbar.html +++ b/zeppelin-web/src/components/navbar/navbar.html @@ -112,19 +112,19 @@ limitations under the License. </div> </div> </headroom> -<div id="aboutModal" class="modal fade" role="dialog" - tabindex="-1"> - <div class="modal-dialog"> - <!-- Modal content--> - <div class="modal-content" id="NoteImportCtrl" ng-init="NoteImportInit"> - <div class="modal-header"> +<!-- about dialog --> +<div id="aboutModal" class="modal fade" role="dialog" tabindex="-1"> + <div class="modal-dialog"> + <div class="modal-content"> + <!-- about dialog header --> + <div class="modal-header modal-header-about"> <button type="button" class="close" data-dismiss="modal">×</button> <h4 class="modal-title">About Zeppelin</h4> </div> - <div class="modal-body"> - <div class="row about"> + <!-- about dialog body --> + <div class="modal-body modal-body-about"> <div class="hidden-xs col-sm-4 logo"> <img src="assets/images/zepLogo.png" alt="Apache Zeppelin" title="Apache Zeppelin" /> </div> @@ -132,13 +132,12 @@ limitations under the License. <h3>Apache Zeppelin</h3> <br/> <span id="i18n-14">Version</span> - {{zeppelinVersion}} + <span class="modal-body-about-version"> {{zeppelinVersion}} </span> <br/> <br/> <a href="http://zeppelin.apache.org/"; target="_blank"><span id="i18n-15">Get involved!</span></a> <br/> <a href="http://www.apache.org/licenses/LICENSE-2.0"; target="_blank"><span id="i18n-16">Licensed under the Apache License, Version 2.0</span></a> - </div> </div> </div>
