Commit 442f1e43 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1602426 - Refactored subthemes so they can be use as parent theme"

parents d08ea7c4 ba568476
......@@ -14,13 +14,8 @@
@import "utilities/custom-variables"; // ...and our custom variables file
// Import raw default variables (colors, fonts, padding, etc)
@import "../../raw/sass/utilities/theme-variables";
@import "../../raw/sass/utilities/bootstrap-variables";
@import "../../raw/sass/utilities/custom-variables";
@import "../../raw/sass/style";
@import "../../raw/sass/utilities/bootstrap-index"; // bootstrap scss dependency file
@import "../../raw/sass/utilities/index"; // raw sass files
@import "utilities/index"; // custom components / layout / forms / features
// Keep these files last to override all other style sheets
......
......@@ -17,3 +17,5 @@ $dashboard-widget-color: #5f751c;
$help-icon-color: #5b8fc8;
$rss-icon-color: #FE6500;
$theme-primary-color-light: lighten(#93be42, 5%);
......@@ -4,7 +4,6 @@
$theme-primary-color: #5c8727;
$theme-primary-color-dark: darken(#93be42, 5%);
$theme-primary-color-light: lighten(#93be42, 5%);
$theme-text-color: #231f20;
$theme-accent-color: #474220;
......
......@@ -10,14 +10,14 @@
color: #FFF;
&:hover {
color: #FFF;
background-color: $theme-secondary-color;
background-color: $accent-color;
}
}
button {
color: #FFF;
&:hover {
color: #FFF;
background-color: $theme-secondary-color;
background-color: $accent-color;
text-decoration: none;
}
}
......
.form-control:focus {
box-shadow: inset 0 0px 0px rgba(0,0,0,1);
background-color: lighten($brand-secondary, 65%);
background-color: lighten($accent-color, 65%);
}
form#filter {
......
......@@ -11,7 +11,7 @@ header {
padding: 2px 8px;
margin-top: 12px;
height: auto;
background-color: darken($brand-secondary, 10%);
background-color: darken($accent-color, 10%);
border-radius: 3px;
a{
color: #FFF;
......
......@@ -7,7 +7,7 @@
font-size: 14px;
text-transform: uppercase;
&:hover {
color: $brand-secondary;
color: $accent-color;
}
}
}
......@@ -58,7 +58,7 @@
.navbar-header {
padding: 10px;
background-color: $theme-secondary-color
background-color: $accent-color;
}
.nav {
li {
......@@ -86,9 +86,9 @@
&.active a,
&.active a:hover,
&.active a:focus {
color: lighten($theme-secondary-color, 3%) !important;
color: lighten($accent-color, 3%) !important;
background-color: darken( $theme-primary-color, 8%);
border-left: 5px solid lighten($theme-secondary-color, 3%);
border-left: 5px solid lighten($accent-color, 3%);
border-top: 1px solid darken($theme-primary-color, 9%);
}
a {
......@@ -98,8 +98,8 @@
border-left: 5px solid darken( $theme-primary-color, 8%);
&:hover,
&:focus {
background-color: darken( $theme-secondary-color, 8%);
border-left: 5px solid darken( $theme-secondary-color, 8%);
background-color: darken( $accent-color, 8%);
border-left: 5px solid darken( $accent-color, 8%);
}
}
}
......
......@@ -7,14 +7,14 @@
padding: 3px 8px;
&:hover {
color: $brand-secondary;
color: $accent-color;
background-color: #FFF;
}
}
.nav>li.active>a,
.nav>li.active>a:hover {
background-color: $brand-secondary;
background-color: $accent-color;
color: #FFF;
}
}
.sidebar {
.panel-heading{
background-color: $brand-secondary;
border-color: $brand-secondary;
background-color: $accent-color;
border-color: $accent-color;
color: #FFF;
.text-midtone {
color: desaturate(lighten($theme-secondary-color, 30), 10);
color: desaturate(lighten($accent-color, 30), 10);
}
}
}
\ No newline at end of file
.sidebar {
.panel {
border-color: $brand-secondary;
border-color: $accent-color;
.list-group-item-link a:hover {
//background-colour: $brand-secondary;
//background-colour: $accent-color;
}
}
}
......@@ -15,23 +15,8 @@
@import "utilities/custom-variables"; // ...and our custom variables file
// Import raw default variables (colors, fonts, padding, etc)
@import "../../raw/sass/utilities/theme-variables";
@import "../../raw/sass/utilities/bootstrap-variables";
@import "../../raw/sass/utilities/custom-variables";
@import "../../raw/sass/utilities/bootstrap-index"; // bootstrap scss dependency file
@import "../../raw/sass/utilities/index"; // raw sass files (if you want heavier customisation you can copy this file and replace partials with your own sass)
@import "../../raw/sass/style";
@import "utilities/index"; // custom components / layout / forms / features
// Keep these files last to override all other style sheets
@import "custom";
@import "layout/header";
@import "form/form";
@import "components/user-icon";
@import "components/btn";
@import "components/arrow-bar";
@import "layout/panel/panel";
@import "layout/panel/panel-heading";
@import "layout/panel/panel-secondary";
@import "layout/nav/main-nav";
@import "layout/nav/minor-nav";
@import "custom";
\ No newline at end of file
......@@ -21,8 +21,7 @@ $gray-lighter: lighten($gray-base, 93.5%); // #eee
$brand-default: #ECECEC;
$brand-primary: $theme-primary-color ;
$brand-secondary: $theme-secondary-color;
$brand-primary: $theme-primary-color;
$brand-success: #8DC129;
$brand-info: #5bc0de;
$brand-warning: #f0ad4e;
......@@ -228,8 +227,8 @@ $input-border-radius-large: $border-radius-large;
$input-border-radius-small: $border-radius-small;
//** Border color for inputs on focus
$input-border-focus: $brand-secondary;
$input-bg-focus: lighten($brand-secondary, 60%);
$input-border-focus: $theme-accent-color;
$input-bg-focus: lighten($theme-accent-color, 60%);
//** Placeholder text color
$input-color-placeholder: #999;
......
// Custom component variables (non-bootstrap components)
$accent-color: $theme-accent-color;
//Arrow component variables
$arrow-color: $brand-secondary;
$arrow-color: $accent-color;
$arrow-text-color: $text-color;
$arrow-link-color: $link-color;
$arrow-link-hover-color: $text-color;
......@@ -17,4 +18,4 @@ $dashboard-widget-bg: darken(#f9f9f9, 2%);
$dashboard-widget-color: $brand-primary;
$help-icon-color: darken(#22C49C, 5%);
$rss-icon-color: #FE6500;
$rss-icon-color: #FE6500;
\ No newline at end of file
// Core variables and mixins
@import "../lib/font-awesome/font-awesome";
@import "mixins";
@import "classes"; // Custom utility classes
@import "whitespace"; // Padding and margin classes
@import "../typography/fonts";
@import "../typography/typography";
@import "../typography/icons";
@import "../typography/tables";
@import "../typography/text";
// General customisation and component files go here...
@import "../layout/layout";
@import "../layout/col-collapse";
@import "../layout/columns";
@import "../layout/footer";
@import "../layout/header";
@import "../layout/profile-block";
// Panels are a very commonly used layout component
@import "../form/form";
@import "../components/user-icon";
@import "../components/btn";
@import "../components/arrow-bar";
@import "../layout/panel/panel";
@import "../layout/panel/panel-body";
@import "../layout/panel/panel-collapse"; // for collapsible panels and collapsible fieldsets
@import "../layout/panel/panel-control";
@import "../layout/panel/panel-footer";
@import "../layout/panel/panel-form";
@import "../layout/panel/panel-half";
@import "../layout/panel/panel-heading";
@import "../layout/panel/panel-items"; // groups of panels
@import "../layout/panel/panel-secondary";
// Navigation
@import "../layout/nav/main-nav";
@import "../layout/nav/minor-nav";
@import "../layout/nav/nav-tabs";
@import "../layout/nav/navbar";
@import "../layout/nav/tabs";
@import "../layout/nav/top-nav";
// Forms
@import "../form/alert";
@import "../form/form";
@import "../form/form-group";
@import "../form/input-group";
@import "../form/site-messages";
@import "../form/dropdown-group";
@import "../form/dropdown";
// Components - small reusable design elements
@import "../components/arrow-bar";
@import "../components/btn";
@import "../components/btn-group";
@import "../components/carousel";
@import "../components/contextual-help";
@import "../components/cells";
@import "../components/custom-dropdown";
@import "../components/dropzone-previews";
@import "../components/indicator";
@import "../components/label";
@import "../components/link-thumb"; // text displayed as a thumbnail (cf. admin cookie consent directives)
@import "../components/list-group";
@import "../components/loading-inner";
@import "../components/modal";
@import "../components/pagination";
@import "../components/switch";
@import "../components/toggles";
@import "../components/user-icon";
// Feature related sass. We avoid this where we can in favour of reusable components
@import "../features/collection-navigation";
@import "../features/comment";
@import "../features/dashboard-widget";
@import "../features/filebrowser";
@import "../features/forum-post";
@import "../features/message-thread";
@import "../features/notification"; // email style notification panels
@import "../features/option-alt";
// Supporting sass for library code
@import "../lib/meter.scss"; // progress bar (old/ported)
@import "../lib/select2";
@import "../lib/star";
@import "../lib/tinymce";
@import "../lib/draggable";
@import "../lib/graph";
// Keep these files last to override all other style sheets
@import "../custom";
@import "../shame";
@import "../layout/nav/minor-nav";
\ No newline at end of file
......@@ -4,8 +4,8 @@
$theme-primary-color: #374757;
$theme-primary-color-dark: darken($theme-primary-color, 10%);
$theme-secondary-color: #1EAE8B;
$theme-text-color: #545B5D;
$theme-text-lighttone-color: #888;
$theme-text-midtone-color: #888;
$theme-accent-color: #1EAE8B;
......@@ -14,26 +14,8 @@
@import "utilities/custom-variables"; // ...and our custom variables file
// Import raw default variables (colors, fonts, padding, etc)
@import "../../raw/sass/utilities/theme-variables";
@import "../../raw/sass/utilities/bootstrap-variables";
@import "../../raw/sass/utilities/custom-variables";
@import "../../raw/sass/style";
@import "../../raw/sass/utilities/bootstrap-index"; // bootstrap scss dependency file
@import "utilities/index"; // custom components / layout / forms / features
@import "../../raw/sass/utilities/index"; // raw sass files (if you want heavier customisation you can copy this file and replace partials with your own sass)
// ----- Custom files -----
@import "typography/fonts"; // Import custom fonts
@import "layout/layout"; // Custom layout (color)
@import "layout/header"; // Custom header
@import "layout/nav/main-nav"; // Custom navigation
@import "layout/nav/navbar"; // Custom navigation
@import "layout/nav/minor-nav"; // Custom navigation
@import "layout/nav/top-nav"; // Custom navigation
@import "layout/panel/panel-heading"; // Custom panel header
@import "components/toggles"; // Custom toggle
@import "features/dashboard-widget"; // Custom dashboard
@import "form/site-messages"; // Custom site messages
@import "custom.scss"; // Custom theme additional
@import "custom"; // Custom theme additional
@import "../typography/fonts"; // Import custom fonts
@import "../layout/layout"; // Custom layout (color)
@import "../layout/header"; // Custom header
@import "../layout/nav/main-nav"; // Custom navigation
@import "../layout/nav/navbar"; // Custom navigation
@import "../layout/nav/minor-nav"; // Custom navigation
@import "../layout/nav/top-nav"; // Custom navigation
@import "../layout/panel/panel-heading"; // Custom panel header
@import "../components/toggles"; // Custom toggle
@import "../features/dashboard-widget"; // Custom dashboard
@import "../form/site-messages"; // Custom site messages
\ No newline at end of file
......@@ -14,6 +14,7 @@ $theme->displayname = 'Ocean';
$theme->formrenderer = 'div';
/* Set parent to boolean FALSE to specify the theme has no parent */
/* Currently Ocean cannot be a parent theme for subtheme */
$theme->parent = 'raw';
/* This theme includes all css via sass, so we don't need raw's css. */
......
......@@ -14,13 +14,8 @@
@import "utilities/custom-variables"; // ...and our custom variables file
// Import raw default variables (colors, fonts, padding, etc)
@import "../../raw/sass/utilities/theme-variables";
@import "../../raw/sass/utilities/bootstrap-variables";
@import "../../raw/sass/utilities/custom-variables";
@import "../../raw/sass/style";
@import "../../raw/sass/utilities/bootstrap-index"; // bootstrap scss dependency file
@import "../../raw/sass/utilities/index"; // raw sass files
@import "utilities/index"; // custom components / layout / forms / features
// Keep these files last to override all other style sheets
......
......@@ -17,4 +17,4 @@ $dashboard-widget-bg: darken(#f9f9f9, 2%);
$dashboard-widget-color: #FFFFFF;
$help-icon-color: #0591ce;
$rss-icon-color: #FE6500;
$rss-icon-color: #FE6500;
\ No newline at end of file
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