diff --git a/classes/class-admin.php b/classes/class-admin.php index d105fd21e..9e42212ae 100644 --- a/classes/class-admin.php +++ b/classes/class-admin.php @@ -502,8 +502,7 @@ public function admin_body_class( $classes ) { * @action admin_enqueue_scripts */ public function admin_menu_css() { - wp_register_style( 'jquery-ui', '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/themes/base/jquery-ui.css', array(), '1.10.1' ); - wp_register_style( 'wp-stream-datepicker', $this->plugin->locations['url'] . 'ui/css/datepicker.css', array( 'jquery-ui' ), $this->plugin->get_version() ); + wp_register_style( 'wp-stream-datepicker', $this->plugin->locations['url'] . 'ui/css/datepicker.css', array(), $this->plugin->get_version() ); wp_register_style( 'wp-stream-icons', $this->plugin->locations['url'] . 'ui/stream-icons/style.css', array(), $this->plugin->get_version() ); // Make sure we're working off a clean version diff --git a/tests/tests/test-class-admin.php b/tests/tests/test-class-admin.php index 6dbfc4fe4..e1df9def1 100644 --- a/tests/tests/test-class-admin.php +++ b/tests/tests/test-class-admin.php @@ -209,7 +209,6 @@ public function test_admin_menu_css() { $this->admin->admin_menu_css(); - $this->assertArrayHasKey( 'jquery-ui', $wp_styles->registered ); $this->assertArrayHasKey( 'wp-stream-datepicker', $wp_styles->registered ); $this->assertArrayHasKey( 'wp-stream-icons', $wp_styles->registered ); diff --git a/ui/css/datepicker.css b/ui/css/datepicker.css index cee181d24..af0a58f82 100644 --- a/ui/css/datepicker.css +++ b/ui/css/datepicker.css @@ -1,4 +1,155 @@ /* Date Picker Styles */ +.ui-datepicker { + width: 17em; + padding: .2em .2em 0; + display: none; +} +.ui-datepicker .ui-datepicker-header { + position: relative; + padding: .2em 0; +} +.ui-datepicker .ui-datepicker-prev, +.ui-datepicker .ui-datepicker-next { + position: absolute; + top: 2px; +} +.ui-datepicker .ui-datepicker-prev { + left: 12px; +} +.ui-datepicker .ui-datepicker-next { + right: 12px; +} +.ui-datepicker .ui-datepicker-prev span, +.ui-datepicker .ui-datepicker-next span { + font-size: 0; + width: 12px; + height: 12px; + display: block; + position: absolute; + left: 50%; + margin-left: -8px; + top: 50%; + margin-top: -8px; +} +.ui-datepicker .ui-datepicker-title { + margin: 0 2.3em; + line-height: 1.8em; + text-align: center; +} +.ui-datepicker .ui-datepicker-title select { + font-size: 1em; + margin: 1px 0; +} +.ui-datepicker select.ui-datepicker-month-year { + width: 100%; +} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { + width: 49%; +} +.ui-datepicker table { + width: 100%; + font-size: .9em; + border-collapse: collapse; + margin: 0 0 .4em; +} +.ui-datepicker th { + padding: .7em .3em; + text-align: center; + font-weight: bold; + border: 0; +} +.ui-datepicker td { + border: 0; + padding: 1px; +} +.ui-datepicker td span, +.ui-datepicker td a { + display: block; + padding: .2em; + text-align: right; + text-decoration: none; +} +.ui-datepicker .ui-datepicker-buttonpane { + background-image: none; + margin: .7em 0 0 0; + padding: 0 .2em; + border-left: 0; + border-right: 0; + border-bottom: 0; +} +.ui-datepicker .ui-datepicker-buttonpane button { + float: right; + margin: .5em .2em .4em; + cursor: pointer; + padding: .2em .6em .3em .6em; + width: auto; + overflow: visible; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { + float: left; +} + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { + width: auto; +} +.ui-datepicker-multi .ui-datepicker-group { + float: left; +} +.ui-datepicker-multi .ui-datepicker-group table { + width: 95%; + margin: 0 auto .4em; +} +.ui-datepicker-multi-2 .ui-datepicker-group { + width: 50%; +} +.ui-datepicker-multi-3 .ui-datepicker-group { + width: 33.3%; +} +.ui-datepicker-multi-4 .ui-datepicker-group { + width: 25%; +} +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { + border-left-width: 0; +} +.ui-datepicker-multi .ui-datepicker-buttonpane { + clear: left; +} +.ui-datepicker-row-break { + clear: both; + width: 100%; + font-size: 0; +} + +/* RTL support */ +.ui-datepicker-rtl { + direction: rtl; +} +.ui-datepicker-rtl .ui-datepicker-prev { + right: 2px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next { + left: 2px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane { + clear: right; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button { + float: left; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, +.ui-datepicker-rtl .ui-datepicker-group { + float: right; +} +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { + border-right-width: 0; + border-left-width: 1px; +} #ui-datepicker-div.stream-datepicker.ui-widget { margin-top: 5px; @@ -51,8 +202,6 @@ } #ui-datepicker-div.stream-datepicker.ui-datepicker .ui-datepicker-title { - margin-top: .4em; - margin-bottom: .3em; color: #fff; font-size: 14px; } @@ -61,19 +210,10 @@ #ui-datepicker-div.stream-datepicker.ui-datepicker .ui-datepicker-next-hover, #ui-datepicker-div.stream-datepicker.ui-datepicker .ui-datepicker-next, #ui-datepicker-div.stream-datepicker.ui-datepicker .ui-datepicker-prev { - height: 1em; - top: .9em; + top: .33em; border:none; } -#ui-datepicker-div.stream-datepicker.ui-datepicker .ui-datepicker-prev-hover { - left: 2px; -} - -#ui-datepicker-div.stream-datepicker.ui-datepicker .ui-datepicker-next-hover { - right: 2px; -} - #ui-datepicker-div.stream-datepicker.ui-datepicker .ui-datepicker-next span, #ui-datepicker-div.stream-datepicker.ui-datepicker .ui-datepicker-prev span { background-image: url(../stream-icons/datepicker-icons.png);