WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Style the color picker button to match the new standard button style. Adjust font size and height of 'Default' button to match color picker button. Fixes #26179. 

Built from https://develop.svn.wordpress.org/trunk@26385


git-svn-id: http://core.svn.wordpress.org/trunk@26285 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Matt Thomas 2013-11-26 03:28:09 +00:00
parent 10dc5dc6a1
commit 9f529e99e3
4 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
wp-admin/css/color-picker-rtl.css
View File

@ -7,9 +7,9 @@
} }
.wp-color-result { .wp-color-result {
background-color: #f9f9f9; background-color: #f7f7f7;
border: 1px solid #bbb; border: 1px solid #ccc;
border-radius: 2px; border-radius: 3px;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
height: 22px; height: 22px;
@ -23,19 +23,16 @@
vertical-align: bottom; vertical-align: bottom;
display: inline-block; display: inline-block;
padding-right: 30px; padding-right: 30px;
-webkit-box-shadow: 0 1px 0 rgba(0,0,0,.08);
box-shadow: 0 1px 0 rgba(0,0,0,.08);
} }
.wp-color-result:after { .wp-color-result:after {
background: #f3f3f3; background: #f7f7f7;
background-image: -webkit-gradient(linear, right top, right bottom, from(#fefefe), to(#f4f4f4)); border-radius: 2px 0 0 2px;
background-image: -webkit-linear-gradient(top, #fefefe, #f4f4f4); border-right: 1px solid #ccc;
background-image: -moz-linear-gradient(top, #fefefe, #f4f4f4); color: #555;
background-image: -o-linear-gradient(top, #fefefe, #f4f4f4);
background-image: linear-gradient(to bottom, #fefefe, #f4f4f4);
color: #333;
text-shadow: 0 1px 0 #fff;
border-radius: 1px 0 0 1px;
border-right: 1px solid #bbb;
content: attr( title ); content: attr( title );
display: block; display: block;
font-size: 11px; font-size: 11px;
@ -45,12 +42,15 @@
left: 0; left: 0;
text-align: center; text-align: center;
top: 0; top: 0;
-webkit-box-shadow: inset 0 1px 0 #fff;
box-shadow: inset 0 1px 0 #fff;
} }
.wp-color-result:hover { .wp-color-result:hover {
border-color: #aaa; background: #fafafa;
-webkit-box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 ); border-color: #999;
box-shadow: 0 1px 1px rgba( 0, 0, 0, 0.1 ); color: #222;
} }
.wp-color-result:hover:after { .wp-color-result:hover:after {
@ -87,6 +87,13 @@
vertical-align: top; vertical-align: top;
} }
/* Match the style of the color picker button */
.wp-picker-input-wrap .button.button-small {
line-height: 22px;
height: 24px;
font-size: 11px;
}
.wp-picker-container .button { .wp-picker-container .button {
margin-right: 6px; margin-right: 6px;
} }

2
wp-admin/css/color-picker-rtl.min.css vendored
View File

@ -1 +1 @@
.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f9f9f9;border:1px solid #bbb;border-radius:2px;cursor:pointer;display:inline-block;height:22px;margin:0 0 6px 6px;position:relative;top:1px;user-select:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;vertical-align:bottom;display:inline-block;padding-right:30px}.wp-color-result:after{background:#f3f3f3;background-image:-webkit-gradient(linear,right top,right bottom,from(#fefefe),to(#f4f4f4));background-image:-webkit-linear-gradient(top,#fefefe,#f4f4f4);background-image:-moz-linear-gradient(top,#fefefe,#f4f4f4);background-image:-o-linear-gradient(top,#fefefe,#f4f4f4);background-image:linear-gradient(to bottom,#fefefe,#f4f4f4);color:#333;text-shadow:0 1px 0 #fff;border-radius:1px 0 0 1px;border-right:1px solid #bbb;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;left:0;text-align:center;top:0}.wp-color-result:hover{border-color:#aaa;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 1px rgba(0,0,0,.1)}.wp-color-result:hover:after{color:#222;border-color:#aaa;border-right:1px solid #999}.wp-color-result.wp-picker-open{top:0}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#888;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 2px rgba(0,0,0,.2)}.wp-color-result:focus:after{border-color:#888}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-right:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-color:#dfdfdf;margin-top:6px}input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000} .wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;border-radius:3px;cursor:pointer;display:inline-block;height:22px;margin:0 0 6px 6px;position:relative;top:1px;user-select:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;vertical-align:bottom;display:inline-block;padding-right:30px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08)}.wp-color-result:after{background:#f7f7f7;border-radius:2px 0 0 2px;border-right:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;left:0;text-align:center;top:0;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.wp-color-result:hover{background:#fafafa;border-color:#999;color:#222}.wp-color-result:hover:after{color:#222;border-color:#aaa;border-right:1px solid #999}.wp-color-result.wp-picker-open{top:0}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#888;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 2px rgba(0,0,0,.2)}.wp-color-result:focus:after{border-color:#888}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-input-wrap .button.button-small{line-height:22px;height:24px;font-size:11px}.wp-picker-container .button{margin-right:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-color:#dfdfdf;margin-top:6px}input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}

39
wp-admin/css/color-picker.css
View File

@ -7,9 +7,9 @@
} }
.wp-color-result { .wp-color-result {
background-color: #f9f9f9; background-color: #f7f7f7;
border: 1px solid #bbb; border: 1px solid #ccc;
border-radius: 2px; border-radius: 3px;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
height: 22px; height: 22px;
@ -23,19 +23,16 @@
vertical-align: bottom; vertical-align: bottom;
display: inline-block; display: inline-block;
padding-left: 30px; padding-left: 30px;
-webkit-box-shadow: 0 1px 0 rgba(0,0,0,.08);
box-shadow: 0 1px 0 rgba(0,0,0,.08);
} }
.wp-color-result:after { .wp-color-result:after {
background: #f3f3f3; background: #f7f7f7;
background-image: -webkit-gradient(linear, left top, left bottom, from(#fefefe), to(#f4f4f4)); border-radius: 0 2px 2px 0;
background-image: -webkit-linear-gradient(top, #fefefe, #f4f4f4); border-left: 1px solid #ccc;
background-image: -moz-linear-gradient(top, #fefefe, #f4f4f4); color: #555;
background-image: -o-linear-gradient(top, #fefefe, #f4f4f4);
background-image: linear-gradient(to bottom, #fefefe, #f4f4f4);
color: #333;
text-shadow: 0 1px 0 #fff;
border-radius: 0 1px 1px 0;
border-left: 1px solid #bbb;
content: attr( title ); content: attr( title );
display: block; display: block;
font-size: 11px; font-size: 11px;
@ -45,12 +42,15 @@
right: 0; right: 0;
text-align: center; text-align: center;
top: 0; top: 0;
-webkit-box-shadow: inset 0 1px 0 #fff;
box-shadow: inset 0 1px 0 #fff;
} }
.wp-color-result:hover { .wp-color-result:hover {
border-color: #aaa; background: #fafafa;
-webkit-box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 ); border-color: #999;
box-shadow: 0 1px 1px rgba( 0, 0, 0, 0.1 ); color: #222;
} }
.wp-color-result:hover:after { .wp-color-result:hover:after {
@ -87,6 +87,13 @@
vertical-align: top; vertical-align: top;
} }
/* Match the style of the color picker button */
.wp-picker-input-wrap .button.button-small {
line-height: 22px;
height: 24px;
font-size: 11px;
}
.wp-picker-container .button { .wp-picker-container .button {
margin-left: 6px; margin-left: 6px;
} }

2
wp-admin/css/color-picker.min.css vendored
View File

@ -1 +1 @@
.wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f9f9f9;border:1px solid #bbb;border-radius:2px;cursor:pointer;display:inline-block;height:22px;margin:0 6px 6px 0;position:relative;top:1px;user-select:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;vertical-align:bottom;display:inline-block;padding-left:30px}.wp-color-result:after{background:#f3f3f3;background-image:-webkit-gradient(linear,left top,left bottom,from(#fefefe),to(#f4f4f4));background-image:-webkit-linear-gradient(top,#fefefe,#f4f4f4);background-image:-moz-linear-gradient(top,#fefefe,#f4f4f4);background-image:-o-linear-gradient(top,#fefefe,#f4f4f4);background-image:linear-gradient(to bottom,#fefefe,#f4f4f4);color:#333;text-shadow:0 1px 0 #fff;border-radius:0 1px 1px 0;border-left:1px solid #bbb;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;right:0;text-align:center;top:0}.wp-color-result:hover{border-color:#aaa;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 1px rgba(0,0,0,.1)}.wp-color-result:hover:after{color:#222;border-color:#aaa;border-left:1px solid #999}.wp-color-result.wp-picker-open{top:0}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#888;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 2px rgba(0,0,0,.2)}.wp-color-result:focus:after{border-color:#888}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-container .button{margin-left:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-color:#dfdfdf;margin-top:6px}input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000} .wp-color-picker{width:80px}.wp-picker-container .hidden{display:none}.wp-color-result{background-color:#f7f7f7;border:1px solid #ccc;border-radius:3px;cursor:pointer;display:inline-block;height:22px;margin:0 6px 6px 0;position:relative;top:1px;user-select:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;vertical-align:bottom;display:inline-block;padding-left:30px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.08);box-shadow:0 1px 0 rgba(0,0,0,.08)}.wp-color-result:after{background:#f7f7f7;border-radius:0 2px 2px 0;border-left:1px solid #ccc;color:#555;content:attr(title);display:block;font-size:11px;line-height:22px;padding:0 6px;position:relative;right:0;text-align:center;top:0;-webkit-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.wp-color-result:hover{background:#fafafa;border-color:#999;color:#222}.wp-color-result:hover:after{color:#222;border-color:#aaa;border-left:1px solid #999}.wp-color-result.wp-picker-open{top:0}.wp-color-result.wp-picker-open:after{content:attr(data-current)}.wp-picker-container,.wp-picker-container:active{display:inline-block;outline:0}.wp-color-result:focus{border-color:#888;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.2);box-shadow:0 1px 2px rgba(0,0,0,.2)}.wp-color-result:focus:after{border-color:#888}.wp-picker-open+.wp-picker-input-wrap{display:inline-block;vertical-align:top}.wp-picker-input-wrap .button.button-small{line-height:22px;height:24px;font-size:11px}.wp-picker-container .button{margin-left:6px}.wp-picker-container .iris-square-slider .ui-slider-handle:focus{background-color:#555}.wp-picker-container .iris-picker{border-color:#dfdfdf;margin-top:6px}input[type=text].iris-error{background-color:#ffebe8;border-color:#c00;color:#000}