diff --git a/wp-content/themes/bliss/functions.php b/wp-content/themes/bliss/functions.php
index d7b208ecc705843bc3f09083e8ab5e433e533619..a5211bf6798b404d08eb76f23b7836b3074bf157 100644
--- a/wp-content/themes/bliss/functions.php
+++ b/wp-content/themes/bliss/functions.php
@@ -225,6 +225,29 @@ function bliss_user_customizations(){
', esc_url($header_background));
}
+ $header_text_color = get_header_textcolor();
+ if($header_text_color && $header_text_color != ''){
+ printf('
+ <style type="text/css">
+ .site-header,
+ .site-header .logo a,
+ .site-header .site-slogan,
+ .site-header .site-slogan a,
+ .site-header a,
+ .site-header h1,
+ .site-header h2,
+ .site-header h3,
+ .site-header h4,
+ .site-header h5,
+ .site-header h6,
+ .site-header .contrast,
+ .site-header .contrast a{
+ color: #%s !important;
+ }
+
+ </style>
+ ', esc_attr($header_text_color));
+ }
}
add_action('wp_head', 'bliss_user_customizations', 100);// a low priority so these styles will be called last.
diff --git a/wp-content/themes/bliss/readme.txt b/wp-content/themes/bliss/readme.txt
index 0a4f2a50f06840bf48fe8d66d19d23117c90dd12..9acd409fdda19d8efb88fbf04ed457ebc11fefa1 100644
--- a/wp-content/themes/bliss/readme.txt
+++ b/wp-content/themes/bliss/readme.txt
@@ -5,9 +5,9 @@ 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.4.2
+Tested up to: 4.8
Stable tag: trunk
-License: Bliss WordPress theme, copyright 2014 by Mardesco. Bliss is distributed under the terms of the GNU GPLv2
+License: Bliss WordPress theme, copyright 2017 by Mardesco. Bliss is distributed under the terms of the GNU GPLv2
A blissful website experience. "Bliss" is a mobile-friendly, responsive WordPress theme. Featuring theme options, to simplify your life. Easily add a site logo, select a color scheme, create slideshows, and more.
@@ -39,6 +39,9 @@ If you spot a bug; if you notice a browser display inconsistency; or if you have
= Known rendering issue =
Heading fonts render with edges that appear rough or pixelated on Chrome 39.x for Windows. A future release of this theme will examine the possibility of self-hosting the font (or a different font), to prevent the Chrome browser from importing the poorly supported .woff file. See http://stackoverflow.com/questions/11487427/is-there-any-font-smoothing-in-google-chrome for a description of the issue, or contact the theme author with suggestions.
+= Plugin compatibility =
+When running "Bliss" with the plugins "Event Organiser" and "Yoast SEO," if you notice the event taxonomy archive pages have a title that says "0" improperly and the "body" element has class "eo-tc-page," you can fix this by simply changing the Event Organiser plugin option to "Enable template handling" under Settings > Event Organiser > Templates.
+
== License ==
= Bliss theme =
@@ -189,7 +192,7 @@ Alternatively, you can eliminate the container width setting, for a layout that
= Add icons =
-See the [Font Awesome documentation](http://fortawesome.github.io/Font-Awesome/examples/) for examples on adding icons to your website.
+See the [Font Awesome documentation](http://fortawesome.github.io/Font-Awesome/examples/) for examples on adding icons to your website content.
= Content columns =
@@ -197,14 +200,19 @@ For responsive content columns as seen in this theme's screenshot.png, all you n
== Changelog ==
-
+1.2.0 Numerous bug fixes and improvements.
+ * Improved color schemes, resolved CSS conflicts
+ * Fixed Cusomizer integration for background color and background image
+ * TODO: when "use slideshow" is UN-checked it should remove that option!!
+ * TODO: add Font selector to Theme Options. Users will be able to select from a choice of several font faces.
+1.1.1 Makes margins a little wider, body grey a little lighter. Corrected hover state color for button links in brown color scheme.
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.
+1.0.10 Update to latest version of Options Framework (version 1.9.1) because the earlier change to add_theme_page() did not resolve the automatic theme check conflict.
1.0.9 Correct new theme review requirements: add .screen-reader-text CSS class; change options framework admin page feature to implement the add_theme_page() function; replace placeholder text domain in options framework files.
1.0.8 Add textdomain for improved internationalization.
1.0.7 Improve styling for "sticky" posts. Make "Read More" link a button with arrow icon. Same for "Previous Post" and "Next Post" links on single blog post pages. Use magnifying glass icon in place of the word "search" on the search form.
diff --git a/wp-content/themes/bliss/style.css b/wp-content/themes/bliss/style.css
index 70930c4075037c25a1d5286e15ea53d7c96bd4ea..995e100e8f4a8fa9c5d6fc75d981132b8aa308b4 100644
--- a/wp-content/themes/bliss/style.css
+++ b/wp-content/themes/bliss/style.css
@@ -4,8 +4,8 @@ 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.1.0
-Tags: blue,brown,custom-header,custom-background,green,gray,featured-images,left-sidebar,responsive-layout,right-sidebar,theme-options
+Version: 1.2.0
+Tags: custom-header,custom-background,featured-images,left-sidebar,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
@@ -1338,14 +1338,14 @@ footer .content{
*/
.hasLeftNav #bliss_main{
- margin-left:22.45%;
+ margin-left:25%;/* formerly 22.45%; */
padding-left:2.9%;/* must match right nav, below. */
}
.sideNav,
.leftSideNav{
float:left;
- width:19.55%;/*auto;/*16.775%;*/
+ width:22.1%;/* formerly 19.55%;/*auto;/*16.775%;*/
margin-left:-100%;
padding-left:2.9%;
}
@@ -1381,7 +1381,7 @@ from large regular screens down to tablets and narrow browsers, min. 680px wide.
*/
.hasRightNav #bliss_main{
- margin-right:22.45%;
+ margin-right:25%;/* formerly 22.45%; */
padding-right:2.9%;/* must match left nav, above. */
}
@@ -1390,8 +1390,8 @@ from large regular screens down to tablets and narrow browsers, min. 680px wide.
padding-left:0;
float:left;
/* don't set a padding-right, just calculate the width and margin-left correctly. */
- width:19.55%;
- margin-left:-22.45%;/* width of the sidebar, PLUS the "padding"... */
+ width:22.1%;/* formerly 19.55%;*/
+ margin-left:-25%;/* width of the sidebar, PLUS the "padding"... */
}
/* small screens: no right hand sidebar either. */
@@ -1464,7 +1464,7 @@ 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 */
+#bliss_container{background-color:#f4f4f4;}/* default is light grey: formerly efefef */
body.blue{background-color:#007fb1;}
body.blue-contrast{background-color:#d8ecf4}
@@ -1566,8 +1566,9 @@ 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-contrast .site-slogan,
+body.green-contrast .site-footer{color:#c4ffc5;}
+body.green a:hover, body.green-contrast a:hover{color:#018113}
body.green a.btn,
body.green .site-header .menu > ul > li > a,
body.green #headerNav > ul > li > a,
@@ -1593,26 +1594,38 @@ body.green .contrast,
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.green .site-footer{border-top:1px solid #018113;background-color:#e2e2e2;}
+body.green-contrast .logo a,
+body.green-contrast .site-slogan,
+body.green-contrast .site-slogan a,
+body.green-contrast .site-footer a{
+color:#c4ffc5;
+}
+body.green-contrast .logo a:hover,
+body.green-contrast .site-slogan a:hover,
+body.green-contrast .site-footer a:hover{
+color:#00650f;
+}
-body.maroon,
-body.maroon-contrast .site-header,
-body.maroon-contrast .site-footer{
-background-color:#540e1f;
+
+/* shared maroon */
+body.maroon a:hover,
+body.maroon-contrast a:hover{color:#921936}
+
+
+body.maroon #headerNav.bliss-full-width-nav > ul > li .sub-menu li > 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;
}
-/*
-949494
-{background-color:#921936;}
-540040
-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;*/
+/* legacy maroon */
+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 #bliss_container{background-color:#e2e2e2;}
body.maroon a,
body.maroon h1,
@@ -1621,71 +1634,57 @@ body.maroon h3,
body.maroon h4,
body.maroon h5,
body.maroon h6{color:#540e1f}
-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
-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-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-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;
+ background-color:#949494;color:#540e1f;
}
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,
-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 .site-footer{border-top:1px solid #540e1f;background-color:#9f9f9f;}
+body.maroon .shadow{box-shadow: 0px 0px 3px #921936;}
+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*/}
+/* new maroon */
+body.maroon-contrast{background-color:#eecd86; }/* #470012; nice deep mahogany/maroon #390013;3d3242*/
-body.maroon-contrast .site-footer{color:#9f9f9f}
+body.maroon-contrast .site-header,
+body.maroon-contrast .site-footer{
+background-color:#540e1f;
+}
+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-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-contrast #headerNav.bliss-full-width-nav > ul > li > a,
+body.maroon-contrast .bliss-full-wrap .menu a{color:#540040; background-color:#e2e2e2;}
+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-contrast .site-footer{color:#9f9f9f}
body.maroon-contrast .contrast,
body.maroon-contrast .contrast a,
body.maroon-contrast .logo a,
@@ -1693,7 +1692,11 @@ 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;}
+body.maroon-contrast .shadow{box-shadow: 0px 0px 3px #921936;}
+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:#540040; color:#e2e2e2;text-decoration:none;}
+
body.brown{background-color:#5a2a00;/*#401300;/*#521800;*/}
@@ -1753,7 +1756,7 @@ 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 #headerNav > ul > li > a:hover{background-color:#e9d7a1;color:#5a2a00}
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;}