Skip to content
Snippets Groups Projects
Commit 4ac667b0 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Merge branch 'release-3.1'

parents 9958aced f8868363
No related merge requests found
Hide whitespace changes
Inline Side-by-side
themes/bootprint3/css/compiled.css
+ 1
− 1
View file @ 4ac667b0
This source diff could not be displayed because it is too large. You can view the blob instead.
themes/bootprint3/less/bootprint.less
+ 10
− 10
View file @ 4ac667b0
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
@import "search"; @import "search";
@brand-primary: #619144; // a11y overrides @brand-primary in sass @brand-primary: #619144; // a11y overrides @brand-primary in sass
@active-orange: #E70;
/* --- Bootstrap MODS ---*/ /* --- Bootstrap MODS ---*/
body { body {
...@@ -151,7 +152,7 @@ header .searchbox .tab-content .navbar-text { margin: 5px 10px 5px 0; } ...@@ -151,7 +152,7 @@ header .searchbox .tab-content .navbar-text { margin: 5px 10px 5px 0; }
} }
} }
header .breadcrumb { header .breadcrumb {
border: 1px solid #CCC; border: 1px solid @gray-lighter;
border-radius: 0; border-radius: 0;
border-width: 1px 0; border-width: 1px 0;
font-size: 12px; font-size: 12px;
...@@ -260,7 +261,6 @@ ul.random.image li img { margin: 0 auto; } ...@@ -260,7 +261,6 @@ ul.random.image li img { margin: 0 auto; }
} }
/* --- Sidebar --- */ /* --- Sidebar --- */
@active-orange: #E70;
.sidebar { .sidebar {
.list-group { margin-bottom: 5px; } .list-group { margin-bottom: 5px; }
.list-group label.list-group-item { padding-left: 26px; } .list-group label.list-group-item { padding-left: 26px; }
...@@ -275,15 +275,15 @@ ul.random.image li img { margin: 0 auto; } ...@@ -275,15 +275,15 @@ ul.random.image li img { margin: 0 auto; }
border-color: @active-orange; border-color: @active-orange;
} }
.list-group-item .badge a { color: #fff; } .list-group-item .badge a { color: #fff; }
}
.slider-container { .slider-container .slider-handle {
margin: 4px auto 10px; background: @brand-primary;
width: 95%; border: 1px solid @brand-primary;
} &:hover,&:active,&:focus {
.slider-container .slider-handle { background: #FFF;
background: #619144; border-color: @gray-light;
opacity: 1;
} }
&:active,&:focus { border-color: @brand-primary; }
} }
.top-row .badge a { .top-row .badge a {
color: #fff; color: #fff;
......
themes/bootprint3/scss/bootprint.scss
+ 10
− 10
View file @ 4ac667b0
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
@import "search"; @import "search";
$brand-primary: #619144; // a11y overrides $brand-primary in sass $brand-primary: #619144; // a11y overrides $brand-primary in sass
$active-orange: #E70 !default;
/* --- Bootstrap MODS ---*/ /* --- Bootstrap MODS ---*/
body { body {
...@@ -150,7 +151,7 @@ header .searchbox .tab-content .navbar-text { margin: 5px 10px 5px 0; } ...@@ -150,7 +151,7 @@ header .searchbox .tab-content .navbar-text { margin: 5px 10px 5px 0; }
} }
} }
header .breadcrumb { header .breadcrumb {
border: 1px solid #CCC; border: 1px solid $gray-lighter;
border-radius: 0; border-radius: 0;
border-width: 1px 0; border-width: 1px 0;
font-size: 12px; font-size: 12px;
...@@ -259,7 +260,6 @@ ul.random.image li img { margin: 0 auto; } ...@@ -259,7 +260,6 @@ ul.random.image li img { margin: 0 auto; }
} }
/* --- Sidebar --- */ /* --- Sidebar --- */
$active-orange: #E70 !default;
.sidebar { .sidebar {
.list-group { margin-bottom: 5px; } .list-group { margin-bottom: 5px; }
.list-group label.list-group-item { padding-left: 26px; } .list-group label.list-group-item { padding-left: 26px; }
...@@ -274,15 +274,15 @@ $active-orange: #E70 !default; ...@@ -274,15 +274,15 @@ $active-orange: #E70 !default;
border-color: $active-orange; border-color: $active-orange;
} }
.list-group-item .badge a { color: #fff; } .list-group-item .badge a { color: #fff; }
}
.slider-container { .slider-container .slider-handle {
margin: 4px auto 10px; background: $brand-primary;
width: 95%; border: 1px solid $brand-primary;
} &:hover,&:active,&:focus {
.slider-container .slider-handle { background: #FFF;
background: #619144; border-color: $gray-light;
opacity: 1;
} }
&:active,&:focus { border-color: $brand-primary; }
} }
.top-row .badge a { .top-row .badge a {
color: #fff; color: #fff;
......
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