Skip to content

Add datepicker styles to plugin, instead of loading external css #751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukecarbis merged 1 commit into from
Sep 2, 2015
Merged

Add datepicker styles to plugin, instead of loading external css #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions classes/class-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/tests/test-class-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
164 changes: 152 additions & 12 deletions ui/css/datepicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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);
Expand Down