From cd92e73dc31d8657bd27f8ec46138b27209fe636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valent=C3=ADn?= Date: Mon, 26 Jun 2017 11:00:18 -0500 Subject: [PATCH 1/4] Fix navigation weeks in calendar page PPRESS-136 --- src/modules/calendar/lib/calendar.css | 31 +++------------------------ 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/src/modules/calendar/lib/calendar.css b/src/modules/calendar/lib/calendar.css index 5b5c703a9..8f596e905 100644 --- a/src/modules/calendar/lib/calendar.css +++ b/src/modules/calendar/lib/calendar.css @@ -1,4 +1,4 @@ -header h2 span { +header h2 span:not(.time-range) { color: #999999; } @@ -521,6 +521,7 @@ table#pp-calendar-view .day-unit ul li .item-overlay .item-actions span.trash a line-height: 35px; min-height: 28px; vertical-align: middle; + margin: 0 3px; } .pp-calendar-navigation li.date-change a:hover, @@ -531,32 +532,6 @@ table#pp-calendar-view .day-unit ul li .item-overlay .item-actions span.trash a color: #23282d; } -.pp-calendar-navigation li.next-week a:first-of-type { - border-radius: 5px 0 0 5px; - -moz-border-radius: 5px 0 0 5px; - -webkit-border-radius: 5px 0 0 5px; - border-right: none; -} - -.pp-calendar-navigation li.next-week a:last-of-type { - border-radius: 0 5px 5px 0; - -moz-border-radius: 0 5px 5px 0; - -webkit-border-radius: 0 5px 5px 0; -} - -.pp-calendar-navigation li.previous-week a:first-of-type { - border-radius: 5px 0 0 5px; - -moz-border-radius: 5px 0 0 5px; - -webkit-border-radius: 5px 0 0 5px; -} - -.pp-calendar-navigation li.previous-week a:last-of-type { - border-radius: 0 5px 5px 0; - -moz-border-radius: 0 5px 5px 0; - -webkit-border-radius: 0 5px 5px 0; - border-left: none; -} - .pp-calendar-navigation li.today a { font-weight: normal; } @@ -597,7 +572,7 @@ table#pp-calendar-view .day-unit ul li .item-overlay .item-actions span.trash a .pp-calendar-navigation li.ajax-actions, .pp-calendar-navigation li.previous-week, .pp-calendar-navigation li.today { - margin-right: 10px; + margin-right: 5px; } .pp_calendar_hidden_list { From ab54b704271f824a477bc92b1ed736a4eabc6a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valent=C3=ADn?= Date: Mon, 26 Jun 2017 11:31:46 -0500 Subject: [PATCH 2/4] Fix navigation weeks in calendar page PPRESS-136 --- src/modules/calendar/calendar.php | 11 +++++++---- src/modules/calendar/lib/calendar.css | 8 +++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/modules/calendar/calendar.php b/src/modules/calendar/calendar.php index a49d33c22..4939fd4c1 100644 --- a/src/modules/calendar/calendar.php +++ b/src/modules/calendar/calendar.php @@ -1310,12 +1310,13 @@ public function print_top_navigation( $filters, $dates ) { total_weeks > 1 ) : ?>total_weeks ); ?>" href="get_pagination_link( 'next', $filters ) ); ?>"> - +
  • total_weeks ); ?>" href="get_pagination_link( 'previous', $filters ) ); ?>">" href="get_pagination_link( 'previous', $filters, 1 ) ); ?>"> diff --git a/src/modules/calendar/lib/calendar.css b/src/modules/calendar/lib/calendar.css index 8f596e905..4c6d35298 100644 --- a/src/modules/calendar/lib/calendar.css +++ b/src/modules/calendar/lib/calendar.css @@ -521,7 +521,6 @@ table#pp-calendar-view .day-unit ul li .item-overlay .item-actions span.trash a line-height: 35px; min-height: 28px; vertical-align: middle; - margin: 0 3px; } .pp-calendar-navigation li.date-change a:hover, @@ -534,6 +533,7 @@ table#pp-calendar-view .day-unit ul li .item-overlay .item-actions span.trash a .pp-calendar-navigation li.today a { font-weight: normal; + margin: 0 4px; } .pp-calendar-navigation a:hover { @@ -569,10 +569,8 @@ table#pp-calendar-view .day-unit ul li .item-overlay .item-actions span.trash a vertical-align:middle; } -.pp-calendar-navigation li.ajax-actions, -.pp-calendar-navigation li.previous-week, -.pp-calendar-navigation li.today { - margin-right: 5px; +.pp-calendar-navigation li.ajax-actions { + margin-right: 10px; } .pp_calendar_hidden_list { From 8e8072c8b053cdb47e3d911f4e1cbbb26bade84d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valent=C3=ADn?= Date: Mon, 26 Jun 2017 11:48:35 -0500 Subject: [PATCH 3/4] Minor tweak --- src/modules/calendar/lib/calendar.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/calendar/lib/calendar.css b/src/modules/calendar/lib/calendar.css index 4c6d35298..d7309c38c 100644 --- a/src/modules/calendar/lib/calendar.css +++ b/src/modules/calendar/lib/calendar.css @@ -177,7 +177,7 @@ table#pp-calendar-view .day-unit .schedule-new-post-label{ color: #adadad; position: absolute; top: 1px; - left: 33px; + right: 8px; } table#pp-calendar-view .day-unit .ui-state-highlight { From e8838653ab072ec0fb6de0abd405671cca42eca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valent=C3=ADn?= Date: Mon, 26 Jun 2017 12:42:58 -0500 Subject: [PATCH 4/4] Fix last column popup display in Internet Explorer 11 PPRESS-138 --- src/modules/calendar/lib/calendar.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/modules/calendar/lib/calendar.css b/src/modules/calendar/lib/calendar.css index d7309c38c..141e301a8 100644 --- a/src/modules/calendar/lib/calendar.css +++ b/src/modules/calendar/lib/calendar.css @@ -160,10 +160,6 @@ table#pp-calendar-view .day-unit .dashicons { color: #b7b7b7; } -/*table#pp-calendar-view .day-unit .dashicons-yes:before { - color: #378137; -}*/ - table#pp-calendar-view .day-unit .item-overlay .dashicons:before { line-height: 37px; margin-left: 12px; @@ -584,7 +580,7 @@ table#pp-calendar-view .day-unit ul li .item-overlay .item-actions span.trash a @media (min-width: 1024px) { table#pp-calendar-view tr td.day-unit:last-of-type .item-overlay { - left: unset; + left: auto; right: 0; }