Update mantra 3.0.5

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

11 files changed, 62 insertions, 16 deletions

diff --git a/themes/mantra/admin/defaults.php b/themes/mantra/admin/defaults.php
index 8acc4c21..0668296f 100644
--- a/themes/mantra/admin/defaults.php
+++ b/themes/mantra/admin/defaults.php
@@ -176,7 +176,7 @@ $mantra_defaults = array(
 	"mantra_excerptarchive" => "Excerpt",
 	"mantra_excerptwords" => "50",
 	"mantra_magazinelayout" => "Disable",
-	"mantra_excerptdots" => "…",
+	"mantra_excerptdots" => "...",
 	"mantra_excerptcont" => " Continue reading",
 	"mantra_excerpttags" => "Disable",
 
@@ -206,7 +206,8 @@ $mantra_defaults = array(
 
 	"mantra_copyright" => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla massa diam, tempus a finibus et, euismod nec arcu. Praesent ultrices massa at molestie facilisis.",
 	"mantra_customcss" => "/* Mantra Custom CSS */  ",
-	"mantra_customjs" => ""
+	"mantra_customjs" => "",
+	"mantra_editorstyle" => 1,
 	
 );
 
diff --git a/themes/mantra/admin/js/admin.js b/themes/mantra/admin/js/admin.js
index d518ed2b..d026e51f 100644
--- a/themes/mantra/admin/js/admin.js
+++ b/themes/mantra/admin/js/admin.js
@@ -68,34 +68,42 @@ jQuery(document).ready(function() {
 
 			case "Slider Shortcode" :
 			jQuery('#sliderShortcode').show("normal");
+			jQuery('#sliderParameters').hide("normal");
 			break;
 
 			case "Custom Slides" :
 			jQuery('#sliderCustomSlides').show("normal");
+			jQuery('#sliderParameters').show("normal");
 			break;
 
 			case "Latest Posts" :
 			jQuery('#sliderLatestPosts').show("normal");
+			jQuery('#sliderParameters').show("normal");
 			break;
 
 			case "Random Posts" :
 			jQuery('#sliderRandomPosts').show("normal");
+			jQuery('#sliderParameters').show("normal");
 			break;
 
 			case "Sticky Posts" :
 			jQuery('#sliderStickyPosts').show("normal");
+			jQuery('#sliderParameters').show("normal");
 			break;
 
 			case "Latest Posts from Category" :
 			jQuery('#sliderLatestCateg').show("normal");
+			jQuery('#sliderParameters').show("normal");
 			break;
 
 			case "Random Posts from Category" :
 			jQuery('#sliderRandomCateg').show("normal");
+			jQuery('#sliderParameters').show("normal");
 			break;
 
 			case "Specific Posts" :
 			jQuery('#sliderSpecificPosts').show("normal");
+			jQuery('#sliderParameters').show("normal");
 			break;
 
 		}//switch
diff --git a/themes/mantra/admin/main.php b/themes/mantra/admin/main.php
index 35500898..d769a9e6 100644
--- a/themes/mantra/admin/main.php
+++ b/themes/mantra/admin/main.php
@@ -215,6 +215,7 @@ function mantra_init_fn(){
 	add_settings_field('mantra_copyright', __('Custom Footer Text','mantra') , 'cryout_setting_copyright_fn', 'mantra-page', 'misc_section');
 	add_settings_field('mantra_customcss', __('Custom CSS','mantra') , 'cryout_setting_customcss_fn', 'mantra-page', 'misc_section');
 	add_settings_field('mantra_customjs', __('Custom JavaScript','mantra') , 'cryout_setting_customjs_fn', 'mantra-page', 'misc_section');
+	add_settings_field('mantra_editorstyle', __('Editor Styling','mantra') , 'cryout_setting_editorstyle_fn', 'mantra-page', 'misc_section');
 }
 
 // Display the admin options page
diff --git a/themes/mantra/admin/settings.php b/themes/mantra/admin/settings.php
index 7f21ab3c..553b2d6f 100644
--- a/themes/mantra/admin/settings.php
+++ b/themes/mantra/admin/settings.php
@@ -182,7 +182,7 @@ function cryout_setting_frontslider_fn() {
 	echo "<input id='mantra_fpsliderheight' name='ma_options[mantra_fpsliderheight]' size='4' type='text' value='".esc_attr( $mantra_options['mantra_fpsliderheight'] )."'  />  px (".__("height","mantra").")";
 	echo "<small>".__("The dimensions of your slider. Make sure your images are of the same size.","mantra")."</small></div>";
 
-	echo "<div class='slmini'><b>".__("Animation:","mantra")."</b> ";
+	echo "<div id='sliderParameters'><div class='slmini'><b>".__("Animation:","mantra")."</b> ";
 	$options = array ("random" , "fold", "fade", "slideInRight", "slideInLeft", "sliceDown", "sliceDownLeft", "sliceUp", "sliceUpLeft", "sliceUpDown" , "sliceUpDownLeft", "boxRandom", "boxRain", "boxRainReverse", "boxRainGrow" , "boxRainGrowReverse");
 	$labels = array( __("Random","mantra"), __("Fold","mantra"), __("Fade","mantra"), __("SlideInRight","mantra"), __("SlideInLeft","mantra"), __("SliceDown","mantra"), __("SliceDownLeft","mantra"), __("SliceUp","mantra"), __("SliceUpLeft","mantra"), __("SliceUpDown","mantra"), __("SliceUpDownLeft","mantra"), __("BoxRandom","mantra"), __("BoxRain","mantra"), __("BoxRainReverse","mantra"), __("BoxRainGrow","mantra"), __("BoxRainGrowReverse","mantra"));
 	echo "<select id='mantra_fpslideranim' name='ma_options[mantra_fpslideranim]'>";
@@ -231,7 +231,7 @@ function cryout_setting_frontslider_fn() {
 		echo ">$labels[$id]</option>";
 	}
 	echo "</select>";
-	echo "<small>".__("The Left and Right arrows on your slider","mantra")."</small></div>";
+	echo "<small>".__("The Left and Right arrows on your slider","mantra")."</small></div><div><!--#sliderParameters-->";
 ?>
 
 <script>
@@ -1664,4 +1664,18 @@ function cryout_setting_customjs_fn() {
 	echo "<div><small>".__("Insert your custom Javascript code here. (Google Analytics and any other forms of Analytic software).<br> The &ltscript&gt tags are not needed.","mantra")."</small></div>";
 }
 
+function cryout_setting_editorstyle_fn() {
+	global $mantra_options;
+	$items = array (1, 0);
+	$itemsare = array( __("Enable","mantra"), __("Disable","mantra"));
+	echo "<select id='mantra_editorstyle' name='ma_options[mantra_editorstyle]'>";
+	foreach($items as $id=>$item) {
+		echo "<option value='$item'";
+		selected($mantra_options['mantra_editorstyle'],$item);
+		echo ">$itemsare[$id]</option>";
+	}
+	echo "</select>";
+	echo "<div><small>".__("Disable to turn off the theme's styling in the Visual Editor.","mantra")."</small></div>";
+}
+
 // FIN
\ No newline at end of file
diff --git a/themes/mantra/functions.php b/themes/mantra/functions.php
index 107e5d7a..903c40e7 100644
--- a/themes/mantra/functions.php
+++ b/themes/mantra/functions.php
@@ -9,7 +9,7 @@
 
 // theme specifics
 define ('_CRYOUT_THEME_NAME','mantra');
-define ('_CRYOUT_THEME_VERSION','3.0.4');
+define ('_CRYOUT_THEME_VERSION','3.0.5');
 
 require_once(get_template_directory() . "/admin/main.php"); 	// Load necessary admin files
 
diff --git a/themes/mantra/includes/custom-styles.php b/themes/mantra/includes/custom-styles.php
index ad83220e..153ef422 100644
--- a/themes/mantra/includes/custom-styles.php
+++ b/themes/mantra/includes/custom-styles.php
@@ -222,7 +222,7 @@ function mantra_custom_styles() {
 	if ($mantra_postmetas == "Hide") { ?> #content .entry-meta, #content .entry-header div.entry-meta2 > * { display:none; } <?php }

 	if (($mantra_mobile == "Enable") &&  $mantra_hcontain) { ?> #branding { -webkit-background-size: contain !important; -moz-background-size: contain !important; background-size: contain !important; } <?php } ?>

 

-	#branding { height:<?php echo HEADER_IMAGE_HEIGHT; ?>px ;} <?php

+	#branding { height:<?php echo $mantra_hheight; ?>px ;} <?php

 	if ($mantra_hratio) { ?> @media (max-width: 800px) {#branding, #bg_image { min-height:inherit !important; } }<?php }

 

 	return ob_get_clean();

diff --git a/themes/mantra/includes/theme-setup.php b/themes/mantra/includes/theme-setup.php
index 5bc922a1..cc23596d 100644
--- a/themes/mantra/includes/theme-setup.php
+++ b/themes/mantra/includes/theme-setup.php
@@ -53,7 +53,7 @@ function mantra_setup() {
 	extract( $mantra_options );
 	
 	// This theme styles the visual editor with editor-style.css to match the theme style.
-	add_editor_style();
+	if ($mantra_editorstyle) add_editor_style( "resources/css/editor-style.css" );
 
 	// Support title tag since WP 4.1
 	add_theme_support( 'title-tag' );
@@ -95,7 +95,6 @@ function mantra_setup() {
 	// Register custom image size for use with post thumbnails
 	add_image_size( 'custom', apply_filters( 'mantra_featured_image_width', $mantra_fwidth ), apply_filters( 'mantra_featured_image_height', $mantra_fheight ), !empty($mantra_fcrop) );
 
-	define( 'NO_HEADER_TEXT', true );
 	$header_args = array(
 		'height' => $mantra_hheight,
 		'width' => $mantra_totalSize,
diff --git a/themes/mantra/readme.txt b/themes/mantra/readme.txt
index b72c541d..504ae8f3 100644
--- a/themes/mantra/readme.txt
+++ b/themes/mantra/readme.txt
@@ -4,8 +4,8 @@ Copyright 2011-18 Cryout Creations
 
 Author: Cryout Creations
 Requires at least: 4.2
-Tested up to: 4.9.2
-Stable tag: 3.0.4
+Tested up to: 4.9.6
+Stable tag: 3.0.5
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl.html
 Donate link: https://www.cryoutcreations.eu/donate/
@@ -95,6 +95,14 @@ Turkish - Emre Dalkili�
 
 == Changelog ==
 
+= 3.0.5 =
+* Added option to control editor styling activation after reintroducing basic editor styling
+* Improved slider captions by making slide links clickable through the captions
+* Improved slider administration interface by hiding unused fields when slider shortcode is used
+* Changed default excerpt ellipis value to avoid settings page issues on some servers
+* Fixed magazine layout two columns responsiveness
+* Fixed usage of obsolete constant in generated styling
+
 = 3.0.4 = 
 * Fixed menu alignment option not working 
 * Fixed 'one column no sidebar' template using broken layout
diff --git a/themes/mantra/resources/css/editor-style.css b/themes/mantra/resources/css/editor-style.css
index 9eefb8bc..41331937 100644
--- a/themes/mantra/resources/css/editor-style.css
+++ b/themes/mantra/resources/css/editor-style.css
@@ -7,7 +7,6 @@ Used to style the TinyMCE editor.
 
 * {
 	font-family: Georgia, "Bitstream Charter", serif;
-	color: #444;
 	line-height: 1.5;
 }
 p,
@@ -103,7 +102,8 @@ del {
 }
 blockquote {
 	font-style: italic;
-	padding: 0 3em;
+	padding: 0.5em 1em;
+	background: #f7f7f7;
 }
 blockquote cite,
 blockquote em,
@@ -111,7 +111,7 @@ blockquote i {
 	font-style: normal;
 }
 pre {
-	background: #f7f7f7;
+	border: 1px dotted #ddd;
 	color: #222;
 	line-height: 18px;
 	margin-bottom: 18px;
@@ -172,6 +172,10 @@ var {
 }
 code {
 	font-size: 13px;
+	display: inline-block;
+	padding: 2px 10px;
+	border-left: 3px solid #EEEEEE;
+	background-color: #FAFAFA;
 }
 strong,
 b,
diff --git a/themes/mantra/resources/css/style-mobile.css b/themes/mantra/resources/css/style-mobile.css
index 44d09164..7aea81d3 100644
--- a/themes/mantra/resources/css/style-mobile.css
+++ b/themes/mantra/resources/css/style-mobile.css
@@ -247,6 +247,12 @@
 		font-size: 2em;
 		line-height: 2em;
 	}
+	
+	#content article.post {
+		width: 100%;
+		margin-right: 0;
+		margin-left: 0;
+	}
 
 	.entry-meta {
 		display: table;
diff --git a/themes/mantra/style.css b/themes/mantra/style.css
index a64030b0..ad14b4e8 100644
--- a/themes/mantra/style.css
+++ b/themes/mantra/style.css
@@ -4,10 +4,10 @@ Theme URI: https://www.cryoutcreations.eu/wordpress-themes/mantra
 Description: Mantra is a do-it-yourself WordPress theme, featuring a pack of over 100 customization options and easy to use tweaks capable of tuning WordPress to your very specific needs and likes. With the help of a simple and efficient user interface you can customize everything:the layout (1,2 or 3 columns), total and partial site widths, colors (all texts, links, backgrounds etc.), fonts (over 35 font-families plus all Google Fonts), text and header sizes, post metas, post excerpts, post formats, header and background images, custom menus, 27 social media links and icons, pins, bullets and much much more. With a fully responsive layout,a customizable showcase presentation page, animated slider, magazine and blog layouts, 8 widget areas, modern graphics and an easy and intuitive admin section, you can start creating your dream site right now.
 Author: Cryout Creations
 Author URI: https://www.cryoutcreations.eu
-Version: 3.0.4
+Version: 3.0.5
 License: GNU General Public License v2.0
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
-Tags: one-column, two-columns, three-columns, right-sidebar, left-sidebar, footer-widgets, grid-layout, custom-background, custom-colors, custom-header, custom-menu, featured-image-header, featured-images, front-page-post-form, full-width-template,  microformats, post-formats, rtl-language-support,  sticky-post, theme-options, threaded-comments, translation-ready, blog, e-commerce, entertainment, news
+Tags: one-column, two-columns, three-columns, right-sidebar, left-sidebar, footer-widgets, grid-layout, custom-background, custom-colors, custom-header, custom-menu, featured-image-header, featured-images, front-page-post-form, full-width-template,  microformats, post-formats, rtl-language-support,  sticky-post, theme-options, threaded-comments, translation-ready, blog, entertainment, news
 Text domain: mantra
 
 Copyright (c) 2011-2018 Cryout Creations
@@ -1852,6 +1852,10 @@ h3#reply-title {
 #respond label {
 	font-size: .9em;
 }
+#respond input + label {
+	margin-right: 0.5em;
+	margin-left: 0.5em;
+}
 
 #respond input {
 	margin: 0 0 9px;
@@ -2499,7 +2503,7 @@ article.sticky {
 
 /* BREADCRUMBS */
 .breadcrumbs {
-	padding-top: .5em;
+	padding-bottom: .5em;
 	font-size: 1em;
 }
 
@@ -2736,6 +2740,7 @@ article.sticky {
 	background: rgba(0,0,0,.5);
 	color: #fff;
 	line-height: 1.5;
+	pointer-events: none;
 }
 
 .nivo-caption > h3 {