You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by le...@apache.org on 2016/01/29 06:29:11 UTC
[1/3] climate git commit: CLIMATE-730 Add OCW logo to ocw-ui header
navigation panel this closes #284
Repository: climate
Updated Branches:
refs/heads/master 64d3668c4 -> 3d863bc58
CLIMATE-730 Add OCW logo to ocw-ui header navigation panel this closes #284
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/5b4273de
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5b4273de
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5b4273de
Branch: refs/heads/master
Commit: 5b4273ded542b1532797577f3c084395d69202cd
Parents: c4f3b50
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Thu Jan 28 16:48:35 2016 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Thu Jan 28 21:27:26 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/5b4273de/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/5b4273de/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/5b4273de/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;
[3/3] climate git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/climate
Posted by le...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/climate
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/3d863bc5
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/3d863bc5
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/3d863bc5
Branch: refs/heads/master
Commit: 3d863bc58d73d1976c9693cd945094deabd9bee2
Parents: 5b4273d 64d3668
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Thu Jan 28 21:28:57 2016 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Thu Jan 28 21:28:57 2016 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] climate git commit: CLIMATE-729 - Remove config file from
NARCCAP examples - Remove Fig7_w from NARCCAP Examples configuration file
Posted by le...@apache.org.
CLIMATE-729 - Remove config file from NARCCAP examples
- Remove Fig7_w from NARCCAP Examples configuration file
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c4f3b507
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c4f3b507
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/c4f3b507
Branch: refs/heads/master
Commit: c4f3b5073e5f708ad92ff7da261d8b9fbc375f23
Parents: b43c75c
Author: Nash <de...@jpl.nasa.gov>
Authored: Thu Jan 28 16:15:09 2016 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Thu Jan 28 21:27:26 2016 -0800
----------------------------------------------------------------------
RCMES/configuration_files/NARCCAP_examples/Fig7_w | 0
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/c4f3b507/RCMES/configuration_files/NARCCAP_examples/Fig7_w
----------------------------------------------------------------------
diff --git a/RCMES/configuration_files/NARCCAP_examples/Fig7_w b/RCMES/configuration_files/NARCCAP_examples/Fig7_w
deleted file mode 100644
index e69de29..0000000