zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject zeppelin git commit: [ZEPPELIN-2602] fix: broken navbar-title rendering in safari
Date Thu, 01 Jun 2017 19:46:47 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master e49baf79a -> 9608f4960


[ZEPPELIN-2602] fix: broken navbar-title rendering in safari

### What is this PR for?

fix: broken navbar-title rendering in safari.

I attached screenshots.

### What type of PR is it?
[Bug Fix]

### Todos

DONE

### What is the Jira issue?

[ZEPPELIN-2602]()

### How should this be tested?

1. Clone apache/zeppelin
2. Build `mvn clean package -DskipTests;`
3. Open `localhost:8080` in **Safari**

### Screenshots (if appropriate)

#### Before

![image](https://cloud.githubusercontent.com/assets/4968473/26576294/4dcc63fa-4563-11e7-87e0-0bc9e0d00dc1.png)

#### After

![image](https://cloud.githubusercontent.com/assets/4968473/26576191/e9db8f4c-4562-11e7-9677-215140f0c852.png)

### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO

Author: 1ambda <1amb4a@gmail.com>

Closes #2378 from 1ambda/ZEPPELIN-2602/navbar-is-broken-in-safari and squashes the following
commits:

947c2f7 [1ambda] fix: navbar-title rendering in safari


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9608f496
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9608f496
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9608f496

Branch: refs/heads/master
Commit: 9608f49601c6590127edd21fabacc2aa8f6bdfae
Parents: e49baf7
Author: 1ambda <1amb4a@gmail.com>
Authored: Tue May 30 18:06:46 2017 +0900
Committer: Lee moon soo <moon@apache.org>
Committed: Thu Jun 1 12:46:43 2017 -0700

----------------------------------------------------------------------
 zeppelin-web/src/components/navbar/navbar.css  | 11 +++++++----
 zeppelin-web/src/components/navbar/navbar.html |  5 ++---
 2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9608f496/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 d825c67..606a618 100644
--- a/zeppelin-web/src/components/navbar/navbar.css
+++ b/zeppelin-web/src/components/navbar/navbar.css
@@ -16,13 +16,15 @@
 /* Navbar
 /* ------------------------------------------- */
 
-.navbar-title {
+.navbar-brand.navbar-title {
+  margin-top: -3px;
+  margin-right: 20px;
+}
+
+.navbar-title > span {
   font-family: 'Patua One', cursive;
   font-size: 25px;
   color: white;
-  margin-top: 7px;
-  margin-right: 20px;
-  display: inline-block;
 }
 
 .navbar-menu {
@@ -43,6 +45,7 @@
 }
 
 .navbar-logo {
+  display: inline-block;
   padding-right: 10px;
 }
 

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9608f496/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 cbff368..acbe1d6 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -20,12 +20,11 @@ limitations under the License.
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <!-- title -->
       <a class="navbar-brand navbar-logo" href="#/">
         <img style="margin-top: -7px;" src="assets/images/zepLogoW.png" width="50" alt="Zeppelin"
/>
       </a>
-      <a class="" href="#/">
-        <span class="navbar-title">Zeppelin</span>
+      <a class="navbar-brand navbar-title" href="#/">
+        <span>Zeppelin</span>
       </a>
     </div>
 


Mime
View raw message