Skip to content

Commit

Permalink
Merge pull request #172 from sugarcalendar/release/2.1.7
Browse files Browse the repository at this point in the history
Release/2.1.7
  • Loading branch information
JJJ authored Feb 26, 2021
2 parents c9481d3 + 2776be0 commit dbea76a
Show file tree
Hide file tree
Showing 20 changed files with 743 additions and 456 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sugar-calendar",
"version": "2.1.6",
"version": "2.1.7",
"description": "A calendar with a sweet disposition.",
"private": true,
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Tags: simple calendar, event calendar, event management, event list
Requires PHP: 5.6.20
Requires at least: 5.1
Tested up to: 5.6
Stable tag: 2.1.6
Stable tag: 2.1.7

You can easily manage events with this lightweight calendar. No complicated configuration. Simple to use. Sweeeet!

Expand Down
2 changes: 1 addition & 1 deletion sugar-calendar-lite.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Domain Path: /sugar-calendar/includes/languages/
* Requires PHP: 5.6.20
* Requires at least: 5.1
* Version: 2.1.6
* Version: 2.1.7
*/

// Exit if accessed directly
Expand Down
76 changes: 37 additions & 39 deletions sugar-calendar/includes/admin/assets/css/ltr/sc-calendar.css
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ table.calendar:not(.list) tbody td:hover {
box-shadow: inset 0 0 0 1px #ccc !important;
}

