zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject zeppelin git commit: [MINOR] Fix navbar layout misalignment
Date Fri, 30 Dec 2016 18:30:47 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master 989a73f20 -> 31b71f739


[MINOR] Fix navbar layout misalignment

### What is this PR for?
Fix navbar layout misalignment when browser width is narrow.

### What type of PR is it?
[Improvement]

### Todos

### What is the Jira issue?
NA

### How should this be tested?
Change the width of browser(chrome/firefox/IE)

### Screenshots (if appropriate)
* before
![before](https://cloud.githubusercontent.com/assets/8870299/21526139/5161c418-cd65-11e6-9a00-b07437413882.gif)
* after
![after](https://cloud.githubusercontent.com/assets/8870299/21526154/71470d42-cd65-11e6-8706-13f93e08445d.gif)

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

Author: Myoungdo Park <cuspymd@gmail.com>

Closes #1810 from cuspymd/fix-navbar and squashes the following commits:

d67be87 [Myoungdo Park] Merge branch 'ori-master' into fix-navbar
ce75696 [Myoungdo Park] Fix navbar layout misalignment


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

Branch: refs/heads/master
Commit: 31b71f7391fab8ff5f7a0feb90f285eb98911902
Parents: 989a73f
Author: Myoungdo Park <cuspymd@gmail.com>
Authored: Thu Dec 29 00:35:24 2016 +0900
Committer: Lee moon soo <moon@apache.org>
Committed: Fri Dec 30 10:30:40 2016 -0800

----------------------------------------------------------------------
 zeppelin-web/src/components/navbar/navbar.css  | 32 +++++++++++++++++++++
 zeppelin-web/src/components/navbar/navbar.html |  1 -
 zeppelin-web/src/index.html                    |  1 +
 3 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/31b71f73/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
new file mode 100644
index 0000000..e5d299a
--- /dev/null
+++ b/zeppelin-web/src/components/navbar/navbar.css
@@ -0,0 +1,32 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#searchTermId {  
+  min-width: 200px;
+}
+
+
+@media (min-width: 795px) and (max-width: 830px) {
+  input#searchTermId {  
+    width: 170px;
+    min-width: 170px;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 794px) {
+  input#searchTermId {  
+    width: 140px;
+    min-width: 140px;
+  }
+}

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/31b71f73/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 8249391..b55fe02 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -52,7 +52,6 @@ limitations under the License.
             <div class="input-group">
               <input
                 type="text"
-                style="min-width:200px;"
                 ng-model="navbar.searchForm.searchTerm"
                 id="searchTermId"
                 ng-disabled="!navbar.connected"

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/31b71f73/zeppelin-web/src/index.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index 602b682..fb2677f 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -52,6 +52,7 @@ limitations under the License.
     <link rel="stylesheet" href="bower_components/select2/dist/css/select2.css" />
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
+    <link rel="stylesheet" href="components/navbar/navbar.css" />
     <link rel="stylesheet" href="app/home/home.css" />
     <link rel="stylesheet" href="app/search/search.css" />
     <link rel="stylesheet" href="app/notebook/notebook.css" />


Mime
View raw message