From 8367b014d9e94698f3c2b2103afa73ca680eb484 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 4 Dec 2014 23:18:30 +0000 Subject: [PATCH] Use teal colour. Switch to Avenir Next W01 as main font. --- app/assets/sass/partials/_base.scss | 10 ++++++---- .../css/{all-d7f46061.css => all-da508f17.css} | 13 +++++++------ public/build/css/all.css | 13 +++++++------ public/build/rev-manifest.json | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) rename public/build/css/{all-d7f46061.css => all-da508f17.css} (99%) diff --git a/app/assets/sass/partials/_base.scss b/app/assets/sass/partials/_base.scss index 5a7ec40f..adc4408a 100644 --- a/app/assets/sass/partials/_base.scss +++ b/app/assets/sass/partials/_base.scss @@ -1,14 +1,15 @@ $base-background-color: #f5f5f5; -$base-font-family: "Helvetica Neue", Helvetica, "Open Sans", sans-serif; -$base-font-weight: lighter; +$base-font-family: "Avenir Next W01", "Helvetica Neue", "Helvetica", "Arial", sans-serif; +$base-font-weight: 300; $base-letter-spacing: 1px; +$base-font-size: 16px; $base-link-color: #ffffff; $base-link-hover-color: #e9e9e9; -$header-background-color: #263238; -$header-border-color: 1px solid #182024; +$header-background-color: #00695C; +$header-border-color: 1px solid darken(#00695C, 10%); $sidebar-transition-speed: .2s; $sidebar-background-color: #37474f; @@ -28,6 +29,7 @@ $screen-lg-min: "(min-width: 1200px)"; body.dashboard { font-family: $base-font-family; font-weight: $base-font-weight; + font-size: $base-font-size; letter-spacing: $base-letter-spacing; background: $base-background-color; } diff --git a/public/build/css/all-d7f46061.css b/public/build/css/all-da508f17.css similarity index 99% rename from public/build/css/all-d7f46061.css rename to public/build/css/all-da508f17.css index 2633efc5..6d690398 100644 --- a/public/build/css/all-d7f46061.css +++ b/public/build/css/all-da508f17.css @@ -22,8 +22,9 @@ ul.tabs { padding: 15px 30px; } body.dashboard { - font-family: "Helvetica Neue", Helvetica, "Open Sans", sans-serif; - font-weight: lighter; + font-family: "Avenir Next W01", "Helvetica Neue", "Helvetica", "Arial", sans-serif; + font-weight: 300; + font-size: 16px; letter-spacing: 1px; background: #f5f5f5; } @@ -52,8 +53,8 @@ body.dashboard .navbar { z-index: 999; border-radius: 0px; border: none; - border-bottom: 1px solid #182024; - background: #263238; + border-bottom: 1px solid #00362f; + background: #00695C; margin: 0; } body.dashboard .navbar a, body.dashboard .navbar a:active, body.dashboard .navbar a:visited { color: #ffffff; } @@ -66,7 +67,7 @@ body.dashboard .navbar { body.dashboard .navbar .navbar-toggle.collapsed span { background-color: #ffffff; } body.dashboard .navbar .navbar-collapse { - background: #263238; } + background: #00695C; } body.dashboard .navbar a.navbar-brand { padding: 34px 21px; line-height: 0px; @@ -117,7 +118,7 @@ body.dashboard .sidebar { body.dashboard .sidebar ul li:last-child { border-bottom: 1px solid rgba(255, 255, 255, 0.1); } body.dashboard .sidebar ul li.active { - background: #263238; } + background: #00695C; } body.dashboard .sidebar ul li.active a { color: #ffffff; } body.dashboard .sidebar ul li a { diff --git a/public/build/css/all.css b/public/build/css/all.css index 2633efc5..6d690398 100644 --- a/public/build/css/all.css +++ b/public/build/css/all.css @@ -22,8 +22,9 @@ ul.tabs { padding: 15px 30px; } body.dashboard { - font-family: "Helvetica Neue", Helvetica, "Open Sans", sans-serif; - font-weight: lighter; + font-family: "Avenir Next W01", "Helvetica Neue", "Helvetica", "Arial", sans-serif; + font-weight: 300; + font-size: 16px; letter-spacing: 1px; background: #f5f5f5; } @@ -52,8 +53,8 @@ body.dashboard .navbar { z-index: 999; border-radius: 0px; border: none; - border-bottom: 1px solid #182024; - background: #263238; + border-bottom: 1px solid #00362f; + background: #00695C; margin: 0; } body.dashboard .navbar a, body.dashboard .navbar a:active, body.dashboard .navbar a:visited { color: #ffffff; } @@ -66,7 +67,7 @@ body.dashboard .navbar { body.dashboard .navbar .navbar-toggle.collapsed span { background-color: #ffffff; } body.dashboard .navbar .navbar-collapse { - background: #263238; } + background: #00695C; } body.dashboard .navbar a.navbar-brand { padding: 34px 21px; line-height: 0px; @@ -117,7 +118,7 @@ body.dashboard .sidebar { body.dashboard .sidebar ul li:last-child { border-bottom: 1px solid rgba(255, 255, 255, 0.1); } body.dashboard .sidebar ul li.active { - background: #263238; } + background: #00695C; } body.dashboard .sidebar ul li.active a { color: #ffffff; } body.dashboard .sidebar ul li a { diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json index f82a9f6f..5554f2ad 100644 --- a/public/build/rev-manifest.json +++ b/public/build/rev-manifest.json @@ -1,4 +1,4 @@ { - "css/all.css": "css/all-d7f46061.css", + "css/all.css": "css/all-da508f17.css", "js/all.js": "js/all-c84ab03b.js" } \ No newline at end of file