WordPress.org

Make WordPress Core

Ticket #14770: 14770.2.diff

File 14770.2.diff, 6.3 KB (added by JohnONolan, 3 years ago)

2nd pass - remove comment from file (as discussed with nacin) - cleanup conflicts.

  • wp-admin/css/wp-admin.dev.css

     
    55All the important stuff is in here. 
    66 
    77 
    8 IMPORTANT: 
    9 ---------- 
    10 Please be careful when editing this file, do not just add  
    11 another ID or Class because it's easy, we want to try and  
    12 maintain the WordPress CSS with good styles, not easy ones! 
    13  
    14 Before editing or adding to this file, please review the table  
    15 of contents and ensure that you add new styles in the correct  
    16 location. This makes it easier to maintain going forwards. 
    17  
    18 Be obvious, not clever. Styles which can be easily changed 
    19 are far more desirable than a complex cascading masterpiece. 
    20  
    21  
    228TABLE OF CONTENTS: 
    239------------------ 
    2410 1.0 - Text Elements 
     
    12451231        border-top-left-radius: 6px; 
    12461232} 
    12471233 
    1248 /* TODO: Review this was a conflict - PJW */ 
    12491234.postbox.closed h3 { 
    12501235        -moz-border-radius-bottomleft: 4px; 
    12511236        -webkit-border-bottom-left-radius: 4px; 
     
    12571242        border-bottom-right-radius: 4px; 
    12581243} 
    12591244 
    1260 .form-table td p { 
    1261         margin-top: 4px; 
    1262 } 
    1263  
    1264 .form-table table.color-palette { 
    1265         vertical-align: bottom; 
    1266         float: left; 
    1267         margin: -12px 3px 11px; 
    1268 } 
    1269 /* Conflict END */ 
    1270  
    12711245.postbox table.form-table { 
    12721246        margin-bottom: 0; 
    12731247} 
     
    14541428        border-radius: 5px; 
    14551429} 
    14561430 
    1457 /* TODO: Review this was a conflict - font-family - PJW */ 
    14581431.tablenav .displaying-num { 
    14591432        margin-right: 10px; 
    14601433        font-size: 12px; 
    14611434        font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; 
    14621435        font-style: italic; 
    1463         font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif; 
    14641436} 
    14651437 
    14661438.tablenav .actions { 
     
    16421614        margin-left: 5em; 
    16431615} 
    16441616 
    1645 /* TODO: Review this was a conflict - PJW */ 
    16461617.quick-edit-row-post fieldset.inline-edit-col-right label span.title { 
    16471618        width: auto; 
    16481619        padding-right: 0.5em; 
    16491620} 
    1650 .howto { 
    1651         font-style: italic; 
    1652         display: block; 
    1653         font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif; 
    1654 } 
    1655 /* END Conflict */ 
    16561621 
    16571622.inline-edit-row .input-text-wrap input[type=text] { 
    16581623        width: 100%; 
     
    19831948        width: 99%; 
    19841949} 
    19851950 
    1986 /* TODO: Review this was a conflict - PJW */ 
    19871951#normal-sortables .postbox .submit { 
    19881952        background: transparent none; 
    19891953        border: 0 none; 
    19901954        float: right; 
    19911955        padding: 0 12px; 
     1956        margin:0; 
    19921957} 
    1993 /* END */ 
    19941958 
    19951959#side-sortables .category-add input { 
    19961960        width: 94%; 
     
    20982062        margin: 0; 
    20992063} 
    21002064 
    2101 /* TODO: Review this was a conflict - PJW */ 
    21022065#normal-sortables .postbox #replyrow .submit { 
    21032066        float: none; 
    21042067        margin: 0; 
     
    21252088ul.wp-tab-bar { 
    21262089        margin-top: 12px; 
    21272090} 
    2128 /* END Conflict */ 
    21292091 
    2130 /* TODO: Review this was a conflict - PJW */ 
    21312092#side-sortables .comments-box thead th, 
    21322093#normal-sortables .comments-box thead th { 
    21332094        background: transparent; 
     
    21452106#commentsdiv img.waiting { 
    21462107        padding-left: 5px; 
    21472108} 
    2148 /* END Conflcit */ 
    21492109 
    21502110#post-body .category-tabs li.tabs, 
    21512111#post-body .add-menu-item-tabs li.tabs { 
     
    22182178        vertical-align: text-top; 
    22192179} 
    22202180 
    2221 /* TODO: Review this was a conflict - PJW */ 
    2222 .defaultavatarpicker .avatar { 
    2223         margin: 2px 0; 
    2224         vertical-align: middle; 
    2225 } 
    2226  
    22272181#post-body .tagsdiv #newtag { 
    22282182        margin-right: 5px; 
    22292183        width: 16em; 
     
    24292383        text-decoration: none; 
    24302384} 
    24312385 
    2432 /* TODO: Review this was a conflict - PJW */ 
    2433 #screen-options-link-wrap, 
    2434 #contextual-help-link-wrap { 
    2435         float: right; 
    2436         height: 22px; 
    2437         padding: 0; 
    2438         margin: 0 6px 0 0; 
    2439         font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif; 
    2440         background: #e3e3e3; 
    2441         -moz-border-radius-bottomleft: 3px; 
    2442         -moz-border-radius-bottomright: 3px; 
    2443         -webkit-border-bottom-left-radius: 3px; 
    2444         -webkit-border-bottom-right-radius: 3px; 
    2445 } 
    2446 /* END */ 
    24472386 
    24482387/*------------------------------------------------------------------------------ 
    24492388  12.0 - Categories 
     
    24542393        padding: 4px 0; 
    24552394} 
    24562395 
    2457 /* TODO: Review this was a conflict - PJW */ 
    24582396.category-adder h4 { 
    24592397        margin: 0 0 8px; 
    24602398} 
    24612399 
    2462 /* END */ 
    2463  
    24642400#side-sortables .category-adder { 
    24652401        margin: 0; 
    24662402} 
     
    24692405        width: 30%; 
    24702406} 
    24712407 
    2472 /* TODO: Review this was a conflict - PJW */ 
    2473 #side-sortables .category-add input { 
    2474         width: 94%; 
    2475 } 
    2476  
    2477 #screen-options-wrap, 
    2478 #contextual-help-wrap { 
    2479         border-style: none solid solid; 
    2480         border-top: 0 none; 
    2481         border-width: 0 1px 1px; 
    2482         margin: 0 15px; 
    2483         padding: 8px 12px 12px; 
    2484         -moz-border-radius: 0 0 4px 4px; 
    2485         -webkit-border-radius: 0 0 4px 4px; 
    2486         -khtml-border-radius: 0 0 4px 4px; 
    2487         border-radius: 0 0 4px 4px; 
    2488 } 
    2489 /* END */ 
    2490  
    24912408#side-sortables .category-add select { 
    24922409        width: 100%; 
    24932410} 
     
    26042521        word-wrap: break-word; 
    26052522} 
    26062523 
    2607 .category-adder h4 { 
    2608         margin-top: 4px; 
    2609         margin-bottom: 0px; 
    2610 } 
    2611  
    26122524.categorydiv .tabs-panel, 
    26132525.customlinkdiv .tabs-panel, 
    26142526.posttypediv .tabs-panel, 
     
    27552667        text-align: justify; 
    27562668} 
    27572669 
    2758 /* TODO: Review this was a conflict - PJW */ 
    27592670.tagcloud h3 { 
    27602671        margin: 2px 0 12px; 
    27612672} 
    27622673 
    2763 .inline-edit-row fieldset ul.cat-checklist label, 
    2764 .inline-edit-row .catshow, 
    2765 .inline-edit-row .cathide, 
    2766 .inline-edit-row #bulk-titles div { 
    2767         font-family: Verdana, Arial, "Bitstream Vera Sans", sans-serif; 
    2768         font-style: normal; 
    2769         font-size: 11px; 
    2770 } 
    2771 /* END */ 
    2772  
    27732674.ac_results { 
    27742675        padding: 0; 
    27752676        margin: 0; 
     
    31413042        line-height: 2px; 
    31423043} 
    31433044 
    3144 /* TODO: Review this was a conflict - PJW */ 
    31453045.swfupload { 
    31463046        margin: 5px 10px; 
    31473047        vertical-align: middle; 
    31483048} 
    3149 /* END */ 
    31503049 
     3050 
    31513051/*------------------------------------------------------------------------------ 
    31523052  14.2 - Image Editor 
    31533053------------------------------------------------------------------------------*/ 
     
    34333333        float: left; 
    34343334} 
    34353335 
     3336.form-table td p { 
     3337        margin-top: 4px; 
     3338} 
     3339 
    34363340.form-table table.color-palette { 
    34373341        vertical-align: bottom; 
    34383342        float: left; 
     
    36973601        color: #cfcfcf; 
    36983602} 
    36993603 
    3700 h2.nav-tab-wrapper, h3.nav-tab-wrapper { 
    3701         border-bottom: 1px solid #ccc; 
    3702         padding-bottom: 0; 
    3703 } 
    3704  
    37053604#broken-themes { 
    37063605        text-align: left; 
    37073606        width: 50%; 
     
    37913690        color: #464646; 
    37923691} 
    37933692 
    3794 /* TODO: Review this was a conflict - PJW */ 
    37953693h2.nav-tab-wrapper, h3.nav-tab-wrapper { 
    37963694        border-bottom: 1px solid #ccc; 
    37973695        padding-bottom: 0; 
     
    38013699        padding: 4px 20px 6px; 
    38023700        font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; 
    38033701} 
    3804 /* END */ 
    38053702 
     3703 
    38063704/*------------------------------------------------------------------------------ 
    38073705  17.0 - Plugins 
    38083706------------------------------------------------------------------------------*/