diff --git a/app/views/layouts/_branding.html.erb b/app/views/layouts/_branding.html.erb index 9e5ddd3..72e65ad 100644 --- a/app/views/layouts/_branding.html.erb +++ b/app/views/layouts/_branding.html.erb @@ -23,21 +23,34 @@
<% if user_signed_in? && !current_user.org.nil? %> - <%= render partial: "layouts/branding" %> + <%= render partial: "layouts/branding" , locals: {max_number_links: MAX_NUMBER_LINKS_FUNDER,} %> <% end %>
diff --git a/lib/assets/stylesheets/overrides.scss b/lib/assets/stylesheets/overrides.scss index 1282a91..b4d87e6 100644 --- a/lib/assets/stylesheets/overrides.scss +++ b/lib/assets/stylesheets/overrides.scss @@ -16,7 +16,7 @@ font-weight: normal; } -/* Font Smoothing in Webkit /* +/* Font Smoothing in Webkit /* body { -webkit-font-smoothing: antialiased; } @@ -45,7 +45,7 @@ .table-responsive > .table { width: 100%; margin-bottom: 15px; - overflow: auto; + overflow: auto; } @media (max-width: 768px) { @@ -63,13 +63,13 @@ /* NOTIFICATION TABLE STYLING */ .notifications { - table { + table { border: none; - thead > tr > th { - border: none; + thead > tr > th { + border: none; background-color: $white; - color: $black; + color: $black; } tbody > tr > td { border: none; } } @@ -82,7 +82,7 @@ color: $white; border: none; margin-right:2px; - margin-bottom: 10px; + margin-bottom: 10px; } .nav-tabs > li > a{ border-radius: 2px; @@ -149,8 +149,8 @@ .btn-primary:focus, .btn-primary:active, .btn-primary:visited, -.btn-primary:active:hover, -.btn-primary.active:hover { +.btn-primary:active:hover, +.btn-primary.active:hover { background-color: $grey; color: $white; border-color: $grey; @@ -165,8 +165,8 @@ .btn-default:focus, .btn-default:active, .btn-default:visited, -.btn-default:active:hover, -.btn-default.active:hover { +.btn-default:active:hover, +.btn-default.active:hover { background-color: $grey; color: $white; border-color: $grey; @@ -216,7 +216,7 @@ $notice-color: $gold; $notice-background: #fcf8e3; -/**** ---------------------------------------------------------------------------- ****/ +/**** ---------------------------------------------------------------------------- ****/ /**** Main layout configuration ****/ main { @@ -276,6 +276,16 @@ height: 102px; padding-top: 0; } + #org-navbar .org-links { + padding-top: 15px; + } + #org-navbar .org-a { + line-height: 36px !important; + height: 36px !important; + vertical-align: middle !important; + padding-top: 0; + padding-bottom: 0; + } } @media (min-width: 768px) { #admin-dropdown ul li a, #super-admin-dropdown ul li a {