Changeset 25068

Timestamp:

08/20/2013 06:09:51 PM (11 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:

• fonts/LICENSE.txt (added)
• fonts/genericons.css (added)
• functions.php (modified) (1 diff)
• style.css (modified) (1 diff)

trunk/src/wp-content/themes/twentyfourteen/functions.php

@@ -172 +172 @@
  */
 function twentyfourteen_scripts() {
+
+    // Add Lato font, used in the main stylesheet.
+    wp_enqueue_style( 'twentyfourteen-lato' );
+
+    // Add Genericons font, used in the main stylesheet.
+    wp_enqueue_style( 'genericons', get_template_directory_uri() . '/fonts/genericons.css', array(), '2.09' );
+
+    // Loads our main stylesheet.
     wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri() );
-
-    wp_enqueue_style( 'twentyfourteen-lato' );
 
     if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )

trunk/src/wp-content/themes/twentyfourteen/style.css

@@ -85 +85 @@
     border: 0;
 }
-
-/* =Repeatable patterns
------------------------------------------------ */
-
-/* Genericons */
-/*
-IE8 and below use EOT and allow cross-site embedding.
-IE9 uses WOFF which is base64 encoded to allow cross-site embedding.
-So unfortunately, IE9 will throw a console error, but it'll still work.
-*/
-@font-face {
-    font-family: 'Genericons';
-    src: url('fonts/genericons-regular-webfont.eot');
-    src: url('fonts/genericons-regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('fonts/genericons-regular-webfont.woff') format('woff'),
-         url('fonts/genericons-regular-webfont.ttf') format('truetype'),
-         url('fonts/genericons-regular-webfont.svg#genericonsregular') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-.genericon:before {
-    display: inline-block;
-    -webkit-font-smoothing: antialiased;
-    font: normal 16px/1 'Genericons';
-    font-size: 1.6rem;
-    vertical-align: top;
-}
-
 
 /* =Global