Commit 233c32d2 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1845104 Ocean theme changes"

parents a8ef00b0 ce78dc84
// Generic custom css (anything longer than a screen view should have its own component file)
// link hover color
// override bootstrap's lighten() as it looks a bit odd with the blue used for $theme-primary-color
a,
.text-link,
.list-group a.text-link,
.list-group-item-heading a,
.collapsible legend h3 .secondary-link,
.collapsible legend h4 .secondary-link,
.card-header .secondary-link,
.pagination > li > a,
.pagination > li > span {
&:hover,
&:focus {
color: scale-color($theme-primary-color, $lightness: 30%);
}
}
.list-group-item-heading a:hover .metadata,
.list-group-item-heading a:focus .metadata {
color: scale-color($theme-primary-color, $lightness: 30%);
}
// cards
.card-secondary .card-header-nested,
.card-secondary >.card-header {
border-left: 0;
background-color: transparent;
}
.loading-inner {
background: transparent;
.icon-spinner {
color: #fff;
}
}
.arrow-bar {
background-color: $arrow-bar-bg;
.arrow {
background-color: $arrow-color;
&:after {
border-left: 14px solid $arrow-color;
}
.text {
color: $arrow-text-color;
}
}
}
.nav-inpage {
&.nav > li {
> a, button {
color: $arrow-link-color;
&:hover,
&:focus {
background: $arrow-link-background-color;
color: $arrow-link-hover-color;
}
}
&.active > a,
&.active > button {
color: $theme-text-color;
background: $arrow-link-background-color;
&:hover,
&:focus {
color: $arrow-link-active-color;
}
}
}
}
.list-group-item {
h4.title,
h4.list-group-item-heading,
h5.title,
h5.list-group-item-heading {
font-family: $font-family-sans-serif;
}
}
.list-group-item-heading {
font-family: $font-family-sans-serif;
}
// Navigation toggle styles
.nav-toggle-area {
.user-icon {
&:hover,
&:focus {
color: $navbar-toggle-hover-color;
background-color: $navbar-toggle-hover-bg;
}
}
}
.navbar-toggle {
color: $navbar-toggle-color;
background-color: $navbar-toggle-bg;
background-image: none;
border: 1px solid transparent;
&:hover,
&:focus {
color: $navbar-toggle-hover-color;
background-color: $navbar-toggle-hover-bg;
}
&.collapsed {
background-color: transparent;
&:hover,
&:focus {
color: $navbar-toggle-hover-color;
background-color: $navbar-toggle-hover-bg;
}
}
&.search-toggle {
@include media-breakpoint-up(md) {
display: none;
}
.icon {
color: $navbar-toggle-color;
background-color: $navbar-toggle-bg;
}
}
&.user-toggle {
color: $navbar-toggle-color;
background-color: $navbar-toggle-bg;
@include media-breakpoint-up(md) {
border-left-width: 1px;
}
&:hover,
&:focus {
color: $navbar-toggle-hover-color;
background-color: $navbar-toggle-hover-bg;
}
}
&:last-of-type {
border-left-width: 1px;
}
}
// navbar menu children toggles
.nav {
.navbar-showchildren {
color: $navbar-inverse-toggle-color;
background: $navbar-inverse-toggle-bg;
border: 0;
&:hover,
&:focus {
background: $navbar-inverse-toggle-hover-bg;
.icon {
color: $navbar-inverse-toggle-hover-color;
}
}
.active & {
background-color: $navbar-inverse-toggle-active-bg;
.icon {
color: $navbar-inverse-toggle-active-color;
}
}
}
}
.pageheader {
background: $pageheader-bg;
}
// cards
.card.card-secondary {
> .card-header, .card-header-nested {
border-left: 0;
background-color: transparent;
}
.card-body {
h4.title {
font-family: $font-family-sans-serif;
}
}
}
.bt-taggedposts .post h4.title {
font-family: $font-family-sans-serif;
}
......@@ -9,100 +9,4 @@
border: 0;
}
}
// Top level navigation items use colour variables from "navbar-default"
.navbar-nav {
> li > a {
color: $navbar-default-link-color;
background-color: $navbar-default-link-bg;
border-top: 1px solid $navbar-default-link-border;
border-bottom: 1px solid $navbar-default-link-border;
&:hover,
&:focus {
background-color: $navbar-default-link-hover-bg;
color: $navbar-default-link-hover-color;
}
@include media-breakpoint-up(md) {
border: 1px solid $navbar-default-link-border;
}
}
> .active > a {
background-color: $navbar-default-active-bg;
color: $navbar-default-active-color;
&:hover,
&:focus {
background-color: $navbar-default-active-bg;
color: $navbar-default-active-color;
}
}
}
// Child navigation items
.child-nav {
li > a {
color: $navbar-inverse-link-color;
background-color: $navbar-inverse-bg;
&:hover,
&:focus {
background-color: $navbar-inverse-link-hover-bg;
color: $navbar-inverse-link-hover-color;
}
}
.active > a {
background-color: $navbar-inverse-link-active-bg;
color: $navbar-inverse-link-active-color;
&:hover,
&:focus {
background-color: $navbar-inverse-link-hover-bg;
color: $navbar-inverse-link-hover-color;
}
}
}
}
// Differently admin header and nav color
body.admin {
.navbar-default {
background-color: scale-color($gray-500, $lightness: 7%);
border-color: scale-color($gray-500, $lightness: 7%);
.navbar-toggle {
&:focus,
&:hover {
background-color: scale-color($gray-500, $lightness: -2%);
}
}
.navbar-collapse {
border-color: scale-color($gray-500, $lightness: 7%);
}
}
.navbar-main {
.navbar-nav > li > a {
border-color: scale-color($gray-500, $lightness: 10%);
background-color: scale-color($gray-500, $lightness: 7%);
&:focus,
&:hover {
background-color: scale-color($gray-500, $lightness: -9%);
}
}
.navbar-showchildren {
background-color: scale-color($gray-500, $lightness: 90%);
color: $gray-700;
&.collapsed {
background-color: transparent;
color: #FFFFFF;
}
}
.child-nav li > a {
background-color: scale-color($gray-500, $lightness: 90%);
&:focus,
&:hover {
background-color: scale-color($gray-500, $lightness: 80%);
}
}
}
}
/*
* Modification to bootstraps default navbar components
*/
// Login link and language form
.topright-menu {
.login-link a {
color: $navbar-default-link-color;
&:focus,
&:hover {
color: $navbar-default-link-hover-color;
background-color: $navbar-default-link-hover-bg;
}
}
}
.navbar-default {
background-color: $navbar-default-bg;
border-color: $navbar-default-border;
}
// Header messagebox form
.navbar-messages {
&:hover,
&:focus {
color: $navbar-default-link-hover-color;
text-decoration: none;
}
.navbar-messages-count {
background-color: $navbar-messages-count-bg;
color: $navbar-messages-count-color;
}
}
......@@ -15,17 +15,7 @@
//
//## Settings for some of the most global styles.
//== Typography
$font-family-serif: 'Osvaldo', Georgia, "Times New Roman", Times, serif; // display font replaces serif
// readjusted using 14px as $font-size-base ^ (larger due to custom font)
$font-size-base: 0.875rem; // ~14px
$font-size-h1: $font-size-base * 2.71; // ~38px
$font-size-h2: $font-size-base * 2.14; // ~30px
$font-size-h3: $font-size-base * 1.71; // ~24px
$font-size-h4: $font-size-base * 1.57; // ~22px
$font-size-h5: $font-size-base * 1.28; // ~18px
$font-size-h6: $font-size-base * 1.14; // ~16px
$headings-font-family: $font-family-serif;
$headings-font-family: $font-family-serif;
......@@ -56,17 +56,3 @@ $navbar-inverse-toggle-hover-color: #333;
$navbar-inverse-toggle-hover-bg: scale-color($theme-primary-color, $lightness: 90%);
$navbar-inverse-toggle-active-color: #000;
$navbar-inverse-toggle-active-bg: scale-color($theme-primary-color, $lightness: 90%);
//== Tabs
$nav-tabs-border-color: #eee;
$nav-tabs-link-hover-border-color: $theme-primary-color;
$nav-tabs-active-link-hover-bg: $body-bg;
$nav-tabs-active-link-hover-color: $theme-primary-color;
$nav-tabs-active-link-hover-border-color: $theme-primary-color;
$nav-tabs-justified-link-border-color: #f7f7f7;
$nav-tabs-justified-active-link-border-color: $body-bg;
@import "../typography/fonts";
@import "../layout/layout";
@import "../layout/nav/main-nav";
@import "../layout/nav/navbar";
@import "../components/arrow-bar";
@import "../components/toggles";
@import "../layout/card/card-secondary";
@import "../components/list-group";
@import "../components/loading-inner";
@import "../features/dashboard-widget";
@import "../features/collection-navigation";
......@@ -349,7 +349,8 @@ pre {
/* but not some titles */
&.list-group-item-heading,
&.title {
&.title,
&.card-header {
font-family: $headings-font-family;
font-weight: $headings-font-weight;
color: $headings-color;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment