<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25214] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: remove Social Links integration.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25214">25214</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-09-02 21:24:41 +0000 (Mon, 02 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: remove Social Links integration. Props obenland, see <a href="http://core.trac.wordpress.org/ticket/25094">#25094</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteenheaderphp">trunk/src/wp-content/themes/twentyfourteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenjsthemejs">trunk/src/wp-content/themes/twentyfourteen/js/theme.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenrtlcss">trunk/src/wp-content/themes/twentyfourteen/rtl.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenstylecss">trunk/src/wp-content/themes/twentyfourteen/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/header.php (25213 => 25214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/header.php 2013-09-02 21:20:56 UTC (rev 25213)
+++ trunk/src/wp-content/themes/twentyfourteen/header.php 2013-09-02 21:24:41 UTC (rev 25214)
</span><span class="lines">@@ -23,31 +23,6 @@
</span><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body <?php body_class(); ?>>
</span><del>-<?php
- $email_link = get_theme_mod( 'email_link' );
- $twitter_link = get_theme_mod( 'twitter_link' );
- $facebook_link = get_theme_mod( 'facebook_link' );
- $pinterest_link = get_theme_mod( 'pinterest_link' );
- $google_plus_link = get_theme_mod( 'google_plus_link' );
- $linkedin_link = get_theme_mod( 'linkedin_link' );
- $flickr_link = get_theme_mod( 'flickr_link' );
- $github_link = get_theme_mod( 'github_link' );
- $dribbble_link = get_theme_mod( 'dribbble_link' );
- $vimeo_link = get_theme_mod( 'vimeo_link' );
- $youtube_link = get_theme_mod( 'youtube_link' );
- $social_links = ( '' != $email_link
- || '' != $twitter_link
- || '' != $facebook_link
- || '' != $pinterest_link
- || '' != $google_plus_link
- || '' != $linkedin_link
- || '' != $flickr_link
- || '' != $github_link
- || '' != $dribbble_link
- || '' != $vimeo_link
- || '' != $youtube_link
- ) ? true : false;
-?>
</del><span class="cx"> <div id="page" class="hfeed site">
</span><span class="cx"> <?php do_action( 'before' ); ?>
</span><span class="cx">
</span><span class="lines">@@ -61,18 +36,12 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <header id="masthead" class="site-header" role="banner">
</span><del>- <div class="header-main clear">
</del><ins>+ <div class="header-main">
</ins><span class="cx"> <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
</span><span class="cx">
</span><span class="cx"> <div class="header-extra">
</span><del>- <?php if ( $social_links ) : ?>
- <div class="social-links-toggle">
- <span class="genericon"><?php _e( 'Connect', 'twentyfourteen' ); ?></span>
- </div>
- <?php endif; ?>
-
</del><span class="cx"> <div class="search-toggle">
</span><del>- <span class="genericon"><?php _e( 'Search', 'twentyfourteen' ); ?></span>
</del><ins>+ <span class="genericon-search"><?php _e( 'Search', 'twentyfourteen' ); ?></span>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -81,108 +50,13 @@
</span><span class="cx"> <div class="screen-reader-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyfourteen' ); ?>"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></a></div>
</span><span class="cx"> <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</span><span class="cx"> </nav>
</span><del>-
</del><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="mobile-navigations" class="hide"></div>
</span><span class="cx">
</span><del>- <?php if ( $social_links ) : ?>
- <div class="social-links-wrapper hide">
- <ul class="social-links clear">
- <?php if ( is_email( $email_link ) ) : ?>
- <li class="email-link">
- <a href="mailto:<?php echo antispambot( sanitize_email( $email_link ) ); ?>" class="genericon" title="<?php esc_attr_e( 'Email', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'Email', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $twitter_link ) : ?>
- <li class="twitter-link">
- <a href="<?php echo esc_url( $twitter_link ); ?>" class="genericon" title="<?php esc_attr_e( 'Twitter', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'Twitter', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $facebook_link ) : ?>
- <li class="facebook-link">
- <a href="<?php echo esc_url( $facebook_link ); ?>" class="genericon" title="<?php esc_attr_e( 'Facebook', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'Facebook', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $pinterest_link ) : ?>
- <li class="pinterest-link">
- <a href="<?php echo esc_url( $pinterest_link ); ?>" class="genericon" title="<?php esc_attr_e( 'Pinterest', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'Pinterest', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $google_plus_link ) : ?>
- <li class="google-link">
- <a href="<?php echo esc_url( $google_plus_link ); ?>" class="genericon" title="<?php esc_attr_e( 'Google Plus', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'Google Plus', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $linkedin_link ) : ?>
- <li class="linkedin-link">
- <a href="<?php echo esc_url( $linkedin_link ); ?>" class="genericon" title="<?php esc_attr_e( 'LinkedIn', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'LinkedIn', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $flickr_link ) : ?>
- <li class="flickr-link">
- <a href="<?php echo esc_url( $flickr_link ); ?>" class="genericon" title="<?php esc_attr_e( 'Flickr', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'Flickr', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $github_link ) : ?>
- <li class="github-link">
- <a href="<?php echo esc_url( $github_link ); ?>" class="genericon" title="<?php esc_attr_e( 'Github', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'Github', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $dribbble_link ) : ?>
- <li class="dribbble-link">
- <a href="<?php echo esc_url( $dribbble_link ); ?>" class="genericon" title="<?php esc_attr_e( 'Dribbble', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'Dribbble', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $vimeo_link ) : ?>
- <li class="vimeo-link">
- <a href="<?php echo esc_url( $vimeo_link ); ?>" class="genericon" title="<?php esc_attr_e( 'Vimeo', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'Vimeo', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
-
- <?php if ( '' != $youtube_link ) : ?>
- <li class="youtube-link">
- <a href="<?php echo esc_url( $youtube_link ); ?>" class="genericon" title="<?php esc_attr_e( 'YouTube', 'twentyfourteen' ); ?>" target="_blank">
- <?php _e( 'YouTube', 'twentyfourteen' ); ?>
- </a>
- </li>
- <?php endif; ?>
- </ul>
- </div>
- <?php endif; ?>
-
</del><span class="cx"> <div class="search-box-wrapper hide">
</span><span class="cx"> <div class="search-box clear">
</span><del>- <?php get_search_form(); ?>
</del><ins>+ <?php get_search_form(); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </header><!-- #masthead -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php (25213 => 25214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-09-02 21:20:56 UTC (rev 25213)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2013-09-02 21:24:41 UTC (rev 25214)
</span><span class="lines">@@ -15,165 +15,6 @@
</span><span class="cx"> function twentyfourteen_customize_register( $wp_customize ) {
</span><span class="cx"> $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
</span><span class="cx"> $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
</span><del>-
- $wp_customize->add_section( 'twentyfourteen_theme_options', array(
- 'title' => __( 'Theme Options', 'twentyfourteen' ),
- 'priority' => 35,
- ) );
-
- $wp_customize->add_setting( 'email_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'email_link', array(
- 'label' => __( 'Email Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'email_link',
- 'type' => 'text',
- 'priority' => 1,
- ) );
-
- $wp_customize->add_setting( 'twitter_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'twitter_link', array(
- 'label' => __( 'Twitter Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'twitter_link',
- 'type' => 'text',
- 'priority' => 2,
- ) );
-
- $wp_customize->add_setting( 'facebook_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'facebook_link', array(
- 'label' => __( 'Facebook Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'facebook_link',
- 'type' => 'text',
- 'priority' => 3,
- ) );
-
- $wp_customize->add_setting( 'pinterest_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'pinterest_link', array(
- 'label' => __( 'Pinterest Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'pinterest_link',
- 'type' => 'text',
- 'priority' => 4,
- ) );
-
- $wp_customize->add_setting( 'google_plus_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'google_plus_link', array(
- 'label' => __( 'Google+ Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'google_plus_link',
- 'type' => 'text',
- 'priority' => 5,
- ) );
-
- $wp_customize->add_setting( 'linkedin_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'linkedin_link', array(
- 'label' => __( 'LinkedIn Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'linkedin_link',
- 'type' => 'text',
- 'priority' => 6,
- ) );
-
- $wp_customize->add_setting( 'flickr_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'flickr_link', array(
- 'label' => __( 'Flickr Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'flickr_link',
- 'type' => 'text',
- 'priority' => 7,
- ) );
-
- $wp_customize->add_setting( 'github_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'github_link', array(
- 'label' => __( 'Github Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'github_link',
- 'type' => 'text',
- 'priority' => 8,
- ) );
-
- $wp_customize->add_setting( 'dribbble_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'dribbble_link', array(
- 'label' => __( 'Dribbble Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'dribbble_link',
- 'type' => 'text',
- 'priority' => 9,
- ) );
-
- $wp_customize->add_setting( 'vimeo_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'vimeo_link', array(
- 'label' => __( 'Vimeo Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'vimeo_link',
- 'type' => 'text',
- 'priority' => 10,
- ) );
-
- $wp_customize->add_setting( 'youtube_link', array(
- 'default' => '',
- 'type' => 'theme_mod',
- 'capability' => 'edit_theme_options',
- ) );
-
- $wp_customize->add_control( 'youtube_link', array(
- 'label' => __( 'YouTube Link', 'twentyfourteen' ),
- 'section' => 'twentyfourteen_theme_options',
- 'settings' => 'youtube_link',
- 'type' => 'text',
- 'priority' => 11,
- ) );
</del><span class="cx"> }
</span><span class="cx"> add_action( 'customize_register', 'twentyfourteen_customize_register' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenjsthemejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/js/theme.js (25213 => 25214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/js/theme.js 2013-09-02 21:20:56 UTC (rev 25213)
+++ trunk/src/wp-content/themes/twentyfourteen/js/theme.js 2013-09-02 21:24:41 UTC (rev 25214)
</span><span class="lines">@@ -7,10 +7,8 @@
</span><span class="cx"> $masthead = $( '#masthead' ),
</span><span class="cx"> $secondaryTop = $( '#secondary-top' ),
</span><span class="cx"> $mobileNavigations = $( '#mobile-navigations'),
</span><del>- $socialLinksWrapper = $( 'div.social-links-wrapper' ),
</del><span class="cx"> $searchBoxWrapper = $( 'div.search-box-wrapper' ),
</span><span class="cx"> $searchToggle = $( 'div.search-toggle' ),
</span><del>- $socialLinksToggle = $( 'div.social-links-toggle' ),
</del><span class="cx"> timeout = false;
</span><span class="cx">
</span><span class="cx"> // Toggle function.
</span><span class="lines">@@ -19,30 +17,11 @@
</span><span class="cx"> $masthead.find( '#mobile-navigations' ).toggleClass( 'hide' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Click event for toggle the social links
- $socialLinksToggle.click( function() {
- $( this ).toggleClass( 'active' );
- $socialLinksWrapper.toggleClass( 'hide' );
- // if .search-box-wrapper is visible hide it
- if ( ! $searchBoxWrapper.hasClass( 'hide' ) ) {
- $searchBoxWrapper.addClass( 'hide' );
- }
- if ( $searchToggle.hasClass( 'active' ) ) {
- $searchToggle.removeClass( 'active' );
- }
- } );
-
</del><span class="cx"> // Click event for toggle the search
</span><span class="cx"> $searchToggle.click( function() {
</span><span class="cx"> $( this ).toggleClass( 'active' );
</span><span class="cx"> $searchBoxWrapper.toggleClass( 'hide' );
</span><del>- // if .social-links-wrapper is visible hide it
- if ( ! $socialLinksWrapper.hasClass( 'hide' ) ) {
- $socialLinksWrapper.addClass( 'hide' );
- }
- if ( $socialLinksToggle.hasClass( 'active' ) ) {
- $socialLinksToggle.removeClass( 'active' );
- }
</del><ins>+
</ins><span class="cx"> if ( $( this ).hasClass( 'active' ) )
</span><span class="cx"> $searchBoxWrapper.find( '.search-field' ).focus();
</span><span class="cx"> } );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/rtl.css (25213 => 25214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/rtl.css 2013-09-02 21:20:56 UTC (rev 25213)
+++ trunk/src/wp-content/themes/twentyfourteen/rtl.css 2013-09-02 21:24:41 UTC (rev 25214)
</span><span class="lines">@@ -82,18 +82,11 @@
</span><span class="cx"> right: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.social-links-toggle,
</del><span class="cx"> .search-toggle {
</span><span class="cx"> float: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.social-links-toggle {
- border-left: 1px solid rgba(255, 255, 255, 0.4);
- border-right: none;
-}
-
-.social-links-toggle span:before,
-.search-toggle span:before {
</del><ins>+.genericon-search:before {
</ins><span class="cx"> margin-right: -8px;
</span><span class="cx"> margin-right: -0.8rem;
</span><span class="cx"> right: 50%;
</span><span class="lines">@@ -101,12 +94,6 @@
</span><span class="cx"> margin-left: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.social-links li {
- float: left;
- margin: 8px 0 8px 10px;
- margin: 0.8rem 0 0.8rem 1.0rem;
-}
-
</del><span class="cx"> .search-box .search-field {
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="lines">@@ -635,7 +622,6 @@
</span><span class="cx"> padding-left: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- .social-links-wrapper,
</del><span class="cx"> .search-box-wrapper {
</span><span class="cx"> padding-right: 222px;
</span><span class="cx"> padding-right: 22.2rem;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/style.css (25213 => 25214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/style.css 2013-09-02 21:20:56 UTC (rev 25213)
+++ trunk/src/wp-content/themes/twentyfourteen/style.css 2013-09-02 21:24:41 UTC (rev 25214)
</span><span class="lines">@@ -431,7 +431,6 @@
</span><span class="cx"> .post-format-archive-link .meta-nav,
</span><span class="cx"> .attachment-featured-featured img,
</span><span class="cx"> .attachment-featured-thumbnail img,
</span><del>-.social-links-toggle,
</del><span class="cx"> .search-toggle,
</span><span class="cx"> button,
</span><span class="cx"> html input[type="button"],
</span><span class="lines">@@ -639,7 +638,6 @@
</span><span class="cx"> #nav-toggle:hover {
</span><span class="cx"> cursor: pointer;
</span><span class="cx"> }
</span><del>-.social-links-toggle,
</del><span class="cx"> .search-toggle {
</span><span class="cx"> background-color: #24890d;
</span><span class="cx"> -moz-box-sizing: border-box;
</span><span class="lines">@@ -659,27 +657,22 @@
</span><span class="cx"> text-align: center;
</span><span class="cx"> text-transform: uppercase;
</span><span class="cx"> }
</span><del>-.social-links-toggle:hover,
</del><span class="cx"> .search-toggle:hover,
</span><del>-.social-links-toggle.active,
</del><span class="cx"> .search-toggle.active {
</span><span class="cx"> background-color: #35921f;
</span><span class="cx"> }
</span><span class="cx"> .search-toggle {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>-.social-links-toggle:hover,
</del><span class="cx"> .search-toggle:hover {
</span><span class="cx"> cursor: pointer;
</span><span class="cx"> }
</span><del>-.social-links-toggle span,
-.search-toggle span {
</del><ins>+.genericon-search {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> padding: 25px 0 0 0;
</span><span class="cx"> padding: 2.5rem 0 0 0;
</span><span class="cx"> }
</span><del>-.social-links-toggle span:before,
-.search-toggle span:before {
</del><ins>+.genericon-search:before {
</ins><span class="cx"> color: #fff;
</span><span class="cx"> margin-left: -8px;
</span><span class="cx"> margin-left: -0.8rem;
</span><span class="lines">@@ -688,13 +681,6 @@
</span><span class="cx"> top: 0.9rem;
</span><span class="cx"> left: 50%;
</span><span class="cx"> }
</span><del>-.social-links-toggle span:before {
- content: '\F107';
-}
-.search-toggle span:before {
- content: '\F400';
-}
-.social-links-wrapper,
</del><span class="cx"> .search-box-wrapper {
</span><span class="cx"> -moz-box-sizing: border-box;
</span><span class="cx"> box-sizing: border-box;
</span><span class="lines">@@ -702,76 +688,6 @@
</span><span class="cx"> width: 100%;
</span><span class="cx"> z-index: 2;
</span><span class="cx"> }
</span><del>-.social-links {
- background-color: #35921f;
- list-style: none;
- margin: 0;
- padding-top: 8px;
- padding-top: 0.8rem;
-}
-.social-links li {
- display: block;
- float: right;
- margin: 0 10px 8px 0;
- margin: 0 1.0rem 0.8rem 0;
- width: 32px;
- width: 3.2rem;
- height: 32px;
- height: 3.2rem;
-}
-.social-links a {
- background-color: rgba(255,255,255,0.2);
- border-radius: 2px;
- color: #fff;
- display: inline-block;
- overflow: hidden;
- position: relative;
- text-align: center;
- text-decoration: none;
- width: 32px;
- width: 3.2rem;
- height: 32px;s
- height: 3.2rem;
-}
-.social-links li a:hover {
- background-color: rgba(0,0,0,0.2);
-}
-.social-links a:before {
- line-height: 2;
-}
-.email-link a:before {
- content: '\f410';
-}
-.facebook-link a:before {
- content: '\f203';
-}
-.twitter-link a:before {
- content: '\f202';
-}
-.google-link a:before {
- content: '\f206';
-}
-.pinterest-link a:before {
- content: '\f210';
-}
-.linkedin-link a:before {
- content: '\f208';
-}
-.flickr-link a:before {
- content: '\f211';
-}
-.github-link a:before {
- content: '\f200';
-}
-.dribbble-link a:before {
- content: '\f201';
-}
-.vimeo-link a:before {
- content: '\f212';
-}
-.youtube-link a:before {
- content: '\f213';
-}
</del><span class="cx"> .search-box {
</span><span class="cx"> background-color: #35921f;
</span><span class="cx"> }
</span><span class="lines">@@ -2495,12 +2411,6 @@
</span><span class="cx"> .search-toggle {
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><del>- .social-links-toggle {
- border-right: 1px solid rgba(255, 255, 255, 0.4);
- }
- .social-links-wrapper {
- margin: 0;
- }
</del><span class="cx"> .content-area {
</span><span class="cx"> float: left;
</span><span class="cx"> padding: 36px 0;
</span><span class="lines">@@ -2788,7 +2698,6 @@
</span><span class="cx"> padding-left: 27px;
</span><span class="cx"> padding-left: 2.7rem;
</span><span class="cx"> }
</span><del>- .social-links-wrapper,
</del><span class="cx"> .search-box-wrapper {
</span><span class="cx"> padding-left: 222px;
</span><span class="cx"> padding-left: 22.2rem;
</span></span></pre>
</div>
</div>
</body>
</html>