WordPress.org

Make WordPress Core

Changeset 27193


Ignore:
Timestamp:
02/19/2014 03:50:09 AM (5 years ago)
Author:
azaozz
Message:

TinyMCE: revert style for the blocks drop-down in the toolbar, limit the styles imported for the same drop-down, make the menu highlight color grey. Part props avryl, see #26952

Location:
trunk/src/wp-includes
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp-editor.php

    r27159 r27193  
    325325                    'paste_remove_styles' => true,
    326326
    327                     // limit the preview styles in the menu/toolbar
    328             //      'preview_styles' => 'font-family font-weight font-style text-decoration text-transform color background-color border',
     327                    // Limit the preview styles in the menu/toolbar
     328                    'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
    329329
    330330                    'wpeditimage_disable_captions' => $no_captions,
  • trunk/src/wp-includes/css/editor.css

    r27190 r27193  
    1818
    1919.mce-window {
     20    -webkit-border-radius: 0;
    2021    border-radius: 0;
     22    -webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
    2123    box-shadow: 0 5px 15px rgba(0,0,0,0.7);
    2224    z-index: 160000 !important; /* Overwrite inline style added by TinyMCE. */
     
    5658    font: normal 20px/2 'dashicons';
    5759    text-align: center;
    58     color: #888;
     60    color: #666;
    5961    width: 40px;
    6062    height: 40px;
     
    6365
    6466.mce-window .mce-window-head .mce-close:hover:before {
    65     color: #555;
     67    color: #2ea2cc;
    6668}
    6769
    6870.mce-window .mce-window-head .mce-dragh {
     71    width: -webkit-calc( 100% - 40px );
    6972    width: calc( 100% - 40px );
    7073}
     
    7275.mce-textbox {
    7376    border: 1px solid #ddd;
     77    -webkit-border-radius: 0;
    7478    border-radius: 0;
    7579    -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
     
    9094.mce-floatpanel.mce-popover {
    9195    border-color: rgba(0,0,0,0.15);
     96    -webkit-border-radius: 0;
    9297    border-radius: 0;
     98    -webkit-box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
    9399    box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
    94100}
     
    154160    -webkit-box-shadow: none;
    155161    box-shadow: none;
     162    text-shadow: none;
    156163}
    157164
     
    215222}
    216223
     224/* mce listbox */
     225.mce-toolbar .mce-btn-group .mce-btn.mce-listbox {
     226    -webkit-border-radius: 0;
     227    border-radius: 0;
     228    direction: ltr;
     229    background: #fff;
     230    border: 1px solid #ddd;
     231    -webkit-box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
     232    box-shadow: inset 0 1px 1px -1px rgba(0, 0, 0, .2);
     233}
     234
     235.mce-toolbar .mce-btn-group .mce-btn.mce-listbox:hover {
     236    background-image: none;
     237    border-color: #bbb;
     238}
     239
     240
     241.mce-toolbar .mce-btn .mce-caret {
     242    border: none;
     243    margin: 0 0 0 -5px;
     244    width: 16px;
     245}
     246
     247.mce-toolbar .mce-listbox .mce-caret {
     248    margin-top: 0;
     249    padding: 2px 0 0;
     250    right: 0;
     251    top: 0;
     252    width: 16px;
     253}
     254
     255.mce-toolbar .mce-listbox .mce-caret:before {
     256    margin-left: -6px;
     257}
     258
     259.mce-toolbar .mce-splitbtn:hover .mce-open {
     260    border-right-color: transparent;
     261}
     262
     263.mce-toolbar .mce-splitbtn .mce-open.mce-active{
     264    -webkit-box-shadow: none;
     265    box-shadow: none;
     266}
     267
     268.mce-menu .mce-menu-item-normal.mce-active {
     269    background-color: #e5e5e5;
     270    -webkit-filter: none;
     271    filter: none;
     272}
     273
     274.mce-menu .mce-menu-item:hover,
     275.mce-menu .mce-menu-item.mce-selected,
     276.mce-menu .mce-menu-item:focus {
     277    color: #000;
     278    background-color: #bbb;
     279    background-image: none;
     280    -webkit-filter: none;
     281    filter: none;
     282}
     283
     284.mce-menu .mce-menu-item:hover .mce-ico,
     285.mce-menu .mce-menu-item.mce-selected .mce-ico,
     286.mce-menu .mce-menu-item:focus .mce-ico,
     287.mce-menu .mce-menu-item:hover .mce-text,
     288.mce-menu .mce-menu-item.mce-active:hover .mce-text,
     289.mce-menu .mce-menu-item.mce-selected .mce-text {
     290    color: #000;
     291}
     292
     293/* Menubar */
    217294.mce-menubar {
    218295    border-color: #e5e5e5;
     
    228305}
    229306
     307.mce-menubtn span {
     308    margin-right: 0;
     309    padding-left: 3px;
     310}
     311
    230312/* Buttons in modals */
     313.mce-primary button,
     314.mce-primary button i {
     315    text-align: center;
     316    color: #fff;
     317    text-shadow: none;
     318}
     319
    231320.mce-window .mce-btn {
    232321    color: #555;
     
    336425
    337426/* TinyMCE tooltips */
    338 
    339427.mce-tooltip {
    340428    margin-top: 2px;
     
    342430
    343431.mce-tooltip-inner {
     432    -webkit-box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
    344433    box-shadow: 0 3px 5px rgba( 0, 0, 0, 0.2 );
    345434    color: #fff;
     
    541630}
    542631
    543 .mce-toolbar .mce-btn .mce-caret {
    544     border: none;
    545     margin: 0 0 0 -5px;
    546     width: 16px;
    547 }
    548 
    549 .mce-menubtn span {
    550     margin-right: 0;
    551     padding-left: 3px;
    552 }
    553 
    554 .mce-toolbar .mce-listbox .mce-caret {
    555     margin-top: 0;
    556     padding: 2px 3px;
    557     right: 0;
    558     top: 0;
    559     width: 10px;
    560 }
    561 
    562 .mce-toolbar .mce-listbox:hover .mce-caret,
    563 .mce-toolbar .mce-listbox.mce-active .mce-caret {
    564     border-left: 1px solid #bdbdbd;
    565 }
    566 
    567 .mce-toolbar .mce-listbox .mce-caret:before {
    568     margin-left: -6px;
    569 }
    570 
    571 .mce-toolbar .mce-splitbtn:hover .mce-open {
    572     border-right-color: transparent;
    573 }
    574 
    575 .mce-toolbar .mce-splitbtn .mce-open.mce-active{
    576     -webkit-box-shadow: none;
    577     box-shadow: none;
    578 }
    579 
    580632/* Editors */
    581633.wp-editor-wrap {
Note: See TracChangeset for help on using the changeset viewer.