Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'color-options'
  • Loading branch information
andrewmbacon committed Dec 30, 2014
2 parents ce40282 + 651b769 commit 35a2d65
Show file tree
Hide file tree
Showing 23 changed files with 35,823 additions and 9,329 deletions.
8,655 changes: 8,655 additions & 0 deletions css/sherman-black.css

Large diffs are not rendered by default.

8,655 changes: 8,655 additions & 0 deletions css/sherman-blue.css

Large diffs are not rendered by default.

8,655 changes: 8,655 additions & 0 deletions css/sherman-grey.css

Large diffs are not rendered by default.

8,655 changes: 8,655 additions & 0 deletions css/sherman-red.css

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions css/sherman-variables-black.css
@@ -0,0 +1,15 @@
/*
==Color Variables
These styles:
* overwrite bootstrap defaults
* overwrite cornerstone defaults
* are referenced in sherman-common.scss
ONLY color variables in this sheet please.
Other variables belong in sherman-variables-common.scss.
*/
/* Sherman Only Variables */
15 changes: 15 additions & 0 deletions css/sherman-variables-blue.css
@@ -0,0 +1,15 @@
/*
==Color Variables
These styles:
* overwrite bootstrap defaults
* overwrite cornerstone defaults
* are referenced in sherman-common.scss
ONLY color variables in this sheet please.
Other variables belong in sherman-variables-common.scss.
*/
/* Sherman Only Variables */
Empty file.
15 changes: 15 additions & 0 deletions css/sherman-variables-grey.css
@@ -0,0 +1,15 @@
/*
==Color Variables
These styles:
* overwrite bootstrap defaults
* overwrite cornerstone defaults
* are referenced in sherman-common.scss
ONLY color variables in this sheet please.
Other variables belong in sherman-variables-common.scss.
*/
/* Sherman Only Variables */
15 changes: 15 additions & 0 deletions css/sherman-variables-red.css
@@ -0,0 +1,15 @@
/*
==Color Variables
These styles:
* overwrite bootstrap defaults
* overwrite cornerstone defaults
* are referenced in sherman-common.scss
ONLY color variables in this sheet please.
Other variables belong in sherman-variables-common.scss.
*/
/* Sherman Only Variables */
13 changes: 7 additions & 6 deletions functions.php
Expand Up @@ -28,20 +28,21 @@ function sherman_titlebar_register( $wp_customize ){

$wp_customize->add_setting( 'themeColor', //Give it a SERIALIZED name (so all theme settings can live under one db record)
array(
'default' => 'sherman-default', //Default setting/value to save
'default' => 'sherman-blue', //Default setting/value to save
'type' => 'theme_mod', //Is this an 'option' or a 'theme_mod'?
'capability' => 'edit_theme_options', //Optional. Special permissions for accessing this setting.
'transport' => 'refresh'
)
);
$wp_customize->add_control('themeColor', array(
'type' => 'radio',
'label' => 'Stylesheet',
'label' => '',
'section' => 'colors',
'choices' => array(
'sherman-default' => 'Sherman Default',
'sherman-red' => 'Sherman Red',
'sherman-black' => 'Sherman Black',
'sherman-blue' => 'Blue',
'sherman-red' => 'Red',
'sherman-black' => 'Black',
'sherman-grey' => 'Grey'
)
)
);
Expand All @@ -51,7 +52,7 @@ add_action( 'customize_register', 'sherman_titlebar_register' , 34);
function sherman_scripts() {
wp_enqueue_script( 'sherman-js', get_stylesheet_directory_uri() . '/javascripts/min/sherman.min.js', array( 'jquery' ));
$stylesheet = get_theme_mod('themeColor');
wp_enqueue_style( $stylesheet, get_stylesheet_directory_uri() . '/stylesheets/'.$stylesheet.'.css', array('cs-style') );
wp_enqueue_style( $stylesheet, get_stylesheet_directory_uri() . '/css/'.$stylesheet.'.css', array('cs-style') );
}

add_action( 'wp_enqueue_scripts', 'sherman_scripts');
Expand Down
10 changes: 10 additions & 0 deletions sass/sherman-black.scss
@@ -0,0 +1,10 @@
/* Scss Document */

// Load variables for this paticular Sherman color scheme.
@import "sherman-variables-black.scss";
// adjustments to Bootstrap or Cornerstone variables. Things like font size, rounded corners, margins. Anything not color related.
@import "sherman-variables-common.scss";
// loads bootstrap, and cornerstone.
@import "../../cornerstone/style.scss";
// Now... load styles that are particular to sherman. The gradient header, for instance.
@import "sherman-common.scss";
10 changes: 10 additions & 0 deletions sass/sherman-blue.scss
@@ -0,0 +1,10 @@
/* Scss Document */

// Load variables for this paticular Sherman color scheme.
@import "sherman-variables-blue.scss";
// adjustments to Bootstrap or Cornerstone variables. Things like font size, rounded corners, margins. Anything not color related.
@import "sherman-variables-common.scss";
// loads bootstrap, and cornerstone.
@import "../../cornerstone/style.scss";
// Now... load styles that are particular to sherman. The gradient header, for instance.
@import "sherman-common.scss";

0 comments on commit 35a2d65

Please sign in to comment.