WordPress.org
Get WordPress

Make WordPress Core

Ticket #37665: 37665-ubnutu-higher.diff

File 37665-ubnutu-higher.diff, 9.6 KB (added by stephenharris, 10 years ago)

Move Ubuntu above Roboto

  • src/wp-admin/css/common.css 

    diff --git src/wp-admin/css/common.css src/wp-admin/css/common.css
index 42c4c7b..aa7de4e 100644
    body { 
    211211body {
    212212        background: #f1f1f1;
    213213        color: #444;
    214         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     214        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    215215        font-size: 13px;
    216216        line-height: 1.4em;
    217217        min-width: 600px;

  • src/wp-admin/css/customize-controls.css 

    diff --git src/wp-admin/css/customize-controls.css src/wp-admin/css/customize-controls.css
index d2eef49..72faae6 100644
    body.cheatin h1 { 
    11801180        clear: both;
    11811181        color: #666;
    11821182        font-size: 24px;
    1183         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     1183        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    11841184        margin: 30px 0 0 0;
    11851185        padding: 0;
    11861186        padding-bottom: 7px;

  • src/wp-admin/css/install.css 

    diff --git src/wp-admin/css/install.css src/wp-admin/css/install.css
index d1db4ec..fc7d5fe 100644
    html { 
    66body {
    77        background: #fff;
    88        color: #444;
    9         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     9        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    1010        margin: 140px auto 25px;
    1111        padding: 20px 20px 10px 20px;
    1212        max-width: 700px;
    … … label { 
    132132}
    133133textarea {
    134134        border: 1px solid #ddd;
    135         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     135        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    136136        width: 100%;
    137137        -webkit-box-sizing: border-box;
    138138        -moz-box-sizing: border-box;
    … … textarea { 
    181181
    182182input,
    183183submit {
    184         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     184        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    185185}
    186186
    187187.form-table input[type=text],

  • src/wp-admin/css/login.css 

    diff --git src/wp-admin/css/login.css src/wp-admin/css/login.css
index 9f69e9c..3332d45 100644
    body { 
    1212        background: #f1f1f1;
    1313        min-width: 0;
    1414        color: #444;
    15         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     15        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    1616        font-size: 13px;
    1717        line-height: 1.4em;
    1818}

  • src/wp-admin/css/press-this-editor.css 

    diff --git src/wp-admin/css/press-this-editor.css src/wp-admin/css/press-this-editor.css
index 8e10d86..5c25575 100644
    object { 
    7777*/
    7878body {
    7979        color: #404040;
    80         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     80        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    8181        font-size: 20px;
    8282        font-weight: 400;
    8383        line-height: 1.6;

  • src/wp-admin/css/press-this.css 

    diff --git src/wp-admin/css/press-this.css src/wp-admin/css/press-this.css
index 1ec3ba0..2837847 100644
    input, 
    294294select,
    295295textarea {
    296296        color: #404040;
    297         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     297        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    298298        font-size: 20px;
    299299        font-weight: 400;
    300300        line-height: 1.6;

  • src/wp-includes/css/admin-bar.css 

    diff --git src/wp-includes/css/admin-bar.css src/wp-includes/css/admin-bar.css
index 573ff8d..9a80cd0 100644
     
    99        letter-spacing: normal;
    1010        font-size: 13px;
    1111        font-weight: 400;
    12         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     12        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    1313        line-height: 32px;
    1414        -webkit-border-radius: 0;
    1515        border-radius: 0;
    … … html:lang(he-il) .rtl #wpadminbar * { 
    8484        color: #ccc;
    8585        font-size: 13px;
    8686        font-weight: 400;
    87         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     87        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    8888        line-height: 32px;
    8989        height: 32px;
    9090        position: fixed;
    … … html:lang(he-il) .rtl #wpadminbar * { 
    627627        position: relative;
    628628        z-index: 30;
    629629        font-size: 13px;
    630         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     630        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    631631        line-height: 24px;
    632632        height: 24px;
    633633        width: 24px;
    … … html:lang(he-il) .rtl #wpadminbar * { 
    810810        #wpadminbar * {
    811811                font-size: 14px;
    812812                font-weight: 400;
    813                 font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     813                font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    814814                line-height: 32px;
    815815        }
    816816

  • src/wp-includes/css/media-views.css 

    diff --git src/wp-includes/css/media-views.css src/wp-includes/css/media-views.css
index b5d0953..0255b50 100644
     
    1717
    1818.media-modal,
    1919.media-frame {
    20         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     20        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    2121        font-size: 12px;
    2222        -webkit-overflow-scrolling: touch;
    2323}
    … …  
    8080.media-frame input[type="url"],
    8181.media-frame textarea,
    8282.media-frame select {
    83         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     83        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    8484        font-size: 12px;
    8585        border-width: 1px;
    8686        border-style: solid;
    … …  
    807807        padding: 4px;
    808808        font-size: 13px;
    809809        color: #444;
    810         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     810        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    811811        -webkit-appearance: none;
    812812}
    813813

  • src/wp-includes/css/wp-embed-template.css 

    diff --git src/wp-includes/css/wp-embed-template.css src/wp-includes/css/wp-embed-template.css
index 10ff56e..a149344 100644
    body { 
    6161        padding: 25px;
    6262        font-size: 14px;
    6363        font-weight: 400;
    64         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     64        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    6565        line-height: 1.5;
    6666        color: #82878c;
    6767        background: white;
    … … p.wp-embed-share-description { 
    312312        padding: 0 5px;
    313313        font-size: 14px;
    314314        font-weight: 400;
    315         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     315        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    316316        line-height: 1.5;
    317317        resize: none;
    318318        cursor: text;

  • src/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css 

    diff --git src/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css src/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css
index 0aacc8b..937c2aa 100644
     
    11/* Generic */
    22body {
    3 font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     3font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    44font-size:13px;
    55background:#fcfcfc;
    66padding:0;

  • src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 

    diff --git src/wp-includes/js/tinymce/skins/wordpress/wp-content.css src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
index fe497d8..5db25a4 100644
    a[data-wplink-url-error]:before { 
    322322.wpview-error p {
    323323        margin: 0;
    324324        text-align: center;
    325         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     325        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif;
    326326}
    327327
    328328.wpview-type-gallery:after {