Commit 7b5e45c4 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge changes I503eed17,I91fdef96,Ia37ed3be

* changes:
  Bug #1746127: Review ocean theme variables and put more colors into variables
  Bug #1746127: Review primary school theme variables and put more colors into variables
  Bug #1746127: Review raw theme variables and put more colors into variables
parents d076df6b e02a5946
.arrow-bar {
// to theme the Résumé nav blue
&.resume {
.nav-inpage {
&.nav > li {
& > a {
color: $arrow-text-color;
}
&.active > a,
&.active > button {
color: $arrow-link-active-color;
background-color: $arrow-link-background-color;
}
& > a:hover {
color: $arrow-link-hover-color;
background-color: $arrow-link-background-color;
}
}
}
}
// to theme the Groups nav blue
&.group {
.nav-inpage {
&.nav > li {
& > a {
color: $arrow-text-color;
}
&.active > a,
&.active > button {
color: $arrow-link-active-color;
background-color: $arrow-link-background-color;
}
& > a:hover {
color: $arrow-link-hover-color;
background-color:$arrow-link-background-color;
}
}
}
}
}
\ No newline at end of file
......@@ -5,7 +5,8 @@ $arrow-color: $brand-primary;
$arrow-text-color: #fff;
$arrow-link-color: #fff;
$arrow-link-hover-color: $text-color;
$arrow-link-active-color: $brand-primary;
$arrow-link-active-color: #20738f;
$arrow-link-background-color: #fff;
// color for the secondary title in sections (cf. groups)
$section-heading-color: #999;
......@@ -20,4 +21,4 @@ $dashboard-widget-color: $brand-primary;
$brand-primary-dark: #629db0; // $brand-primary 70%
$brand-primary-mid: #93becc; // $brand-primary 50%
$brand-primary-light: #bed8e1; // $brand-primary 30%
$brand-primary-faint: #e9f2f5; // $brand-primary 10%
$brand-primary-faint: #e9f2f5; // $brand-primary 10%
\ No newline at end of file
......@@ -5,3 +5,4 @@
@import "../layout/panel/panel-heading"; // Custom panel header
@import "../features/dashboard-widget"; // Custom dashboard
@import "../features/collection-navigation"; // Custom collection navigation
@import "../components/arrow-bar";
.arrow-bar {
// to theme the Résumé nav red
&.resume {
background-color: lighten(#ca0238, 5%);
background-color: lighten($arrow-link-color, 5%);
.arrow {
background-color: #ca0238;
background-color: $arrow-link-color;
&:after {
border-left-color: #ca0238;
border-left-color: $arrow-link-color;
}
}
.nav-inpage {
&.nav > li {
& > a {
color: $arrow-text-color;
}
&.active > a,
&.active > button, {
color: #ca0238;
&.active > button {
color: $arrow-link-color;
background-color: $arrow-link-background-color;
}
& > a:hover {
color: $arrow-link-hover-color;
background-color: $arrow-link-background-color;
}
}
}
......@@ -21,19 +29,27 @@
// to theme the Groups nav green
&.group {
background-color: lighten(#799323, 5%);
background-color: lighten($arrow-link-group-color, 5%);
.arrow {
background-color: #799323;
background-color: $arrow-link-group-color;
&:after {
border-left-color: #799323;
border-left-color: $arrow-link-group-color;
}
}
.nav-inpage {
&.nav > li {
& > a {
color: $arrow-text-color;
}
&.active > a,
&.active > button, {
color: #799323;
&.active > button {
color: $arrow-link-group-color;
background-color: $arrow-link-background-color;
}
& > a:hover {
color: $arrow-link-hover-color;
background-color:$arrow-link-background-color;
}
}
}
......
// Custom component variables (non-bootstrap components)
//Arrow compoanent variables
//Arrow component variables
$arrow-color: $brand-primary;
$arrow-text-color: #fff;
$arrow-link-color: #fff;
$arrow-link-color: #ca0238;
$arrow-link-hover-color: $text-color;
$arrow-link-active-color: $brand-primary;
$arrow-link-background-color: #fff;
$arrow-link-group-color: #799323;
// color for the secondary title in sections (cf. groups)
$section-heading-color: #999;
......
......@@ -113,8 +113,8 @@
.select2-choices {
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset);
border-radius: 4px;
background-color: #fff;
border: 1px solid #ccc;
background-color: $body-bg;
border: 1px solid $input-border;
background-image: none;
width: 100%;
.select2-search-choice {
......
......@@ -4,7 +4,7 @@
margin-top: 10px;
margin-bottom: $grid-gutter-width;
line-height: 46px;
color: #fff;
color: $popover-arrow-color;
display: block;
width: 100%;
background-color: lighten($arrow-color, 5%);
......@@ -78,14 +78,14 @@
&:hover,
&:focus {
@include transition-duration(0.3s);
background: #fff;
background: $navbar-default-bg;
color: $link-color;
}
}
&.active > a,
&.active > button, {
&.active > button {
color: $text-color;
background: #fff;
background: $navbar-default-bg;
&:hover,
&:focus {
color: $link-color;
......
......@@ -53,7 +53,7 @@
}
&.attachment-incontent {
border-left: 1px solid #ddd; // Full Journal attachment list block
border-left: 1px solid $list-group-border; // Full Journal attachment list block
}
}
......
......@@ -162,9 +162,9 @@ $width-sm: 90%;
.modal-header {
background: $brand-primary;
padding: 10px 15px;
color: #fff;
color: $modal-docked-header;
h4, a {
color: #fff;
color: $modal-docked-header;
}
&.modal-section {
margin: 0 0 10px 0;
......@@ -177,7 +177,7 @@ $width-sm: 90%;
top: 1px;
left: -29px;
padding: 10px 7px 9px;
background: #fff;
background: $modal-docked-header;
border: 1px solid $modal-header-border-color;
border-right:0;
......
.user-icon {
border-radius: 3px;
background-color: #fff;
background-color: $panel-bg;
padding: 5px;
display: table;
border: 1px solid $thumbnail-border;
......
......@@ -51,7 +51,7 @@ $logged-in-height-mobile: 100px;
text-align:center;
.icon {
color: #fff;
color: $body-bg;
padding-top:16px;
font-size: 30px;
&.icon-user {
......@@ -136,7 +136,7 @@ $logged-in-height-mobile: 100px;
border-radius: 0 0 $border-radius-base $border-radius-base;
margin-top: 0;
border: 1px solid $gray-lighter;
background-color: #fff;
background-color: $body-bg;
font-weight: normal;
opacity: 1;
}
......@@ -144,7 +144,7 @@ $logged-in-height-mobile: 100px;
color: #fff;
@media (max-width: $screen-sm-min) {
color:#333;
color:$theme-text-color;
}
}
}
......
.fileupload {
padding: 20px;
border: 1px solid $gray-lighter;
background-color: #fff;
background-color: $body-bg;
.intro {
font-weight: bold;
}
......
......@@ -8,7 +8,7 @@
.option-alt-divider {
color: $theme-text-lighttone-color;
background: #fff;
background: $panel-bg;
text-transform: uppercase;
font-size: 1.2em;
position: absolute;
......
......@@ -14,7 +14,7 @@
.table {
margin-top:10px;
color: inherit;
background-color: rgba(#fff, 0.75);
background-color: rgba($body-bg, 0.75);
>thead{
color: inherit;
}
......@@ -38,7 +38,7 @@
}
.alert-default {
background-color: rgba(#fff, 0.4);
background-color: rgba($body-bg, 0.4);
border: 1px solid darken($brand-default, 5%);
color: $gray;
}
......@@ -2,7 +2,7 @@
.dropdown {
.picker {
position: relative;
background: #fff;
background: $body-bg;
display: inline-block;
min-width: 20px;
max-width: 100%;
......@@ -119,7 +119,7 @@
.picker {
select.form-control:disabled {
cursor: default;
background: #fff;
background: $body-bg;
border: 0;
box-shadow: none;
color: $theme-text-midtone-color;
......
......@@ -8,7 +8,7 @@
.admin {
.tab-content {
padding: 10px;
background-color: #fff;
background-color: $panel-bg;
.panel-secondary {
border: none;
}
......
......@@ -77,7 +77,7 @@
.fieldset-body {
border: 1px solid $panel-default-border;
padding: 10px 15px;
background: #fff;
background: $panel-bg;
margin-bottom: -1px; //remove double border
.jstabs & {
border: 0;
......@@ -148,7 +148,7 @@
.panel-heading {
border: 0;
a {
text-shadow: 1px 0 0 #fff;
text-shadow: 1px 0 0 $text-shadow;
}
}
......@@ -219,7 +219,7 @@
legend h4,
legend h3 {
a {
text-shadow: 1px 0 0 #fff;
text-shadow: 1px 0 0 $text-shadow;
background-color: darken($panel-default-heading-bg, 1%);
border: 1px solid $panel-default-border;
border-bottom: 0;
......
......@@ -21,7 +21,7 @@ a.panel-footer {
.has-attachment {
position: relative;
z-index: 1;
background-color:#fff;
background-color: $panel-bg;
}
.panel-footer {
......
......@@ -33,7 +33,7 @@
&.collapsed {
background-color: $panel-default-heading-bg;
color: #333;
color: $theme-text-color;
padding: 10px 15px;
&.outer-link {
background: none;
......@@ -43,7 +43,7 @@
}
}
&:hover, &:focus {
background: rgba(#333, 0.03);
background: rgba($theme-text-color, 0.03);
text-decoration: none;
}
.pieform > .collapsible-group:first-child &,
......
......@@ -16,7 +16,7 @@
}
.text-watermark {
text-shadow: 0 1px 0 #fff;
text-shadow: 0 1px 0 $text-shadow;
opacity: 0.3;
}
......
......@@ -8,7 +8,7 @@ body, p {
h1 {
@extend .page-header;
.admin & {
text-shadow: 1px 1px 0 rgba(#fff, 0.5);
text-shadow: 1px 1px 0 rgba($text-shadow, 0.5);
color: $gray;
border-bottom-color: $list-group-border;
}
......
......@@ -65,6 +65,8 @@ $link-hover-color: darken($theme-primary-color, 5%) !default;
//** Link hover decoration.
$link-hover-decoration: underline !default;
$text-shadow: #fff;
//== Typography
//
......@@ -610,6 +612,8 @@ $modal-backdrop-bg: #000 !default;
$modal-backdrop-opacity: .5 !default;
//** Modal header border color
$modal-header-border-color: #e5e5e5 !default;
$modal-docked-header: #fff;
//** Modal footer border color
$modal-footer-border-color: $modal-header-border-color !default;
......
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