Merge pull request #17 from oceanwp/dev-oe

Dev oe

changelog.txt

@@ -1,5 +1,22 @@
 == Changelog ==
 
+= 1.7.2 =
+- Fixed: [oceanwp_login] shortcode: logout '404 page not found' error when WooCommerce enabled.
+- Added: New shortcode to display the modified date on posts and pages: [oceanwp_last_modified]
+- Added: New demos
+
+= 1.7.1 =
+- Added: New demos
+
+= 1.7.0 =
+- Fixed: PHP 8 compatibility with demo import.
+- Added: New demo, Maria: https://maria.oceanwp.org/
+- Added: New demo, Photos: https://photos.oceanwp.org/
+- Updated: Freemius SDK version.
+
+= 1.6.9 =
+- Fixed: Demo import issue and Elementor page styling after import.
+
 = 1.6.8 =
 - Fixed: MailChimp Widget: failed subscription error.
 - Fixed: WC_Cart->taxes is deprecated since version 3.2 error when oceanwp_woo_free_shipping_left shortcode is in use.

includes/freemius/assets/scss/_colors.scss

@@ -0,0 +1,85 @@
+$menu-hover-color: #333;
+$darkest-color: #000;
+$fms-live-color: #71ae00;
+$fms-test-color: #f7941d;
+$fms-link-color: #29abe1;
+$fms-link-hover-color: darken(#29abe1, 10%);
+$body-bkg: #111;
+$special-color: #d3135a;
+$body-color: #f1f1f1;
+$fms-white: #f1f1f1;
+$container-bkg: #222;
+$container-bkg-odd: #262626;
+$container-border-color: #333;
+$table-head-bkg: #333;
+$table-head-color: #999;
+$info-color: #999;
+$error-color: #ff0000;
+
+$fs-logo-blue-color: #29abe1;
+$fs-logo-green-color: #71ae00;
+$fs-logo-magenta-color: #d3135a;
+
+// WordPress colors.
+$page-header-bkg: #333;
+$page-header-color: $fms-white;
+$text-dark-color: #333;
+$text-light-color: #666;
+$text-lightest-color: #999;
+
+// Notices.
+$wp-notice-success-color: #f7fff7;
+$wp-notice-success-dark-color: #46b450;
+$wp-notice-error-color: #ffeaea;
+$wp-notice-error-dark-color: #dc3232;
+$wp-notice-warn-color: #fff8e5;
+$wp-notice-warn-dark-color: #ffb900;
+$fs-notice-promotion-border-color: #00a0d2;
+$fs-notice-promotion-bkg: #f2fcff;
+
+// WP Buttons.
+$button-primary-bkg: #6bc406;
+$button-primary-color: $fms-white;
+$button-secondary-bkg: #333;
+$button-secondary-color: $fms-white;
+$featured-color: #6bc406;
+$wp-selected-color: #0074a3;
+$wp-button-alert-border-color: #d2593c;
+$wp-button-alert-border-top-color: #ec6544;
+$wp-button-alert-shadow-color: #d2593c;
+$wp-button-alert-focused-shadow1-color: #dd6041;
+$wp-button-alert-focused-shadow2-color: #e4a796;
+$wp-button-alert-background-color: #f56a48;
+$wp-button-alert-hovered-background-color: #fd6d4a;
+$wp-button-alert-active-background-color: #dd6041;
+$wp-button-alert-disabled-color: #f5b3a1;
+$wp-button-alert-disabled-background-color: #e76444;
+$wp-button-alert-disabled-border-color: #d85e40;
+$wp-button-primary-color: #fff;
+$wp-button-primary-background-color: #0085ba;
+$wp-button-primary-hover-background-color: #008ec2;
+$wp-button-primary-focus-background-color: $wp-button-primary-hover-background-color;
+$wp-button-primary-active-background-color: #0073aa;
+
+
+$wordpress_color: #01749A;
+$blogger_color: #ff8100;
+$wix_color: #fac102;
+$shopify_color: #80d100;
+$addthis_color: #fe6d4e;
+$tumblr_color: #34506b;
+$zepo_color: #00baf2;
+$jquery_color: #000919;
+$javascript_color: #00baf2;
+$squarespace_color: #000;
+
+$blog_color: #ff6600;
+$facebook_color: #3b5998;
+$twitter_color: #4099ff;
+$linkedin_color: #4875b4;
+$youtube_color: #ff3333;
+$gplus_color: #c63d2d;
+
+// Tooltip
+$tooltip-color: #fff;
+$tooltip-bkg-color: rgba(0,0,0,0.8);

includes/freemius/assets/scss/_load.scss

@@ -0,0 +1,4 @@
+@import 'mixins';
+@import "vars";
+@import "functions";
+@import "colors";

includes/freemius/assets/scss/_mixins.scss

@@ -0,0 +1,270 @@
+// ---- CSS3 SASS MIXINS ----
+// https://github.com/madr/css3-sass-mixins
+//  
+//  Copyright (C) 2011 by Anders Ytterström
+//  
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+
+// ---- LEGACY IE SUPPORT USING FILTERS ----
+//  Should IE filters be used or not?
+//  PROS: gradients, drop shadows etc will be handled by css.
+//  CONS: will harm the site performance badly, 
+//        especially on sites with heavy rendering and scripting. 
+$useIEFilters: 0; 
+// might be 0 or 1. disabled by default.
+// ---- /LEGACY IE SUPPORT USING FILTERS ----
+
+
+@mixin background-size ($value) {
+  -webkit-background-size: $value;
+          background-size: $value;
+}
+
+@mixin border-image ($path, $offsets, $repeats) {
+     -moz-border-image: $path $offsets $repeats;
+       -o-border-image: $path $offsets $repeats;
+  -webkit-border-image: $path $offsets $repeats;
+          border-image: $path $offsets $repeats;
+}
+
+@mixin border-radius ($values...) {
+     -moz-border-radius: $values;
+  -webkit-border-radius: $values;
+          border-radius: $values;
+             /*-moz-background-clip: padding; 
+          -webkit-background-clip: padding-box; 
+                  background-clip: padding-box;*/
+}
+
+@mixin box-shadow ($values...) {
+     -moz-box-shadow: $values;
+  -webkit-box-shadow: $values;
+          box-shadow: $values;
+}
+
+//@mixin box-shadow ($x, $y, $offset, $hex, $ie: $useIEFilters, $inset: null, $spread:null) {
+//     -moz-box-shadow: $x $y $offset $spread $hex $inset;
+//  -webkit-box-shadow: $x $y $offset $spread $hex $inset;
+//          box-shadow: $x $y $offset $spread $hex $inset;
+//  
+//  @if $ie == 1 {
+//    $iecolor: '#' + red($hex) + green($hex) + blue($hex);
+//    filter: progid:DXImageTransform.Microsoft.dropshadow(OffX=#{$x}, OffY=#{$y}, Color='#{$iecolor}');
+//    -ms-filter: quote(progid:DXImageTransform.Microsoft.dropshadow(OffX=#{$x}, OffY=#{$y}, Color='#{$iecolor}'));
+//  }
+//}
+
+@mixin box-sizing($value) {
+     -moz-box-sizing: $value;
+  -webkit-box-sizing: $value;
+          box-sizing: $value;
+}
+
+// requires sass 3.2
+@mixin keyframes($name){
+     @-moz-keyframes #{$name} { @content; }
+      @-ms-keyframes #{$name} { @content; }
+       @-o-keyframes #{$name} { @content; }
+  @-webkit-keyframes #{$name} { @content; }
+          @keyframes #{$name} { @content; }
+}
+
+@mixin linear-gradient($from, $to, $ie: $useIEFilters) {
+  @if $ie != 1 { background-color: $to; }
+
+  background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, $from),color-stop(1, $to));
+  background-image: -webkit-linear-gradient(top, $from, $to);
+  background-image: -moz-linear-gradient(top, $from, $to);
+  background-image: -ms-linear-gradient(top, $from, $to);
+  background-image: -o-linear-gradient(top, $from, $to);
+  background-image: linear-gradient(top, bottom, $from, $to);
+
+  @if $ie == 1 { 
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$from}', endColorstr='#{$to}');
+  }
+}
+
+@mixin horizontal-gradient($startColor: #555, $endColor: #333, $ie: $useIEFilters) {
+	@if $ie != 1 { background-color: $endColor; }
+
+	background-color: $endColor;
+	background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
+	background-image: -webkit-linear-gradient(left, $startColor, $endColor); // Safari 5.1+, Chrome 10+
+	background-image: -moz-linear-gradient(left, $startColor, $endColor); // FF 3.6+
+	background-image: -o-linear-gradient(left, $startColor, $endColor); // Opera 11.10
+	background-image: linear-gradient(to right, $startColor, $endColor); // Standard, IE10
+	background-repeat: repeat-x;
+	@if $ie == 1 { 
+		filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$startColor}', endColorstr='#{$endColor}', GradientType=1);
+	}
+}
+
+@mixin radial-gradient($from, $to, $ie: $useIEFilters) {
+    @if $ie != 1 { background-color: $to; }
+
+    background: -moz-radial-gradient(center, circle cover, $from 0%, $to 100%);
+    background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%, $from), color-stop(100%, $to));
+    background: -webkit-radial-gradient(center, circle cover, $from 0%, $to 100%);
+    background: -o-radial-gradient(center, circle cover, $from 0%, $to 100%);
+    background: -ms-radial-gradient(center, circle cover, $from 0%, $to 100%);
+    background: radial-gradient(center, circle cover, $from 0%, $to 100%);
+    background-color: $from;
+
+    @if $ie == 1 {
+        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{$from}', endColorstr='#{$to}', GradientType=1); /* IE6-9 fallback on horizontal gradient */
+    }
+}
+
+@mixin perspective($perspective) {
+     -moz-perspective: $perspective;
+      -ms-perspective: $perspective;
+  -webkit-perspective: $perspective;
+          perspective: $perspective;
+     -moz-transform-style: preserve-3d;
+      -ms-transform-style: preserve-3d;
+  -webkit-transform-style: preserve-3d;
+          transform-style: preserve-3d;
+}
+
+@mixin transform ($transforms) {
+	   -moz-transform: $transforms;
+	     -o-transform: $transforms;
+	    -ms-transform: $transforms;
+	-webkit-transform: $transforms;
+          transform: $transforms;
+}
+
+    @mixin matrix ($a, $b, $c, $d, $e, $f) {
+    	   -moz-transform: matrix($a, $b, $c, $d, #{$e}px, #{$f}px);
+    	     -o-transform: matrix($a, $b, $c, $d, $e, $f);
+    	    -ms-transform: matrix($a, $b, $c, $d, $e, $f);
+    	-webkit-transform: matrix($a, $b, $c, $d, $e, $f);
+              transform: matrix($a, $b, $c, $d, $e, $f);
+    }
+
+    @mixin rotate ($deg) {
+      @include transform(rotate(#{$deg}deg));
+    }
+
+    @mixin scale ($size) {
+      @include transform(scale(#{$size}));
+    }
+
+    @mixin translate ($x, $y) {
+    	@include transform(translate($x, $y));
+    }
+
+@mixin transition ($value...) {
+     -moz-transition: $value;
+       -o-transition: $value;
+      -ms-transition: $value;
+  -webkit-transition: $value;
+          transition: $value;
+}
+
+@mixin animation($str) {
+    -webkit-animation: #{$str};
+    -moz-animation: #{$str};
+    -ms-animation: #{$str};
+    -o-animation: #{$str};
+    animation: #{$str};
+}
+
+@mixin animation-name($str) {
+    -webkit-animation-name: #{$str};
+    -moz-animation-name: #{$str};
+    -ms-animation-name: #{$str};
+    -o-animation-name: #{$str};
+    animation-name: #{$str};
+}
+
+@mixin animation-duration($str) {
+    -webkit-animation-duration: #{$str};
+    -moz-animation-duration: #{$str};
+    -ms-animation-duration: #{$str};
+    -o-animation-duration: #{$str};
+    animation-duration: #{$str};
+}
+
+@mixin animation-direction($str) {
+    -webkit-animation-direction: #{$str};
+    -moz-animation-direction: #{$str};
+    -ms-animation-direction: #{$str};
+    -o-animation-direction: #{$str};
+    animation-direction: #{$str};
+}
+
+@mixin animation-delay($str) {
+    animation-delay:#{$str};
+    -o-animation-delay:#{$str};
+    -ms-animation-delay:#{$str};
+    -webkit-animation-delay:#{$str};
+    -moz-animation-delay:#{$str};
+}
+
+@mixin animation-iteration-count($str) {
+    animation-iteration-count:#{$str};
+    -o-animation-iteration-count:#{$str};
+    -ms-animation-iteration-count:#{$str};
+    -webkit-animation-iteration-count:#{$str};
+    -moz-animation-iteration-count:#{$str};
+}
+
+@mixin animation-timing-function($str) {
+    -webkit-animation-timing-function: #{$str};
+    -moz-animation-timing-function: #{$str};
+    -ms-animation-timing-function: #{$str};
+    -o-animation-timing-function: #{$str};
+    animation-timing-function: #{$str};
+}
+
+// ==== /CSS3 SASS MIXINS ====
+
+@mixin opacity($opacity) {
+    opacity: $opacity;
+    $opacity-ie: $opacity * 100;
+    filter: alpha(opacity=$opacity-ie); //IE8
+}
+
+@mixin size($width, $height: $width)
+{
+    width: $width;
+    height: $height;
+}
+
+@mixin clearfix
+{
+    &:after {
+        content: "";
+        display: table;
+        clear: both;
+    }
+}
+
+// Placeholder text
+@mixin placeholder($color: $input-color-placeholder) {
+    // Firefox
+    &::-moz-placeholder {
+        color: $color;
+        opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
+    }
+    &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
+    &::-webkit-input-placeholder  { color: $color; } // Safari and Chrome
+}

includes/freemius/assets/scss/_start.scss

@@ -0,0 +1,4 @@
+@import "vars";
+@import "colors";
+@import "mixins";
+@import "functions";

includes/freemius/assets/scss/_vars.scss

@@ -0,0 +1,6 @@
+$is_production: true;
+
+$img_common: if($is_production == true, '//img.freemius.com', 'http://img.freemius:8080');
+
+$layout_width: 960px;
+$admin_mobile_max_width: 782px;