table.calendar a.sugar-calendar {
table.calendar a.sugar-calendar,
table.calendar.list strong.status-trash {
display: block;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
Expand All @@ -227,12 +228,14 @@ table.calendar a.sugar-calendar {
padding: 0 5px;
}

table.calendar a.sugar-calendar {
table.calendar a.sugar-calendar,
table.calendar.list strong.status-trash {
position: relative;
padding: 0 0 0 20px;
}

table.calendar a.sugar-calendar:before {
table.calendar a.sugar-calendar:before,
table.calendar.list strong.status-trash:before {
font: normal 15px/18px 'dashicons';
display: inline-block;
position: absolute;
Expand All @@ -246,13 +249,15 @@ table.calendar a.sugar-calendar:before {
margin: 0;
}

table.calendar.list a.sugar-calendar {
table.calendar.list a.sugar-calendar,
table.calendar.list strong.status-trash {
display: inline;
border-radius: 3px;
padding: 5px 5px 5px 22px;
}

table.calendar.list a.sugar-calendar:before {
table.calendar.list a.sugar-calendar:before,
table.calendar.list strong.status-trash:before {
top: 4.5px;
left: 5px;
}
Expand Down Expand Up @@ -296,7 +301,8 @@ table.calendar a.all-day:before {
}

.wp-pointer-content h3.status-trash:before,
table.calendar a.status-trash:before {
table.calendar a.status-trash:before,
table.calendar.list strong.status-trash:before {
content: '\f182';
}

Expand All @@ -319,66 +325,58 @@ table.calendar a.post-password-required:before {
margin-bottom: 20px;
}

.wp-pointer-actions {
.wp-pointer.sugar-calendar .wp-pointer-actions {
border-top: 1px solid #ddd;
background-color: #f4f4f4;
padding: 12px 10px 14px;
margin: 0 0 -38px;
min-height: 19px;
}

.wp-pointer-actions .action {
.wp-pointer.sugar-calendar .wp-pointer-actions .action {
position: relative;
margin-left: 20px;
margin-right: 10px;
margin: 0;
padding: 0 5px;
}

.wp-pointer-actions .action a {
text-decoration: none;
.wp-pointer.sugar-calendar .wp-pointer-actions .action:first-child {
margin-left: 10px;
padding-left: 0;
}

.wp-pointer-actions .action a:before {
background: none;
color: #72777c;
display: block !important;
font: normal 16px/1 dashicons;
speak: none;
text-align: center;
-webkit-font-smoothing: antialiased !important;
width: 10px;
height: 100%;
position: absolute;
left: -18px;
top: 0px;
.wp-pointer.sugar-calendar .wp-pointer-actions .action:not(:last-child) {
border-right: 1px solid #dcdcde;
}

.wp-pointer-actions .event-delete a {
color: #dc3232;
.wp-pointer.sugar-calendar .wp-pointer-actions .action a {
text-decoration: none;
}

.wp-pointer-actions .event-delete a:hover,
.wp-pointer-actions .event-delete a:active {
color: #a00;
.wp-pointer.sugar-calendar .wp-pointer-actions .event-delete a {
color: #dc3232;
}

.wp-pointer-actions .event-edit a:before {
content: "\f464";
.wp-pointer.sugar-calendar .wp-pointer-actions .event-delete a:hover,
.wp-pointer.sugar-calendar .wp-pointer-actions .event-delete a:active {
color: #a00;
}

.wp-pointer-actions .event-restore a:before {
content: "\f171";
.wp-pointer.sugar-calendar .wp-pointer-buttons a.close {
color: #aaa;
}

.wp-pointer-actions .event-delete a:before {
content: "\f158";
.wp-pointer.sugar-calendar .wp-pointer-buttons a.close:hover,
.wp-pointer.sugar-calendar .wp-pointer-buttons a.close:active {
color: #bbb;
}

.wp-pointer-actions .event-view a:before {
content: "\f103";
.wp-pointer.sugar-calendar .wp-pointer-buttons a.close:before {
display: none !important;
}

table.calendar:not(.draft) a.status-draft,
table.calendar:not(.trash) a.status-trash {
table.calendar:not(.trash) a.status-trash,
table.calendar:not(.trash) strong.status-trash {
opacity: 0.5;
}

Expand Down
43 changes: 33 additions & 10 deletions sugar-calendar/includes/admin/assets/css/ltr/sc-menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,33 @@

/* Secondary Separators */
#adminmenu ul > li:not(:last-child) a[href^="admin.php?page=sugar-calendar"]:after,
#adminmenu ul > li:not(:last-child) a[href^="post-new.php?post_type=sc_event"]:after
#adminmenu ul > li:not(:last-child) a[href^="post-new.php?post_type=sc_event"]:after,
#adminmenu ul > li:last-child a[href^="admin.php?page=sc-addons"]:before
{
display: block;
border-bottom: 1px solid rgba(255,255,255,0.2);
height: 14px;
margin: 0 -13px;
margin: 13px -15px 8px -15px;
content: '';
float: left;
width: calc(100% + 30px);
}

/* Bottom Separators */
#adminmenu ul > li:not(:last-child) a[href^="admin.php?page=sugar-calendar"]:after,
#adminmenu ul > li:not(:last-child) a[href^="post-new.php?post_type=sc_event"]:after
{
border-bottom: 1px solid rgba(255,255,255,0.2);
}

/* Top Separator */
#adminmenu ul > li:last-child a[href^="admin.php?page=sc-addons"]:before
{
display: block;
border-top: 1px solid rgba(255,255,255,0.2);
height: 14px;
margin: 0 -13px;
content: '';
}

/* WordPress 5.7 fix for left-shadow on hover */
#adminmenu li.toplevel_page_sugar-calendar ul.wp-submenu-wrap li
{
clear: both;
}

/* Hide Parent Arrow */
Expand All @@ -32,11 +43,23 @@ ul#adminmenu #toplevel_page_sugar-calendar ul.wp-submenu li.current a:before
{
right: 0;
border: solid 8px transparent;
content: " ";
content: '';
height: 0;
width: 0;
position: absolute;
pointer-events: none;
border-right-color: #f1f1f1;
margin-top: 2px;
}
}

@media screen and (max-width: 782px) {

/* Small Screen Separator */
#adminmenu ul > li:not(:last-child) a[href^="admin.php?page=sugar-calendar"]:after,
#adminmenu ul > li:not(:last-child) a[href^="post-new.php?post_type=sc_event"]:after,
#adminmenu ul > li:last-child a[href^="admin.php?page=sc-addons"]:before
{
margin: 20px -20px 8px -20px;
width: calc(100% + 40px);
}
}

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dbea76a

Please sign in to comment.