Merge branch 'development' into gcmd_keyword_tweaks

USGCRP · Mar 20, 2018 · 5c74907 · 5c74907
2 parents d74eff7 + 0391641
commit 5c74907
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/lib/Tuba/files/public/css/gcis.css b/lib/Tuba/files/public/css/gcis.css
@@ -1,5 +1,12 @@
 body {
 	padding-top: 0 !important;
+
+}
+a {
+        color: #0F9EFB;
+}
+.label-primary {
+      background-color: #096BA3;
 }
 html, body {
 	height: 100%;
@@ -26,7 +33,7 @@ table.squeeze tr th {
     padding-bottom:0px;
 }
 form label.required:after {
-    color: #e32;
+    color: #CA2C3A;
     content: '*';
     display:inline;
 }
@@ -39,7 +46,7 @@ form label.required:after {
 	margin-right: 0;
 }
 div.required_note:before {
-    color: #e32;
+    color: #CA2C3A;
     content: '*';
     display:inline;
 }
@@ -62,7 +69,7 @@ body.front-page p.lead {
      font-size: 22px;
 }
 h3.sub-title {
-	color: #626e7c;
+	color: #3D4044;
 	font-weight: normal;
 }
 .centered {
@@ -289,4 +296,6 @@ table tr td.non_numeric {
     left:40%;
     right:40%;
     white-space:nowrap;
+    background-color: #FF9405;
+    border-color: #FF9405;
 }
diff --git a/lib/Tuba/files/templates/index.html.ep b/lib/Tuba/files/templates/index.html.ep
@@ -24,7 +24,7 @@
       .jumbotron h1 {
         font-size: 50px;
         line-height: 1;
-        color: #013d87;
+        color: #096BA3;
       }
       .lead {
         font-size: 24px;
@@ -41,10 +41,14 @@
       	  margin: 30px 0 30px;
       }
       #svgwrap a text {
-        fill: #0088cc;
+        fill: #0F9EFB;
       }
       h2 {
       	font-size: 20px;
+        color: #10252A;
+      }
+      h3 {
+        color: #10252A;
       }
       .row .front-footer {
       	  text-align: center;
@@ -76,7 +80,7 @@
         <%= link_to "metrics" => { format => 'yaml' } => class => 'label label-primary' => begin %>YAML<%= end %>
         </p>
 <div class='row'>
-<div class="col-md-7 col-md-offset-3 centered">
+<div class="well centered">
 <h2>Featured USGCRP reports : <br /><br />
 %= include 'h/featured_reports'
 </div>