Skip to content

GitLab

Commit 5e15470d authored by Evonne Cheung's avatar Evonne Cheung Committed by Robert Lyon
Browse files

Bug 1674518: Design changes for themes 

Change-Id: Ib22e09ecc91221f5a42f2d2b16f614c8b067a84a
behatnotneeded: design changes only
parent ff4a9a9d
Hide whitespace changes
Inline Side-by-side
htdocs/theme/modern/sass/typography/_fonts.scss
View file @ 5e15470d
......@@ -7,56 +7,25 @@ $regular: normal, normal;
$italic: normal, italic;
$bold: 700, bold;
$opensans: (
OpenSansLight: $light,
OpenSansLightItalic: $lightItalic,
OpenSansRegular: $regular,
OpenSansItalic: $italic,
OpenSansBold: $bold
);
$robotoslab: (
RobotoSlab-Thin: $thin,
RobotoSlab-Light: $light,
RobotoSlab-Regular: $regular,
RobotoSlab-Bold: $bold
);
$raleway: (
Raleway-Thin: $thin,
Raleway-Light: $light,
Raleway-Regular: $regular,
Raleway-Bold: $bold
raleway-thin: $thin,
raleway-light: $light,
raleway-lightitalic: $lightItalic,
raleway-regular: $regular,
raleway-italic: $italic,
raleway-bold: $bold
);
@each $fontname, $style in $opensans {
@font-face {
font-family: 'Open Sans';
src: url('#{$font-path}/opensans/#{$fontname}.eot');
src: url('#{$font-path}/opensans/#{$fontname}.eot') format('embedded-opentype'),
url('#{$font-path}/opensans/#{$fontname}.woff2') format('woff2'),
url('#{$font-path}/opensans/#{$fontname}.woff') format('woff'),
url('#{$font-path}/opensans/#{$fontname}.ttf') format('truetype'),
url('#{$font-path}/opensans/#{$fontname}.svg##{$fontname}') format('svg');
font-weight: nth($style, 1);
font-style: nth($style, 2);
}
}
@each $fontname, $style in $robotoslab {
@font-face {
font-family: 'Roboto Slab';
src: url('#{$font-path}/robotoslab/#{$fontname}.ttf') format('truetype');
font-weight: nth($style, 1);
font-style: nth($style, 2);
}
}
@each $fontname, $style in $raleway {
@font-face {
font-family: 'Raleway';
src: url('#{$font-path}/raleway/#{$fontname}.ttf') format('truetype');
src: url('#{$font-path}/raleway/#{$fontname}.eot');
src: url('#{$font-path}/raleway/#{$fontname}.eot?#iefix') format('embedded-opentype'),
url('#{$font-path}/raleway/#{$fontname}.woff2') format('woff2'),
url('#{$font-path}/raleway/#{$fontname}.svg##{$fontname}') format('svg'),
url('#{$font-path}/raleway/#{$fontname}.otf') format('opentype'),
url('#{$font-path}/raleway/#{$fontname}.ttf') format('truetype'),
url('#{$font-path}/raleway/#{$fontname}.woff') format('woff');
font-weight: nth($style, 1);
font-style: nth($style, 2);
}
......
htdocs/theme/modern/sass/utilities/_bootstrap-variables.scss
View file @ 5e15470d
......@@ -44,7 +44,7 @@ $state-warning-text: #8a6d3b !default;
$state-warning-bg: #fcf8e3 !default;
$state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
$state-danger-text: #a94442 !default;
$state-danger-text: #545B5D !default;
$state-danger-bg: #f2dede !default;
$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
......@@ -390,7 +390,7 @@ $navbar-collapse-max-height: none;
$navbar-default-color: #FFF;
$navbar-default-bg: $brand-primary;
$navbar-default-border: darken($brand-primary, 3%);
$navbar-default-border: transparent;
// Navbar links
$navbar-default-link-color: #FFF;
......@@ -409,7 +409,7 @@ $navbar-default-brand-hover-bg: transparent;
// Navbar toggle
$navbar-default-toggle-hover-bg: $theme-accent-color;
$navbar-default-toggle-icon-bar-bg: $navbar-default-link-color;
$navbar-default-toggle-border-color: $theme-accent-color;
$navbar-default-toggle-border-color: transparent;
// Inverted navbar
......@@ -422,7 +422,7 @@ $navbar-inverse-border: $navbar-inverse-bg;
$navbar-inverse-link-color: #FFFFFF;
$navbar-inverse-link-hover-color: #FFFFFF;
$navbar-inverse-link-hover-bg: darken($navbar-inverse-bg, 2%);
$navbar-inverse-link-active-color: $text-color;
$navbar-inverse-link-active-color: #FFFFFF;
$navbar-inverse-link-active-bg: $navbar-inverse-link-hover-bg;
$navbar-inverse-link-disabled-color: #444;
$navbar-inverse-link-disabled-bg: transparent;
......@@ -434,7 +434,7 @@ $navbar-inverse-brand-hover-bg: transparent;
// Inverted navbar toggle
$navbar-inverse-toggle-hover-bg: $theme-accent-color;
$navbar-inverse-toggle-icon-bar-bg: $theme-accent-color;
$navbar-inverse-toggle-icon-bar-bg: #FFFFFF;
$navbar-inverse-toggle-border-color: #333;
//== Navs
......
htdocs/theme/modern/sass/utilities/_index.scss
View file @ 5e15470d
@import "../form/form";
@import "../components/user-icon";
@import "../components/btn";
@import "../components/arrow-bar";
@import "../typography/fonts";
@import "../layout/panel/panel";
@import "../layout/panel/panel-heading";
@import "../layout/panel/panel-secondary";
@import "../form/form";
@import "../components/arrow-bar";
@import "../components/btn";
@import "../components/user-icon";
@import "../features/dashboard-widget";
htdocs/theme/ocean/sass/_custom.scss
View file @ 5e15470d
......@@ -33,20 +33,3 @@ a,
color: #fff;
}
}
// headings in journals
.myblogs {
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
font-family: $font-family-sans-serif;
font-weight: 700;
}
h1 {
border-bottom: 0;
padding-bottom: 0;
font-size: 30px;
}
.list-group-item-heading {
font-family: $font-family-serif;
}
}
htdocs/theme/ocean/sass/layout/nav/_main-nav.scss
View file @ 5e15470d
// Primary Nav
// overriding/additional styles for theme
body.admin {
.navbar-default {
background-color: lighten($gray, 7%);
border-color: lighten($gray, 7%);;
.navbar-toggle {
&.navbar-showchildren {
background-color: $navbar-inverse-bg;
color: $gray-dark;
&:focus,
&:hover {
.icon {
color: #FFFFFF;
}
}
&.collapsed {
background-color: transparent;
color: #FFFFFF;
}
}
.navbar-toggle {
border-color: $gray;
}
.active {
.navbar-showchildren.collapsed {
.icon {
color: #FFFFFF;
}
}
}
// Tweak mene toggle styles
.navbar-showchildren {
.icon {
color: $navbar-inverse-toggle-icon-bar-bg;
}
&:hover,
&:focus {
.icon {
color: $navbar-inverse-toggle-icon-bar-bg;
body.admin {
.navbar-default {
background-color: lighten($gray, 7%);
border-color: lighten($gray, 7%);
.navbar-toggle {
&:focus,
&:hover {
background-color: darken($gray, 2%);
}
}
.navbar-collapse {
border-color: lighten($gray, 7%);
}
}
.active & {
.icon {
color: $gray;
.navbar-main {
.navbar-nav > li > a {
border-color: lighten($gray, 10%);
background-color: lighten($gray, 7%);
&:focus,
&:hover {
background-color: darken($gray, 9%);
}
}
.navbar-showchildren {
background-color: lighten($gray, 60%);
color: $gray-dark;
&.collapsed {
background-color: transparent;
color: #FFFFFF;
}
}
.child-nav li > a {
background-color: lighten($gray, 60%);
&:focus,
&:hover {
background-color: lighten($gray, 58%);
}
}
}
}
htdocs/theme/ocean/sass/typography/_fonts.scss
View file @ 5e15470d
......@@ -2,11 +2,12 @@
@font-face {
font-family: 'Osvaldo';
src: url('../fonts/osvaldo/osvaldo-regular.eot');
src: url('../fonts/osvaldo/osvaldo-regular.eot') format('embedded-opentype'),
src: url('../fonts/osvaldo/osvaldo-regular.eot?#iefix') format('embedded-opentype'),
url('../fonts/osvaldo/osvaldo-regular.woff2') format('woff2'),
url('../fonts/osvaldo/osvaldo-regular.woff') format('woff'),
url('../fonts/osvaldo/osvaldo-regular.svg#osvaldo') format('svg'),
url('../fonts/osvaldo/osvaldo-regular.otf') format('opentype'),
url('../fonts/osvaldo/osvaldo-regular.ttf') format('truetype'),
url('../fonts/osvaldo/osvaldo-regular.svg#osvaldo') format('svg');
url('../fonts/osvaldo/osvaldo-regular.woff') format('woff');
font-weight: normal;
font-style: normal;
}
\ No newline at end of file
}
htdocs/theme/ocean/sass/utilities/_bootstrap-variables.scss
View file @ 5e15470d
......@@ -408,7 +408,7 @@ $navbar-default-brand-hover-bg: transparent;
// Navbar toggle
$navbar-default-toggle-hover-bg: darken($navbar-default-bg, 3%);
$navbar-default-toggle-icon-bar-bg: $navbar-default-link-color;
$navbar-default-toggle-border-color: $navbar-default-border;
$navbar-default-toggle-border-color: transparent;
// Inverted navbar
......
htdocs/theme/primaryschool/fonts/opensans/OpenSansItalic.svg deleted 100755 → 0
View file @ ff4a9a9d
This source diff could not be displayed because it is too large. You can view the blob instead.
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