WordPress.org

Make WordPress Core

Changeset 22025


Ignore:
Timestamp:
09/27/12 00:41:49 (3 years ago)
Author:
azaozz
Message:

Fix background on split buttons, remove redundant !important, remove spacers, a little css cleanup, see #18141

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/css/colors-classic.css

    r22018 r22025  
    10221022/* TinyMCE */ 
    10231023 
    1024 .wp-editor-wrap .wp-switch-editor { 
     1024.wp-admin .wp-editor-wrap .wp-switch-editor { 
    10251025    background-color: #d3e9f2; 
    10261026    border-color: #d1e5ee #d1e5ee #d3e9f2; 
     
    10281028} 
    10291029 
    1030 .wp-editor-wrap.tmce-active .switch-tmce, 
    1031 .wp-editor-wrap.html-active .switch-html { 
    1032     background: #f7fcfe !important; 
    1033     border-color: #d1e5ee #d1e5ee #f7fcfe !important; 
    1034 } 
    1035  
    1036 .wp-editor-wrap .quicktags-toolbar, 
    1037 .wp-editor-wrap .wp_themeSkin tr.mceFirst td.mceToolbar { 
     1030.wp-admin .wp-editor-wrap.tmce-active .switch-tmce, 
     1031.wp-admin .wp-editor-wrap.html-active .switch-html { 
     1032    background: #f7fcfe; 
     1033    border-color: #d1e5ee #d1e5ee #f7fcfe; 
     1034} 
     1035 
     1036.wp-admin .wp-editor-wrap .quicktags-toolbar, 
     1037.wp-admin .wp-editor-wrap .wp_themeSkin tr.mceFirst td.mceToolbar { 
    10381038    border-color: #d0dfe9; 
    10391039    background-color: #f5fafd; 
     
    10451045} 
    10461046 
    1047 .wp_themeSkin table.mceListBox { 
     1047.wp-admin .wp_themeSkin table.mceListBox { 
    10481048    border-color: #d1e5ee; 
    10491049} 
    10501050 
    1051 .wp_themeSkin table.mceListBoxEnabled:hover, 
    1052 .wp_themeSkin table.mceListBoxEnabled:active, 
    1053 .wp_themeSkin table.mceListBoxHover, 
    1054 .wp_themeSkin table.mceListBoxHover:active, 
    1055 .wp_themeSkin table.mceListBoxSelected { 
     1051.wp-admin .wp_themeSkin table.mceListBoxEnabled:hover, 
     1052.wp-admin .wp_themeSkin table.mceListBoxEnabled:active, 
     1053.wp-admin .wp_themeSkin table.mceListBoxHover, 
     1054.wp-admin .wp_themeSkin table.mceListBoxHover:active, 
     1055.wp-admin .wp_themeSkin table.mceListBoxSelected { 
    10561056    border-color: #b8cfdf; 
    10571057} 
    10581058 
    1059 .wp_themeSkin a.mceButtonEnabled:hover { 
    1060     border-color: #c3d2dc !important; 
     1059.wp-admin .wp_themeSkin a.mceButtonEnabled:hover, 
     1060.wp-admin .wp_themeSkin table.mceSplitButton:hover { 
     1061    border-color: #c3d2dc; 
    10611062    background: #f4f9fc; 
    1062     background-image: -webkit-gradient(linear, left bottom, left top, from(#f4f9fc), to(#fff)) !important; 
    1063     background-image: -webkit-linear-gradient(bottom, #f4f9fc, #fff) !important; 
    1064     background-image:    -moz-linear-gradient(bottom, #f4f9fc, #fff) !important; 
    1065     background-image:      -o-linear-gradient(bottom, #f4f9fc, #fff) !important; 
    1066     background-image: linear-gradient(to top, #f4f9fc, #fff) !important; 
    1067 } 
    1068  
    1069 .wp_themeSkin a.mceButton:active, 
    1070 .wp_themeSkin a.mceButtonEnabled:active, 
    1071 .wp_themeSkin a.mceButtonSelected:active, 
    1072 .wp_themeSkin a.mceButtonActive, 
    1073 .wp_themeSkin a.mceButtonActive:active, 
    1074 .wp_themeSkin a.mceButtonActive:hover { 
    1075     border-color: #8f9da9 #c3d2dc #c3d2dc #8f9da9 !important; 
     1063    background-image: -webkit-gradient(linear, left bottom, left top, from(#f4f9fc), to(#fff)); 
     1064    background-image: -webkit-linear-gradient(bottom, #f4f9fc, #fff); 
     1065    background-image:    -moz-linear-gradient(bottom, #f4f9fc, #fff); 
     1066    background-image:      -o-linear-gradient(bottom, #f4f9fc, #fff); 
     1067    background-image: linear-gradient(to top, #f4f9fc, #fff); 
     1068} 
     1069 
     1070.wp-admin .wp_themeSkin a.mceButton:active, 
     1071.wp-admin .wp_themeSkin a.mceButtonEnabled:active, 
     1072.wp-admin .wp_themeSkin a.mceButtonSelected:active, 
     1073.wp-admin .wp_themeSkin a.mceButtonActive, 
     1074.wp-admin .wp_themeSkin a.mceButtonActive:active, 
     1075.wp-admin .wp_themeSkin a.mceButtonActive:hover, 
     1076.wp-admin .wp_themeSkin .mceSplitButtonSelected table, 
     1077.wp-admin .wp_themeSkin .mceSplitButtonSelected table:hover { 
     1078    border-color: #8f9da9 #c3d2dc #c3d2dc #8f9da9; 
    10761079    background: #f4f9fc; 
    1077     background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#f4f9fc)) !important; 
    1078     background-image: -webkit-linear-gradient(bottom, #fff, #f4f9fc) !important; 
    1079     background-image:    -moz-linear-gradient(bottom, #fff, #f4f9fc) !important; 
    1080     background-image:      -o-linear-gradient(bottom, #fff, #f4f9fc) !important; 
    1081     background-image: linear-gradient(to top, #fff, #f4f9fc) !important; 
    1082 } 
    1083  
    1084 .wp_themeSkin .mceSplitButton:hover a.mceOpen, 
    1085 .wp_themeSkin .mceSplitButtonSelected a.mceOpen, 
    1086 .wp_themeSkin .mceSplitButtonSelected a.mceAction, 
    1087 .wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, 
    1088 .wp_themeSkin .mceSplitButton a.mceAction:hover { 
    1089     border-color: #c3d2dc !important; 
    1090 } 
    1091  
    1092 .wp_themeSkin table.mceSplitButton:hover td { 
    1093     border-color: #f4f9fc; 
    1094     background: #eee; 
    1095     background-image: -webkit-gradient(linear, left bottom, left top, from(#f4f9fc), to(#fff)) !important; 
    1096     background-image: -webkit-linear-gradient(bottom, #f4f9fc, #fff) !important; 
    1097     background-image:    -moz-linear-gradient(bottom, #f4f9fc, #fff) !important; 
    1098     background-image:      -o-linear-gradient(bottom, #f4f9fc, #fff) !important; 
    1099     background-image: linear-gradient(to top, #f4f9fc, #fff) !important; 
    1100 } 
    1101  
    1102 .wp_themeSkin .mceSplitButtonSelected td { 
    1103     background: #f4f9fc; 
    1104     background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#f4f9fc)) !important; 
    1105     background-image: -webkit-linear-gradient(bottom, #fff, #f4f9fc) !important; 
    1106     background-image:    -moz-linear-gradient(bottom, #fff, #f4f9fc) !important; 
    1107     background-image:      -o-linear-gradient(bottom, #fff, #f4f9fc) !important; 
    1108     background-image: linear-gradient(to top, #fff, #f4f9fc) !important; 
    1109 } 
    1110  
     1080    background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#f4f9fc)); 
     1081    background-image: -webkit-linear-gradient(bottom, #fff, #f4f9fc); 
     1082    background-image:    -moz-linear-gradient(bottom, #fff, #f4f9fc); 
     1083    background-image:      -o-linear-gradient(bottom, #fff, #f4f9fc); 
     1084    background-image: linear-gradient(to top, #fff, #f4f9fc); 
     1085} 
     1086 
     1087.wp-admin .wp_themeSkin .mceSplitButtonSelected table a.mceOpen, 
     1088.wp-admin .wp_themeSkin .mceSplitButtonSelected table a.mceAction { 
     1089    border-color: #8f9da9 #c3d2dc #c3d2dc #8f9da9; 
     1090} 
     1091 
     1092.wp-admin .wp_themeSkin .mceSplitButton:hover a { 
     1093    border-color: #c3d2dc; 
     1094} 
    11111095/* end TinyMCE */ 
    11121096 
  • trunk/wp-admin/css/wp-admin.css

    r22019 r22025  
    720720 
    721721.pre { 
    722     /* http://www.longren.org/2006/09/27/wrapping-text-inside-pre-tags/ */ 
     722    /* https://developer.mozilla.org/en-US/docs/CSS/white-space */ 
    723723    white-space: pre-wrap; /* css-3 */ 
    724     white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ 
    725     white-space: -pre-wrap; /* Opera 4-6 */ 
    726     white-space: -o-pre-wrap; /* Opera 7 */ 
    727     word-wrap: break-word; /* Internet Explorer 5.5+ */ 
     724    word-wrap: break-word; /* IE 5.5 - 7 */ 
    728725} 
    729726 
  • trunk/wp-includes/class-wp-editor.php

    r22019 r22025  
    384384 
    385385            if ( $set['teeny'] ) { 
    386                 $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'separator', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id ); 
     386                $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id ); 
    387387                $mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array(); 
    388388            } else { 
    389                 $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id); 
    390                 $mce_buttons_2 = apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ), $editor_id); 
     389                $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', 'bullist', 'numlist', 'blockquote', 'justifyleft', 'justifycenter', 'justifyright', 'link', 'unlink', 'wp_more', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id); 
     390                $mce_buttons_2 = apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'justifyfull', 'forecolor', 'pastetext', 'pasteword', 'removeformat', 'charmap', 'outdent', 'indent', 'undo', 'redo', 'wp_help' ), $editor_id); 
    391391                $mce_buttons_3 = apply_filters('mce_buttons_3', array(), $editor_id); 
    392392                $mce_buttons_4 = apply_filters('mce_buttons_4', array(), $editor_id); 
  • trunk/wp-includes/css/editor.css

    r22019 r22025  
    201201/* Separator */ 
    202202.wp_themeSkin .mceSeparator { 
    203     height: 24px; 
    204     width: 1px; 
    205     display: block; 
    206     background: transparent; 
    207     overflow: hidden; 
    208     margin: 0 2px; 
     203    display: none; 
    209204} 
    210205 
     
    317312    width: 20px; 
    318313    padding: 1px 2px; 
    319     border-right: 0 none !important; 
     314    border-right: 0 none; 
    320315} 
    321316 
     
    333328    background-repeat: no-repeat; 
    334329    padding: 1px 0; 
    335 } 
    336  
    337 .wp_themeSkin .mceSplitButtonActive a.mceOpen, 
    338 .wp_themeSkin .mceSplitButtonSelected a.mceOpen, 
    339 .wp_themeSkin .mceSplitButton a.mceOpen:hover { 
    340     width: 12px; 
    341     border-left: 1px solid transparent !important; 
    342     background-position: 2px 2px !important; 
    343     position: relative; 
    344     left: -1px; 
    345     margin-right: -1px; 
    346330} 
    347331 
     
    757741.wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor {background-position:-320px -20px} 
    758742.wp_themeSkin .mceSplitButtonEnabled:hover span.mce_forecolor, 
    759 .wp_themeSkin .mceSplitButtonActive span.mce_forecolor {background-position:-320px 0} 
     743.wp_themeSkin .mceSplitButtonSelected span.mce_forecolor {background-position:-320px 0} 
    760744 
    761745.wp_themeSkin .mce_forecolorpicker {background-position:-320px -20px} 
     
    786770.wp_themeSkin .mceSplitButtonEnabled:hover span.mce_spellchecker, 
    787771.wp_themeSkin .mceButtonActive span.mce_spellchecker, 
    788 .wp_themeSkin .mceSplitButtonActive span.mce_spellchecker {background-position:-220px 0} 
     772.wp_themeSkin .mceSplitButtonSelected span.mce_spellchecker {background-position:-220px 0} 
    789773 
    790774.wp_themeSkin span.mce_wp_help {background-position:-520px -20px} 
     
    906890} 
    907891 
    908 .wp_themeSkin a.mceButtonEnabled:hover { 
     892.wp_themeSkin a.mceButtonEnabled:hover, 
     893.wp_themeSkin table.mceSplitButton:hover { 
    909894    border-color: #bbb; 
    910895    background: #eee; 
     
    921906.wp_themeSkin a.mceButtonActive, 
    922907.wp_themeSkin a.mceButtonActive:active, 
    923 .wp_themeSkin a.mceButtonActive:hover { 
     908.wp_themeSkin a.mceButtonActive:hover, 
     909.wp_themeSkin .mceSplitButtonSelected table, 
     910.wp_themeSkin .mceSplitButtonSelected table:hover { 
    924911    outline: none; 
    925912    border-color: #999 #ccc #ccc #999; 
     
    932919} 
    933920 
     921.wp_themeSkin .mceSplitButtonSelected table a.mceOpen, 
     922.wp_themeSkin .mceSplitButtonSelected table a.mceAction { 
     923    border-color: #999 #ccc #ccc #999; 
     924} 
     925 
    934926.wp_themeSkin .mceButtonDisabled { 
    935     border-color: transparent !important; 
     927    border-color: transparent; 
    936928} 
    937929 
    938930.wp_themeSkin .mceListBox .mceOpen { 
    939     border-left: 0 !important; 
     931    border-left: 0; 
    940932} 
    941933 
     
    952944/* SplitButton */ 
    953945.wp_themeSkin .mceSplitButton .mceLast span.mceOpen .mceIconOnly { 
    954     display: block !important; 
     946    display: block; 
    955947} 
    956948 
     
    960952} 
    961953 
    962 .wp_themeSkin .mceSplitButton:hover a.mceOpen, 
    963 .wp_themeSkin .mceSplitButtonSelected a.mceOpen, 
    964 .wp_themeSkin .mceSplitButtonSelected a.mceAction, 
    965 .wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, 
    966 .wp_themeSkin .mceSplitButton a.mceAction:hover { 
     954.wp_themeSkin .mceSplitButton:hover a { 
    967955    border-color: #bbb; 
    968956} 
     
    975963    background-position: 1px 2px; 
    976964    background-repeat: no-repeat; 
    977 } 
    978  
    979 .wp_themeSkin .mceSplitButtonSelected td { 
    980     background-color: #ddd; 
    981     background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#ccc)); 
    982     background-image: -webkit-linear-gradient(bottom, #fff, #ccc); 
    983     background-image:    -moz-linear-gradient(bottom, #fff, #ccc); 
    984     background-image:      -o-linear-gradient(bottom, #fff, #ccc); 
    985     background-image: linear-gradient(to top, #fff, #ccc); 
    986 } 
    987  
    988 .wp_themeSkin table.mceSplitButton:hover td { 
    989     border-color: #bbb; 
    990     background-color: #eee; 
    991     background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#fff)); 
    992     background-image: -webkit-linear-gradient(bottom, #ccc, #fff); 
    993     background-image:    -moz-linear-gradient(bottom, #ccc, #fff); 
    994     background-image:      -o-linear-gradient(bottom, #ccc, #fff); 
    995     background-image: linear-gradient(to top, #ccc, #fff); 
    996 } 
    997  
    998 .wp_themeSkin table.mceSplitButton:active td.mceFirst, 
    999 .wp_themeSkin table.mceSplitButton td.mceLast:active { 
    1000     border-color: #bbb; 
    1001     background-color: #ddd; 
    1002     background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#ccc)); 
    1003     background-image: -webkit-linear-gradient(bottom, #fff, #ccc); 
    1004     background-image:    -moz-linear-gradient(bottom, #fff, #ccc); 
    1005     background-image:      -o-linear-gradient(bottom, #fff, #ccc); 
    1006     background-image: linear-gradient(to top, #fff, #ccc); 
    1007 } 
    1008  
    1009 .wp_themeSkin .mceSplitButtonActive td a.mceAction, 
    1010 .wp_themeSkin .mceSplitButtonActive td a.mceOpen { 
    1011     border-color: #bbb; 
     965    border-left: 0; 
    1012966} 
    1013967 
    1014968.wp_themeSkin .mceSplitButtonActive td { 
    1015     background-color: #ddd; 
    1016     background-image: -webkit-gradient(linear, left bottom, left top, from(#fff), to(#ccc)); 
    1017     background-image: -webkit-linear-gradient(bottom, #fff, #ccc); 
    1018     background-image:    -moz-linear-gradient(bottom, #fff, #ccc); 
    1019     background-image:      -o-linear-gradient(bottom, #fff, #ccc); 
    1020     background-image: linear-gradient(to top, #fff, #ccc); 
    1021969    -webkit-border-radius: 3px; 
    1022970    border-radius: 3px; 
Note: See TracChangeset for help on using the changeset viewer.