Merge Standard into Lite for 2.0.12.

awesomemotive · Dec 6, 2019 · 138ddb7 · 138ddb7
1 parent 6477035
commit 138ddb7
Show file tree

Hide file tree

Showing 14 changed files with 239 additions and 117 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sugar-calendar",
-	"version": "2.0.11",
+	"version": "2.0.12",
 	"description": "A calendar with a sweet disposition.",
 	"private": true,
 	"license": "GPL-2.0-or-later",

diff --git a/readme.txt b/readme.txt
@@ -7,7 +7,7 @@ Tags:              event calendar, events, simple, events calendar, calendar, Pi
 Requires PHP:      5.6.20
 Requires at least: 5.0
 Tested up to:      5.3
-Stable tag:        2.0.11
+Stable tag:        2.0.12
 
 A sweet, simple event calendar plugin. Create your events and show them on a simple calendar. That's it.
 

diff --git a/sugar-event-calendar/includes/admin/assets/css/ltr/sc-chosen.css b/sugar-event-calendar/includes/admin/assets/css/ltr/sc-chosen.css
@@ -339,12 +339,15 @@ body.sugar-calendar .tablenav .actions {
 	background-color: #4f6d59;
 }
 
-/* WordPress 5.3 Support
+/* WordPress 5.3+ Support
 -------------------------------------------------------------- */
 
 body.branch-5-3 .chosen-container-multi .chosen-choices,
 body.branch-5-3 .chosen-container-single .chosen-single,
