Merge branch 'development' of https://github.com/OSTraining/PublishPress

into development
publishpress · Jun 26, 2017 · 4e9f11e · 4e9f11e
2 parents bd8dba3 + e883865
commit 4e9f11e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 40 deletions.
diff --git a/src/modules/calendar/calendar.php b/src/modules/calendar/calendar.php
@@ -1310,12 +1310,13 @@ public function print_top_navigation( $filters, $dates ) {
                     <a title="<?php printf( __( 'Forward 1 week', 'publishpress' ) );
             ?>" href="<?php echo esc_url( $this->get_pagination_link( 'next', $filters, 1 ) );
             ?>"><?php _e( '&rsaquo;', 'publishpress' );
-            ?></a><?php if ( $this->total_weeks > 1 ) : ?><a title="<?php printf( __( 'Forward %d weeks', 'publishpress' ), $this->total_weeks );
+            ?></a>
+                    <?php if ( $this->total_weeks > 1 ) : ?>
+                        <a title="<?php printf( __( 'Forward %d weeks', 'publishpress' ), $this->total_weeks );
             ?>" href="<?php echo esc_url( $this->get_pagination_link( 'next', $filters ) );
             ?>"><?php _e( '&raquo;', 'publishpress' );
             ?></a>
-                    <?php endif;
-            ?>
+                    <?php endif; ?>
                 </li>
                 <li class="date-change today">
                     <a title="<?php printf( __( 'Today is %s', 'publishpress' ), date( get_option( 'date_format' ), current_time( 'timestamp' ) ) );
@@ -1328,7 +1329,9 @@ public function print_top_navigation( $filters, $dates ) {
                     <a title="<?php printf( __( 'Back %d weeks', 'publishpress' ), $this->total_weeks );
             ?>"  href="<?php echo esc_url( $this->get_pagination_link( 'previous', $filters ) );
             ?>"><?php _e( '&laquo;', 'publishpress' );
-            ?></a><?php endif; ?><a title="<?php printf( __( 'Back 1 week', 'publishpress' ) );
+            ?></a>
+                    <?php endif; ?>
+                    <a title="<?php printf( __( 'Back 1 week', 'publishpress' ) );
             ?>" href="<?php echo esc_url( $this->get_pagination_link( 'previous', $filters, 1 ) );
             ?>"><?php _e( '&lsaquo;', 'publishpress' );
             ?></a>

diff --git 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;
 }
 
@@ -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;
@@ -177,7 +173,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 {
@@ -531,34 +527,9 @@ 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;
+    margin: 0 4px;
 }
 
 .pp-calendar-navigation a:hover {
@@ -594,9 +565,7 @@ 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 {
+.pp-calendar-navigation li.ajax-actions {
 	margin-right: 10px;
 }
 
@@ -611,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;
     }