climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [1/2] climate git commit: CLIMATE-730 Add OCW logo to ocw-ui header navigation panel
Date Fri, 29 Jan 2016 05:30:59 GMT
Repository: climate
Updated Branches:
  refs/heads/master 3d863bc58 -> 584dfd4c2


CLIMATE-730 Add OCW logo to ocw-ui header navigation panel


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

Branch: refs/heads/master
Commit: f506754451c375d10b6ac1c0ff5ec0984cd55431
Parents: 4743021
Author: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Authored: Thu Jan 28 16:48:35 2016 -0800
Committer: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Committed: Thu Jan 28 16:48:35 2016 -0800

----------------------------------------------------------------------
 .../frontend/app/img/ocw-logo-variant-sm-01-01.png  | Bin 0 -> 5776 bytes
 ocw-ui/frontend/app/index.html                      |   5 +++--
 ocw-ui/frontend/app/styles/main.css                 |   7 ++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/f5067544/ocw-ui/frontend/app/img/ocw-logo-variant-sm-01-01.png
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/img/ocw-logo-variant-sm-01-01.png b/ocw-ui/frontend/app/img/ocw-logo-variant-sm-01-01.png
new file mode 100644
index 0000000..95c3b31
Binary files /dev/null and b/ocw-ui/frontend/app/img/ocw-logo-variant-sm-01-01.png differ

http://git-wip-us.apache.org/repos/asf/climate/blob/f5067544/ocw-ui/frontend/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/index.html b/ocw-ui/frontend/app/index.html
index 4d5996a..835a427 100644
--- a/ocw-ui/frontend/app/index.html
+++ b/ocw-ui/frontend/app/index.html
@@ -48,7 +48,9 @@ under the License.
         <div class="navbar navbar-default" id="ocw-navbar" role="navigation">
           <div class="container">
             <div class="navbar-header">
-              <a class="navbar-brand brand" href="#">OCW UI</a>
+              <a class="navbar-brand brand" href="http://climate.apache.org">
+                <img id="header-img" src="img/ocw-logo-variant-sm-01-01.png" align="right"
height="75"/>
+              </a>
             </div>
             <div class="navbar-collapse">
               <ul class="nav navbar-nav">
@@ -61,7 +63,6 @@ under the License.
         <div class="row">
           <div class="col-md-12">
             <div id="header">
-              <img id="header-img" src=""/>
               <h3 id="header-title">Project Name</h3>
               <h5 id="OCW-powered">Powered by Apache Open Climate Workbench</h5>
             </div>

http://git-wip-us.apache.org/repos/asf/climate/blob/f5067544/ocw-ui/frontend/app/styles/main.css
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/styles/main.css b/ocw-ui/frontend/app/styles/main.css
index b06a9e7..37d9e9e 100644
--- a/ocw-ui/frontend/app/styles/main.css
+++ b/ocw-ui/frontend/app/styles/main.css
@@ -22,7 +22,7 @@ body {
 }
 
 #header-img {
-	
+	heigh: auto;
 }
 
 #header-title {
@@ -61,6 +61,11 @@ body {
 
 #map { height: 500px; }
 
+.navbar-header {
+    height: 100px;
+    padding-top: 0;
+}
+
 /* Small preview map that is displayed alongside dataset information */
 .preview-map {
 	height: 100px;


Mime
View raw message