diff --git a/wp-content/themes/bliss/css/admin.css b/wp-content/themes/bliss/css/admin.css
index 0fa2fcae4635adcbdbc5e801d302d832e05e01ec..aff373039605a5a18a9602f10cb4f782e129b585 100644
--- a/wp-content/themes/bliss/css/admin.css
+++ b/wp-content/themes/bliss/css/admin.css
@@ -3,8 +3,12 @@ http://codex.wordpress.org/Function_Reference/add_editor_style
*/
/* the use of this file and associated function call are recommended by ThemeCheck. */
+/*
+version 1.0.14 note: remember that this file will be called when the visitor will be within the wp-admin folder.
+So the relative URL has to go up one level, or else this will return a 404 error...
+*/
-@import url( 'style.css' );
+@import url( '../style.css' );
/* Add overwrites as needed so that the content of the editor field is attractive and not broken */
body { padding: 0; background: #fff; }
\ No newline at end of file
diff --git a/wp-content/themes/bliss/functions.php b/wp-content/themes/bliss/functions.php
index 9565101d4ecad22f12fdeba5dc714b05a5824f73..d7b208ecc705843bc3f09083e8ab5e433e533619 100644
--- a/wp-content/themes/bliss/functions.php
+++ b/wp-content/themes/bliss/functions.php
@@ -231,9 +231,9 @@ add_action('wp_head', 'bliss_user_customizations', 100);// a low priority so the
/* color scheme selection via theme options */
function bliss_color_scheme($classes){
- // get the user-selected color scheme. Defaults to light grey.
+ // get the user-selected color scheme. Formerly: Defaults to light grey. Now: defaults to blue!
// other options: blue, green, or maroon.
- $color = esc_attr(of_get_option('bliss_colors', 'light'));
+ $color = esc_attr(of_get_option('bliss_colors', 'blue-contrast'));// formerly "light"
if($color){
// add the color as a class name to the $classes array
$classes[] = $color;
diff --git a/wp-content/themes/bliss/header.php b/wp-content/themes/bliss/header.php
index f07efd010e772b562b11f431434897e68f643955..d303500c4da2c1cfecc98442bec450a10e8b643e 100644
--- a/wp-content/themes/bliss/header.php
+++ b/wp-content/themes/bliss/header.php
@@ -94,7 +94,12 @@
<?php
// the search form.
- get_search_form();//you could move this to the sidebar, but you'd have to modify the CSS to prevent it from overflowing.
+ // new as of Bliss version 1.0.15 - displaying the search form in the header bar is now optional.
+ $show_search_form = of_get_option('bliss_search_form_in_header', '1');// defaults to true here for backwards compatibility.
+
+ if($show_search_form){
+ get_search_form();
+ }
diff --git a/wp-content/themes/bliss/includes/formatting.php b/wp-content/themes/bliss/includes/formatting.php
index df14310cd8fbcfa283749465e899646e6bf099a1..e6f5c267678f03540aeacd49324ee648bff0105c 100644
--- a/wp-content/themes/bliss/includes/formatting.php
+++ b/wp-content/themes/bliss/includes/formatting.php
@@ -145,94 +145,98 @@ function bliss_social_menu_icons($items, $args){
// not doing it this way.
// $item->classes[] = 'fa fa-lg fa-behance-square';
- $icon_wrap = '<span class="fa fa-lg fa-behance-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-behance-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'facebook') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-facebook-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-facebook-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'github') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-github-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-github-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'plus.google') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-google-plus-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-google-plus-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'instagram') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-instagram"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-instagram"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'jsfiddle') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-jsfiddle"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-jsfiddle"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'linkedin') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-linkedin-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-linkedin-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'pinterest') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-pinterest-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-pinterest-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'reddit') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-reddit-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-reddit-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'skype') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-skype"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-skype"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'tumblr') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-tumblr-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-tumblr-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'twitter') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-twitter-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-twitter-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'wordpress') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-wordpress"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-wordpress"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'weibo') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-weibo"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-weibo"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'yelp') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-yelp"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-yelp"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'youtube') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-youtube-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-youtube-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'vimeo') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-vimeo-square"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-vimeo-square"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'vine') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-vine"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-vine"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'wechat') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-wechat"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-wechat"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'stackexchange') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-stack-exchange"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-stack-exchange"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'stackoverflow' !== false)){
- $icon_wrap = '<span class="fa fa-lg fa-stack-overflow"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-stack-overflow"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
if(stripos($item->url, 'stumbleupon') !== false){
- $icon_wrap = '<span class="fa fa-lg fa-stumbleupon-circle"> </span><span class="block visuallyhidden">'.$item->title.'</span>';
+ $icon_wrap = '<span class="fa fa-lg fa-stumbleupon-circle"></span><span class="block visuallyhidden">'.$item->title.'</span>';
$item->title = $icon_wrap;
}
+ if(stripos($item->url, 'mailto:') !== false){
+ $icon_wrap = '<span class="fa fa-lg fa-envelope-o"></span><span class="visuallyhidden">'.$item->title.'</span>';
+ $item->title = $icon_wrap;
+ }
}
}
diff --git a/wp-content/themes/bliss/js/jquery.cycle2.js.map b/wp-content/themes/bliss/js/jquery.cycle2.js.map
new file mode 100644
index 0000000000000000000000000000000000000000..4f375d8531abeda75d46012c5f83074c52399763
--- /dev/null
+++ b/wp-content/themes/bliss/js/jquery.cycle2.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"build/jquery.cycle2.min.js","sources":["build/jquery.cycle2.js"],"names":["$","lowerCase","s","toLowerCase","version","fn","cycle","options","o","this","length","isReady","each","data","opts","shortName","val","container","log","noop","p","hasOwnProperty","test","match","replace","extend","defaults","timeoutId","paused","_maxZ","maxZ","API","_container","trigger","eventName","args","addInitialSlides","preInitSlideshow","slides","initSlideshow","selector","c","context","slideCount","jquery","find","random","sort","Math","add","tx","transitions","fx","isFunction","preInit","_preInitialized","postInitSlideshow","postInit","slideOpts","pauseObj","calcFirstSlide","css","currSlide","opacity","display","visibility","stackSlides","nextSlide","reverse","pauseOnHover","hover","pause","resume","timeout","getSlideOpts","queueTransition","delay","_initialized","updateView","alreadyPaused","hoverPaused","addClass","clearTimeout","_remainingTimeout","now","_lastQueue","isNaN","undefined","alreadyResumed","removeClass","filter","prepend","len","oldSlideCount","startSlideshow","type","trim","slide","append","buildSlideOpts","initSlide","firstSlideIndex","parseInt","startingSlide","calcNextSlide","roll","calcTx","manual","_tempFx","manualFx","fade","prepareTx","fwd","after","curr","next","busy","manualTrump","stopTransition","_tx","manualSpeed","speed","before","transition","doTransition","currEl","nextEl","callback","animate","animIn","easeIn","easing","cssBefore","animOut","easeOut","cssAfter","sync","specificTimeout","loop","setTimeout","continueAuto","stop","advanceSlide","slideNum","e","index","suggestedZindex","slideCss","speeds","_default","slideClass","isAfter","isDuring","slideActiveClass","eq","hideNonActive","getComponent","name","i","z","getSlideIndex","el","window","console","Array","prototype","join","call","arguments","custom","none","fadeout","scrollHorz","w","width","left","top","zIndex","allowWrap","autoSelector","position","document","ready","jQuery","initAutoHeight","clone","height","sentinelIndex","autoHeight","outerHeight","_autoHeightRatio","calcSentinelIndex","_sentinelIndex","_sentinel","remove","cloneNode","removeAttr","prependTo","max","h","onBefore","outgoing","incoming","autoHeightSpeed","autoHeightEasing","onDestroy","_autoHeightOnResize","off","on","onResize","ratio","t","resizeThrottle","caption","captionTemplate","overlay","overlayTemplate","captionModule","template","html","tmpl","show","hide","empty","c2","cmd","cmdFn","makeArray","cmdArgs","shift","apply","count","prev","destroy","clean","_data","removeData","retainStylesOnDestroy","jump","num","reinit","slideToRemove","push","preventDefault","command","onHashChange","setStartingSlide","hash","_hashFence","location","substring","_onHashChange","loader","addSlide","slideArr","sorter","addFn","a","b","appendTo","imageLoaded","images","is","complete","load","src","buildPagerLink","pagerLink","pagers","pager","pagerTemplate","markup","children","pagerEvent","pagerEventBubble","page","currentTarget","target","pagerFx","pagerActiveClass","slideAdded","nextEvent","disabledClass","prevEvent","swipe","swipeVert","swipeFx","cls","prevBoundry","_prevBoundry","nextBoundry","_nextBoundry","prop","progressive","scriptEl","nextFn","prevFn","prepareTxFn","parseJSON","err","split","RegExp","pop","slice","one","tmplRegex","str","regex","_","j","obj","names"],"mappings":"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","sourceRoot":"http://malsup.github.io/"}
\ No newline at end of file
diff --git a/wp-content/themes/bliss/options.php b/wp-content/themes/bliss/options.php
index 78c1fb6d1bc396d1b5712b58bbef71f601045021..9b1164cfcb9907baa92145b5e1729bb32a581047 100644
--- a/wp-content/themes/bliss/options.php
+++ b/wp-content/themes/bliss/options.php
@@ -45,7 +45,7 @@ function optionsframework_options() {
// logo in headerbar.
$options[] = array(
'name' => __('Your Logo', 'bliss'),
- 'desc' => __('Add your logo to the theme headerbar. Recommend a .png file with transparent background, scaled to 90px high or smaller. ', 'bliss'),
+ 'desc' => __('Add your logo to the theme headerbar. We recommend a .png file with transparent background, scaled to 90px tall. ', 'bliss'),
'id' => 'bliss_logo',
'type' => 'upload'
);
@@ -65,19 +65,33 @@ function optionsframework_options() {
// selectable color scheme.
$colors_array = array(
- 'blue' => __('Blue', 'bliss'),
- 'green' => __('Green', 'bliss'),
- 'maroon' => __('Maroon', 'bliss'),
- 'brown' => __('Brown', 'bliss'),
- 'light' => __('Light Grey', 'bliss'),
- 'dark' => __('Dark Grey', 'bliss')
+
+ // new color schemes with more contrast!
+ 'blue-contrast' => __('New Blue', 'bliss'),
+ 'green-contrast' => __('New Green', 'bliss'),
+ 'light' => __('Light Grey', 'bliss'),
+ 'brown-contrast' => __('New Brown', 'bliss'),
+ 'dark' => __('Dark Grey', 'bliss'),
+ 'maroon-contrast' => __('New Maroon', 'bliss'),
+ 'green' => __('Legacy Green', 'bliss'),
+ 'maroon' => __('Legacy Maroon', 'bliss'),
+ 'brown' => __('Legacy Brown', 'bliss'),
+ 'blue' => __('Legacy Blue', 'bliss')
+
+ /*
+ // "Dark Contrast" is postponed.
+ ,
+ 'dark-contrast' => __('New Dark Grey', 'bliss')
+ */
+
+
);
$options[] = array(
'name' => __('Primary Color', 'bliss'),
'desc' => __('What color should be emphasized most prominently in your website's design?', 'bliss'),
'id' => 'bliss_colors',
- 'std' => 'light',
+ 'std' => 'blue-contrast',// light
'type' => 'select',
'class' => 'mini', //mini, tiny, small
'options' => $colors_array
@@ -100,6 +114,15 @@ function optionsframework_options() {
'options' => $header_nav_options_array
);
+ // new in v.1.0.15 - make the search form in the header bar optional (defaults to false)
+ $options[] = array(
+ 'name' => __('Show search form in header bar', 'bliss'),
+ 'desc' => __('Do you want to show the search form in the header bar?', 'bliss'),
+ 'id' => 'bliss_search_form_in_header',
+ 'type' => 'checkbox',
+ 'std' => '0'
+ );
+
// new in v.0.1.4 - make rounded corners optional
$rcr_options_array = array(
diff --git a/wp-content/themes/bliss/readme.txt b/wp-content/themes/bliss/readme.txt
index f4aacdfb84333fc4be7886642bca76fcd3a1a6d1..0a4f2a50f06840bf48fe8d66d19d23117c90dd12 100644
--- a/wp-content/themes/bliss/readme.txt
+++ b/wp-content/themes/bliss/readme.txt
@@ -5,7 +5,7 @@ Donate link: http://www.mardesco.com/payments/
Theme URI: http://www.mardesco.com/themes/bliss/
Tags: blue,custom-header,custom-background,custom-logo,custom-width,green,grey,featured-images,left-sidebar,maroon,mobile,options,responsive,responsive-layout,right-sidebar,theme-options
Requires at least: 3.7
-Tested up to: 4.3
+Tested up to: 4.4.2
Stable tag: trunk
License: Bliss WordPress theme, copyright 2014 by Mardesco. Bliss is distributed under the terms of the GNU GPLv2
@@ -43,7 +43,7 @@ Heading fonts render with edges that appear rough or pixelated on Chrome 39.x fo
= Bliss theme =
-"Bliss" theme for WordPress is copyright 2014 by Mardesco. Bliss is distributed under the terms of the GNU GPLv2. The theme design and original theme source code were created by [Jesse Smith](http://www.jesse-smith.net) for [Mardesco](http://www.mardesco.com), and are licensed under the GPLv2.
+"Bliss" theme for WordPress is copyright 2014-2016 by Mardesco. Bliss is distributed under the terms of the GNU GPLv2. The theme design and original theme source code were created by [Jesse Smith](http://www.jesse-smith.net) for [Mardesco](http://www.mardesco.com), and are licensed under the GPLv2.
= Additional resources =
@@ -197,6 +197,11 @@ For responsive content columns as seen in this theme's screenshot.png, all you n
== Changelog ==
+
+1.1.0 *Color scheme now defaults to "New Blue". If you have been running Bliss for a while but you have NEVER clicked the "Save Options" button on the "Bliss Theme Options" menu (really?), we recommend clicking that button once prior to installing this update. If you have already made the update, you can easily get back to the old look by selecting the "Light Grey" color scheme from the "Primary Color" dropdown menu on the "Bliss Theme Options" page. *"Display search form in header bar" now defaults to false. Control the search form display by (un)checking the box under Appearance > Bliss Theme Options > "Show search form in header bar". Be sure to click "Save Options" when you're done.
+1.0.15 Additional CSS fixes & new color scheme wrap, preparatory to release on WordPress.org. Add .map file for minified cycle2.js to stop 404 errors when viewing on dev / edge builds (eg Chrome Canary).
+1.0.14 Fix relative path for admin.css @import rule.
+1.0.13 Begin theme upgrade. Introduce new color schemes with improved contrast. Retains old color scheme selections for legacy installation support.
1.0.12 Change "read more" link icon to right arrow (instead of right arrow in a circle) and similar for prev/next post icons.
1.0.11 Rename a function within Options Framework to resolve collision. Note that add_theme_page() was in fact properly implemented by the framework all along.
1.0.10 Update to latest version of Options Framework because the earlier change to add_theme_page() did not resolve the automatic theme check conflict.
diff --git a/wp-content/themes/bliss/style.css b/wp-content/themes/bliss/style.css
index c87227910baf865a1597a77fdebfb9f53ca59bd4..70930c4075037c25a1d5286e15ea53d7c96bd4ea 100644
--- a/wp-content/themes/bliss/style.css
+++ b/wp-content/themes/bliss/style.css
@@ -4,21 +4,12 @@ Author: Jesse Smith for Mardesco
Theme URI: http://www.mardesco.com/themes/bliss/
Description: A blissful website experience. "Bliss" is a mobile-friendly, responsive WordPress theme with a clean, modern design. Feature-rich theme includes built-in slideshows, theme color switcher, a convenient site logo uploader, and more! Now with WooCommerce compatibility.
Author URI: http://www.mardesco.com
-Version: 1.0.12
+Version: 1.1.0
Tags: blue,brown,custom-header,custom-background,green,gray,featured-images,left-sidebar,responsive-layout,right-sidebar,theme-options
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: bliss
-General comments:
-
-The cross-browser normalization section of this stylesheet is based on the HTML5 Boilerplate, which is released under the MIT license.
-
-This theme contains all of the basic page types described by the WordPress Codex at http://codex.wordpress.org/Theme_Development#Template_Files_List
-EXCEPT for the following:
-rtl.css
-taxonomy.php
-date.php
*/
@@ -713,7 +704,7 @@ img.alignright{
.site-header .logo{
float:left;
display:block;
- height:90px;
+/* height:90px; */
margin-bottom:0;
margin-top:13px;
}
@@ -845,7 +836,7 @@ Header navigation styles, including suckerfish-style dropdown menus.
.bliss-header-nav ul li:hover ul li a{
max-height:200px;
-
+ overflow:hidden;
}
@@ -1377,7 +1368,7 @@ footer .content{
clear:both;
}
.leftSideNav li{
- float:left;
+ /* float:left; */
margin-right:2.5em;
}
}
@@ -1407,19 +1398,20 @@ from large regular screens down to tablets and narrow browsers, min. 680px wide.
@media only screen and (max-width:679px){
.hasRightNav #bliss_main{
margin:0;
- padding:0 2.9% 0 0;
+ padding:0 2.9% 0 2.9%;
}
.rightSideNav{
clear:both;
width:100%;
margin:0.6875em auto 0 auto;
+ padding-left:2.9%;
}
.rightSideNav ul{
clear:both;
}
.rightSideNav li{
- float:left;
+ /* float:left; */
margin-right:2.5em;
}
}
@@ -1472,7 +1464,10 @@ from large regular screens down to tablets and narrow browsers, min. 680px wide.
/* user-selectable color schemes */
+#bliss_container{background-color:#efefef;}/* default is light grey */
+
body.blue{background-color:#007fb1;}
+body.blue-contrast{background-color:#d8ecf4}
body.blue #bliss_container{background-color:#d8ecf4}
body.blue a,
body.blue h1,
@@ -1480,26 +1475,82 @@ body.blue h2,
body.blue h3,
body.blue h4,
body.blue h5,
-body.blue h6{color:#0074A2}
-body.blue a:hover{color:#2ac3ff}
+body.blue h6,
+body.blue-contrast a,
+body.blue-contrast h1,
+body.blue-contrast h2,
+body.blue-contrast h3,
+body.blue-contrast h4,
+body.blue-contrast h5,
+body.blue-contrast h6,
+body.blue-contrast .contrast,
+body.blue-contrast .contrast a{
+ color:#0066cc;/*#0074A2*/
+}
+body.blue a:hover,
+body.blue-contrast a:hover{
+ color:#2ac3ff
+}
body.blue a.btn,
body.blue .site-header .menu > ul > li > a,
body.blue #headerNav > ul > li > a,
body.blue .bliss-full-wrap .menu > ul > li > a,
body.blue .bliss-full-width-nav,
-body.blue .bliss-full-wrap .menu{background-color:#0074A2;color:#d8ecf4}
+body.blue .bliss-full-wrap .menu{
+ background-color:#0074A2;color:#d8ecf4
+}
+body.blue-contrast a.btn,
+body.blue-contrast .site-header .menu > ul > li > a,
+body.blue-contrast #headerNav > ul > li > a,
+body.blue-contrast .bliss-full-wrap .menu > ul > li > a,
+body.blue-contrast .bliss-full-width-nav,
+body.blue-contrast .bliss-full-wrap .menu{
+ background-color:#0066cc;
+ color:#d8ecf4
+}
body.blue a.btn:hover,
body.blue .site-header .menu > ul > li > a:hover,
-body.blue #headerNav > ul > li > a:hover{background-color:#007fb1;color:#d8ecf4}
+body.blue #headerNav > ul > li > a:hover{
+background-color:#007fb1;color:#d8ecf4
+}
+
+body.blue-contrast a.btn:hover,
+body.blue-contrast .site-header .menu > ul > li > a:hover,
+body.blue-contrast #headerNav > ul > li > a:hover{
+ color:#d8ecf4
+}
body.blue .bliss-full-width-nav > ul > li > a:hover,
body.blue #headerNav.bliss-full-width-nav > ul > li > a:hover,
-body.blue .bliss-full-wrap .menu > ul > li > a:hover{background-color:#0074A2;color:#2ac3ff;}
+body.blue .bliss-full-wrap .menu > ul > li > a:hover{
+background-color:#0074A2;color:#2ac3ff
+}
+body.blue-contrast .bliss-full-width-nav > ul > li > a:hover,
+body.blue-contrast #headerNav.bliss-full-width-nav > ul > li > a:hover,
+body.blue-contrast .bliss-full-wrap .menu > ul > li > a:hover{
+ color:#2ac3ff
+}
body.blue .contrast,
-body.blue .contrast a{color:#007fb1}
-body.blue .site-footer{border-top:1px solid #007fb1;background-color:#e2e2e2}
+body.blue .contrast a{
+color:#007fb1;
+}
+
+body.blue-contrast .logo a,
+body.blue-contrast .site-slogan,
+body.blue-contrast .site-slogan a,
+body.blue-contrast .site-footer a{
+ color: #d8ecf4;
+}
+body.blue .site-footer,
+body.blue-contrast .site-footer{border-top:1px solid #007fb1;}
+body.blue .site-footer{background-color:#e2e2e2}
+body.blue-contrast .site-footer,
+body.blue-contrast .site-header{background-color:#0094d9}
-body.green{background-color:#018113}
+body.green,
+body.green-contrast .site-header,
+body.green-contrast .site-footer{background-color:#018113}
+body.green-contrast{background-color:#c4ffc5}
body.green #bliss_container{background-color:#c4ffc5}
body.green a,
body.green h1,
@@ -1507,27 +1558,61 @@ body.green h2,
body.green h3,
body.green h4,
body.green h5,
-body.green h6{color:#00650f}
-body.green a:hover{color:#018113}/*0F0*/
+body.green h6,
+body.green-contrast a,
+body.green-contrast h1,
+body.green-contrast h2,
+body.green-contrast h3,
+body.green-contrast h4,
+body.green-contrast h5,
+body.green-contrast h6{color:#00650f}
+body.green-contrast .site-slogan{color:#c4ffc5;/*#fff;*/}
+body.green a:hover, body.green-contrast a:hover{color:#018113}/*0F0*/
body.green a.btn,
body.green .site-header .menu > ul > li > a,
body.green #headerNav > ul > li > a,
body.green .bliss-full-wrap .menu > ul > li > a,
body.green .bliss-full-width-nav,
-body.green .bliss-full-wrap .menu{background-color:#00650f;color:#c4ffc5}
+body.green .bliss-full-wrap .menu,
+body.green-contrast a.btn,
+body.green-contrast .site-header .menu > ul > li > a,
+body.green-contrast #headerNav > ul > li > a,
+body.green-contrast .bliss-full-wrap .menu > ul > li > a,
+body.green-contrast .bliss-full-width-nav,
+body.green-contrast .bliss-full-wrap .menu{background-color:#00650f;color:#c4ffc5}
body.green a.btn:hover,
body.green .site-header .menu > ul > li > a:hover,
-body.green #headerNav > ul > li > a:hover{background-color:#018113;}
-body.green .bliss-full-width-nav > ul > li > a:hover,
-body.green #headerNav.bliss-full-width-nav > ul > li > a:hover,
-body.green .bliss-full-wrap .menu > ul > li > a:hover{background-color:#00650f; color:#c4ffc5;}
+body.green #headerNav > ul > li > a:hover,
+body.green-contrast a.btn:hover,
+body.green-contrast .site-header .menu > ul > li > a:hover,
+body.green-contrast #headerNav > ul > li > a:hover{background-color:#018113;}
+body.green-contrast .bliss-full-width-nav > ul > li > a:hover,
+body.green-contrast #headerNav.bliss-full-width-nav > ul > li > a:hover,
+body.green-contrast .bliss-full-wrap .menu > ul > li > a:hover{background-color:#00650f; color:#c4ffc5;}
body.green .contrast,
-body.green .contrast a{color:#018113}
-body.green .site-footer{border-top:1px solid #018113;background-color:#e2e2e2;}
+body.green .contrast a,
+body.green-contrast .contrast,
+body.green-contrast .contrast a{color:#018113}
+body.green .site-footer, body.green-contrast .site-footer{border-top:1px solid #018113;background-color:#e2e2e2;}
+
+
+
+body.maroon,
+body.maroon-contrast .site-header,
+body.maroon-contrast .site-footer{
+background-color:#540e1f;
+}
+/*
+949494
+{background-color:#921936;}
+540040
-body.maroon{background-color:#540e1f;}
-body.maroon .site-header{background-color:#9f9f9f;}/* That's grey. If you prefer pink, you could use: #ffd9e2;*/
+body.maroon-contrast
+efefef
+*/
+body.maroon .site-header,
+body.maroon-contrast{background-color:#9f9f9f;}/* That's grey. If you prefer pink, you could use: #ffd9e2;*/
body.maroon #bliss_container{background-color:#e2e2e2;}
body.maroon a,
body.maroon h1,
@@ -1536,31 +1621,78 @@ body.maroon h3,
body.maroon h4,
body.maroon h5,
body.maroon h6{color:#540e1f}
-body.maroon a:hover{color:#921936}
+body.maroon-contrast a,
+body.maroon-contrast h1,
+body.maroon-contrast h2,
+body.maroon-contrast h3,
+body.maroon-contrast h4,
+body.maroon-contrast h5,
+body.maroon-contrast h6{color:#540040}
+
+body.maroon a:hover,
+body.maroon-contrast a:hover{color:#921936}
+
body.maroon a.btn,
body.maroon .site-header .menu > ul > li > a,
body.maroon #headerNav > ul > li > a{background-color:#540e1f;color:#9f9f9f}/*a3a7a9;*/
+body.maroon-contrast a.btn,
+body.maroon-contrast .site-header .menu > ul > li > a,
+body.maroon-contrast #headerNav > ul > li > a{background-color:#9f9f9f;/*540e1f;*/color:#540040}/*a3a7a9;*/
+
body.maroon a.btn:hover,
body.maroon .site-header .menu > ul > li > a:hover,
-body.maroon #headerNav > ul > li > a:hover{background-color:#921936/*;color:#540e1f*/}
+body.maroon #headerNav > ul > li > a:hover
+body.maroon-contrast a.btn:hover,
+body.maroon-contrast .site-header .menu > ul > li > a:hover,
+body.maroon-contrast #headerNav > ul > li > a:hover{background-color:#921936/*;color:#540e1f*/}
+
body.maroon .bliss-full-width-nav > ul > li > a:hover,
body.maroon #headerNav.bliss-full-width-nav > ul > li > a:hover,
body.maroon .bliss-full-wrap .menu > ul > li > a:hover{background-color:#540e1f;}
+
body.maroon .bliss-full-width-nav,
body.maroon .bliss-full-wrap .menu{background-color:#949494;/*333;*/}
+body.maroon-contrast .bliss-full-width-nav,
+body.maroon-contrast .bliss-full-wrap .menu{
+ background-color:#e2e2e2;/*540040;*/
+
+}
+body.maroon-contrast .bliss-full-width-nav{
+ border-bottom:1px solid #540040;
+}
+
body.maroon #headerNav.bliss-full-width-nav > ul > li > a,
-body.maroon .bliss-full-wrap .menu a{background-color:#949494;color:#540e1f;}
+body.maroon .bliss-full-wrap .menu a{
+background-color:#949494;color:#540e1f;}
+body.maroon-contrast #headerNav.bliss-full-width-nav > ul > li > a,
+body.maroon-contrast .bliss-full-wrap .menu a{color:#540040; background-color:#e2e2e2;}
+
body.maroon #headerNav.bliss-full-width-nav > ul > li .sub-menu li > a,
-body.maroon .bliss-full-wrap .menu .sub-menu a{
+body.maroon .bliss-full-wrap .menu .sub-menu a,
+body.maroon-contrast #headerNav.bliss-full-width-nav > ul > li .sub-menu li > a,
+body.maroon-contrast .bliss-full-wrap .menu .sub-menu a{
background-color:inherit;
}
body.maroon #headerNav.bliss-full-width-nav > ul > li > a:hover,
body.maroon .bliss-full-wrap .menu > ul > li > a:hover{/*color:#921936;*/color:#9f9f9f;}
-body.maroon .shadow{box-shadow: 0px 0px 3px #921936;}
+
+body.maroon .shadow,
+body.maroon-contrast .shadow{box-shadow: 0px 0px 3px #921936;}
+
body.maroon #headerNav.bliss-full-width-nav > ul > li > ul > li > a,
body.maroon .bliss-full-wrap .menu li li a{}
body.maroon .contrast,
body.maroon .contrast a{color:#540e1f}
+
+body.maroon-contrast .site-footer{color:#9f9f9f}
+
+body.maroon-contrast .contrast,
+body.maroon-contrast .contrast a,
+body.maroon-contrast .logo a,
+body.maroon-contrast .site-slogan,
+body.maroon-contrast .site-slogan a,
+body.maroon-contrast .site-footer a{color:#efefef}
+
body.maroon .site-footer{border-top:1px solid #540e1f;background-color:#9f9f9f;}
@@ -1590,6 +1722,54 @@ body.brown .contrast,
body.brown .contrast a{color:#5a2a00}
body.brown .site-footer{border-top:1px solid #5a2a00;background-color:#e2e2e2}
+/*
+make the header 774111
+make the nav 5a2a00 ( change 774111 to 5a2a00 )
+make the body fddec2 (change 5a2a00 to fddec2 )
+update: replaced fddec2 with e9d8c9
+replaced e9d8c9 with e9d7a1
+*/
+
+body.brown-contrast{background-color:#e9d7a1;}
+
+body.brown-contrast a,
+body.brown-contrast h1,
+body.brown-contrast h2,
+body.brown-contrast h3,
+body.brown-contrast h4,
+body.brown-contrast h5,
+body.brown-contrast h6,
+body.brown-contrast .contrast,
+body.brown-contrast .contrast a{color:#5a2a00;}
+
+
+
+body.brown-contrast a:hover{color:#E86C0C}
+body.brown-contrast a.btn,
+body.brown-contrast .site-header .menu > ul > li > a,
+body.brown-contrast #headerNav > ul > li > a,
+body.brown-contrast .bliss-full-wrap .menu > ul > li > a,
+body.brown-contrast .bliss-full-width-nav,
+body.brown-contrast .bliss-full-wrap .menu{background-color:#5a2a00;color:#e9d7a1}
+body.brown-contrast a.btn:hover,
+body.brown-contrast .site-header .menu > ul > li > a:hover,
+body.brown-contrast #headerNav > ul > li > a:hover{background-color:#e9d7a1;color:#e9d7a1}
+body.brown-contrast .bliss-full-width-nav > ul > li > a:hover,
+body.brown-contrast #headerNav.bliss-full-width-nav > ul > li > a:hover,
+body.brown-contrast .bliss-full-wrap .menu > ul > li > a:hover{background-color:#5a2a00;color:#E86C0C;}
+
+body.brown-contrast .logo a,
+body.brown-contrast .site-slogan,
+body.brown-contrast .site-slogan a,
+body.brown-contrast .site-footer a{color:#e9d7a1}
+
+body.brown-contrast .site-footer{color:#c7b57f;}
+
+body.brown-contrast .site-header,
+body.brown-contrast .site-footer{
+background-color:#774111;
+}
+body.brown-contrast .site-footer{border-top:1px solid #e9d7a1;}
body.light{background-color:#EFEFEF;}
body.light #bliss_container{background-color:#F8F8F8;}
@@ -1605,10 +1785,10 @@ body.light a.btn,
body.light .bliss-header-nav .menu > ul > li > a,
body.light #headerNav > ul > li > a,
body.light .bliss-full-width-nav,
-body.light .bliss-full-wrap .menu{background-color:#656869;color:#F8F8F8}/*color:#a3a7a9*/
+body.light .bliss-full-wrap .menu{background-color:#656869;color:#F8F8F8}
body.light a.btn:hover,
body.light .site-header .menu > ul > li > a:hover,
-body.light #headerNav > ul > li > a:hover{background-color:#a3a7a9;color:#444647}/*656869*/
+body.light #headerNav > ul > li > a:hover{background-color:#a3a7a9;color:#444647}
body.light .bliss-full-width-nav > ul > li > a:hover,
body.light #headerNav.bliss-full-width-nav > ul > li > a:hover,
body.light .bliss-full-wrap .menu > ul > li > a:hover{background-color:#656869;color:#a3a7a9}
@@ -1643,6 +1823,15 @@ body.dark .contrast,
body.dark .contrast a{color:#666666}
body.dark .site-footer{border-top:1px solid #666666;background-color:#a3a7a9;}
+/*
+new higher contrast color schemes.
+ 'blue-contrast'
+ 'green-contrast'
+ 'maroon-contrast'
+ 'brown-contrast'
+ not now: 'dark-contrast'
+*/
+
/* ==========================================================================
Don't Put Custom Style Rules Here