diff --git a/app/views/layouts/_branding.html.erb b/app/views/layouts/_branding.html.erb index ccccb03..1870dc0 100644 --- a/app/views/layouts/_branding.html.erb +++ b/app/views/layouts/_branding.html.erb @@ -2,13 +2,6 @@
<% if user_signed_in? %> <% if !current_user.org.nil? %> - - <% if current_user.org.logo.present? %> - - <% end %> - <% if current_user.org.banner_text.present? %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 1b3a5c4..a3a7c0b 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,7 +1,11 @@
diff --git a/lib/assets/images/logo.png b/lib/assets/images/logo.png index f360454..e4cc2dc 100644 --- a/lib/assets/images/logo.png +++ b/lib/assets/images/logo.png Binary files differ diff --git a/lib/assets/images/roadmap_logo_orange_grey.png b/lib/assets/images/roadmap_logo_orange_grey.png new file mode 100644 index 0000000..e4cc2dc --- /dev/null +++ b/lib/assets/images/roadmap_logo_orange_grey.png Binary files differ diff --git a/lib/assets/images/roadmap_logo_orange_white.png b/lib/assets/images/roadmap_logo_orange_white.png new file mode 100644 index 0000000..f360454 --- /dev/null +++ b/lib/assets/images/roadmap_logo_orange_white.png Binary files differ diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss index 2e9d86c..5a89958 100644 --- a/lib/assets/stylesheets/dmproadmap.scss +++ b/lib/assets/stylesheets/dmproadmap.scss @@ -27,9 +27,10 @@ /* HEADER STYLING */ $header-height: 165px; $header-logo-width: 165px; -$header-background: $primary-color; +$header-background: $white; +$header-text-color: $black; /* $header-background: linear-gradient(#ED6406, #F59503); */ /* HEADER LOGO POSITIONING */ -$header-logo-top-margin: 70px; +$header-logo-top-margin: 20px; $header-logo-left-margin: 10px; \ No newline at end of file diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss index ee7c9ac..e474521 100644 --- a/lib/assets/stylesheets/dmproadmap/base.scss +++ b/lib/assets/stylesheets/dmproadmap/base.scss @@ -201,7 +201,7 @@ /* ----------------------------------------------------- */ header { background: $header-background; - color: white; + color: $header-text-color; height: $header-height; text-align: left; @@ -231,7 +231,7 @@ height: 60%; a { - color: white; + color: $header-text-color; } .header-org-logo, .header-org-banner-text { @@ -248,9 +248,8 @@ } } .header-org-banner-text { - width: 60%; + width: 80%; vertical-align: bottom; - margin-left: 25px; } } .main-nav { @@ -265,9 +264,9 @@ li { position: relative; display: inline-block; - color: $white; + color: $header-text-color; background-color: $primary-color; - border: 1px solid $white; + border: 1px solid $black; padding: 6px 10px; margin-bottom: -1px; font-size: 14px; @@ -299,8 +298,8 @@ padding-right: 15px; .caret { - border-top: 4px solid $white; - border-bottom: $white; + border-top: 4px solid $header-text-color; + border-bottom: $header-text-color; } } #explore-dropdown { @@ -331,17 +330,17 @@ position: absolute; top: 5px; right: 10px; - color: white; + color: $header-text-color; margin-top: 5px; a { - color: white; + color: $header-text-color; font-size: 14px; text-decoration: none; } .caret { - border-top-color: $white; - border-bottom-color: $white; + border-top-color: $header-text-color; + border-bottom-color: $header-text-color; } } }