WordPress.org

Make WordPress Core

Changeset 25068


Ignore:
Timestamp:
08/20/2013 06:09:51 PM (7 years ago)
Author:
lancewillett
Message:

Twenty Fourteen: load Genericons correctly, and add comments to other CSS enqueue calls. Props obenland, fixes #25085.

Location:
trunk/src/wp-content/themes/twentyfourteen
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-content/themes/twentyfourteen/functions.php

    r25065 r25068  
    172172 */
    173173function twentyfourteen_scripts() {
     174
     175    // Add Lato font, used in the main stylesheet.
     176    wp_enqueue_style( 'twentyfourteen-lato' );
     177
     178    // Add Genericons font, used in the main stylesheet.
     179    wp_enqueue_style( 'genericons', get_template_directory_uri() . '/fonts/genericons.css', array(), '2.09' );
     180
     181    // Loads our main stylesheet.
    174182    wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri() );
    175 
    176     wp_enqueue_style( 'twentyfourteen-lato' );
    177183
    178184    if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
  • trunk/src/wp-content/themes/twentyfourteen/style.css

    r25067 r25068  
    8585    border: 0;
    8686}
    87 
    88 /* =Repeatable patterns
    89 ----------------------------------------------- */
    90 
    91 /* Genericons */
    92 /*
    93 IE8 and below use EOT and allow cross-site embedding.
    94 IE9 uses WOFF which is base64 encoded to allow cross-site embedding.
    95 So unfortunately, IE9 will throw a console error, but it'll still work.
    96 */
    97 @font-face {
    98     font-family: 'Genericons';
    99     src: url('fonts/genericons-regular-webfont.eot');
    100     src: url('fonts/genericons-regular-webfont.eot?#iefix') format('embedded-opentype'),
    101          url('fonts/genericons-regular-webfont.woff') format('woff'),
    102          url('fonts/genericons-regular-webfont.ttf') format('truetype'),
    103          url('fonts/genericons-regular-webfont.svg#genericonsregular') format('svg');
    104     font-weight: normal;
    105     font-style: normal;
    106 }
    107 .genericon:before {
    108     display: inline-block;
    109     -webkit-font-smoothing: antialiased;
    110     font: normal 16px/1 'Genericons';
    111     font-size: 1.6rem;
    112     vertical-align: top;
    113 }
    114 
    11587
    11688/* =Global
Note: See TracChangeset for help on using the changeset viewer.