-body.branch-5-3 .chosen-container-active .chosen-single {
+body.branch-5-3 .chosen-container-active .chosen-single,
+body.branch-5-4 .chosen-container-multi .chosen-choices,
+body.branch-5-4 .chosen-container-single .chosen-single,
+body.branch-5-4 .chosen-container-active .chosen-single {
 	background: #fff url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2220%22%20height%3D%2220%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M5%206l5%205%205-5%202%201-7%207-7-7%202-1z%22%20fill%3D%22%23555%22%2F%3E%3C%2Fsvg%3E') no-repeat right 5px top 50%;
 	background-size: 16px 16px;
 	border-radius: 3px;
@@ -354,21 +357,26 @@ body.branch-5-3 .chosen-container-active .chosen-single {
 	padding: 1px 7px;
 }
 
-body.branch-5-3 .chosen-container-active .chosen-single {
+body.branch-5-3 .chosen-container-active .chosen-single,
+body.branch-5-4 .chosen-container-active .chosen-single {
 	border-color: transparent;
 	outline: 2px solid transparent;
 }
 
-body.branch-5-3 .chosen-container-active.chosen-with-drop .chosen-single {
+body.branch-5-3 .chosen-container-active.chosen-with-drop .chosen-single,
+body.branch-5-4 .chosen-container-active.chosen-with-drop .chosen-single {
 	border-radius: 3px 3px 0 0;
 }
 
 body.branch-5-3 .chosen-container-single .chosen-single div b:before,
-body.branch-5-3 .chosen-container-single .chosen-search input[type=text]:before {
+body.branch-5-3 .chosen-container-single .chosen-search input[type=text]:before,
+body.branch-5-4 .chosen-container-single .chosen-single div b:before,
+body.branch-5-4 .chosen-container-single .chosen-search input[type=text]:before {
 	content: '';
 }
 
-body.branch-5-3 .chosen-container .chosen-drop {
+body.branch-5-3 .chosen-container .chosen-drop,
+body.branch-5-4 .chosen-container .chosen-drop {
 	width: 100%;
 	border-radius: 0 0 3px 3px;
 	background: #fff;
@@ -378,11 +386,15 @@ body.branch-5-3 .chosen-container .chosen-drop {
 
 body.branch-5-3 .chosen-container:hover .chosen-drop,
 body.branch-5-3 .chosen-container:hover .chosen-choices,
-body.branch-5-3 .chosen-container:hover .chosen-single {
+body.branch-5-3 .chosen-container:hover .chosen-single,
+body.branch-5-4 .chosen-container:hover .chosen-drop,
+body.branch-5-4 .chosen-container:hover .chosen-choices,
+body.branch-5-4 .chosen-container:hover .chosen-single {
 	color: #007cba;
 }
 
-body.branch-5-3 .chosen-container-single .chosen-search input[type=text] {
+body.branch-5-3 .chosen-container-single .chosen-search input[type=text],
+body.branch-5-4 .chosen-container-single .chosen-search input[type=text] {
 	border: 1px solid #ddd;
 	border-radius: 3px;
 	box-shadow: none;
@@ -393,99 +405,121 @@ body.branch-5-3 .chosen-container-single .chosen-search input[type=text] {
 -------------------------------------------------------------- */
 
 /* Fresh */
-body.branch-5-3 .chosen-container-active .chosen-single {
+body.branch-5-3 .chosen-container-active .chosen-single,
+body.branch-5-4 .chosen-container-active .chosen-single {
 	border-color: #007cba;
 	box-shadow: 0 0 0 1px #007cba;
 }
-body.branch-5-3 .chosen-container .chosen-drop {
+body.branch-5-3 .chosen-container .chosen-drop,
+body.branch-5-4 .chosen-container .chosen-drop {
 	border-color: #007cba;
 	box-shadow: 0 1px 0 1px #007cba;
 }
-body.branch-5-3 .chosen-container .chosen-results li.highlighted {
+body.branch-5-3 .chosen-container .chosen-results li.highlighted,
+body.branch-5-4 .chosen-container .chosen-results li.highlighted {
 	background-color: #007cba;
 	border-radius: 3px;
 }
 
 /* Blue */
-body.branch-5-3.admin-color-blue .chosen-container-active .chosen-single {
+body.branch-5-3.admin-color-blue .chosen-container-active .chosen-single,
+body.branch-5-4.admin-color-blue .chosen-container-active .chosen-single {
 	border-color: #096484;
 	box-shadow: 0 0 0 1px #096484;
 }
-body.branch-5-3.admin-color-blue .chosen-container .chosen-drop {
+body.branch-5-3.admin-color-blue .chosen-container .chosen-drop,
+body.branch-5-4.admin-color-blue .chosen-container .chosen-drop {
 	border-color: #096484;
 	box-shadow: 0 1px 0 1px #096484;
 }
-body.branch-5-3.admin-color-blue .chosen-container .chosen-results li.highlighted {
+body.branch-5-3.admin-color-blue .chosen-container .chosen-results li.highlighted,
+body.branch-5-4.admin-color-blue .chosen-container .chosen-results li.highlighted {
 	background-color: #007cba;
 }
 
 /* Coffee */
-body.branch-5-3.admin-color-coffee .chosen-container-active .chosen-single {
+body.branch-5-3.admin-color-coffee .chosen-container-active .chosen-single,
+body.branch-5-4.admin-color-coffee .chosen-container-active .chosen-single {
 	border-color: #c7a589;
 	box-shadow: 0 0 0 1px #c7a589;
 }
-body.branch-5-3.admin-color-coffee .chosen-container .chosen-drop {
+body.branch-5-3.admin-color-coffee .chosen-container .chosen-drop,
+body.branch-5-4.admin-color-coffee .chosen-container .chosen-drop {
 	border-color: #c7a589;
 	box-shadow: 0 1px 0 1px #c7a589;
 }
-body.branch-5-3.admin-color-coffee .chosen-container .chosen-results li.highlighted {
+body.branch-5-3.admin-color-coffee .chosen-container .chosen-results li.highlighted,
+body.branch-5-4.admin-color-coffee .chosen-container .chosen-results li.highlighted {
 	background-color: #c7a589;
 }
 
 /* Ectoplasm */
-body.branch-5-3.admin-color-ectoplasm .chosen-container-active .chosen-single {
+body.branch-5-3.admin-color-ectoplasm .chosen-container-active .chosen-single,
+body.branch-5-4.admin-color-ectoplasm .chosen-container-active .chosen-single {
 	border-color: #a3b745;
 	box-shadow: 0 0 0 1px #a3b745;
 }
-body.branch-5-3.admin-color-ectoplasm .chosen-container .chosen-drop {
+body.branch-5-3.admin-color-ectoplasm .chosen-container .chosen-drop,
+body.branch-5-4.admin-color-ectoplasm .chosen-container .chosen-drop {
 	border-color: #a3b745;
 	box-shadow: 0 1px 0 1px #a3b745;
 }
+body.branch-5-4.admin-color-ectoplasm .chosen-container .chosen-results li.highlighted,
 body.branch-5-3.admin-color-ectoplasm .chosen-container .chosen-results li.highlighted {
 	background-color: #a3b745;
 }
 
 /* Midnight */
-body.branch-5-3.admin-color-midnight .chosen-container-active .chosen-single {
+body.branch-5-3.admin-color-midnight .chosen-container-active .chosen-single,
+body.branch-5-4.admin-color-midnight .chosen-container-active .chosen-single {
 	border-color: #e14d43;
 	box-shadow: 0 0 0 1px #e14d43;
 }
-body.branch-5-3.admin-color-midnight .chosen-container .chosen-drop {
+body.branch-5-3.admin-color-midnight .chosen-container .chosen-drop,
+body.branch-5-4.admin-color-midnight .chosen-container .chosen-drop {
 	border-color: #e14d43;
 	box-shadow: 0 1px 0 1px #e14d43;
 }
-body.branch-5-3.admin-color-midnight .chosen-container .chosen-results li.highlighted {
+body.branch-5-3.admin-color-midnight .chosen-container .chosen-results li.highlighted,
+body.branch-5-4.admin-color-midnight .chosen-container .chosen-results li.highlighted {
 	background-color: #e14d43;
 }
 
 /* Ocean */
-body.branch-5-3.admin-color-ocean .chosen-container-active .chosen-single {
+body.branch-5-3.admin-color-ocean .chosen-container-active .chosen-single,
+body.branch-5-4.admin-color-ocean .chosen-container-active .chosen-single {
 	border-color: #9ebaa0;
 	box-shadow: 0 0 0 1px #9ebaa0;
 }
-body.branch-5-3.admin-color-ocean .chosen-container .chosen-drop {
+body.branch-5-3.admin-color-ocean .chosen-container .chosen-drop,
+body.branch-5-4.admin-color-ocean .chosen-container .chosen-drop {
 	border-color: #9ebaa0;
 	box-shadow: 0 1px 0 1px #9ebaa0;
 }
-body.branch-5-3.admin-color-ocean .chosen-container .chosen-results li.highlighted {
+body.branch-5-3.admin-color-ocean .chosen-container .chosen-results li.highlighted,
+body.branch-5-4.admin-color-ocean .chosen-container .chosen-results li.highlighted {
 	background-color: #9ebaa0;
 }
 
 /* Sunrise */
-body.branch-5-3.admin-color-sunrise .chosen-container-active .chosen-single {
+body.branch-5-3.admin-color-sunrise .chosen-container-active .chosen-single,
+body.branch-5-4.admin-color-sunrise .chosen-container-active .chosen-single {
 	border-color: #dd823b;
 	box-shadow: 0 0 0 1px #dd823b;
 }
-body.branch-5-3.admin-color-sunrise .chosen-container .chosen-drop {
+body.branch-5-3.admin-color-sunrise .chosen-container .chosen-drop,
+body.branch-5-4.admin-color-sunrise .chosen-container .chosen-drop {
 	border-color: #dd823b;
 	box-shadow: 0 1px 0 1px #dd823b;
 }
-body.branch-5-3.admin-color-sunrise .chosen-container .chosen-results li.highlighted {
+body.branch-5-3.admin-color-sunrise .chosen-container .chosen-results li.highlighted,
+body.branch-5-4.admin-color-sunrise .chosen-container .chosen-results li.highlighted {
 	background-color: #dd823b;
 }
 
 /* Light */
-body.branch-5-3.admin-color-light .chosen-container-active .chosen-single {
+body.branch-5-3.admin-color-light .chosen-container-active .chosen-single,
+body.branch-5-4.admin-color-light .chosen-container-active .chosen-single {
 	border-color: #04a4cc;
 	box-shadow: 0 0 0 1px #04a4cc;
 }
@@ -501,26 +535,32 @@ body.branch-5-3.admin-color-light .chosen-container .chosen-results li.highlight
 -------------------------------------------------------------- */
 
 /* Evergreen */
-body.branch-5-3.admin-color-evergreen .chosen-container-active .chosen-single {
+body.branch-5-3.admin-color-evergreen .chosen-container-active .chosen-single,
+body.branch-5-4.admin-color-evergreen .chosen-container-active .chosen-single {
 	box-shadow: 0 0 0 1px #36533f;
 }
-body.branch-5-3.admin-color-evergreen .chosen-container .chosen-drop {
+body.branch-5-3.admin-color-evergreen .chosen-container .chosen-drop,
+body.branch-5-4.admin-color-evergreen .chosen-container .chosen-drop {
 	border-color: #36533f;
 	box-shadow: 0 1px 0 1px #36533f;
 }
-body.branch-5-3.admin-color-evergreen .chosen-container .chosen-results li.highlighted {
+body.branch-5-3.admin-color-evergreen .chosen-container .chosen-results li.highlighted,
+body.branch-5-4.admin-color-evergreen .chosen-container .chosen-results li.highlighted {
 	background-color: #36533f;
 }
 
 /* Mint */
-body.branch-5-3.admin-color-mint .chosen-container-active .chosen-single {
+body.branch-5-3.admin-color-mint .chosen-container-active .chosen-single,
+body.branch-5-4.admin-color-mint .chosen-container-active .chosen-single {
 	border-color: #4f6d59;
 	box-shadow: 0 0 0 1px #4f6d59;
 }
-body.branch-5-3.admin-color-mint .chosen-container .chosen-drop {
+body.branch-5-3.admin-color-mint .chosen-container .chosen-drop,
+body.branch-5-4.admin-color-mint .chosen-container .chosen-drop {
 	border-color: #4f6d59;
 	box-shadow: 0 1px 0 1px #4f6d59;
 }
-body.branch-5-3.admin-color-mint .chosen-container .chosen-results li.highlighted {
+body.branch-5-3.admin-color-mint .chosen-container .chosen-results li.highlighted,
+body.branch-5-4.admin-color-mint .chosen-container .chosen-results li.highlighted {
 	background-color: #4f6d59;
 }
diff --git a/sugar-event-calendar/includes/admin/assets/css/ltr/sc-settings.css b/sugar-event-calendar/includes/admin/assets/css/ltr/sc-settings.css
@@ -271,14 +271,17 @@ body.calendar_page_sc-settings .wrap h1.wp-heading-inline {
 	width: 69%;
 	display: inline-block;
 	position: relative;
+	margin-right: 2px;
 }
 
 .sc-license-input-wrapper input[type="text"],
 .sc-license-input-wrapper input[type="password"] {
 	width: 100%;
-	font-family: monospace;
+	font-family: caption;
+	font-size: 18px;
+	line-height: 18px;
+	letter-spacing: 3px;
 	padding: 5px 5px 5px 30px;
-	font-size: 15px;
 }
 
 .sc-license-content .sc-license-input-wrapper button {
@@ -298,7 +301,8 @@ span.sc-license-input span.sc-license-status {
 	background: transparent;
 	position: absolute;
 	display: inline-block;
-	top: 3px;
+	top: 5px;
+	left: 5px;
 	padding: 0;
 	margin: 0;
 	color: #aaa;
@@ -309,10 +313,6 @@ span.sc-license-input span.sc-license-status {
 	font: 400 20px/25px dashicons !important;
 }
 
-span.sc-license-status {
-	left: 3px;
-}
-
 span.sc-license-status.empty:after {
 	content: "\f112"; /* Key */
 	color: #aaa;