diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 468835f204..f54de10264 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -60,3 +60,4 @@ @import 'avalon'; @import "datatables"; +@import "tamu"; diff --git a/app/assets/stylesheets/avalon/_homepage.scss b/app/assets/stylesheets/avalon/_homepage.scss index 7a5fde7623..6e76cf227c 100644 --- a/app/assets/stylesheets/avalon/_homepage.scss +++ b/app/assets/stylesheets/avalon/_homepage.scss @@ -112,7 +112,7 @@ main.homepage-main { #footer.homepage-footer { color: white; - background: $blueGreen; + background: $primary; a { color: white; diff --git a/app/assets/stylesheets/avalon/_nav.scss b/app/assets/stylesheets/avalon/_nav.scss index b3aeb97bf0..30d216bd3c 100644 --- a/app/assets/stylesheets/avalon/_nav.scss +++ b/app/assets/stylesheets/avalon/_nav.scss @@ -33,7 +33,7 @@ $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !de .navbar-brand { @extend .desktop-hidden; background-size: contain; - background-color: white; + background-color: $primary; background-position: 20%; margin-top: 0; } diff --git a/app/assets/stylesheets/branding.scss b/app/assets/stylesheets/branding.scss index 50615f9747..f5346d2e92 100644 --- a/app/assets/stylesheets/branding.scss +++ b/app/assets/stylesheets/branding.scss @@ -30,7 +30,8 @@ $sansFontFamily: Arial, Helvetica, sans-serif; $museoSlab: 'MuseoSlab'; // Primary colors -$primary: #2a5459; +// $primary: #2a5459; +$primary: #500000; $secondary: #80a590; $dark: #0a2326; diff --git a/app/assets/stylesheets/tamu.scss b/app/assets/stylesheets/tamu.scss new file mode 100644 index 0000000000..a7e6f96802 --- /dev/null +++ b/app/assets/stylesheets/tamu.scss @@ -0,0 +1,87 @@ +#header-navbar { + @media screen and (min-width: 768px) { + border-top: 1px solid gray; + } +} + +#header-navbar .navbar-brand { + background: transparent "tamu-logo-with-bar.png" no-repeat top left; + margin-top: 10px; + margin-bottom: -10px; +} + +#header-navbar .navbar-toggle, #header-navbar .facets-toggle { + background: $yellow; +} + +.container > .navbar-header, .container > .navbar-collapse, .container > #facet-panel-collapse, .container > div[id*='facet-panel-'], .container-fluid > .navbar-header, .container-fluid > .navbar-collapse, .container-fluid > #facet-panel-collapse, .container-fluid > div[id*='facet-panel-'] { + background-color: $primary; +} + +.header-logo .desktop-hidden { + color: white; + margin-left: 10px; +} + +.custom-header { + background-color: #3c0000; +} + +.navbar-default { + background: $primary; +} + +.navbar-right { + background: #3c0000; +} + +.navbar-title { + background: #3c0000; + color: $white; +} + +.header-wrapper .header-logo > a:hover { + text-decoration: none; +} + +#footer.homepage-footer { + background: #3c0000; + padding: 0px 0px 0px 0px; +} + +.navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { + color: $primary; + background-color: $yellow; +} + +.navbar-default .navbar-nav > li > a { + color: $white; + display: block; + padding: 15px 10px 15px 10px; +} + +.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { + color: $primary; + background-color: $yellow; + text-decoration: none; +} + +.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { + color: #333333; +} + +.btn-primary { + color: $white; + background-color: $primary; + border-color: $primary; +} + +.btn-primary:hover { + color: $white; + background-color: #3c0000; + border-color: #3c0000; +} + +.homepage-splash-search { + margin-top: 7px; +} diff --git a/app/views/layouts/avalon.html.erb b/app/views/layouts/avalon.html.erb index 190ac2c836..74e416e064 100644 --- a/app/views/layouts/avalon.html.erb +++ b/app/views/layouts/avalon.html.erb @@ -22,14 +22,14 @@ Unless required by applicable law or agreed to in writing, software distributed