WordPress.org
Get WordPress

Make WordPress Core

Changeset 44149


Ignore:
Timestamp:
12/14/2018 02:32:33 AM (6 years ago)
Author:
pento
Message:

Default Themes: Import Twenty Nineteen from the 5.0 branch.

Merges [43808,43821,43842,43860,43892,43904,43909,43926-43929,43956,43961-43963] from the 5.0 branch to trunk.

Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, jorbin, netweb, b-07, khleomix, audrasjb, nielslange, mmaumio, richsalvucci, littlebigthing, dimadin, joyously, anevins, peterwilsoncc, dannycooper, iCaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, grapplerulrich, ocean90, joshfeck, frankew, AbdulWahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, nao, mayukojpn, enodekciw, ketuchetan, atanasangelovdev, poena, sharaz, artisticasad, mukesh27, burhandodhy, crunnells, aprakasa, themeroots, imonly_ik, tlxo, youthkee, brentswisher, smyoon315, mrahmadawais, desideveloper, Kau-Boy, mor10, mikeyarce, dingo_bastard, xkon, twoabove.

Fixes #45424.

Location:
trunk
Files:
7 deleted
60 edited
18 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/wp-content/themes/twentynineteen/404.php

    r43808 r44149  
    77 * @package WordPress
    88 * @subpackage Twenty_Nineteen
     9 * @since 1.0.0
    910 */
    1011
    … …  
    1213?>
    1314
    14     <div id="primary" class="content-area">
     15    <section id="primary" class="content-area">
    1516        <main id="main" class="site-main">
    1617
    17             <section class="error-404 not-found">
     18            <div class="error-404 not-found">
    1819                <header class="page-header">
    1920                    <h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'twentynineteen' ); ?></h1>
    … …  
    2223                <div class="page-content">
    2324                    <p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentynineteen' ); ?></p>
    24 
    2525                    <?php get_search_form(); ?>
    2626                </div><!-- .page-content -->
    27             </section><!-- .error-404 -->
     27            </div><!-- .error-404 -->
    2828
    2929        </main><!-- #main -->
    30     </div><!-- #primary -->
     30    </section><!-- #primary -->
    3131
    3232<?php

  • trunk/src/wp-content/themes/twentynineteen/archive.php

    r43808 r44149  
    77 * @package WordPress
    88 * @subpackage Twenty_Nineteen
     9 * @since 1.0.0
    910 */
    1011
    … …  
    1213?>
    1314
    14     <div id="primary" class="content-area">
     15    <section id="primary" class="content-area">
    1516        <main id="main" class="site-main">
    1617
    … …  
    2021                <?php
    2122                    the_archive_title( '<h1 class="page-title">', '</h1>' );
    22                     the_archive_description( '<div class="page-description">', '</div>' );
     23                    // Remove for now @TODO
     24                    // the_archive_description( '<div class="page-description">', '</div>' );
    2325                ?>
    2426            </header><!-- .page-header -->
    … …  
    3436                 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
    3537                 */
    36                 get_template_part( 'template-parts/content/content' );
     38                get_template_part( 'template-parts/content/content', 'excerpt' );
    3739
    3840                // End the loop.
    … …  
    4446            // If no content, include the "No posts found" template.
    4547        else :
    46             get_template_part( 'template-parts/content', 'none' );
     48            get_template_part( 'template-parts/content/content', 'none' );
    4749
    4850        endif;
    4951        ?>
    50 
    51         </main><!-- .site-main -->
    52     </div><!-- .content-area -->
     52        </main><!-- #main -->
     53    </section><!-- #primary -->
    5354
    5455<?php

  • trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php

    r43808 r44149  
    55 * @package WordPress
    66 * @subpackage Twenty_Nineteen
     7 * @since 1.0.0
    78 */
    89
    … …  
    3334        }
    3435        if ( array_key_exists( $icon, $arr ) ) {
    35             $repl = sprintf( '<svg id="%s-icon-%s" class="svg-icon" width="%d" height="%d" aria-hidden="true" role="img" ', $group, $icon, $size, $size );
     36            $repl = sprintf( '<svg class="svg-icon" width="%d" height="%d" aria-hidden="true" role="img" focusable="false" ', $size, $size );
    3637            $svg  = preg_replace( '/^<svg /', $repl, trim( $arr[ $icon ] ) ); // Add extra attributes to SVG code.
    3738            $svg  = preg_replace( "/([\n\t]+)/", ' ', $svg ); // Remove newlines & tabs.
    … …  
    7172     */
    7273    static $ui_icons = array(
    73         'link'          => /* material-design – link */ '
    74 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
    75     <path d="M0 0h24v24H0z" fill="none"/>
    76     <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"/>
    77 </svg>',
    78 
    79         'watch'         => /* material-design – watch-later */ '
    80 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     74        'link'                   => /* material-design – link */ '
     75<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     76    <path d="M0 0h24v24H0z" fill="none"></path>
     77    <path d="M3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM8 13h8v-2H8v2zm9-6h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1s-1.39 3.1-3.1 3.1h-4V17h4c2.76 0 5-2.24 5-5s-2.24-5-5-5z"></path>
     78</svg>',
     79
     80        'watch'                  => /* material-design – watch-later */ '
     81<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
    8182    <defs>
    82         <path id="a" d="M0 0h24v24H0V0z"/>
     83        <path id="a" d="M0 0h24v24H0V0z"></path>
    8384    </defs>
    8485    <clipPath id="b">
    85         <use xlink:href="#a" overflow="visible"/>
     86        <use xlink:href="#a" overflow="visible"></use>
    8687    </clipPath>
    87     <path clip-path="url(#b)" d="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10-4.5 10-10S17.5 2 12 2zm4.2 14.2L11 13V7h1.5v5.2l4.5 2.7-.8 1.3z"/>
    88 </svg>',
    89 
    90         'archive'       => /* material-design – folder */ '
     88    <path clip-path="url(#b)" d="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10-4.5 10-10S17.5 2 12 2zm4.2 14.2L11 13V7h1.5v5.2l4.5 2.7-.8 1.3z"></path>
     89</svg>',
     90
     91        'archive'                => /* material-design – folder */ '
     92<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     93    <path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"></path>
     94    <path d="M0 0h24v24H0z" fill="none"></path>
     95</svg>',
     96
     97        'tag'                    => /* material-design – local_offer */ '
     98<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     99    <path d="M21.41 11.58l-9-9C12.05 2.22 11.55 2 11 2H4c-1.1 0-2 .9-2 2v7c0 .55.22 1.05.59 1.42l9 9c.36.36.86.58 1.41.58.55 0 1.05-.22 1.41-.59l7-7c.37-.36.59-.86.59-1.41 0-.55-.23-1.06-.59-1.42zM5.5 7C4.67 7 4 6.33 4 5.5S4.67 4 5.5 4 7 4.67 7 5.5 6.33 7 5.5 7z"></path>
     100    <path d="M0 0h24v24H0z" fill="none"></path>
     101</svg>',
     102
     103        'comment'                => /* material-design – comment */ '
     104<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     105    <path d="M21.99 4c0-1.1-.89-2-1.99-2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14l4 4-.01-18z"></path>
     106    <path d="M0 0h24v24H0z" fill="none"></path>
     107</svg>',
     108
     109        'person'                 => /* material-design – person */ '
     110<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     111    <path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"></path>
     112    <path d="M0 0h24v24H0z" fill="none"></path>
     113</svg>',
     114
     115        'edit'                   => /* material-design – edit */ '
     116<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     117    <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"></path>
     118    <path d="M0 0h24v24H0z" fill="none"></path>
     119</svg>',
     120
     121        'chevron_left'           => /* material-design – chevron_left */ '
     122<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     123    <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"></path>
     124    <path d="M0 0h24v24H0z" fill="none"></path>
     125</svg>',
     126
     127        'chevron_right'          => /* material-design – chevron_right */ '
     128<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     129    <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"></path>
     130    <path d="M0 0h24v24H0z" fill="none"></path>
     131</svg>',
     132
     133        'check'                  => /* material-design – check */ '
     134<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     135    <path d="M0 0h24v24H0z" fill="none"></path>
     136    <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"></path>
     137</svg>',
     138
     139        'arrow_drop_down_circle' => /* material-design – arrow_drop_down_circle */ '
     140<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     141    <path d="M0 0h24v24H0z" fill="none"></path>
     142    <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 12l-4-4h8l-4 4z"></path>
     143</svg>',
     144
     145        'keyboard_arrow_down'    => /* material-design – keyboard_arrow_down */ '
     146<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     147    <path d="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"></path>
     148    <path fill="none" d="M0 0h24v24H0V0z"></path>
     149</svg>',
     150
     151        'keyboard_arrow_right'   => /* material-design – keyboard_arrow_right */ '
     152<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     153    <path d="M10 17l5-5-5-5v10z"></path>
     154    <path fill="none" d="M0 24V0h24v24H0z"></path>
     155</svg>',
     156
     157        'keyboard_arrow_left'   => /* material-design – keyboard_arrow_left */ '
    91158<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
    92     <path d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"/>
    93     <path d="M0 0h24v24H0z" fill="none"/>
    94 </svg>',
    95 
    96         'tag' => /* material-design – local_offer */ '
    97 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
    98     <path d="M21.41 11.58l-9-9C12.05 2.22 11.55 2 11 2H4c-1.1 0-2 .9-2 2v7c0 .55.22 1.05.59 1.42l9 9c.36.36.86.58 1.41.58.55 0 1.05-.22 1.41-.59l7-7c.37-.36.59-.86.59-1.41 0-.55-.23-1.06-.59-1.42zM5.5 7C4.67 7 4 6.33 4 5.5S4.67 4 5.5 4 7 4.67 7 5.5 6.33 7 5.5 7z"/>
    99     <path d="M0 0h24v24H0z" fill="none"/>
    100 </svg>',
    101 
    102         'comment' => /* material-design – comment */ '
    103 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    104     <path d="M21.99 4c0-1.1-.89-2-1.99-2H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14l4 4-.01-18z"/>
    105     <path d="M0 0h24v24H0z" fill="none"/>
    106 </svg>',
    107 
    108         'person'        => /* material-design – person */ '
    109 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    110     <path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/>
    111     <path d="M0 0h24v24H0z" fill="none"/>
    112 </svg>',
    113 
    114         'edit'          => /* material-design – edit */ '
    115 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    116     <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
    117     <path d="M0 0h24v24H0z" fill="none"/>
    118 </svg>',
    119 
    120         'chevron_left'  => /* material-design – chevron_left */ '
    121 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    122     <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
    123     <path d="M0 0h24v24H0z" fill="none"/>
    124 </svg>',
    125 
    126         'chevron_right' => /* material-design – chevron_right */ '
    127 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
    128     <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
    129     <path d="M0 0h24v24H0z" fill="none"/>
    130 </svg>',
    131 
    132         'check'         => /* material-design – check */ '
    133 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
    134     <path d="M0 0h24v24H0z" fill="none"/>
    135     <path d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
    136 </svg>',
    137 
    138         'arrow_drop_down_circle' => /* material-design – arrow_drop_down_circle */ '
    139 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
    140     <path d="M0 0h24v24H0z" fill="none"/>
    141     <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 12l-4-4h8l-4 4z"/>
    142 </svg>',
    143 
    144         'keyboard_arrow_down' => /* material-design – keyboard_arrow_down */ '
    145 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
    146     <path d="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"/>
    147     <path fill="none" d="M0 0h24v24H0V0z"/>
    148 </svg>',
    149 
    150         'keyboard_arrow_right' => /* material-design – keyboard_arrow_right */ '
    151 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
    152     <path d="M10 17l5-5-5-5v10z"/>
    153     <path fill="none" d="M0 24V0h24v24H0z"/>
     159    <path d="M14 7l-5 5 5 5V7z"></path>
     160    <path fill="none" d="M24 0v24H0V0h24z"></path>
     161</svg>',
     162
     163        'arrow_drop_down_ellipsis' => /* custom – arrow_drop_down_ellipsis */ '
     164<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg">
     165    <g fill="none" fill-rule="evenodd">
     166        <path d="M0 0h24v24H0z"/>
     167        <path fill="currentColor" fill-rule="nonzero" d="M12 2c5.52 0 10 4.48 10 10s-4.48 10-10 10S2 17.52 2 12 6.48 2 12 2zM6 14a2 2 0 1 0 0-4 2 2 0 0 0 0 4zm6 0a2 2 0 1 0 0-4 2 2 0 0 0 0 4zm6 0a2 2 0 1 0 0-4 2 2 0 0 0 0 4z"/>
     168    </g>
    154169</svg>',
    155170
    … …  
    191206            'fb.me',
    192207        ),
     208        'feed'    => array(
     209            'feed',
     210        ),
    193211        'google-plus' => array(
    194212            'plus.google.com',
     213        ),
     214        'lastfm'   => array(
     215            'last.fm',
     216        ),
     217        'mail'   => array(
     218            'mailto:',
    195219        ),
    196220        'slideshare'  => array(
    … …  
    217241        '500px'       => '
    218242<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    219     <path d="M6.94026,15.1412c.00437.01213.108.29862.168.44064a6.55008,6.55008,0,1,0,6.03191-9.09557,6.68654,6.68654,0,0,0-2.58357.51467A8.53914,8.53914,0,0,0,8.21268,8.61344L8.209,8.61725V3.22948l9.0504-.00008c.32934-.0036.32934-.46353.32934-.61466s0-.61091-.33035-.61467L7.47248,2a.43.43,0,0,0-.43131.42692v7.58355c0,.24466.30476.42131.58793.4819.553.11812.68074-.05864.81617-.2457l.018-.02481A10.52673,10.52673,0,0,1,9.32258,9.258a5.35268,5.35268,0,1,1,7.58985,7.54976,5.417,5.417,0,0,1-3.80867,1.56365,5.17483,5.17483,0,0,1-2.69822-.74478l.00342-4.61111a2.79372,2.79372,0,0,1,.71372-1.78792,2.61611,2.61611,0,0,1,1.98282-.89477,2.75683,2.75683,0,0,1,1.95525.79477,2.66867,2.66867,0,0,1,.79656,1.909,2.724,2.724,0,0,1-2.75849,2.748,4.94651,4.94651,0,0,1-.86254-.13719c-.31234-.093-.44519.34058-.48892.48349-.16811.54966.08453.65862.13687.67489a3.75751,3.75751,0,0,0,1.25234.18375,3.94634,3.94634,0,1,0-2.82444-6.742,3.67478,3.67478,0,0,0-1.13028,2.584l-.00041.02323c-.0035.11667-.00579,2.881-.00644,3.78811l-.00407-.00451a6.18521,6.18521,0,0,1-1.0851-1.86092c-.10544-.27856-.34358-.22925-.66857-.12917-.14192.04372-.57386.17677-.47833.489Zm4.65165-1.08338a.51346.51346,0,0,0,.19513.31818l.02276.022a.52945.52945,0,0,0,.3517.18416.24242.24242,0,0,0,.16577-.0611c.05473-.05082.67382-.67812.73287-.738l.69041.68819a.28978.28978,0,0,0,.21437.11032.53239.53239,0,0,0,.35708-.19486c.29792-.30419.14885-.46821.07676-.54751l-.69954-.69975.72952-.73469c.16-.17311.01874-.35708-.12218-.498-.20461-.20461-.402-.25742-.52855-.14083l-.7254.72665-.73354-.73375a.20128.20128,0,0,0-.14179-.05695.54135.54135,0,0,0-.34379.19648c-.22561.22555-.274.38149-.15656.5059l.73374.7315-.72942.73072A.26589.26589,0,0,0,11.59191,14.05782Zm1.59866-9.915A8.86081,8.86081,0,0,0,9.854,4.776a.26169.26169,0,0,0-.16938.22759.92978.92978,0,0,0,.08619.42094c.05682.14524.20779.531.50006.41955a8.40969,8.40969,0,0,1,2.91968-.55484,7.87875,7.87875,0,0,1,3.086.62286,8.61817,8.61817,0,0,1,2.30562,1.49315.2781.2781,0,0,0,.18318.07586c.15529,0,.30425-.15253.43167-.29551.21268-.23861.35873-.4369.1492-.63538a8.50425,8.50425,0,0,0-2.62312-1.694A9.0177,9.0177,0,0,0,13.19058,4.14283ZM19.50945,18.6236h0a.93171.93171,0,0,0-.36642-.25406.26589.26589,0,0,0-.27613.06613l-.06943.06929A7.90606,7.90606,0,0,1,7.60639,18.505a7.57284,7.57284,0,0,1-1.696-2.51537,8.58715,8.58715,0,0,1-.5147-1.77754l-.00871-.04864c-.04939-.25873-.28755-.27684-.62981-.22448-.14234.02178-.5755.088-.53426.39969l.001.00712a9.08807,9.08807,0,0,0,15.406,4.99094c.00193-.00192.04753-.04718.0725-.07436C19.79425,19.16234,19.87422,18.98728,19.50945,18.6236Z"/>
     243    <path d="M6.94026,15.1412c.00437.01213.108.29862.168.44064a6.55008,6.55008,0,1,0,6.03191-9.09557,6.68654,6.68654,0,0,0-2.58357.51467A8.53914,8.53914,0,0,0,8.21268,8.61344L8.209,8.61725V3.22948l9.0504-.00008c.32934-.0036.32934-.46353.32934-.61466s0-.61091-.33035-.61467L7.47248,2a.43.43,0,0,0-.43131.42692v7.58355c0,.24466.30476.42131.58793.4819.553.11812.68074-.05864.81617-.2457l.018-.02481A10.52673,10.52673,0,0,1,9.32258,9.258a5.35268,5.35268,0,1,1,7.58985,7.54976,5.417,5.417,0,0,1-3.80867,1.56365,5.17483,5.17483,0,0,1-2.69822-.74478l.00342-4.61111a2.79372,2.79372,0,0,1,.71372-1.78792,2.61611,2.61611,0,0,1,1.98282-.89477,2.75683,2.75683,0,0,1,1.95525.79477,2.66867,2.66867,0,0,1,.79656,1.909,2.724,2.724,0,0,1-2.75849,2.748,4.94651,4.94651,0,0,1-.86254-.13719c-.31234-.093-.44519.34058-.48892.48349-.16811.54966.08453.65862.13687.67489a3.75751,3.75751,0,0,0,1.25234.18375,3.94634,3.94634,0,1,0-2.82444-6.742,3.67478,3.67478,0,0,0-1.13028,2.584l-.00041.02323c-.0035.11667-.00579,2.881-.00644,3.78811l-.00407-.00451a6.18521,6.18521,0,0,1-1.0851-1.86092c-.10544-.27856-.34358-.22925-.66857-.12917-.14192.04372-.57386.17677-.47833.489Zm4.65165-1.08338a.51346.51346,0,0,0,.19513.31818l.02276.022a.52945.52945,0,0,0,.3517.18416.24242.24242,0,0,0,.16577-.0611c.05473-.05082.67382-.67812.73287-.738l.69041.68819a.28978.28978,0,0,0,.21437.11032.53239.53239,0,0,0,.35708-.19486c.29792-.30419.14885-.46821.07676-.54751l-.69954-.69975.72952-.73469c.16-.17311.01874-.35708-.12218-.498-.20461-.20461-.402-.25742-.52855-.14083l-.7254.72665-.73354-.73375a.20128.20128,0,0,0-.14179-.05695.54135.54135,0,0,0-.34379.19648c-.22561.22555-.274.38149-.15656.5059l.73374.7315-.72942.73072A.26589.26589,0,0,0,11.59191,14.05782Zm1.59866-9.915A8.86081,8.86081,0,0,0,9.854,4.776a.26169.26169,0,0,0-.16938.22759.92978.92978,0,0,0,.08619.42094c.05682.14524.20779.531.50006.41955a8.40969,8.40969,0,0,1,2.91968-.55484,7.87875,7.87875,0,0,1,3.086.62286,8.61817,8.61817,0,0,1,2.30562,1.49315.2781.2781,0,0,0,.18318.07586c.15529,0,.30425-.15253.43167-.29551.21268-.23861.35873-.4369.1492-.63538a8.50425,8.50425,0,0,0-2.62312-1.694A9.0177,9.0177,0,0,0,13.19058,4.14283ZM19.50945,18.6236h0a.93171.93171,0,0,0-.36642-.25406.26589.26589,0,0,0-.27613.06613l-.06943.06929A7.90606,7.90606,0,0,1,7.60639,18.505a7.57284,7.57284,0,0,1-1.696-2.51537,8.58715,8.58715,0,0,1-.5147-1.77754l-.00871-.04864c-.04939-.25873-.28755-.27684-.62981-.22448-.14234.02178-.5755.088-.53426.39969l.001.00712a9.08807,9.08807,0,0,0,15.406,4.99094c.00193-.00192.04753-.04718.0725-.07436C19.79425,19.16234,19.87422,18.98728,19.50945,18.6236Z"></path>
    220244</svg>',
    221245
    222246        'amazon'      => '
    223247<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    224     <path d="M13.582,8.182C11.934,8.367,9.78,8.49,8.238,9.166c-1.781,0.769-3.03,2.337-3.03,4.644 c0,2.953,1.86,4.429,4.253,4.429c2.02,0,3.125-0.477,4.685-2.065c0.516,0.747,0.685,1.109,1.629,1.894 c0.212,0.114,0.483,0.103,0.672-0.066l0.006,0.006c0.567-0.505,1.599-1.401,2.18-1.888c0.231-0.188,0.19-0.496,0.009-0.754 c-0.52-0.718-1.072-1.303-1.072-2.634V8.305c0-1.876,0.133-3.599-1.249-4.891C15.23,2.369,13.422,2,12.04,2 C9.336,2,6.318,3.01,5.686,6.351C5.618,6.706,5.877,6.893,6.109,6.945l2.754,0.298C9.121,7.23,9.308,6.977,9.357,6.72 c0.236-1.151,1.2-1.706,2.284-1.706c0.584,0,1.249,0.215,1.595,0.738c0.398,0.584,0.346,1.384,0.346,2.061V8.182z M13.049,14.088 c-0.451,0.8-1.169,1.291-1.967,1.291c-1.09,0-1.728-0.83-1.728-2.061c0-2.42,2.171-2.86,4.227-2.86v0.615 C13.582,12.181,13.608,13.104,13.049,14.088z M20.683,19.339C18.329,21.076,14.917,22,11.979,22c-4.118,0-7.826-1.522-10.632-4.057 c-0.22-0.199-0.024-0.471,0.241-0.317c3.027,1.762,6.771,2.823,10.639,2.823c2.608,0,5.476-0.541,8.115-1.66 C20.739,18.62,21.072,19.051,20.683,19.339z M21.336,21.043c-0.194,0.163-0.379,0.076-0.293-0.139 c0.284-0.71,0.92-2.298,0.619-2.684c-0.301-0.386-1.99-0.183-2.749-0.092c-0.23,0.027-0.266-0.173-0.059-0.319 c1.348-0.946,3.555-0.673,3.811-0.356C22.925,17.773,22.599,19.986,21.336,21.043z"/>
     248    <path d="M13.582,8.182C11.934,8.367,9.78,8.49,8.238,9.166c-1.781,0.769-3.03,2.337-3.03,4.644 c0,2.953,1.86,4.429,4.253,4.429c2.02,0,3.125-0.477,4.685-2.065c0.516,0.747,0.685,1.109,1.629,1.894 c0.212,0.114,0.483,0.103,0.672-0.066l0.006,0.006c0.567-0.505,1.599-1.401,2.18-1.888c0.231-0.188,0.19-0.496,0.009-0.754 c-0.52-0.718-1.072-1.303-1.072-2.634V8.305c0-1.876,0.133-3.599-1.249-4.891C15.23,2.369,13.422,2,12.04,2 C9.336,2,6.318,3.01,5.686,6.351C5.618,6.706,5.877,6.893,6.109,6.945l2.754,0.298C9.121,7.23,9.308,6.977,9.357,6.72 c0.236-1.151,1.2-1.706,2.284-1.706c0.584,0,1.249,0.215,1.595,0.738c0.398,0.584,0.346,1.384,0.346,2.061V8.182z M13.049,14.088 c-0.451,0.8-1.169,1.291-1.967,1.291c-1.09,0-1.728-0.83-1.728-2.061c0-2.42,2.171-2.86,4.227-2.86v0.615 C13.582,12.181,13.608,13.104,13.049,14.088z M20.683,19.339C18.329,21.076,14.917,22,11.979,22c-4.118,0-7.826-1.522-10.632-4.057 c-0.22-0.199-0.024-0.471,0.241-0.317c3.027,1.762,6.771,2.823,10.639,2.823c2.608,0,5.476-0.541,8.115-1.66 C20.739,18.62,21.072,19.051,20.683,19.339z M21.336,21.043c-0.194,0.163-0.379,0.076-0.293-0.139 c0.284-0.71,0.92-2.298,0.619-2.684c-0.301-0.386-1.99-0.183-2.749-0.092c-0.23,0.027-0.266-0.173-0.059-0.319 c1.348-0.946,3.555-0.673,3.811-0.356C22.925,17.773,22.599,19.986,21.336,21.043z"></path>
    225249</svg>',
    226250
    227251        'apple'       => '
    228252<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    229     <path d="M20.07,17.586a10.874,10.874,0,0,1-1.075,1.933,9.822,9.822,0,0,1-1.385,1.674,2.687,2.687,0,0,1-1.78.784,4.462,4.462,0,0,1-1.644-.393,4.718,4.718,0,0,0-1.77-.391,4.878,4.878,0,0,0-1.82.391A4.9,4.9,0,0,1,9.021,22a2.53,2.53,0,0,1-1.82-.8A10.314,10.314,0,0,1,5.752,19.46,11.987,11.987,0,0,1,4.22,16.417a11.143,11.143,0,0,1-.643-3.627,6.623,6.623,0,0,1,.87-3.465A5.1,5.1,0,0,1,6.268,7.483a4.9,4.9,0,0,1,2.463-.695,5.8,5.8,0,0,1,1.9.443,6.123,6.123,0,0,0,1.511.444,9.04,9.04,0,0,0,1.675-.523,5.537,5.537,0,0,1,2.277-.4,4.835,4.835,0,0,1,3.788,1.994,4.213,4.213,0,0,0-2.235,3.827,4.222,4.222,0,0,0,1.386,3.181,4.556,4.556,0,0,0,1.385.909q-.167.483-.353.927ZM16.211,2.4a4.267,4.267,0,0,1-1.094,2.8,3.726,3.726,0,0,1-3.1,1.528A3.114,3.114,0,0,1,12,6.347a4.384,4.384,0,0,1,1.16-2.828,4.467,4.467,0,0,1,1.414-1.061A4.215,4.215,0,0,1,16.19,2a3.633,3.633,0,0,1,.021.4Z"/>
     253    <path d="M20.07,17.586a10.874,10.874,0,0,1-1.075,1.933,9.822,9.822,0,0,1-1.385,1.674,2.687,2.687,0,0,1-1.78.784,4.462,4.462,0,0,1-1.644-.393,4.718,4.718,0,0,0-1.77-.391,4.878,4.878,0,0,0-1.82.391A4.9,4.9,0,0,1,9.021,22a2.53,2.53,0,0,1-1.82-.8A10.314,10.314,0,0,1,5.752,19.46,11.987,11.987,0,0,1,4.22,16.417a11.143,11.143,0,0,1-.643-3.627,6.623,6.623,0,0,1,.87-3.465A5.1,5.1,0,0,1,6.268,7.483a4.9,4.9,0,0,1,2.463-.695,5.8,5.8,0,0,1,1.9.443,6.123,6.123,0,0,0,1.511.444,9.04,9.04,0,0,0,1.675-.523,5.537,5.537,0,0,1,2.277-.4,4.835,4.835,0,0,1,3.788,1.994,4.213,4.213,0,0,0-2.235,3.827,4.222,4.222,0,0,0,1.386,3.181,4.556,4.556,0,0,0,1.385.909q-.167.483-.353.927ZM16.211,2.4a4.267,4.267,0,0,1-1.094,2.8,3.726,3.726,0,0,1-3.1,1.528A3.114,3.114,0,0,1,12,6.347a4.384,4.384,0,0,1,1.16-2.828,4.467,4.467,0,0,1,1.414-1.061A4.215,4.215,0,0,1,16.19,2a3.633,3.633,0,0,1,.021.4Z"></path>
    230254</svg>',
    231255
    232256        'bandcamp'    => '
    233257<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    234     <path d="M15.27 17.289 3 17.289 8.73 6.711 21 6.711 15.27 17.289"/>
     258    <path d="M15.27 17.289 3 17.289 8.73 6.711 21 6.711 15.27 17.289"></path>
    235259</svg>',
    236260
    237261        'behance'     => '
    238262<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    239     <path d="M7.799,5.698c0.589,0,1.12,0.051,1.606,0.156c0.482,0.102,0.894,0.273,1.241,0.507c0.344,0.235,0.612,0.546,0.804,0.938 c0.188,0.387,0.281,0.871,0.281,1.443c0,0.619-0.141,1.137-0.421,1.551c-0.284,0.413-0.7,0.751-1.255,1.014 c0.756,0.218,1.317,0.601,1.689,1.146c0.374,0.549,0.557,1.205,0.557,1.975c0,0.623-0.12,1.161-0.359,1.612 c-0.241,0.457-0.569,0.828-0.973,1.114c-0.408,0.288-0.876,0.5-1.399,0.637C9.052,17.931,8.514,18,7.963,18H2V5.698H7.799 M7.449,10.668c0.481,0,0.878-0.114,1.192-0.345c0.311-0.228,0.463-0.603,0.463-1.119c0-0.286-0.051-0.523-0.152-0.707 C8.848,8.315,8.711,8.171,8.536,8.07C8.362,7.966,8.166,7.894,7.94,7.854c-0.224-0.044-0.457-0.06-0.697-0.06H4.709v2.874H7.449z M7.6,15.905c0.267,0,0.521-0.024,0.759-0.077c0.243-0.053,0.457-0.137,0.637-0.261c0.182-0.12,0.332-0.283,0.441-0.491 C9.547,14.87,9.6,14.602,9.6,14.278c0-0.633-0.18-1.084-0.533-1.357c-0.356-0.27-0.83-0.404-1.413-0.404H4.709v3.388L7.6,15.905z M16.162,15.864c0.367,0.358,0.897,0.538,1.583,0.538c0.493,0,0.92-0.125,1.277-0.374c0.354-0.248,0.571-0.514,0.654-0.79h2.155 c-0.347,1.072-0.872,1.838-1.589,2.299C19.534,18,18.67,18.23,17.662,18.23c-0.701,0-1.332-0.113-1.899-0.337 c-0.567-0.227-1.041-0.544-1.439-0.958c-0.389-0.415-0.689-0.907-0.904-1.484c-0.213-0.574-0.32-1.21-0.32-1.899 c0-0.666,0.11-1.288,0.329-1.863c0.222-0.577,0.529-1.075,0.933-1.492c0.406-0.42,0.885-0.751,1.444-0.994 c0.558-0.241,1.175-0.363,1.857-0.363c0.754,0,1.414,0.145,1.98,0.44c0.563,0.291,1.026,0.686,1.389,1.181 c0.363,0.493,0.622,1.057,0.783,1.69c0.16,0.632,0.217,1.292,0.171,1.983h-6.428C15.557,14.84,15.795,15.506,16.162,15.864 M18.973,11.184c-0.291-0.321-0.783-0.496-1.384-0.496c-0.39,0-0.714,0.066-0.973,0.2c-0.254,0.132-0.461,0.297-0.621,0.491 c-0.157,0.197-0.265,0.405-0.328,0.628c-0.063,0.217-0.101,0.413-0.111,0.587h3.98C19.478,11.969,19.265,11.509,18.973,11.184z M15.057,7.738h4.985V6.524h-4.985L15.057,7.738z"/>
     263    <path d="M7.799,5.698c0.589,0,1.12,0.051,1.606,0.156c0.482,0.102,0.894,0.273,1.241,0.507c0.344,0.235,0.612,0.546,0.804,0.938 c0.188,0.387,0.281,0.871,0.281,1.443c0,0.619-0.141,1.137-0.421,1.551c-0.284,0.413-0.7,0.751-1.255,1.014 c0.756,0.218,1.317,0.601,1.689,1.146c0.374,0.549,0.557,1.205,0.557,1.975c0,0.623-0.12,1.161-0.359,1.612 c-0.241,0.457-0.569,0.828-0.973,1.114c-0.408,0.288-0.876,0.5-1.399,0.637C9.052,17.931,8.514,18,7.963,18H2V5.698H7.799 M7.449,10.668c0.481,0,0.878-0.114,1.192-0.345c0.311-0.228,0.463-0.603,0.463-1.119c0-0.286-0.051-0.523-0.152-0.707 C8.848,8.315,8.711,8.171,8.536,8.07C8.362,7.966,8.166,7.894,7.94,7.854c-0.224-0.044-0.457-0.06-0.697-0.06H4.709v2.874H7.449z M7.6,15.905c0.267,0,0.521-0.024,0.759-0.077c0.243-0.053,0.457-0.137,0.637-0.261c0.182-0.12,0.332-0.283,0.441-0.491 C9.547,14.87,9.6,14.602,9.6,14.278c0-0.633-0.18-1.084-0.533-1.357c-0.356-0.27-0.83-0.404-1.413-0.404H4.709v3.388L7.6,15.905z M16.162,15.864c0.367,0.358,0.897,0.538,1.583,0.538c0.493,0,0.92-0.125,1.277-0.374c0.354-0.248,0.571-0.514,0.654-0.79h2.155 c-0.347,1.072-0.872,1.838-1.589,2.299C19.534,18,18.67,18.23,17.662,18.23c-0.701,0-1.332-0.113-1.899-0.337 c-0.567-0.227-1.041-0.544-1.439-0.958c-0.389-0.415-0.689-0.907-0.904-1.484c-0.213-0.574-0.32-1.21-0.32-1.899 c0-0.666,0.11-1.288,0.329-1.863c0.222-0.577,0.529-1.075,0.933-1.492c0.406-0.42,0.885-0.751,1.444-0.994 c0.558-0.241,1.175-0.363,1.857-0.363c0.754,0,1.414,0.145,1.98,0.44c0.563,0.291,1.026,0.686,1.389,1.181 c0.363,0.493,0.622,1.057,0.783,1.69c0.16,0.632,0.217,1.292,0.171,1.983h-6.428C15.557,14.84,15.795,15.506,16.162,15.864 M18.973,11.184c-0.291-0.321-0.783-0.496-1.384-0.496c-0.39,0-0.714,0.066-0.973,0.2c-0.254,0.132-0.461,0.297-0.621,0.491 c-0.157,0.197-0.265,0.405-0.328,0.628c-0.063,0.217-0.101,0.413-0.111,0.587h3.98C19.478,11.969,19.265,11.509,18.973,11.184z M15.057,7.738h4.985V6.524h-4.985L15.057,7.738z"></path>
    240264</svg>',
    241265
    242266        'chain'       => '
    243267<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    244     <path d="M19.647,16.706a1.134,1.134,0,0,0-.343-.833l-2.549-2.549a1.134,1.134,0,0,0-.833-.343,1.168,1.168,0,0,0-.883.392l.233.226q.2.189.264.264a2.922,2.922,0,0,1,.184.233.986.986,0,0,1,.159.312,1.242,1.242,0,0,1,.043.337,1.172,1.172,0,0,1-1.176,1.176,1.237,1.237,0,0,1-.337-.043,1,1,0,0,1-.312-.159,2.76,2.76,0,0,1-.233-.184q-.073-.068-.264-.264l-.226-.233a1.19,1.19,0,0,0-.4.895,1.134,1.134,0,0,0,.343.833L15.837,19.3a1.13,1.13,0,0,0,.833.331,1.18,1.18,0,0,0,.833-.318l1.8-1.789a1.12,1.12,0,0,0,.343-.821Zm-8.615-8.64a1.134,1.134,0,0,0-.343-.833L8.163,4.7a1.134,1.134,0,0,0-.833-.343,1.184,1.184,0,0,0-.833.331L4.7,6.473a1.12,1.12,0,0,0-.343.821,1.134,1.134,0,0,0,.343.833l2.549,2.549a1.13,1.13,0,0,0,.833.331,1.184,1.184,0,0,0,.883-.38L8.728,10.4q-.2-.189-.264-.264A2.922,2.922,0,0,1,8.28,9.9a.986.986,0,0,1-.159-.312,1.242,1.242,0,0,1-.043-.337A1.172,1.172,0,0,1,9.254,8.079a1.237,1.237,0,0,1,.337.043,1,1,0,0,1,.312.159,2.761,2.761,0,0,1,.233.184q.073.068.264.264l.226.233a1.19,1.19,0,0,0,.4-.895ZM22,16.706a3.343,3.343,0,0,1-1.042,2.488l-1.8,1.789a3.536,3.536,0,0,1-4.988-.025l-2.525-2.537a3.384,3.384,0,0,1-1.017-2.488,3.448,3.448,0,0,1,1.078-2.561l-1.078-1.078a3.434,3.434,0,0,1-2.549,1.078,3.4,3.4,0,0,1-2.5-1.029L3.029,9.794A3.4,3.4,0,0,1,2,7.294,3.343,3.343,0,0,1,3.042,4.806l1.8-1.789A3.384,3.384,0,0,1,7.331,2a3.357,3.357,0,0,1,2.5,1.042l2.525,2.537a3.384,3.384,0,0,1,1.017,2.488,3.448,3.448,0,0,1-1.078,2.561l1.078,1.078a3.551,3.551,0,0,1,5.049-.049l2.549,2.549A3.4,3.4,0,0,1,22,16.706Z"/>
     268    <path d="M19.647,16.706a1.134,1.134,0,0,0-.343-.833l-2.549-2.549a1.134,1.134,0,0,0-.833-.343,1.168,1.168,0,0,0-.883.392l.233.226q.2.189.264.264a2.922,2.922,0,0,1,.184.233.986.986,0,0,1,.159.312,1.242,1.242,0,0,1,.043.337,1.172,1.172,0,0,1-1.176,1.176,1.237,1.237,0,0,1-.337-.043,1,1,0,0,1-.312-.159,2.76,2.76,0,0,1-.233-.184q-.073-.068-.264-.264l-.226-.233a1.19,1.19,0,0,0-.4.895,1.134,1.134,0,0,0,.343.833L15.837,19.3a1.13,1.13,0,0,0,.833.331,1.18,1.18,0,0,0,.833-.318l1.8-1.789a1.12,1.12,0,0,0,.343-.821Zm-8.615-8.64a1.134,1.134,0,0,0-.343-.833L8.163,4.7a1.134,1.134,0,0,0-.833-.343,1.184,1.184,0,0,0-.833.331L4.7,6.473a1.12,1.12,0,0,0-.343.821,1.134,1.134,0,0,0,.343.833l2.549,2.549a1.13,1.13,0,0,0,.833.331,1.184,1.184,0,0,0,.883-.38L8.728,10.4q-.2-.189-.264-.264A2.922,2.922,0,0,1,8.28,9.9a.986.986,0,0,1-.159-.312,1.242,1.242,0,0,1-.043-.337A1.172,1.172,0,0,1,9.254,8.079a1.237,1.237,0,0,1,.337.043,1,1,0,0,1,.312.159,2.761,2.761,0,0,1,.233.184q.073.068.264.264l.226.233a1.19,1.19,0,0,0,.4-.895ZM22,16.706a3.343,3.343,0,0,1-1.042,2.488l-1.8,1.789a3.536,3.536,0,0,1-4.988-.025l-2.525-2.537a3.384,3.384,0,0,1-1.017-2.488,3.448,3.448,0,0,1,1.078-2.561l-1.078-1.078a3.434,3.434,0,0,1-2.549,1.078,3.4,3.4,0,0,1-2.5-1.029L3.029,9.794A3.4,3.4,0,0,1,2,7.294,3.343,3.343,0,0,1,3.042,4.806l1.8-1.789A3.384,3.384,0,0,1,7.331,2a3.357,3.357,0,0,1,2.5,1.042l2.525,2.537a3.384,3.384,0,0,1,1.017,2.488,3.448,3.448,0,0,1-1.078,2.561l1.078,1.078a3.551,3.551,0,0,1,5.049-.049l2.549,2.549A3.4,3.4,0,0,1,22,16.706Z"></path>
    245269</svg>',
    246270
    247271        'codepen'     => '
    248272<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    249     <path d="M22.016,8.84c-0.002-0.013-0.005-0.025-0.007-0.037c-0.005-0.025-0.008-0.048-0.015-0.072 c-0.003-0.015-0.01-0.028-0.013-0.042c-0.008-0.02-0.015-0.04-0.023-0.062c-0.007-0.015-0.013-0.028-0.02-0.042 c-0.008-0.02-0.018-0.037-0.03-0.057c-0.007-0.013-0.017-0.027-0.025-0.038c-0.012-0.018-0.023-0.035-0.035-0.052 c-0.01-0.013-0.02-0.025-0.03-0.037c-0.015-0.017-0.028-0.032-0.043-0.045c-0.01-0.012-0.022-0.023-0.035-0.035 c-0.015-0.015-0.032-0.028-0.048-0.04c-0.012-0.01-0.025-0.02-0.037-0.03c-0.005-0.003-0.01-0.008-0.015-0.012l-9.161-6.096 c-0.289-0.192-0.666-0.192-0.955,0L2.359,8.237C2.354,8.24,2.349,8.245,2.344,8.249L2.306,8.277 c-0.017,0.013-0.033,0.027-0.048,0.04C2.246,8.331,2.234,8.342,2.222,8.352c-0.015,0.015-0.028,0.03-0.042,0.047 c-0.012,0.013-0.022,0.023-0.03,0.037C2.139,8.453,2.125,8.471,2.115,8.488C2.107,8.501,2.099,8.514,2.09,8.526 C2.079,8.548,2.069,8.565,2.06,8.585C2.054,8.6,2.047,8.613,2.04,8.626C2.032,8.648,2.025,8.67,2.019,8.69 c-0.005,0.013-0.01,0.027-0.013,0.042C1.999,8.755,1.995,8.778,1.99,8.803C1.989,8.817,1.985,8.828,1.984,8.84 C1.978,8.879,1.975,8.915,1.975,8.954v6.093c0,0.037,0.003,0.075,0.008,0.112c0.002,0.012,0.005,0.025,0.007,0.038 c0.005,0.023,0.008,0.047,0.015,0.072c0.003,0.015,0.008,0.028,0.013,0.04c0.007,0.022,0.013,0.042,0.022,0.063 c0.007,0.015,0.013,0.028,0.02,0.04c0.008,0.02,0.018,0.038,0.03,0.058c0.007,0.013,0.015,0.027,0.025,0.038 c0.012,0.018,0.023,0.035,0.035,0.052c0.01,0.013,0.02,0.025,0.03,0.037c0.013,0.015,0.028,0.032,0.042,0.045 c0.012,0.012,0.023,0.023,0.035,0.035c0.015,0.013,0.032,0.028,0.048,0.04l0.038,0.03c0.005,0.003,0.01,0.007,0.013,0.01 l9.163,6.095C11.668,21.953,11.833,22,12,22c0.167,0,0.332-0.047,0.478-0.144l9.163-6.095l0.015-0.01 c0.013-0.01,0.027-0.02,0.037-0.03c0.018-0.013,0.035-0.028,0.048-0.04c0.013-0.012,0.025-0.023,0.035-0.035 c0.017-0.015,0.03-0.032,0.043-0.045c0.01-0.013,0.02-0.025,0.03-0.037c0.013-0.018,0.025-0.035,0.035-0.052 c0.008-0.013,0.018-0.027,0.025-0.038c0.012-0.02,0.022-0.038,0.03-0.058c0.007-0.013,0.013-0.027,0.02-0.04 c0.008-0.022,0.015-0.042,0.023-0.063c0.003-0.013,0.01-0.027,0.013-0.04c0.007-0.025,0.01-0.048,0.015-0.072 c0.002-0.013,0.005-0.027,0.007-0.037c0.003-0.042,0.007-0.079,0.007-0.117V8.954C22.025,8.915,22.022,8.879,22.016,8.84z M12.862,4.464l6.751,4.49l-3.016,2.013l-3.735-2.492V4.464z M11.138,4.464v4.009l-3.735,2.494L4.389,8.954L11.138,4.464z M3.699,10.562L5.853,12l-2.155,1.438V10.562z M11.138,19.536l-6.749-4.491l3.015-2.011l3.735,2.492V19.536z M12,14.035L8.953,12 L12,9.966L15.047,12L12,14.035z M12.862,19.536v-4.009l3.735-2.492l3.016,2.011L12.862,19.536z M20.303,13.438L18.147,12 l2.156-1.438L20.303,13.438z"/>
     273    <path d="M22.016,8.84c-0.002-0.013-0.005-0.025-0.007-0.037c-0.005-0.025-0.008-0.048-0.015-0.072 c-0.003-0.015-0.01-0.028-0.013-0.042c-0.008-0.02-0.015-0.04-0.023-0.062c-0.007-0.015-0.013-0.028-0.02-0.042 c-0.008-0.02-0.018-0.037-0.03-0.057c-0.007-0.013-0.017-0.027-0.025-0.038c-0.012-0.018-0.023-0.035-0.035-0.052 c-0.01-0.013-0.02-0.025-0.03-0.037c-0.015-0.017-0.028-0.032-0.043-0.045c-0.01-0.012-0.022-0.023-0.035-0.035 c-0.015-0.015-0.032-0.028-0.048-0.04c-0.012-0.01-0.025-0.02-0.037-0.03c-0.005-0.003-0.01-0.008-0.015-0.012l-9.161-6.096 c-0.289-0.192-0.666-0.192-0.955,0L2.359,8.237C2.354,8.24,2.349,8.245,2.344,8.249L2.306,8.277 c-0.017,0.013-0.033,0.027-0.048,0.04C2.246,8.331,2.234,8.342,2.222,8.352c-0.015,0.015-0.028,0.03-0.042,0.047 c-0.012,0.013-0.022,0.023-0.03,0.037C2.139,8.453,2.125,8.471,2.115,8.488C2.107,8.501,2.099,8.514,2.09,8.526 C2.079,8.548,2.069,8.565,2.06,8.585C2.054,8.6,2.047,8.613,2.04,8.626C2.032,8.648,2.025,8.67,2.019,8.69 c-0.005,0.013-0.01,0.027-0.013,0.042C1.999,8.755,1.995,8.778,1.99,8.803C1.989,8.817,1.985,8.828,1.984,8.84 C1.978,8.879,1.975,8.915,1.975,8.954v6.093c0,0.037,0.003,0.075,0.008,0.112c0.002,0.012,0.005,0.025,0.007,0.038 c0.005,0.023,0.008,0.047,0.015,0.072c0.003,0.015,0.008,0.028,0.013,0.04c0.007,0.022,0.013,0.042,0.022,0.063 c0.007,0.015,0.013,0.028,0.02,0.04c0.008,0.02,0.018,0.038,0.03,0.058c0.007,0.013,0.015,0.027,0.025,0.038 c0.012,0.018,0.023,0.035,0.035,0.052c0.01,0.013,0.02,0.025,0.03,0.037c0.013,0.015,0.028,0.032,0.042,0.045 c0.012,0.012,0.023,0.023,0.035,0.035c0.015,0.013,0.032,0.028,0.048,0.04l0.038,0.03c0.005,0.003,0.01,0.007,0.013,0.01 l9.163,6.095C11.668,21.953,11.833,22,12,22c0.167,0,0.332-0.047,0.478-0.144l9.163-6.095l0.015-0.01 c0.013-0.01,0.027-0.02,0.037-0.03c0.018-0.013,0.035-0.028,0.048-0.04c0.013-0.012,0.025-0.023,0.035-0.035 c0.017-0.015,0.03-0.032,0.043-0.045c0.01-0.013,0.02-0.025,0.03-0.037c0.013-0.018,0.025-0.035,0.035-0.052 c0.008-0.013,0.018-0.027,0.025-0.038c0.012-0.02,0.022-0.038,0.03-0.058c0.007-0.013,0.013-0.027,0.02-0.04 c0.008-0.022,0.015-0.042,0.023-0.063c0.003-0.013,0.01-0.027,0.013-0.04c0.007-0.025,0.01-0.048,0.015-0.072 c0.002-0.013,0.005-0.027,0.007-0.037c0.003-0.042,0.007-0.079,0.007-0.117V8.954C22.025,8.915,22.022,8.879,22.016,8.84z M12.862,4.464l6.751,4.49l-3.016,2.013l-3.735-2.492V4.464z M11.138,4.464v4.009l-3.735,2.494L4.389,8.954L11.138,4.464z M3.699,10.562L5.853,12l-2.155,1.438V10.562z M11.138,19.536l-6.749-4.491l3.015-2.011l3.735,2.492V19.536z M12,14.035L8.953,12 L12,9.966L15.047,12L12,14.035z M12.862,19.536v-4.009l3.735-2.492l3.016,2.011L12.862,19.536z M20.303,13.438L18.147,12 l2.156-1.438L20.303,13.438z"></path>
    250274</svg>',
    251275
    252276        'deviantart'  => '
    253277<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    254     <path d="M 18.19 5.636 18.19 2 18.188 2 14.553 2 14.19 2.366 12.474 5.636 11.935 6 5.81 6 5.81 10.994 9.177 10.994 9.477 11.357 5.81 18.363 5.81 22 5.811 22 9.447 22 9.81 21.634 11.526 18.364 12.065 18 18.19 18 18.19 13.006 14.823 13.006 14.523 12.641 18.19 5.636z"/>
     278    <path d="M 18.19 5.636 18.19 2 18.188 2 14.553 2 14.19 2.366 12.474 5.636 11.935 6 5.81 6 5.81 10.994 9.177 10.994 9.477 11.357 5.81 18.363 5.81 22 5.811 22 9.447 22 9.81 21.634 11.526 18.364 12.065 18 18.19 18 18.19 13.006 14.823 13.006 14.523 12.641 18.19 5.636z"></path>
    255279</svg>',
    256280
    257281        'digg'        => '
    258282<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    259     <path d="M4.5,5.4h2.2V16H1V8.5h3.5V5.4L4.5,5.4z M4.5,14.2v-4H3.2v4H4.5z M7.6,8.5V16h2.2V8.5C9.8,8.5,7.6,8.5,7.6,8.5z M7.6,5.4 v2.2h2.2V5.4C9.8,5.4,7.6,5.4,7.6,5.4z M10.7,8.5h5.7v10.1h-5.7v-1.8h3.5V16h-3.5C10.7,16,10.7,8.5,10.7,8.5z M14.2,14.2v-4h-1.3v4 H14.2z M17.3,8.5H23v10.1h-5.7v-1.8h3.5V16h-3.5C17.3,16,17.3,8.5,17.3,8.5z M20.8,14.2v-4h-1.3v4H20.8z"/>
     283    <path d="M4.5,5.4h2.2V16H1V8.5h3.5V5.4L4.5,5.4z M4.5,14.2v-4H3.2v4H4.5z M7.6,8.5V16h2.2V8.5C9.8,8.5,7.6,8.5,7.6,8.5z M7.6,5.4 v2.2h2.2V5.4C9.8,5.4,7.6,5.4,7.6,5.4z M10.7,8.5h5.7v10.1h-5.7v-1.8h3.5V16h-3.5C10.7,16,10.7,8.5,10.7,8.5z M14.2,14.2v-4h-1.3v4 H14.2z M17.3,8.5H23v10.1h-5.7v-1.8h3.5V16h-3.5C17.3,16,17.3,8.5,17.3,8.5z M20.8,14.2v-4h-1.3v4H20.8z"></path>
    260284</svg>',
    261285
    262286        'dribbble'    => '
    263287<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    264     <path d="M12,22C6.486,22,2,17.514,2,12S6.486,2,12,2c5.514,0,10,4.486,10,10S17.514,22,12,22z M20.434,13.369 c-0.292-0.092-2.644-0.794-5.32-0.365c1.117,3.07,1.572,5.57,1.659,6.09C18.689,17.798,20.053,15.745,20.434,13.369z M15.336,19.876c-0.127-0.749-0.623-3.361-1.822-6.477c-0.019,0.006-0.038,0.013-0.056,0.019c-4.818,1.679-6.547,5.02-6.701,5.334 c1.448,1.129,3.268,1.803,5.243,1.803C13.183,20.555,14.311,20.313,15.336,19.876z M5.654,17.724 c0.193-0.331,2.538-4.213,6.943-5.637c0.111-0.036,0.224-0.07,0.337-0.102c-0.214-0.485-0.448-0.971-0.692-1.45 c-4.266,1.277-8.405,1.223-8.778,1.216c-0.003,0.087-0.004,0.174-0.004,0.261C3.458,14.207,4.29,16.21,5.654,17.724z M3.639,10.264 c0.382,0.005,3.901,0.02,7.897-1.041c-1.415-2.516-2.942-4.631-3.167-4.94C5.979,5.41,4.193,7.613,3.639,10.264z M9.998,3.709 c0.236,0.316,1.787,2.429,3.187,5c3.037-1.138,4.323-2.867,4.477-3.085C16.154,4.286,14.17,3.471,12,3.471 C11.311,3.471,10.641,3.554,9.998,3.709z M18.612,6.612C18.432,6.855,17,8.69,13.842,9.979c0.199,0.407,0.389,0.821,0.567,1.237 c0.063,0.148,0.124,0.295,0.184,0.441c2.842-0.357,5.666,0.215,5.948,0.275C20.522,9.916,19.801,8.065,18.612,6.612z"/>
     288    <path d="M12,22C6.486,22,2,17.514,2,12S6.486,2,12,2c5.514,0,10,4.486,10,10S17.514,22,12,22z M20.434,13.369 c-0.292-0.092-2.644-0.794-5.32-0.365c1.117,3.07,1.572,5.57,1.659,6.09C18.689,17.798,20.053,15.745,20.434,13.369z M15.336,19.876c-0.127-0.749-0.623-3.361-1.822-6.477c-0.019,0.006-0.038,0.013-0.056,0.019c-4.818,1.679-6.547,5.02-6.701,5.334 c1.448,1.129,3.268,1.803,5.243,1.803C13.183,20.555,14.311,20.313,15.336,19.876z M5.654,17.724 c0.193-0.331,2.538-4.213,6.943-5.637c0.111-0.036,0.224-0.07,0.337-0.102c-0.214-0.485-0.448-0.971-0.692-1.45 c-4.266,1.277-8.405,1.223-8.778,1.216c-0.003,0.087-0.004,0.174-0.004,0.261C3.458,14.207,4.29,16.21,5.654,17.724z M3.639,10.264 c0.382,0.005,3.901,0.02,7.897-1.041c-1.415-2.516-2.942-4.631-3.167-4.94C5.979,5.41,4.193,7.613,3.639,10.264z M9.998,3.709 c0.236,0.316,1.787,2.429,3.187,5c3.037-1.138,4.323-2.867,4.477-3.085C16.154,4.286,14.17,3.471,12,3.471 C11.311,3.471,10.641,3.554,9.998,3.709z M18.612,6.612C18.432,6.855,17,8.69,13.842,9.979c0.199,0.407,0.389,0.821,0.567,1.237 c0.063,0.148,0.124,0.295,0.184,0.441c2.842-0.357,5.666,0.215,5.948,0.275C20.522,9.916,19.801,8.065,18.612,6.612z"></path>
    265289</svg>',
    266290
    267291        'dropbox'     => '
    268292<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    269     <path d="M12,6.134L6.069,9.797L2,6.54l5.883-3.843L12,6.134z M2,13.054l5.883,3.843L12,13.459L6.069,9.797L2,13.054z M12,13.459 l4.116,3.439L22,13.054l-4.069-3.257L12,13.459z M22,6.54l-5.884-3.843L12,6.134l5.931,3.663L22,6.54z M12.011,14.2l-4.129,3.426 l-1.767-1.153v1.291l5.896,3.539l5.897-3.539v-1.291l-1.769,1.153L12.011,14.2z"/>
     293    <path d="M12,6.134L6.069,9.797L2,6.54l5.883-3.843L12,6.134z M2,13.054l5.883,3.843L12,13.459L6.069,9.797L2,13.054z M12,13.459 l4.116,3.439L22,13.054l-4.069-3.257L12,13.459z M22,6.54l-5.884-3.843L12,6.134l5.931,3.663L22,6.54z M12.011,14.2l-4.129,3.426 l-1.767-1.153v1.291l5.896,3.539l5.897-3.539v-1.291l-1.769,1.153L12.011,14.2z"></path>
    270294</svg>',
    271295
    272296        'etsy'        => '
    273297<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    274     <path d="M9.16033,4.038c0-.27174.02717-.43478.48913-.43478h6.22283c1.087,0,1.68478.92391,2.11957,2.663l.35326,1.38587h1.05978C19.59511,3.712,19.75815,2,19.75815,2s-2.663.29891-4.23913.29891h-7.962L3.29076,2.163v1.1413L4.731,3.57609c1.00543.19022,1.25.40761,1.33152,1.33152,0,0,.08152,2.71739.08152,7.20109s-.08152,7.17391-.08152,7.17391c0,.81522-.32609,1.11413-1.33152,1.30435l-1.44022.27174V22l4.2663-.13587h7.11957c1.60326,0,5.32609.13587,5.32609.13587.08152-.97826.625-5.40761.70652-5.89674H19.7038L18.644,18.52174c-.84239,1.90217-2.06522,2.038-3.42391,2.038H11.1712c-1.3587,0-2.01087-.54348-2.01087-1.712V12.65217s3.0163,0,3.99457.08152c.76087.05435,1.22283.27174,1.46739,1.33152l.32609,1.413h1.16848l-.08152-3.55978.163-3.587H15.02989l-.38043,1.57609c-.24457,1.03261-.40761,1.22283-1.46739,1.33152-1.38587.13587-4.02174.1087-4.02174.1087Z"/>
     298    <path d="M9.16033,4.038c0-.27174.02717-.43478.48913-.43478h6.22283c1.087,0,1.68478.92391,2.11957,2.663l.35326,1.38587h1.05978C19.59511,3.712,19.75815,2,19.75815,2s-2.663.29891-4.23913.29891h-7.962L3.29076,2.163v1.1413L4.731,3.57609c1.00543.19022,1.25.40761,1.33152,1.33152,0,0,.08152,2.71739.08152,7.20109s-.08152,7.17391-.08152,7.17391c0,.81522-.32609,1.11413-1.33152,1.30435l-1.44022.27174V22l4.2663-.13587h7.11957c1.60326,0,5.32609.13587,5.32609.13587.08152-.97826.625-5.40761.70652-5.89674H19.7038L18.644,18.52174c-.84239,1.90217-2.06522,2.038-3.42391,2.038H11.1712c-1.3587,0-2.01087-.54348-2.01087-1.712V12.65217s3.0163,0,3.99457.08152c.76087.05435,1.22283.27174,1.46739,1.33152l.32609,1.413h1.16848l-.08152-3.55978.163-3.587H15.02989l-.38043,1.57609c-.24457,1.03261-.40761,1.22283-1.46739,1.33152-1.38587.13587-4.02174.1087-4.02174.1087Z"></path>
    275299</svg>',
    276300
    277301        'facebook'    => '
    278302<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    279     <path d="M20.007,3H3.993C3.445,3,3,3.445,3,3.993v16.013C3,20.555,3.445,21,3.993,21h8.621v-6.971h-2.346v-2.717h2.346V9.31 c0-2.325,1.42-3.591,3.494-3.591c0.993,0,1.847,0.074,2.096,0.107v2.43l-1.438,0.001c-1.128,0-1.346,0.536-1.346,1.323v1.734h2.69 l-0.35,2.717h-2.34V21h4.587C20.555,21,21,20.555,21,20.007V3.993C21,3.445,20.555,3,20.007,3z"/>
     303    <path d="M20.007,3H3.993C3.445,3,3,3.445,3,3.993v16.013C3,20.555,3.445,21,3.993,21h8.621v-6.971h-2.346v-2.717h2.346V9.31 c0-2.325,1.42-3.591,3.494-3.591c0.993,0,1.847,0.074,2.096,0.107v2.43l-1.438,0.001c-1.128,0-1.346,0.536-1.346,1.323v1.734h2.69 l-0.35,2.717h-2.34V21h4.587C20.555,21,21,20.555,21,20.007V3.993C21,3.445,20.555,3,20.007,3z"></path>
    280304</svg>',
    281305
    282306        'feed'        => '
    283307<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    284     <path d="M2,8.667V12c5.515,0,10,4.485,10,10h3.333C15.333,14.637,9.363,8.667,2,8.667z M2,2v3.333 c9.19,0,16.667,7.477,16.667,16.667H22C22,10.955,13.045,2,2,2z M4.5,17C3.118,17,2,18.12,2,19.5S3.118,22,4.5,22S7,20.88,7,19.5 S5.882,17,4.5,17z"/>
     308    <path d="M2,8.667V12c5.515,0,10,4.485,10,10h3.333C15.333,14.637,9.363,8.667,2,8.667z M2,2v3.333 c9.19,0,16.667,7.477,16.667,16.667H22C22,10.955,13.045,2,2,2z M4.5,17C3.118,17,2,18.12,2,19.5S3.118,22,4.5,22S7,20.88,7,19.5 S5.882,17,4.5,17z"></path>
    285309</svg>',
    286310
    287311        'flickr'      => '
    288312<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    289     <path d="M6.5,7c-2.75,0-5,2.25-5,5s2.25,5,5,5s5-2.25,5-5S9.25,7,6.5,7z M17.5,7c-2.75,0-5,2.25-5,5s2.25,5,5,5s5-2.25,5-5 S20.25,7,17.5,7z"/>
     313    <path d="M6.5,7c-2.75,0-5,2.25-5,5s2.25,5,5,5s5-2.25,5-5S9.25,7,6.5,7z M17.5,7c-2.75,0-5,2.25-5,5s2.25,5,5,5s5-2.25,5-5 S20.25,7,17.5,7z"></path>
    290314</svg>',
    291315
    292316        'foursquare'  => '
    293317<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    294     <path d="M17.573,2c0,0-9.197,0-10.668,0S5,3.107,5,3.805s0,16.948,0,16.948c0,0.785,0.422,1.077,0.66,1.172 c0.238,0.097,0.892,0.177,1.285-0.275c0,0,5.035-5.843,5.122-5.93c0.132-0.132,0.132-0.132,0.262-0.132h3.26 c1.368,0,1.588-0.977,1.732-1.552c0.078-0.318,0.692-3.428,1.225-6.122l0.675-3.368C19.56,2.893,19.14,2,17.573,2z M16.495,7.22 c-0.053,0.252-0.372,0.518-0.665,0.518c-0.293,0-4.157,0-4.157,0c-0.467,0-0.802,0.318-0.802,0.787v0.508 c0,0.467,0.337,0.798,0.805,0.798c0,0,3.197,0,3.528,0s0.655,0.362,0.583,0.715c-0.072,0.353-0.407,2.102-0.448,2.295 c-0.04,0.193-0.262,0.523-0.655,0.523c-0.33,0-2.88,0-2.88,0c-0.523,0-0.683,0.068-1.033,0.503 c-0.35,0.437-3.505,4.223-3.505,4.223c-0.032,0.035-0.063,0.027-0.063-0.015V4.852c0-0.298,0.26-0.648,0.648-0.648 c0,0,8.228,0,8.562,0c0.315,0,0.61,0.297,0.528,0.683L16.495,7.22z"/>
     318    <path d="M17.573,2c0,0-9.197,0-10.668,0S5,3.107,5,3.805s0,16.948,0,16.948c0,0.785,0.422,1.077,0.66,1.172 c0.238,0.097,0.892,0.177,1.285-0.275c0,0,5.035-5.843,5.122-5.93c0.132-0.132,0.132-0.132,0.262-0.132h3.26 c1.368,0,1.588-0.977,1.732-1.552c0.078-0.318,0.692-3.428,1.225-6.122l0.675-3.368C19.56,2.893,19.14,2,17.573,2z M16.495,7.22 c-0.053,0.252-0.372,0.518-0.665,0.518c-0.293,0-4.157,0-4.157,0c-0.467,0-0.802,0.318-0.802,0.787v0.508 c0,0.467,0.337,0.798,0.805,0.798c0,0,3.197,0,3.528,0s0.655,0.362,0.583,0.715c-0.072,0.353-0.407,2.102-0.448,2.295 c-0.04,0.193-0.262,0.523-0.655,0.523c-0.33,0-2.88,0-2.88,0c-0.523,0-0.683,0.068-1.033,0.503 c-0.35,0.437-3.505,4.223-3.505,4.223c-0.032,0.035-0.063,0.027-0.063-0.015V4.852c0-0.298,0.26-0.648,0.648-0.648 c0,0,8.228,0,8.562,0c0.315,0,0.61,0.297,0.528,0.683L16.495,7.22z"></path>
    295319</svg>',
    296320
    297321        'goodreads'   => '
    298322<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    299     <path d="M17.3,17.5c-0.2,0.8-0.5,1.4-1,1.9c-0.4,0.5-1,0.9-1.7,1.2C13.9,20.9,13.1,21,12,21c-0.6,0-1.3-0.1-1.9-0.2 c-0.6-0.1-1.1-0.4-1.6-0.7c-0.5-0.3-0.9-0.7-1.2-1.2c-0.3-0.5-0.5-1.1-0.5-1.7h1.5c0.1,0.5,0.2,0.9,0.5,1.2 c0.2,0.3,0.5,0.6,0.9,0.8c0.3,0.2,0.7,0.3,1.1,0.4c0.4,0.1,0.8,0.1,1.2,0.1c1.4,0,2.5-0.4,3.1-1.2c0.6-0.8,1-2,1-3.5v-1.7h0 c-0.4,0.8-0.9,1.4-1.6,1.9c-0.7,0.5-1.5,0.7-2.4,0.7c-1,0-1.9-0.2-2.6-0.5C8.7,15,8.1,14.5,7.7,14c-0.5-0.6-0.8-1.3-1-2.1 c-0.2-0.8-0.3-1.6-0.3-2.5c0-0.9,0.1-1.7,0.4-2.5c0.3-0.8,0.6-1.5,1.1-2c0.5-0.6,1.1-1,1.8-1.4C10.3,3.2,11.1,3,12,3 c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.8,0.3,1.1,0.5c0.3,0.2,0.6,0.5,0.9,0.8c0.3,0.3,0.5,0.6,0.6,1h0V3.4h1.5V15 C17.6,15.9,17.5,16.7,17.3,17.5z M13.8,14.1c0.5-0.3,0.9-0.7,1.3-1.1c0.3-0.5,0.6-1,0.8-1.6c0.2-0.6,0.3-1.2,0.3-1.9 c0-0.6-0.1-1.2-0.2-1.9c-0.1-0.6-0.4-1.2-0.7-1.7c-0.3-0.5-0.7-0.9-1.3-1.2c-0.5-0.3-1.1-0.5-1.9-0.5s-1.4,0.2-1.9,0.5 c-0.5,0.3-1,0.7-1.3,1.2C8.5,6.4,8.3,7,8.1,7.6C8,8.2,7.9,8.9,7.9,9.5c0,0.6,0.1,1.3,0.2,1.9C8.3,12,8.6,12.5,8.9,13 c0.3,0.5,0.8,0.8,1.3,1.1c0.5,0.3,1.1,0.4,1.9,0.4C12.7,14.5,13.3,14.4,13.8,14.1z"/>
     323    <path d="M17.3,17.5c-0.2,0.8-0.5,1.4-1,1.9c-0.4,0.5-1,0.9-1.7,1.2C13.9,20.9,13.1,21,12,21c-0.6,0-1.3-0.1-1.9-0.2 c-0.6-0.1-1.1-0.4-1.6-0.7c-0.5-0.3-0.9-0.7-1.2-1.2c-0.3-0.5-0.5-1.1-0.5-1.7h1.5c0.1,0.5,0.2,0.9,0.5,1.2 c0.2,0.3,0.5,0.6,0.9,0.8c0.3,0.2,0.7,0.3,1.1,0.4c0.4,0.1,0.8,0.1,1.2,0.1c1.4,0,2.5-0.4,3.1-1.2c0.6-0.8,1-2,1-3.5v-1.7h0 c-0.4,0.8-0.9,1.4-1.6,1.9c-0.7,0.5-1.5,0.7-2.4,0.7c-1,0-1.9-0.2-2.6-0.5C8.7,15,8.1,14.5,7.7,14c-0.5-0.6-0.8-1.3-1-2.1 c-0.2-0.8-0.3-1.6-0.3-2.5c0-0.9,0.1-1.7,0.4-2.5c0.3-0.8,0.6-1.5,1.1-2c0.5-0.6,1.1-1,1.8-1.4C10.3,3.2,11.1,3,12,3 c0.5,0,0.9,0.1,1.3,0.2c0.4,0.1,0.8,0.3,1.1,0.5c0.3,0.2,0.6,0.5,0.9,0.8c0.3,0.3,0.5,0.6,0.6,1h0V3.4h1.5V15 C17.6,15.9,17.5,16.7,17.3,17.5z M13.8,14.1c0.5-0.3,0.9-0.7,1.3-1.1c0.3-0.5,0.6-1,0.8-1.6c0.2-0.6,0.3-1.2,0.3-1.9 c0-0.6-0.1-1.2-0.2-1.9c-0.1-0.6-0.4-1.2-0.7-1.7c-0.3-0.5-0.7-0.9-1.3-1.2c-0.5-0.3-1.1-0.5-1.9-0.5s-1.4,0.2-1.9,0.5 c-0.5,0.3-1,0.7-1.3,1.2C8.5,6.4,8.3,7,8.1,7.6C8,8.2,7.9,8.9,7.9,9.5c0,0.6,0.1,1.3,0.2,1.9C8.3,12,8.6,12.5,8.9,13 c0.3,0.5,0.8,0.8,1.3,1.1c0.5,0.3,1.1,0.4,1.9,0.4C12.7,14.5,13.3,14.4,13.8,14.1z"></path>
    300324</svg>',
    301325
    302326        'google-plus' => '
    303327<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    304     <path d="M8,11h6.61c0.06,0.35,0.11,0.7,0.11,1.16c0,4-2.68,6.84-6.72,6.84c-3.87,0-7-3.13-7-7s3.13-7,7-7 c1.89,0,3.47,0.69,4.69,1.83l-1.9,1.83C10.27,8.16,9.36,7.58,8,7.58c-2.39,0-4.34,1.98-4.34,4.42S5.61,16.42,8,16.42 c2.77,0,3.81-1.99,3.97-3.02H8V11L8,11z M23,11h-2V9h-2v2h-2v2h2v2h2v-2h2"/>
     328    <path d="M8,11h6.61c0.06,0.35,0.11,0.7,0.11,1.16c0,4-2.68,6.84-6.72,6.84c-3.87,0-7-3.13-7-7s3.13-7,7-7 c1.89,0,3.47,0.69,4.69,1.83l-1.9,1.83C10.27,8.16,9.36,7.58,8,7.58c-2.39,0-4.34,1.98-4.34,4.42S5.61,16.42,8,16.42 c2.77,0,3.81-1.99,3.97-3.02H8V11L8,11z M23,11h-2V9h-2v2h-2v2h2v2h2v-2h2"></path>
    305329</svg>',
    306330
    307331        'google'      => '
    308332<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    309     <path d="M12.02,10.18v3.72v0.01h5.51c-0.26,1.57-1.67,4.22-5.5,4.22c-3.31,0-6.01-2.75-6.01-6.12s2.7-6.12,6.01-6.12 c1.87,0,3.13,0.8,3.85,1.48l2.84-2.76C16.99,2.99,14.73,2,12.03,2c-5.52,0-10,4.48-10,10s4.48,10,10,10c5.77,0,9.6-4.06,9.6-9.77 c0-0.83-0.11-1.42-0.25-2.05H12.02z"/>
     333    <path d="M12.02,10.18v3.72v0.01h5.51c-0.26,1.57-1.67,4.22-5.5,4.22c-3.31,0-6.01-2.75-6.01-6.12s2.7-6.12,6.01-6.12 c1.87,0,3.13,0.8,3.85,1.48l2.84-2.76C16.99,2.99,14.73,2,12.03,2c-5.52,0-10,4.48-10,10s4.48,10,10,10c5.77,0,9.6-4.06,9.6-9.77 c0-0.83-0.11-1.42-0.25-2.05H12.02z"></path>
    310334</svg>',
    311335
    312336        'github'      => '
    313337<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    314     <path d="M12,2C6.477,2,2,6.477,2,12c0,4.419,2.865,8.166,6.839,9.489c0.5,0.09,0.682-0.218,0.682-0.484 c0-0.236-0.009-0.866-0.014-1.699c-2.782,0.602-3.369-1.34-3.369-1.34c-0.455-1.157-1.11-1.465-1.11-1.465 c-0.909-0.62,0.069-0.608,0.069-0.608c1.004,0.071,1.532,1.03,1.532,1.03c0.891,1.529,2.341,1.089,2.91,0.833
    315         c0.091-0.647,0.349-1.086,0.635-1.337c-2.22-0.251-4.555-1.111-4.555-4.943c0-1.091,0.39-1.984,1.03-2.682 C6.546,8.54,6.202,7.524,6.746,6.148c0,0,0.84-0.269,2.75,1.025C10.295,6.95,11.15,6.84,12,6.836 c0.85,0.004,1.705,0.114,2.504,0.336c1.909-1.294,2.748-1.025,2.748-1.025c0.546,1.376,0.202,2.394,0.1,2.646 c0.64,0.699,1.026,1.591,1.026,2.682c0,3.841-2.337,4.687-4.565,4.935c0.359,0.307,0.679,0.917,0.679,1.852 c0,1.335-0.012,2.415-0.012,2.741c0,0.269,0.18,0.579,0.688,0.481C19.138,20.161,22,16.416,22,12C22,6.477,17.523,2,12,2z"/>
     338    <path d="M12,2C6.477,2,2,6.477,2,12c0,4.419,2.865,8.166,6.839,9.489c0.5,0.09,0.682-0.218,0.682-0.484 c0-0.236-0.009-0.866-0.014-1.699c-2.782,0.602-3.369-1.34-3.369-1.34c-0.455-1.157-1.11-1.465-1.11-1.465 c-0.909-0.62,0.069-0.608,0.069-0.608c1.004,0.071,1.532,1.03,1.532,1.03c0.891,1.529,2.341,1.089,2.91,0.833 c0.091-0.647,0.349-1.086,0.635-1.337c-2.22-0.251-4.555-1.111-4.555-4.943c0-1.091,0.39-1.984,1.03-2.682 C6.546,8.54,6.202,7.524,6.746,6.148c0,0,0.84-0.269,2.75,1.025C10.295,6.95,11.15,6.84,12,6.836 c0.85,0.004,1.705,0.114,2.504,0.336c1.909-1.294,2.748-1.025,2.748-1.025c0.546,1.376,0.202,2.394,0.1,2.646 c0.64,0.699,1.026,1.591,1.026,2.682c0,3.841-2.337,4.687-4.565,4.935c0.359,0.307,0.679,0.917,0.679,1.852 c0,1.335-0.012,2.415-0.012,2.741c0,0.269,0.18,0.579,0.688,0.481C19.138,20.161,22,16.416,22,12C22,6.477,17.523,2,12,2z"></path>
    316339</svg>',
    317340
    318341        'instagram'   => '
    319342<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    320     <path d="M12,4.622c2.403,0,2.688,0.009,3.637,0.052c0.877,0.04,1.354,0.187,1.671,0.31c0.42,0.163,0.72,0.358,1.035,0.673 c0.315,0.315,0.51,0.615,0.673,1.035c0.123,0.317,0.27,0.794,0.31,1.671c0.043,0.949,0.052,1.234,0.052,3.637 s-0.009,2.688-0.052,3.637c-0.04,0.877-0.187,1.354-0.31,1.671c-0.163,0.42-0.358,0.72-0.673,1.035 c-0.315,0.315-0.615,0.51-1.035,0.673c-0.317,0.123-0.794,0.27-1.671,0.31c-0.949,0.043-1.233,0.052-3.637,0.052 s-2.688-0.009-3.637-0.052c-0.877-0.04-1.354-0.187-1.671-0.31c-0.42-0.163-0.72-0.358-1.035-0.673 c-0.315-0.315-0.51-0.615-0.673-1.035c-0.123-0.317-0.27-0.794-0.31-1.671C4.631,14.688,4.622,14.403,4.622,12 s0.009-2.688,0.052-3.637c0.04-0.877,0.187-1.354,0.31-1.671c0.163-0.42,0.358-0.72,0.673-1.035 c0.315-0.315,0.615-0.51,1.035-0.673c0.317-0.123,0.794-0.27,1.671-0.31C9.312,4.631,9.597,4.622,12,4.622 M12,3 C9.556,3,9.249,3.01,8.289,3.054C7.331,3.098,6.677,3.25,6.105,3.472C5.513,3.702,5.011,4.01,4.511,4.511 c-0.5,0.5-0.808,1.002-1.038,1.594C3.25,6.677,3.098,7.331,3.054,8.289C3.01,9.249,3,9.556,3,12c0,2.444,0.01,2.751,0.054,3.711 c0.044,0.958,0.196,1.612,0.418,2.185c0.23,0.592,0.538,1.094,1.038,1.594c0.5,0.5,1.002,0.808,1.594,1.038 c0.572,0.222,1.227,0.375,2.185,0.418C9.249,20.99,9.556,21,12,21s2.751-0.01,3.711-0.054c0.958-0.044,1.612-0.196,2.185-0.418 c0.592-0.23,1.094-0.538,1.594-1.038c0.5-0.5,0.808-1.002,1.038-1.594c0.222-0.572,0.375-1.227,0.418-2.185 C20.99,14.751,21,14.444,21,12s-0.01-2.751-0.054-3.711c-0.044-0.958-0.196-1.612-0.418-2.185c-0.23-0.592-0.538-1.094-1.038-1.594 c-0.5-0.5-1.002-0.808-1.594-1.038c-0.572-0.222-1.227-0.375-2.185-0.418C14.751,3.01,14.444,3,12,3L12,3z M12,7.378 c-2.552,0-4.622,2.069-4.622,4.622S9.448,16.622,12,16.622s4.622-2.069,4.622-4.622S14.552,7.378,12,7.378z M12,15 c-1.657,0-3-1.343-3-3s1.343-3,3-3s3,1.343,3,3S13.657,15,12,15z M16.804,6.116c-0.596,0-1.08,0.484-1.08,1.08 s0.484,1.08,1.08,1.08c0.596,0,1.08-0.484,1.08-1.08S17.401,6.116,16.804,6.116z"/>
     343    <path d="M12,4.622c2.403,0,2.688,0.009,3.637,0.052c0.877,0.04,1.354,0.187,1.671,0.31c0.42,0.163,0.72,0.358,1.035,0.673 c0.315,0.315,0.51,0.615,0.673,1.035c0.123,0.317,0.27,0.794,0.31,1.671c0.043,0.949,0.052,1.234,0.052,3.637 s-0.009,2.688-0.052,3.637c-0.04,0.877-0.187,1.354-0.31,1.671c-0.163,0.42-0.358,0.72-0.673,1.035 c-0.315,0.315-0.615,0.51-1.035,0.673c-0.317,0.123-0.794,0.27-1.671,0.31c-0.949,0.043-1.233,0.052-3.637,0.052 s-2.688-0.009-3.637-0.052c-0.877-0.04-1.354-0.187-1.671-0.31c-0.42-0.163-0.72-0.358-1.035-0.673 c-0.315-0.315-0.51-0.615-0.673-1.035c-0.123-0.317-0.27-0.794-0.31-1.671C4.631,14.688,4.622,14.403,4.622,12 s0.009-2.688,0.052-3.637c0.04-0.877,0.187-1.354,0.31-1.671c0.163-0.42,0.358-0.72,0.673-1.035 c0.315-0.315,0.615-0.51,1.035-0.673c0.317-0.123,0.794-0.27,1.671-0.31C9.312,4.631,9.597,4.622,12,4.622 M12,3 C9.556,3,9.249,3.01,8.289,3.054C7.331,3.098,6.677,3.25,6.105,3.472C5.513,3.702,5.011,4.01,4.511,4.511 c-0.5,0.5-0.808,1.002-1.038,1.594C3.25,6.677,3.098,7.331,3.054,8.289C3.01,9.249,3,9.556,3,12c0,2.444,0.01,2.751,0.054,3.711 c0.044,0.958,0.196,1.612,0.418,2.185c0.23,0.592,0.538,1.094,1.038,1.594c0.5,0.5,1.002,0.808,1.594,1.038 c0.572,0.222,1.227,0.375,2.185,0.418C9.249,20.99,9.556,21,12,21s2.751-0.01,3.711-0.054c0.958-0.044,1.612-0.196,2.185-0.418 c0.592-0.23,1.094-0.538,1.594-1.038c0.5-0.5,0.808-1.002,1.038-1.594c0.222-0.572,0.375-1.227,0.418-2.185 C20.99,14.751,21,14.444,21,12s-0.01-2.751-0.054-3.711c-0.044-0.958-0.196-1.612-0.418-2.185c-0.23-0.592-0.538-1.094-1.038-1.594 c-0.5-0.5-1.002-0.808-1.594-1.038c-0.572-0.222-1.227-0.375-2.185-0.418C14.751,3.01,14.444,3,12,3L12,3z M12,7.378 c-2.552,0-4.622,2.069-4.622,4.622S9.448,16.622,12,16.622s4.622-2.069,4.622-4.622S14.552,7.378,12,7.378z M12,15 c-1.657,0-3-1.343-3-3s1.343-3,3-3s3,1.343,3,3S13.657,15,12,15z M16.804,6.116c-0.596,0-1.08,0.484-1.08,1.08 s0.484,1.08,1.08,1.08c0.596,0,1.08-0.484,1.08-1.08S17.401,6.116,16.804,6.116z"></path>
     344</svg>',
     345
     346        'lastfm'    => '
     347<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     348    <path d="M10.5002,0 C4.7006,0 0,4.70109753 0,10.4998496 C0,16.2989526 4.7006,21 10.5002,21 C16.299,21 21,16.2989526 21,10.4998496 C21,4.70109753 16.299,0 10.5002,0 Z M14.69735,14.7204413 C13.3164,14.7151781 12.4346,14.0870017 11.83445,12.6859357 L11.6816001,12.3451305 L10.35405,9.31011397 C9.92709997,8.26875064 8.85260001,7.57120012 7.68010001,7.57120012 C6.06945001,7.57120012 4.75925001,8.88509738 4.75925001,10.5009524 C4.75925001,12.1164565 6.06945001,13.4303036 7.68010001,13.4303036 C8.77200001,13.4303036 9.76514999,12.827541 10.2719501,11.8567047 C10.2893,11.8235214 10.3239,11.8019673 10.36305,11.8038219 C10.4007,11.8053759 10.43535,11.8287847 10.4504,11.8631709 L10.98655,13.1045863 C11.0016,13.1389726 10.9956,13.17782 10.97225,13.2068931 C10.1605001,14.1995341 8.96020001,14.7683115 7.68010001,14.7683115 C5.33305,14.7683115 3.42340001,12.8535563 3.42340001,10.5009524 C3.42340001,8.14679459 5.33300001,6.23203946 7.68010001,6.23203946 C9.45720002,6.23203946 10.8909,7.19074535 11.6138,8.86359341 C11.6205501,8.88018505 12.3412,10.5707777 12.97445,12.0190621 C13.34865,12.8739575 13.64615,13.3959676 14.6288,13.4291508 C15.5663001,13.4612814 16.25375,12.9121534 16.25375,12.1484869 C16.25375,11.4691321 15.8320501,11.3003585 14.8803,10.98216 C13.2365,10.4397989 12.34495,9.88605929 12.34495,8.51817658 C12.34495,7.1809207 13.26665,6.31615054 14.692,6.31615054 C15.62875,6.31615054 16.3155,6.7286858 16.79215,7.5768142 C16.80495,7.60062396 16.8079001,7.62814302 16.8004001,7.65420843 C16.7929,7.68027384 16.7748,7.70212868 16.7507001,7.713808 L15.86145,8.16900031 C15.8178001,8.19200805 15.7643,8.17807308 15.73565,8.13847371 C15.43295,7.71345711 15.0956,7.52513451 14.6423,7.52513451 C14.05125,7.52513451 13.6220001,7.92899802 13.6220001,8.48649708 C13.6220001,9.17382194 14.1529001,9.34144259 15.0339,9.61923972 C15.14915,9.65578139 15.26955,9.69397731 15.39385,9.73432853 C16.7763,10.1865133 17.57675,10.7311301 17.57675,12.1836251 C17.57685,13.629654 16.3389,14.7204413 14.69735,14.7204413 Z"></path>
    321349</svg>',
    322350
    323351        'linkedin'    => '
    324352<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    325     <path d="M19.7,3H4.3C3.582,3,3,3.582,3,4.3v15.4C3,20.418,3.582,21,4.3,21h15.4c0.718,0,1.3-0.582,1.3-1.3V4.3 C21,3.582,20.418,3,19.7,3z M8.339,18.338H5.667v-8.59h2.672V18.338z M7.004,8.574c-0.857,0-1.549-0.694-1.549-1.548 c0-0.855,0.691-1.548,1.549-1.548c0.854,0,1.547,0.694,1.547,1.548C8.551,7.881,7.858,8.574,7.004,8.574z M18.339,18.338h-2.669 v-4.177c0-0.996-0.017-2.278-1.387-2.278c-1.389,0-1.601,1.086-1.601,2.206v4.249h-2.667v-8.59h2.559v1.174h0.037 c0.356-0.675,1.227-1.387,2.526-1.387c2.703,0,3.203,1.779,3.203,4.092V18.338z"/>
     353    <path d="M19.7,3H4.3C3.582,3,3,3.582,3,4.3v15.4C3,20.418,3.582,21,4.3,21h15.4c0.718,0,1.3-0.582,1.3-1.3V4.3 C21,3.582,20.418,3,19.7,3z M8.339,18.338H5.667v-8.59h2.672V18.338z M7.004,8.574c-0.857,0-1.549-0.694-1.549-1.548 c0-0.855,0.691-1.548,1.549-1.548c0.854,0,1.547,0.694,1.547,1.548C8.551,7.881,7.858,8.574,7.004,8.574z M18.339,18.338h-2.669 v-4.177c0-0.996-0.017-2.278-1.387-2.278c-1.389,0-1.601,1.086-1.601,2.206v4.249h-2.667v-8.59h2.559v1.174h0.037 c0.356-0.675,1.227-1.387,2.526-1.387c2.703,0,3.203,1.779,3.203,4.092V18.338z"></path>
    326354</svg>',
    327355
    328356        'mail'        => '
    329357<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    330     <path d="M20,4H4C2.895,4,2,4.895,2,6v12c0,1.105,0.895,2,2,2h16c1.105,0,2-0.895,2-2V6C22,4.895,21.105,4,20,4z M20,8.236l-8,4.882 L4,8.236V6h16V8.236z"/>
     358    <path d="M20,4H4C2.895,4,2,4.895,2,6v12c0,1.105,0.895,2,2,2h16c1.105,0,2-0.895,2-2V6C22,4.895,21.105,4,20,4z M20,8.236l-8,4.882 L4,8.236V6h16V8.236z"></path>
    331359</svg>',
    332360
    333361        'meetup'      => '
    334362<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    335     <path d="M19.24775,14.722a3.57032,3.57032,0,0,1-2.94457,3.52073,3.61886,3.61886,0,0,1-.64652.05634c-.07314-.0008-.10187.02846-.12507.09547A2.38881,2.38881,0,0,1,13.49453,20.094a2.33092,2.33092,0,0,1-1.827-.50716.13635.13635,0,0,0-.19878-.00408,3.191,3.191,0,0,1-2.104.60248,3.26309,3.26309,0,0,1-3.00324-2.71993,2.19076,2.19076,0,0,1-.03512-.30865c-.00156-.08579-.03413-.1189-.11608-.13493a2.86421,2.86421,0,0,1-1.23189-.56111,2.945,2.945,0,0,1-1.166-2.05749,2.97484,2.97484,0,0,1,.87524-2.50774.112.112,0,0,0,.02091-.16107,2.7213,2.7213,0,0,1-.36648-1.48A2.81256,2.81256,0,0,1,6.57673,7.58838a.35764.35764,0,0,0,.28869-.22819,4.2208,4.2208,0,0,1,6.02892-1.90111.25161.25161,0,0,0,.22023.0243,3.65608,3.65608,0,0,1,3.76031.90678A3.57244,3.57244,0,0,1,17.95918,8.626a2.97339,2.97339,0,0,1,.01829.57356.10637.10637,0,0,0,.0853.12792,1.97669,1.97669,0,0,1,1.27939,1.33733,2.00266,2.00266,0,0,1-.57112,2.12652c-.05284.05166-.04168.08328-.01173.13489A3.51189,3.51189,0,0,1,19.24775,14.722Zm-6.35959-.27836a1.6984,1.6984,0,0,0,1.14556,1.61113,3.82039,3.82039,0,0,0,1.036.17935,1.46888,1.46888,0,0,0,.73509-.12255.44082.44082,0,0,0,.26057-.44274.45312.45312,0,0,0-.29211-.43375.97191.97191,0,0,0-.20678-.063c-.21326-.03806-.42754-.0701-.63973-.11215a.54787.54787,0,0,1-.50172-.60926,2.75864,2.75864,0,0,1,.1773-.901c.1763-.535.414-1.045.64183-1.55913A12.686,12.686,0,0,0,15.85,10.47863a1.58461,1.58461,0,0,0,.04861-.87208,1.04531,1.04531,0,0,0-.85432-.83981,1.60658,1.60658,0,0,0-1.23654.16594.27593.27593,0,0,1-.36286-.03413c-.085-.0747-.16594-.15379-.24918-.23055a.98682.98682,0,0,0-1.33577-.04933,6.1468,6.1468,0,0,1-.4989.41615.47762.47762,0,0,1-.51535.03566c-.17448-.09307-.35512-.175-.53531-.25665a1.74949,1.74949,0,0,0-.56476-.2016,1.69943,1.69943,0,0,0-1.61654.91787,8.05815,8.05815,0,0,0-.32952.80126c-.45471,1.2557-.82507,2.53825-1.20838,3.81639a1.24151,1.24151,0,0,0,.51532,1.44389,1.42659,1.42659,0,0,0,1.22008.17166,1.09728,1.09728,0,0,0,.66994-.69764c.44145-1.04111.839-2.09989,1.25981-3.14926.11581-.28876.22792-.57874.35078-.86438a.44548.44548,0,0,1,.69189-.19539.50521.50521,0,0,1,.15044.43836,1.75625,1.75625,0,0,1-.14731.50453c-.27379.69219-.55265,1.38236-.82766,2.074a2.0836,2.0836,0,0,0-.14038.42876.50719.50719,0,0,0,.27082.57722.87236.87236,0,0,0,.66145.02739.99137.99137,0,0,0,.53406-.532q.61571-1.20914,1.228-2.42031.28423-.55863.57585-1.1133a.87189.87189,0,0,1,.29055-.35253.34987.34987,0,0,1,.37634-.01265.30291.30291,0,0,1,.12434.31459.56716.56716,0,0,1-.04655.1915c-.05318.12739-.10286.25669-.16183.38156-.34118.71775-.68754,1.43273-1.02568,2.152A2.00213,2.00213,0,0,0,12.88816,14.44366Zm4.78568,5.28972a.88573.88573,0,0,0-1.77139.00465.8857.8857,0,0,0,1.77139-.00465Zm-14.83838-7.296a.84329.84329,0,1,0,.00827-1.68655.8433.8433,0,0,0-.00827,1.68655Zm10.366-9.43673a.83506.83506,0,1,0-.0091,1.67.83505.83505,0,0,0,.0091-1.67Zm6.85014,5.22a.71651.71651,0,0,0-1.433.0093.71656.71656,0,0,0,1.433-.0093ZM5.37528,6.17908A.63823.63823,0,1,0,6.015,5.54483.62292.62292,0,0,0,5.37528,6.17908Zm6.68214,14.80843a.54949.54949,0,1,0-.55052.541A.54556.54556,0,0,0,12.05742,20.98752Zm8.53235-8.49689a.54777.54777,0,0,0-.54027.54023.53327.53327,0,0,0,.532.52293.51548.51548,0,0,0,.53272-.5237A.53187.53187,0,0,0,20.58977,12.49063ZM7.82846,2.4715a.44927.44927,0,1,0,.44484.44766A.43821.43821,0,0,0,7.82846,2.4715Zm13.775,7.60492a.41186.41186,0,0,0-.40065.39623.40178.40178,0,0,0,.40168.40168A.38994.38994,0,0,0,22,10.48172.39946.39946,0,0,0,21.60349,10.07642ZM5.79193,17.96207a.40469.40469,0,0,0-.397-.39646.399.399,0,0,0-.396.405.39234.39234,0,0,0,.39939.389A.39857.39857,0,0,0,5.79193,17.96207Z"/>
     363    <path d="M19.24775,14.722a3.57032,3.57032,0,0,1-2.94457,3.52073,3.61886,3.61886,0,0,1-.64652.05634c-.07314-.0008-.10187.02846-.12507.09547A2.38881,2.38881,0,0,1,13.49453,20.094a2.33092,2.33092,0,0,1-1.827-.50716.13635.13635,0,0,0-.19878-.00408,3.191,3.191,0,0,1-2.104.60248,3.26309,3.26309,0,0,1-3.00324-2.71993,2.19076,2.19076,0,0,1-.03512-.30865c-.00156-.08579-.03413-.1189-.11608-.13493a2.86421,2.86421,0,0,1-1.23189-.56111,2.945,2.945,0,0,1-1.166-2.05749,2.97484,2.97484,0,0,1,.87524-2.50774.112.112,0,0,0,.02091-.16107,2.7213,2.7213,0,0,1-.36648-1.48A2.81256,2.81256,0,0,1,6.57673,7.58838a.35764.35764,0,0,0,.28869-.22819,4.2208,4.2208,0,0,1,6.02892-1.90111.25161.25161,0,0,0,.22023.0243,3.65608,3.65608,0,0,1,3.76031.90678A3.57244,3.57244,0,0,1,17.95918,8.626a2.97339,2.97339,0,0,1,.01829.57356.10637.10637,0,0,0,.0853.12792,1.97669,1.97669,0,0,1,1.27939,1.33733,2.00266,2.00266,0,0,1-.57112,2.12652c-.05284.05166-.04168.08328-.01173.13489A3.51189,3.51189,0,0,1,19.24775,14.722Zm-6.35959-.27836a1.6984,1.6984,0,0,0,1.14556,1.61113,3.82039,3.82039,0,0,0,1.036.17935,1.46888,1.46888,0,0,0,.73509-.12255.44082.44082,0,0,0,.26057-.44274.45312.45312,0,0,0-.29211-.43375.97191.97191,0,0,0-.20678-.063c-.21326-.03806-.42754-.0701-.63973-.11215a.54787.54787,0,0,1-.50172-.60926,2.75864,2.75864,0,0,1,.1773-.901c.1763-.535.414-1.045.64183-1.55913A12.686,12.686,0,0,0,15.85,10.47863a1.58461,1.58461,0,0,0,.04861-.87208,1.04531,1.04531,0,0,0-.85432-.83981,1.60658,1.60658,0,0,0-1.23654.16594.27593.27593,0,0,1-.36286-.03413c-.085-.0747-.16594-.15379-.24918-.23055a.98682.98682,0,0,0-1.33577-.04933,6.1468,6.1468,0,0,1-.4989.41615.47762.47762,0,0,1-.51535.03566c-.17448-.09307-.35512-.175-.53531-.25665a1.74949,1.74949,0,0,0-.56476-.2016,1.69943,1.69943,0,0,0-1.61654.91787,8.05815,8.05815,0,0,0-.32952.80126c-.45471,1.2557-.82507,2.53825-1.20838,3.81639a1.24151,1.24151,0,0,0,.51532,1.44389,1.42659,1.42659,0,0,0,1.22008.17166,1.09728,1.09728,0,0,0,.66994-.69764c.44145-1.04111.839-2.09989,1.25981-3.14926.11581-.28876.22792-.57874.35078-.86438a.44548.44548,0,0,1,.69189-.19539.50521.50521,0,0,1,.15044.43836,1.75625,1.75625,0,0,1-.14731.50453c-.27379.69219-.55265,1.38236-.82766,2.074a2.0836,2.0836,0,0,0-.14038.42876.50719.50719,0,0,0,.27082.57722.87236.87236,0,0,0,.66145.02739.99137.99137,0,0,0,.53406-.532q.61571-1.20914,1.228-2.42031.28423-.55863.57585-1.1133a.87189.87189,0,0,1,.29055-.35253.34987.34987,0,0,1,.37634-.01265.30291.30291,0,0,1,.12434.31459.56716.56716,0,0,1-.04655.1915c-.05318.12739-.10286.25669-.16183.38156-.34118.71775-.68754,1.43273-1.02568,2.152A2.00213,2.00213,0,0,0,12.88816,14.44366Zm4.78568,5.28972a.88573.88573,0,0,0-1.77139.00465.8857.8857,0,0,0,1.77139-.00465Zm-14.83838-7.296a.84329.84329,0,1,0,.00827-1.68655.8433.8433,0,0,0-.00827,1.68655Zm10.366-9.43673a.83506.83506,0,1,0-.0091,1.67.83505.83505,0,0,0,.0091-1.67Zm6.85014,5.22a.71651.71651,0,0,0-1.433.0093.71656.71656,0,0,0,1.433-.0093ZM5.37528,6.17908A.63823.63823,0,1,0,6.015,5.54483.62292.62292,0,0,0,5.37528,6.17908Zm6.68214,14.80843a.54949.54949,0,1,0-.55052.541A.54556.54556,0,0,0,12.05742,20.98752Zm8.53235-8.49689a.54777.54777,0,0,0-.54027.54023.53327.53327,0,0,0,.532.52293.51548.51548,0,0,0,.53272-.5237A.53187.53187,0,0,0,20.58977,12.49063ZM7.82846,2.4715a.44927.44927,0,1,0,.44484.44766A.43821.43821,0,0,0,7.82846,2.4715Zm13.775,7.60492a.41186.41186,0,0,0-.40065.39623.40178.40178,0,0,0,.40168.40168A.38994.38994,0,0,0,22,10.48172.39946.39946,0,0,0,21.60349,10.07642ZM5.79193,17.96207a.40469.40469,0,0,0-.397-.39646.399.399,0,0,0-.396.405.39234.39234,0,0,0,.39939.389A.39857.39857,0,0,0,5.79193,17.96207Z"></path>
    336364</svg>',
    337365
    338366        'medium'      => '
    339367<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    340     <path d="M20.962,7.257l-5.457,8.867l-3.923-6.375l3.126-5.08c0.112-0.182,0.319-0.286,0.527-0.286c0.05,0,0.1,0.008,0.149,0.02 c0.039,0.01,0.078,0.023,0.114,0.041l5.43,2.715l0.006,0.003c0.004,0.002,0.007,0.006,0.011,0.008 C20.971,7.191,20.98,7.227,20.962,7.257z M9.86,8.592v5.783l5.14,2.57L9.86,8.592z M15.772,17.331l4.231,2.115 C20.554,19.721,21,19.529,21,19.016V8.835L15.772,17.331z M8.968,7.178L3.665,4.527C3.569,4.479,3.478,4.456,3.395,4.456 C3.163,4.456,3,4.636,3,4.938v11.45c0,0.306,0.224,0.669,0.498,0.806l4.671,2.335c0.12,0.06,0.234,0.088,0.337,0.088 c0.29,0,0.494-0.225,0.494-0.602V7.231C9,7.208,8.988,7.188,8.968,7.178z"/>
     368    <path d="M20.962,7.257l-5.457,8.867l-3.923-6.375l3.126-5.08c0.112-0.182,0.319-0.286,0.527-0.286c0.05,0,0.1,0.008,0.149,0.02 c0.039,0.01,0.078,0.023,0.114,0.041l5.43,2.715l0.006,0.003c0.004,0.002,0.007,0.006,0.011,0.008 C20.971,7.191,20.98,7.227,20.962,7.257z M9.86,8.592v5.783l5.14,2.57L9.86,8.592z M15.772,17.331l4.231,2.115 C20.554,19.721,21,19.529,21,19.016V8.835L15.772,17.331z M8.968,7.178L3.665,4.527C3.569,4.479,3.478,4.456,3.395,4.456 C3.163,4.456,3,4.636,3,4.938v11.45c0,0.306,0.224,0.669,0.498,0.806l4.671,2.335c0.12,0.06,0.234,0.088,0.337,0.088 c0.29,0,0.494-0.225,0.494-0.602V7.231C9,7.208,8.988,7.188,8.968,7.178z"></path>
    341369</svg>',
    342370
    343371        'pinterest'   => '
    344372<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    345     <path d="M12.289,2C6.617,2,3.606,5.648,3.606,9.622c0,1.846,1.025,4.146,2.666,4.878c0.25,0.111,0.381,0.063,0.439-0.169 c0.044-0.175,0.267-1.029,0.365-1.428c0.032-0.128,0.017-0.237-0.091-0.362C6.445,11.911,6.01,10.75,6.01,9.668 c0-2.777,2.194-5.464,5.933-5.464c3.23,0,5.49,2.108,5.49,5.122c0,3.407-1.794,5.768-4.13,5.768c-1.291,0-2.257-1.021-1.948-2.277 c0.372-1.495,1.089-3.112,1.089-4.191c0-0.967-0.542-1.775-1.663-1.775c-1.319,0-2.379,1.309-2.379,3.059 c0,1.115,0.394,1.869,0.394,1.869s-1.302,5.279-1.54,6.261c-0.405,1.666,0.053,4.368,0.094,4.604 c0.021,0.126,0.167,0.169,0.25,0.063c0.129-0.165,1.699-2.419,2.142-4.051c0.158-0.59,0.817-2.995,0.817-2.995 c0.43,0.784,1.681,1.446,3.013,1.446c3.963,0,6.822-3.494,6.822-7.833C20.394,5.112,16.849,2,12.289,2"/>
     373    <path d="M12.289,2C6.617,2,3.606,5.648,3.606,9.622c0,1.846,1.025,4.146,2.666,4.878c0.25,0.111,0.381,0.063,0.439-0.169 c0.044-0.175,0.267-1.029,0.365-1.428c0.032-0.128,0.017-0.237-0.091-0.362C6.445,11.911,6.01,10.75,6.01,9.668 c0-2.777,2.194-5.464,5.933-5.464c3.23,0,5.49,2.108,5.49,5.122c0,3.407-1.794,5.768-4.13,5.768c-1.291,0-2.257-1.021-1.948-2.277 c0.372-1.495,1.089-3.112,1.089-4.191c0-0.967-0.542-1.775-1.663-1.775c-1.319,0-2.379,1.309-2.379,3.059 c0,1.115,0.394,1.869,0.394,1.869s-1.302,5.279-1.54,6.261c-0.405,1.666,0.053,4.368,0.094,4.604 c0.021,0.126,0.167,0.169,0.25,0.063c0.129-0.165,1.699-2.419,2.142-4.051c0.158-0.59,0.817-2.995,0.817-2.995 c0.43,0.784,1.681,1.446,3.013,1.446c3.963,0,6.822-3.494,6.822-7.833C20.394,5.112,16.849,2,12.289,2"></path>
    346374</svg>',
    347375
    348376        'pocket'      => '
    349377<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    350     <path d="M21.927,4.194C21.667,3.48,20.982,3,20.222,3h-0.01h-1.721H3.839C3.092,3,2.411,3.47,2.145,4.17 C2.066,4.378,2.026,4.594,2.026,4.814v6.035l0.069,1.2c0.29,2.73,1.707,5.115,3.899,6.778c0.039,0.03,0.079,0.059,0.119,0.089 l0.025,0.018c1.175,0.859,2.491,1.441,3.91,1.727c0.655,0.132,1.325,0.2,1.991,0.2c0.615,0,1.232-0.057,1.839-0.17 c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.297,2.621-0.864,3.753-1.691l0.025-0.018 c0.04-0.029,0.08-0.058,0.119-0.089c2.192-1.664,3.609-4.049,3.898-6.778l0.069-1.2V4.814C22.026,4.605,22,4.398,21.927,4.194z M17.692,10.481l-4.704,4.512c-0.266,0.254-0.608,0.382-0.949,0.382c-0.342,0-0.684-0.128-0.949-0.382l-4.705-4.512 C5.838,9.957,5.82,9.089,6.344,8.542c0.524-0.547,1.392-0.565,1.939-0.04l3.756,3.601l3.755-3.601 c0.547-0.524,1.415-0.506,1.939,0.04C18.256,9.089,18.238,9.956,17.692,10.481z"/>
     378    <path d="M21.927,4.194C21.667,3.48,20.982,3,20.222,3h-0.01h-1.721H3.839C3.092,3,2.411,3.47,2.145,4.17 C2.066,4.378,2.026,4.594,2.026,4.814v6.035l0.069,1.2c0.29,2.73,1.707,5.115,3.899,6.778c0.039,0.03,0.079,0.059,0.119,0.089 l0.025,0.018c1.175,0.859,2.491,1.441,3.91,1.727c0.655,0.132,1.325,0.2,1.991,0.2c0.615,0,1.232-0.057,1.839-0.17 c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.297,2.621-0.864,3.753-1.691l0.025-0.018 c0.04-0.029,0.08-0.058,0.119-0.089c2.192-1.664,3.609-4.049,3.898-6.778l0.069-1.2V4.814C22.026,4.605,22,4.398,21.927,4.194z M17.692,10.481l-4.704,4.512c-0.266,0.254-0.608,0.382-0.949,0.382c-0.342,0-0.684-0.128-0.949-0.382l-4.705-4.512 C5.838,9.957,5.82,9.089,6.344,8.542c0.524-0.547,1.392-0.565,1.939-0.04l3.756,3.601l3.755-3.601 c0.547-0.524,1.415-0.506,1.939,0.04C18.256,9.089,18.238,9.956,17.692,10.481z"></path>
    351379</svg>',
    352380
    353381        'reddit'      => '
    354382<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    355     <path d="M22,11.816c0-1.256-1.021-2.277-2.277-2.277c-0.593,0-1.122,0.24-1.526,0.614c-1.481-0.965-3.455-1.594-5.647-1.69 l1.171-3.702l3.18,0.748c0.008,1.028,0.846,1.862,1.876,1.862c1.035,0,1.877-0.842,1.877-1.878c0-1.035-0.842-1.877-1.877-1.877 c-0.769,0-1.431,0.466-1.72,1.13l-3.508-0.826c-0.203-0.047-0.399,0.067-0.46,0.261l-1.35,4.268 c-2.316,0.038-4.411,0.67-5.97,1.671C5.368,9.765,4.853,9.539,4.277,9.539C3.021,9.539,2,10.56,2,11.816 c0,0.814,0.433,1.523,1.078,1.925c-0.037,0.221-0.061,0.444-0.061,0.672c0,3.292,4.011,5.97,8.941,5.97s8.941-2.678,8.941-5.97 c0-0.214-0.02-0.424-0.053-0.632C21.533,13.39,22,12.661,22,11.816z M18.776,4.394c0.606,0,1.1,0.493,1.1,1.1s-0.493,1.1-1.1,1.1 s-1.1-0.494-1.1-1.1S18.169,4.394,18.776,4.394z M2.777,11.816c0-0.827,0.672-1.5,1.499-1.5c0.313,0,0.598,0.103,0.838,0.269 c-0.851,0.676-1.477,1.479-1.812,2.36C2.983,12.672,2.777,12.27,2.777,11.816z M11.959,19.606c-4.501,0-8.164-2.329-8.164-5.193 S7.457,9.22,11.959,9.22s8.164,2.329,8.164,5.193S16.46,19.606,11.959,19.606z M20.636,13.001c-0.326-0.89-0.948-1.701-1.797-2.384 c0.248-0.186,0.55-0.301,0.883-0.301c0.827,0,1.5,0.673,1.5,1.5C21.223,12.299,20.992,12.727,20.636,13.001z M8.996,14.704 c-0.76,0-1.397-0.616-1.397-1.376c0-0.76,0.637-1.397,1.397-1.397c0.76,0,1.376,0.637,1.376,1.397 C10.372,14.088,9.756,14.704,8.996,14.704z M16.401,13.328c0,0.76-0.616,1.376-1.376,1.376c-0.76,0-1.399-0.616-1.399-1.376 c0-0.76,0.639-1.397,1.399-1.397C15.785,11.931,16.401,12.568,16.401,13.328z M15.229,16.708c0.152,0.152,0.152,0.398,0,0.55 c-0.674,0.674-1.727,1.002-3.219,1.002c-0.004,0-0.007-0.002-0.011-0.002c-0.004,0-0.007,0.002-0.011,0.002 c-1.492,0-2.544-0.328-3.218-1.002c-0.152-0.152-0.152-0.398,0-0.55c0.152-0.152,0.399-0.151,0.55,0 c0.521,0.521,1.394,0.775,2.669,0.775c0.004,0,0.007,0.002,0.011,0.002c0.004,0,0.007-0.002,0.011-0.002 c1.275,0,2.148-0.253,2.669-0.775C14.831,16.556,15.078,16.556,15.229,16.708z"/>
     383    <path d="M22,11.816c0-1.256-1.021-2.277-2.277-2.277c-0.593,0-1.122,0.24-1.526,0.614c-1.481-0.965-3.455-1.594-5.647-1.69 l1.171-3.702l3.18,0.748c0.008,1.028,0.846,1.862,1.876,1.862c1.035,0,1.877-0.842,1.877-1.878c0-1.035-0.842-1.877-1.877-1.877 c-0.769,0-1.431,0.466-1.72,1.13l-3.508-0.826c-0.203-0.047-0.399,0.067-0.46,0.261l-1.35,4.268 c-2.316,0.038-4.411,0.67-5.97,1.671C5.368,9.765,4.853,9.539,4.277,9.539C3.021,9.539,2,10.56,2,11.816 c0,0.814,0.433,1.523,1.078,1.925c-0.037,0.221-0.061,0.444-0.061,0.672c0,3.292,4.011,5.97,8.941,5.97s8.941-2.678,8.941-5.97 c0-0.214-0.02-0.424-0.053-0.632C21.533,13.39,22,12.661,22,11.816z M18.776,4.394c0.606,0,1.1,0.493,1.1,1.1s-0.493,1.1-1.1,1.1 s-1.1-0.494-1.1-1.1S18.169,4.394,18.776,4.394z M2.777,11.816c0-0.827,0.672-1.5,1.499-1.5c0.313,0,0.598,0.103,0.838,0.269 c-0.851,0.676-1.477,1.479-1.812,2.36C2.983,12.672,2.777,12.27,2.777,11.816z M11.959,19.606c-4.501,0-8.164-2.329-8.164-5.193 S7.457,9.22,11.959,9.22s8.164,2.329,8.164,5.193S16.46,19.606,11.959,19.606z M20.636,13.001c-0.326-0.89-0.948-1.701-1.797-2.384 c0.248-0.186,0.55-0.301,0.883-0.301c0.827,0,1.5,0.673,1.5,1.5C21.223,12.299,20.992,12.727,20.636,13.001z M8.996,14.704 c-0.76,0-1.397-0.616-1.397-1.376c0-0.76,0.637-1.397,1.397-1.397c0.76,0,1.376,0.637,1.376,1.397 C10.372,14.088,9.756,14.704,8.996,14.704z M16.401,13.328c0,0.76-0.616,1.376-1.376,1.376c-0.76,0-1.399-0.616-1.399-1.376 c0-0.76,0.639-1.397,1.399-1.397C15.785,11.931,16.401,12.568,16.401,13.328z M15.229,16.708c0.152,0.152,0.152,0.398,0,0.55 c-0.674,0.674-1.727,1.002-3.219,1.002c-0.004,0-0.007-0.002-0.011-0.002c-0.004,0-0.007,0.002-0.011,0.002 c-1.492,0-2.544-0.328-3.218-1.002c-0.152-0.152-0.152-0.398,0-0.55c0.152-0.152,0.399-0.151,0.55,0 c0.521,0.521,1.394,0.775,2.669,0.775c0.004,0,0.007,0.002,0.011,0.002c0.004,0,0.007-0.002,0.011-0.002 c1.275,0,2.148-0.253,2.669-0.775C14.831,16.556,15.078,16.556,15.229,16.708z"></path>
    356384</svg>',
    357385
    358386        'skype'       => '
    359387<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    360     <path d="M10.113,2.699c0.033-0.006,0.067-0.013,0.1-0.02c0.033,0.017,0.066,0.033,0.098,0.051L10.113,2.699z M2.72,10.223 c-0.006,0.034-0.011,0.069-0.017,0.103c0.018,0.032,0.033,0.064,0.051,0.095L2.72,10.223z M21.275,13.771 c0.007-0.035,0.011-0.071,0.018-0.106c-0.018-0.031-0.033-0.064-0.052-0.095L21.275,13.771z M13.563,21.199 c0.032,0.019,0.065,0.035,0.096,0.053c0.036-0.006,0.071-0.011,0.105-0.017L13.563,21.199z M22,16.386 c0,1.494-0.581,2.898-1.637,3.953c-1.056,1.057-2.459,1.637-3.953,1.637c-0.967,0-1.914-0.251-2.75-0.725 c0.036-0.006,0.071-0.011,0.105-0.017l-0.202-0.035c0.032,0.019,0.065,0.035,0.096,0.053c-0.543,0.096-1.099,0.147-1.654,0.147 c-1.275,0-2.512-0.25-3.676-0.743c-1.125-0.474-2.135-1.156-3.002-2.023c-0.867-0.867-1.548-1.877-2.023-3.002 c-0.493-1.164-0.743-2.401-0.743-3.676c0-0.546,0.049-1.093,0.142-1.628c0.018,0.032,0.033,0.064,0.051,0.095L2.72,10.223 c-0.006,0.034-0.011,0.069-0.017,0.103C2.244,9.5,2,8.566,2,7.615c0-1.493,0.582-2.898,1.637-3.953 c1.056-1.056,2.46-1.638,3.953-1.638c0.915,0,1.818,0.228,2.622,0.655c-0.033,0.007-0.067,0.013-0.1,0.02l0.199,0.031 c-0.032-0.018-0.066-0.034-0.098-0.051c0.002,0,0.003-0.001,0.004-0.001c0.586-0.112,1.187-0.169,1.788-0.169 c1.275,0,2.512,0.249,3.676,0.742c1.124,0.476,2.135,1.156,3.002,2.024c0.868,0.867,1.548,1.877,2.024,3.002 c0.493,1.164,0.743,2.401,0.743,3.676c0,0.575-0.054,1.15-0.157,1.712c-0.018-0.031-0.033-0.064-0.052-0.095l0.034,0.201 c0.007-0.035,0.011-0.071,0.018-0.106C21.754,14.494,22,15.432,22,16.386z M16.817,14.138c0-1.331-0.613-2.743-3.033-3.282 l-2.209-0.49c-0.84-0.192-1.807-0.444-1.807-1.237c0-0.794,0.679-1.348,1.903-1.348c2.468,0,2.243,1.696,3.468,1.696 c0.645,0,1.209-0.379,1.209-1.031c0-1.521-2.435-2.663-4.5-2.663c-2.242,0-4.63,0.952-4.63,3.488c0,1.221,0.436,2.521,2.839,3.123 l2.984,0.745c0.903,0.223,1.129,0.731,1.129,1.189c0,0.762-0.758,1.507-2.129,1.507c-2.679,0-2.307-2.062-3.743-2.062 c-0.645,0-1.113,0.444-1.113,1.078c0,1.236,1.501,2.886,4.856,2.886C15.236,17.737,16.817,16.199,16.817,14.138z"/>
     388    <path d="M10.113,2.699c0.033-0.006,0.067-0.013,0.1-0.02c0.033,0.017,0.066,0.033,0.098,0.051L10.113,2.699z M2.72,10.223 c-0.006,0.034-0.011,0.069-0.017,0.103c0.018,0.032,0.033,0.064,0.051,0.095L2.72,10.223z M21.275,13.771 c0.007-0.035,0.011-0.071,0.018-0.106c-0.018-0.031-0.033-0.064-0.052-0.095L21.275,13.771z M13.563,21.199 c0.032,0.019,0.065,0.035,0.096,0.053c0.036-0.006,0.071-0.011,0.105-0.017L13.563,21.199z M22,16.386 c0,1.494-0.581,2.898-1.637,3.953c-1.056,1.057-2.459,1.637-3.953,1.637c-0.967,0-1.914-0.251-2.75-0.725 c0.036-0.006,0.071-0.011,0.105-0.017l-0.202-0.035c0.032,0.019,0.065,0.035,0.096,0.053c-0.543,0.096-1.099,0.147-1.654,0.147 c-1.275,0-2.512-0.25-3.676-0.743c-1.125-0.474-2.135-1.156-3.002-2.023c-0.867-0.867-1.548-1.877-2.023-3.002 c-0.493-1.164-0.743-2.401-0.743-3.676c0-0.546,0.049-1.093,0.142-1.628c0.018,0.032,0.033,0.064,0.051,0.095L2.72,10.223 c-0.006,0.034-0.011,0.069-0.017,0.103C2.244,9.5,2,8.566,2,7.615c0-1.493,0.582-2.898,1.637-3.953 c1.056-1.056,2.46-1.638,3.953-1.638c0.915,0,1.818,0.228,2.622,0.655c-0.033,0.007-0.067,0.013-0.1,0.02l0.199,0.031 c-0.032-0.018-0.066-0.034-0.098-0.051c0.002,0,0.003-0.001,0.004-0.001c0.586-0.112,1.187-0.169,1.788-0.169 c1.275,0,2.512,0.249,3.676,0.742c1.124,0.476,2.135,1.156,3.002,2.024c0.868,0.867,1.548,1.877,2.024,3.002 c0.493,1.164,0.743,2.401,0.743,3.676c0,0.575-0.054,1.15-0.157,1.712c-0.018-0.031-0.033-0.064-0.052-0.095l0.034,0.201 c0.007-0.035,0.011-0.071,0.018-0.106C21.754,14.494,22,15.432,22,16.386z M16.817,14.138c0-1.331-0.613-2.743-3.033-3.282 l-2.209-0.49c-0.84-0.192-1.807-0.444-1.807-1.237c0-0.794,0.679-1.348,1.903-1.348c2.468,0,2.243,1.696,3.468,1.696 c0.645,0,1.209-0.379,1.209-1.031c0-1.521-2.435-2.663-4.5-2.663c-2.242,0-4.63,0.952-4.63,3.488c0,1.221,0.436,2.521,2.839,3.123 l2.984,0.745c0.903,0.223,1.129,0.731,1.129,1.189c0,0.762-0.758,1.507-2.129,1.507c-2.679,0-2.307-2.062-3.743-2.062 c-0.645,0-1.113,0.444-1.113,1.078c0,1.236,1.501,2.886,4.856,2.886C15.236,17.737,16.817,16.199,16.817,14.138z"></path>
    361389</svg>',
    362390
    363391        'slideshare'  => '
    364392<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    365     <path d="M11.738,10.232a2.142,2.142,0,0,1-.721,1.619,2.556,2.556,0,0,1-3.464,0,2.183,2.183,0,0,1,0-3.243,2.572,2.572,0,0,1,3.464,0A2.136,2.136,0,0,1,11.738,10.232Zm5.7,0a2.15,2.15,0,0,1-.715,1.619,2.563,2.563,0,0,1-3.469,0,2.183,2.183,0,0,1,0-3.243,2.58,2.58,0,0,1,3.469,0A2.144,2.144,0,0,1,17.439,10.232Zm2.555,2.045V4.7a2.128,2.128,0,0,0-.363-1.4,1.614,1.614,0,0,0-1.261-.415H5.742a1.656,1.656,0,0,0-1.278.386A2.246,2.246,0,0,0,4.129,4.7v7.643a8.212,8.212,0,0,0,1,.454q.516.193.92.318a6.847,6.847,0,0,0,.92.21q.516.085.806.125a6.615,6.615,0,0,0,.795.045l.665.006q.16,0,.642-.023t.506-.023a1.438,1.438,0,0,1,1.079.307,1.134,1.134,0,0,0,.114.1,7.215,7.215,0,0,0,.693.579q.079-1.033,1.34-.988.057,0,.415.017l.488.023q.13.006.517.011t.6-.011l.619-.051a5.419,5.419,0,0,0,.693-.1l.7-.153a5.353,5.353,0,0,0,.761-.221q.345-.131.766-.307a8.727,8.727,0,0,0,.818-.392Zm1.851-.057a10.4,10.4,0,0,1-4.225,2.862,6.5,6.5,0,0,1-.261,5.281,3.524,3.524,0,0,1-2.078,1.681,2.452,2.452,0,0,1-2.067-.17,1.915,1.915,0,0,1-.931-1.863l-.011-3.7V16.3l-.279-.068q-.188-.045-.267-.057l-.011,3.839a1.9,1.9,0,0,1-.943,1.863,2.481,2.481,0,0,1-2.078.17,3.519,3.519,0,0,1-2.067-1.7,6.546,6.546,0,0,1-.25-5.258A10.4,10.4,0,0,1,2.152,12.22a.56.56,0,0,1-.045-.715q.238-.3.681.011l.125.079a.767.767,0,0,1,.125.091V3.8a1.987,1.987,0,0,1,.534-1.4,1.7,1.7,0,0,1,1.295-.579H19.141a1.7,1.7,0,0,1,1.295.579,1.985,1.985,0,0,1,.534,1.4v7.882l.238-.17q.443-.307.681-.011a.56.56,0,0,1-.045.715Z"/>
     393    <path d="M11.738,10.232a2.142,2.142,0,0,1-.721,1.619,2.556,2.556,0,0,1-3.464,0,2.183,2.183,0,0,1,0-3.243,2.572,2.572,0,0,1,3.464,0A2.136,2.136,0,0,1,11.738,10.232Zm5.7,0a2.15,2.15,0,0,1-.715,1.619,2.563,2.563,0,0,1-3.469,0,2.183,2.183,0,0,1,0-3.243,2.58,2.58,0,0,1,3.469,0A2.144,2.144,0,0,1,17.439,10.232Zm2.555,2.045V4.7a2.128,2.128,0,0,0-.363-1.4,1.614,1.614,0,0,0-1.261-.415H5.742a1.656,1.656,0,0,0-1.278.386A2.246,2.246,0,0,0,4.129,4.7v7.643a8.212,8.212,0,0,0,1,.454q.516.193.92.318a6.847,6.847,0,0,0,.92.21q.516.085.806.125a6.615,6.615,0,0,0,.795.045l.665.006q.16,0,.642-.023t.506-.023a1.438,1.438,0,0,1,1.079.307,1.134,1.134,0,0,0,.114.1,7.215,7.215,0,0,0,.693.579q.079-1.033,1.34-.988.057,0,.415.017l.488.023q.13.006.517.011t.6-.011l.619-.051a5.419,5.419,0,0,0,.693-.1l.7-.153a5.353,5.353,0,0,0,.761-.221q.345-.131.766-.307a8.727,8.727,0,0,0,.818-.392Zm1.851-.057a10.4,10.4,0,0,1-4.225,2.862,6.5,6.5,0,0,1-.261,5.281,3.524,3.524,0,0,1-2.078,1.681,2.452,2.452,0,0,1-2.067-.17,1.915,1.915,0,0,1-.931-1.863l-.011-3.7V16.3l-.279-.068q-.188-.045-.267-.057l-.011,3.839a1.9,1.9,0,0,1-.943,1.863,2.481,2.481,0,0,1-2.078.17,3.519,3.519,0,0,1-2.067-1.7,6.546,6.546,0,0,1-.25-5.258A10.4,10.4,0,0,1,2.152,12.22a.56.56,0,0,1-.045-.715q.238-.3.681.011l.125.079a.767.767,0,0,1,.125.091V3.8a1.987,1.987,0,0,1,.534-1.4,1.7,1.7,0,0,1,1.295-.579H19.141a1.7,1.7,0,0,1,1.295.579,1.985,1.985,0,0,1,.534,1.4v7.882l.238-.17q.443-.307.681-.011a.56.56,0,0,1-.045.715Z"></path>
    366394</svg>',
    367395
    368396        'snapchat'    => '
    369397<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    370     <path d="M12.065,2a5.526,5.526,0,0,1,3.132.892A5.854,5.854,0,0,1,17.326,5.4a5.821,5.821,0,0,1,.351,2.33q0,.612-.117,2.487a.809.809,0,0,0,.365.091,1.93,1.93,0,0,0,.664-.176,1.93,1.93,0,0,1,.664-.176,1.3,1.3,0,0,1,.729.234.7.7,0,0,1,.351.6.839.839,0,0,1-.41.7,2.732,2.732,0,0,1-.9.41,3.192,3.192,0,0,0-.9.378.728.728,0,0,0-.41.618,1.575,1.575,0,0,0,.156.56,6.9,6.9,0,0,0,1.334,1.953,5.6,5.6,0,0,0,1.881,1.315,5.875,5.875,0,0,0,1.042.3.42.42,0,0,1,.365.456q0,.911-2.852,1.341a1.379,1.379,0,0,0-.143.507,1.8,1.8,0,0,1-.182.605.451.451,0,0,1-.429.241,5.878,5.878,0,0,1-.807-.085,5.917,5.917,0,0,0-.833-.085,4.217,4.217,0,0,0-.807.065,2.42,2.42,0,0,0-.82.293,6.682,6.682,0,0,0-.755.5q-.351.267-.755.527a3.886,3.886,0,0,1-.989.436A4.471,4.471,0,0,1,11.831,22a4.307,4.307,0,0,1-1.256-.176,3.784,3.784,0,0,1-.976-.436q-.4-.26-.749-.527a6.682,6.682,0,0,0-.755-.5,2.422,2.422,0,0,0-.807-.293,4.432,4.432,0,0,0-.82-.065,5.089,5.089,0,0,0-.853.1,5,5,0,0,1-.762.1.474.474,0,0,1-.456-.241,1.819,1.819,0,0,1-.182-.618,1.411,1.411,0,0,0-.143-.521q-2.852-.429-2.852-1.341a.42.42,0,0,1,.365-.456,5.793,5.793,0,0,0,1.042-.3,5.524,5.524,0,0,0,1.881-1.315,6.789,6.789,0,0,0,1.334-1.953A1.575,1.575,0,0,0,6,12.9a.728.728,0,0,0-.41-.618,3.323,3.323,0,0,0-.9-.384,2.912,2.912,0,0,1-.9-.41.814.814,0,0,1-.41-.684.71.71,0,0,1,.338-.593,1.208,1.208,0,0,1,.716-.241,1.976,1.976,0,0,1,.625.169,2.008,2.008,0,0,0,.69.169.919.919,0,0,0,.416-.091q-.117-1.849-.117-2.474A5.861,5.861,0,0,1,6.385,5.4,5.516,5.516,0,0,1,8.625,2.819,7.075,7.075,0,0,1,12.062,2Z"/>
     398    <path d="M12.065,2a5.526,5.526,0,0,1,3.132.892A5.854,5.854,0,0,1,17.326,5.4a5.821,5.821,0,0,1,.351,2.33q0,.612-.117,2.487a.809.809,0,0,0,.365.091,1.93,1.93,0,0,0,.664-.176,1.93,1.93,0,0,1,.664-.176,1.3,1.3,0,0,1,.729.234.7.7,0,0,1,.351.6.839.839,0,0,1-.41.7,2.732,2.732,0,0,1-.9.41,3.192,3.192,0,0,0-.9.378.728.728,0,0,0-.41.618,1.575,1.575,0,0,0,.156.56,6.9,6.9,0,0,0,1.334,1.953,5.6,5.6,0,0,0,1.881,1.315,5.875,5.875,0,0,0,1.042.3.42.42,0,0,1,.365.456q0,.911-2.852,1.341a1.379,1.379,0,0,0-.143.507,1.8,1.8,0,0,1-.182.605.451.451,0,0,1-.429.241,5.878,5.878,0,0,1-.807-.085,5.917,5.917,0,0,0-.833-.085,4.217,4.217,0,0,0-.807.065,2.42,2.42,0,0,0-.82.293,6.682,6.682,0,0,0-.755.5q-.351.267-.755.527a3.886,3.886,0,0,1-.989.436A4.471,4.471,0,0,1,11.831,22a4.307,4.307,0,0,1-1.256-.176,3.784,3.784,0,0,1-.976-.436q-.4-.26-.749-.527a6.682,6.682,0,0,0-.755-.5,2.422,2.422,0,0,0-.807-.293,4.432,4.432,0,0,0-.82-.065,5.089,5.089,0,0,0-.853.1,5,5,0,0,1-.762.1.474.474,0,0,1-.456-.241,1.819,1.819,0,0,1-.182-.618,1.411,1.411,0,0,0-.143-.521q-2.852-.429-2.852-1.341a.42.42,0,0,1,.365-.456,5.793,5.793,0,0,0,1.042-.3,5.524,5.524,0,0,0,1.881-1.315,6.789,6.789,0,0,0,1.334-1.953A1.575,1.575,0,0,0,6,12.9a.728.728,0,0,0-.41-.618,3.323,3.323,0,0,0-.9-.384,2.912,2.912,0,0,1-.9-.41.814.814,0,0,1-.41-.684.71.71,0,0,1,.338-.593,1.208,1.208,0,0,1,.716-.241,1.976,1.976,0,0,1,.625.169,2.008,2.008,0,0,0,.69.169.919.919,0,0,0,.416-.091q-.117-1.849-.117-2.474A5.861,5.861,0,0,1,6.385,5.4,5.516,5.516,0,0,1,8.625,2.819,7.075,7.075,0,0,1,12.062,2Z"></path>
    371399</svg>',
    372400
    373401        'soundcloud'  => '
    374402<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    375     <path d="M8.9,16.1L9,14L8.9,9.5c0-0.1,0-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1,0-0.1,0.1c0,0-0.1,0.1-0.1,0.1L8.3,14l0.1,2.1 c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1C8.8,16.3,8.9,16.3,8.9,16.1z M11.4,15.9l0.1-1.8L11.4,9c0-0.1,0-0.2-0.1-0.2 c0,0-0.1,0-0.1,0s-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.2l0,0.1l-0.1,5c0,0,0,0.7,0.1,2v0c0,0.1,0,0.1,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.1 c0.1,0,0.1,0,0.2-0.1c0.1,0,0.1-0.1,0.1-0.2L11.4,15.9z M2.4,12.9L2.5,14l-0.2,1.1c0,0.1,0,0.1-0.1,0.1c0,0-0.1,0-0.1-0.1L2.1,14 l0.1-1.1C2.2,12.9,2.3,12.9,2.4,12.9C2.3,12.9,2.4,12.9,2.4,12.9z M3.1,12.2L3.3,14l-0.2,1.8c0,0.1,0,0.1-0.1,0.1 c-0.1,0-0.1,0-0.1-0.1L2.8,14L3,12.2C3,12.2,3,12.2,3.1,12.2C3.1,12.2,3.1,12.2,3.1,12.2z M3.9,11.9L4.1,14l-0.2,2.1 c0,0.1,0,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L3.5,14l0.2-2.1c0-0.1,0-0.1,0.1-0.1C3.9,11.8,3.9,11.8,3.9,11.9z M4.7,11.9L4.9,14 l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L4.3,14l0.2-2.2c0-0.1,0-0.1,0.1-0.1C4.7,11.7,4.7,11.8,4.7,11.9z M5.6,12 l0.2,2l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1L5.1,14l0.2-2c0,0,0-0.1,0-0.1s0.1,0,0.1,0 C5.5,11.9,5.5,11.9,5.6,12L5.6,12z M6.4,10.7L6.6,14l-0.2,2.1c0,0,0,0.1,0,0.1c0,0-0.1,0-0.1,0c-0.1,0-0.1-0.1-0.2-0.2L5.9,14 l0.2-3.3c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0C6.4,10.7,6.4,10.7,6.4,10.7z M7.2,10l0.2,4.1l-0.2,2.1c0,0,0,0.1,0,0.1 c0,0-0.1,0-0.1,0c-0.1,0-0.2-0.1-0.2-0.2l-0.1-2.1L6.8,10c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0S7.2,9.9,7.2,10z M8,9.6L8.2,14 L8,16.1c0,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2-0.1-0.2-0.2L7.5,14l0.1-4.4c0-0.1,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1,0,0.1,0,0.1,0.1 C8,9.6,8,9.6,8,9.6z M11.4,16.1L11.4,16.1L11.4,16.1z M9.7,9.6L9.8,14l-0.1,2.1c0,0.1,0,0.1-0.1,0.2s-0.1,0.1-0.2,0.1 c-0.1,0-0.1,0-0.1-0.1s-0.1-0.1-0.1-0.2L9.2,14l0.1-4.4c0-0.1,0-0.1,0.1-0.2s0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S9.7,9.5,9.7,9.6 L9.7,9.6z M10.6,9.8l0.1,4.3l-0.1,2c0,0.1,0,0.1-0.1,0.2c0,0-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c0,0-0.1-0.1-0.1-0.2L10,14 l0.1-4.3c0-0.1,0-0.1,0.1-0.2c0,0,0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S10.6,9.7,10.6,9.8z M12.4,14l-0.1,2c0,0.1,0,0.1-0.1,0.2 c-0.1,0.1-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2l-0.1-1l-0.1-1l0.1-5.5v0c0-0.1,0-0.2,0.1-0.2 c0.1,0,0.1-0.1,0.2-0.1c0,0,0.1,0,0.1,0c0.1,0,0.1,0.1,0.1,0.2L12.4,14z M22.1,13.9c0,0.7-0.2,1.3-0.7,1.7c-0.5,0.5-1.1,0.7-1.7,0.7 h-6.8c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2V8.2c0-0.1,0.1-0.2,0.2-0.3c0.5-0.2,1-0.3,1.6-0.3c1.1,0,2.1,0.4,2.9,1.1 c0.8,0.8,1.3,1.7,1.4,2.8c0.3-0.1,0.6-0.2,1-0.2c0.7,0,1.3,0.2,1.7,0.7C21.8,12.6,22.1,13.2,22.1,13.9L22.1,13.9z"/>
     403    <path d="M8.9,16.1L9,14L8.9,9.5c0-0.1,0-0.1-0.1-0.1c0,0-0.1-0.1-0.1-0.1c-0.1,0-0.1,0-0.1,0.1c0,0-0.1,0.1-0.1,0.1L8.3,14l0.1,2.1 c0,0.1,0,0.1,0.1,0.1c0,0,0.1,0.1,0.1,0.1C8.8,16.3,8.9,16.3,8.9,16.1z M11.4,15.9l0.1-1.8L11.4,9c0-0.1,0-0.2-0.1-0.2 c0,0-0.1,0-0.1,0s-0.1,0-0.1,0c-0.1,0-0.1,0.1-0.1,0.2l0,0.1l-0.1,5c0,0,0,0.7,0.1,2v0c0,0.1,0,0.1,0.1,0.1c0.1,0.1,0.1,0.1,0.2,0.1 c0.1,0,0.1,0,0.2-0.1c0.1,0,0.1-0.1,0.1-0.2L11.4,15.9z M2.4,12.9L2.5,14l-0.2,1.1c0,0.1,0,0.1-0.1,0.1c0,0-0.1,0-0.1-0.1L2.1,14 l0.1-1.1C2.2,12.9,2.3,12.9,2.4,12.9C2.3,12.9,2.4,12.9,2.4,12.9z M3.1,12.2L3.3,14l-0.2,1.8c0,0.1,0,0.1-0.1,0.1 c-0.1,0-0.1,0-0.1-0.1L2.8,14L3,12.2C3,12.2,3,12.2,3.1,12.2C3.1,12.2,3.1,12.2,3.1,12.2z M3.9,11.9L4.1,14l-0.2,2.1 c0,0.1,0,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L3.5,14l0.2-2.1c0-0.1,0-0.1,0.1-0.1C3.9,11.8,3.9,11.8,3.9,11.9z M4.7,11.9L4.9,14 l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c-0.1,0-0.1,0-0.1-0.1L4.3,14l0.2-2.2c0-0.1,0-0.1,0.1-0.1C4.7,11.7,4.7,11.8,4.7,11.9z M5.6,12 l0.2,2l-0.2,2.1c0,0.1-0.1,0.1-0.1,0.1c0,0-0.1,0-0.1,0c0,0,0-0.1,0-0.1L5.1,14l0.2-2c0,0,0-0.1,0-0.1s0.1,0,0.1,0 C5.5,11.9,5.5,11.9,5.6,12L5.6,12z M6.4,10.7L6.6,14l-0.2,2.1c0,0,0,0.1,0,0.1c0,0-0.1,0-0.1,0c-0.1,0-0.1-0.1-0.2-0.2L5.9,14 l0.2-3.3c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0C6.4,10.7,6.4,10.7,6.4,10.7z M7.2,10l0.2,4.1l-0.2,2.1c0,0,0,0.1,0,0.1 c0,0-0.1,0-0.1,0c-0.1,0-0.2-0.1-0.2-0.2l-0.1-2.1L6.8,10c0-0.1,0.1-0.2,0.2-0.2c0,0,0.1,0,0.1,0S7.2,9.9,7.2,10z M8,9.6L8.2,14 L8,16.1c0,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2-0.1-0.2-0.2L7.5,14l0.1-4.4c0-0.1,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1,0,0.1,0,0.1,0.1 C8,9.6,8,9.6,8,9.6z M11.4,16.1L11.4,16.1L11.4,16.1z M9.7,9.6L9.8,14l-0.1,2.1c0,0.1,0,0.1-0.1,0.2s-0.1,0.1-0.2,0.1 c-0.1,0-0.1,0-0.1-0.1s-0.1-0.1-0.1-0.2L9.2,14l0.1-4.4c0-0.1,0-0.1,0.1-0.2s0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S9.7,9.5,9.7,9.6 L9.7,9.6z M10.6,9.8l0.1,4.3l-0.1,2c0,0.1,0,0.1-0.1,0.2c0,0-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c0,0-0.1-0.1-0.1-0.2L10,14 l0.1-4.3c0-0.1,0-0.1,0.1-0.2c0,0,0.1-0.1,0.2-0.1c0.1,0,0.1,0,0.2,0.1S10.6,9.7,10.6,9.8z M12.4,14l-0.1,2c0,0.1,0,0.1-0.1,0.2 c-0.1,0.1-0.1,0.1-0.2,0.1c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2l-0.1-1l-0.1-1l0.1-5.5v0c0-0.1,0-0.2,0.1-0.2 c0.1,0,0.1-0.1,0.2-0.1c0,0,0.1,0,0.1,0c0.1,0,0.1,0.1,0.1,0.2L12.4,14z M22.1,13.9c0,0.7-0.2,1.3-0.7,1.7c-0.5,0.5-1.1,0.7-1.7,0.7 h-6.8c-0.1,0-0.1,0-0.2-0.1c-0.1-0.1-0.1-0.1-0.1-0.2V8.2c0-0.1,0.1-0.2,0.2-0.3c0.5-0.2,1-0.3,1.6-0.3c1.1,0,2.1,0.4,2.9,1.1 c0.8,0.8,1.3,1.7,1.4,2.8c0.3-0.1,0.6-0.2,1-0.2c0.7,0,1.3,0.2,1.7,0.7C21.8,12.6,22.1,13.2,22.1,13.9L22.1,13.9z"></path>
    376404</svg>',
    377405
    378406        'spotify'     => '
    379407<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    380     <path d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10c5.523,0,10-4.477,10-10C22,6.477,17.523,2,12,2 M16.586,16.424 c-0.18,0.295-0.563,0.387-0.857,0.207c-2.348-1.435-5.304-1.76-8.785-0.964c-0.335,0.077-0.67-0.133-0.746-0.469 c-0.077-0.335,0.132-0.67,0.469-0.746c3.809-0.871,7.077-0.496,9.713,1.115C16.673,15.746,16.766,16.13,16.586,16.424 M17.81,13.7 c-0.226,0.367-0.706,0.482-1.072,0.257c-2.687-1.652-6.785-2.131-9.965-1.166C6.36,12.917,5.925,12.684,5.8,12.273 C5.675,11.86,5.908,11.425,6.32,11.3c3.632-1.102,8.147-0.568,11.234,1.328C17.92,12.854,18.035,13.335,17.81,13.7 M17.915,10.865 c-3.223-1.914-8.54-2.09-11.618-1.156C5.804,9.859,5.281,9.58,5.131,9.086C4.982,8.591,5.26,8.069,5.755,7.919 c3.532-1.072,9.404-0.865,13.115,1.338c0.445,0.264,0.59,0.838,0.327,1.282C18.933,10.983,18.359,11.129,17.915,10.865"/>
     408    <path d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10c5.523,0,10-4.477,10-10C22,6.477,17.523,2,12,2 M16.586,16.424 c-0.18,0.295-0.563,0.387-0.857,0.207c-2.348-1.435-5.304-1.76-8.785-0.964c-0.335,0.077-0.67-0.133-0.746-0.469 c-0.077-0.335,0.132-0.67,0.469-0.746c3.809-0.871,7.077-0.496,9.713,1.115C16.673,15.746,16.766,16.13,16.586,16.424 M17.81,13.7 c-0.226,0.367-0.706,0.482-1.072,0.257c-2.687-1.652-6.785-2.131-9.965-1.166C6.36,12.917,5.925,12.684,5.8,12.273 C5.675,11.86,5.908,11.425,6.32,11.3c3.632-1.102,8.147-0.568,11.234,1.328C17.92,12.854,18.035,13.335,17.81,13.7 M17.915,10.865 c-3.223-1.914-8.54-2.09-11.618-1.156C5.804,9.859,5.281,9.58,5.131,9.086C4.982,8.591,5.26,8.069,5.755,7.919 c3.532-1.072,9.404-0.865,13.115,1.338c0.445,0.264,0.59,0.838,0.327,1.282C18.933,10.983,18.359,11.129,17.915,10.865"></path>
    381409</svg>',
    382410
    383411        'stumbleupon' => '
    384412<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    385     <path d="M12,4.294c-2.469,0-4.471,2.002-4.471,4.471v6.353c0,0.585-0.474,1.059-1.059,1.059c-0.585,0-1.059-0.474-1.059-1.059 v-2.824H2v2.941c0,2.469,2.002,4.471,4.471,4.471c2.469,0,4.471-2.002,4.471-4.471V8.765c0-0.585,0.474-1.059,1.059-1.059 s1.059,0.474,1.059,1.059v1.294l1.412,0.647l2-0.647V8.765C16.471,6.296,14.469,4.294,12,4.294z M13.059,12.353v2.882 c0,2.469,2.002,4.471,4.471,4.471S22,17.704,22,15.235v-2.824h-3.412v2.824c0,0.585-0.474,1.059-1.059,1.059 c-0.585,0-1.059-0.474-1.059-1.059v-2.882l-2,0.647L13.059,12.353z"/>
     413    <path d="M12,4.294c-2.469,0-4.471,2.002-4.471,4.471v6.353c0,0.585-0.474,1.059-1.059,1.059c-0.585,0-1.059-0.474-1.059-1.059 v-2.824H2v2.941c0,2.469,2.002,4.471,4.471,4.471c2.469,0,4.471-2.002,4.471-4.471V8.765c0-0.585,0.474-1.059,1.059-1.059 s1.059,0.474,1.059,1.059v1.294l1.412,0.647l2-0.647V8.765C16.471,6.296,14.469,4.294,12,4.294z M13.059,12.353v2.882 c0,2.469,2.002,4.471,4.471,4.471S22,17.704,22,15.235v-2.824h-3.412v2.824c0,0.585-0.474,1.059-1.059,1.059 c-0.585,0-1.059-0.474-1.059-1.059v-2.882l-2,0.647L13.059,12.353z"></path>
    386414</svg>',
    387415
    388416        'tumblr'      => '
    389417<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    390     <path d="M16.749,17.396c-0.357,0.17-1.041,0.319-1.551,0.332c-1.539,0.041-1.837-1.081-1.85-1.896V9.847h3.861V6.937h-3.847V2.039 c0,0-2.77,0-2.817,0c-0.046,0-0.127,0.041-0.138,0.144c-0.165,1.499-0.867,4.13-3.783,5.181v2.484h1.945v6.282 c0,2.151,1.587,5.206,5.775,5.135c1.413-0.024,2.982-0.616,3.329-1.126L16.749,17.396z"/>
     418    <path d="M16.749,17.396c-0.357,0.17-1.041,0.319-1.551,0.332c-1.539,0.041-1.837-1.081-1.85-1.896V9.847h3.861V6.937h-3.847V2.039 c0,0-2.77,0-2.817,0c-0.046,0-0.127,0.041-0.138,0.144c-0.165,1.499-0.867,4.13-3.783,5.181v2.484h1.945v6.282 c0,2.151,1.587,5.206,5.775,5.135c1.413-0.024,2.982-0.616,3.329-1.126L16.749,17.396z"></path>
    391419</svg>',
    392420
    393421        'twitch'      => '
    394422<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    395     <path d="M16.499,8.089h-1.636v4.91h1.636V8.089z M12,8.089h-1.637v4.91H12V8.089z M4.228,3.178L3,6.451v13.092h4.499V22h2.456 l2.454-2.456h3.681L21,14.636V3.178H4.228z M19.364,13.816l-2.864,2.865H12l-2.453,2.453V16.68H5.863V4.814h13.501V13.816z"/>
     423    <path d="M16.499,8.089h-1.636v4.91h1.636V8.089z M12,8.089h-1.637v4.91H12V8.089z M4.228,3.178L3,6.451v13.092h4.499V22h2.456 l2.454-2.456h3.681L21,14.636V3.178H4.228z M19.364,13.816l-2.864,2.865H12l-2.453,2.453V16.68H5.863V4.814h13.501V13.816z"></path>
    396424</svg>',
    397425
    398426        'twitter'     => '
    399427<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    400     <path d="M22.23,5.924c-0.736,0.326-1.527,0.547-2.357,0.646c0.847-0.508,1.498-1.312,1.804-2.27 c-0.793,0.47-1.671,0.812-2.606,0.996C18.324,4.498,17.257,4,16.077,4c-2.266,0-4.103,1.837-4.103,4.103 c0,0.322,0.036,0.635,0.106,0.935C8.67,8.867,5.647,7.234,3.623,4.751C3.27,5.357,3.067,6.062,3.067,6.814 c0,1.424,0.724,2.679,1.825,3.415c-0.673-0.021-1.305-0.206-1.859-0.513c0,0.017,0,0.034,0,0.052c0,1.988,1.414,3.647,3.292,4.023 c-0.344,0.094-0.707,0.144-1.081,0.144c-0.264,0-0.521-0.026-0.772-0.074c0.522,1.63,2.038,2.816,3.833,2.85 c-1.404,1.1-3.174,1.756-5.096,1.756c-0.331,0-0.658-0.019-0.979-0.057c1.816,1.164,3.973,1.843,6.29,1.843 c7.547,0,11.675-6.252,11.675-11.675c0-0.178-0.004-0.355-0.012-0.531C20.985,7.47,21.68,6.747,22.23,5.924z"/>
     428    <path d="M22.23,5.924c-0.736,0.326-1.527,0.547-2.357,0.646c0.847-0.508,1.498-1.312,1.804-2.27 c-0.793,0.47-1.671,0.812-2.606,0.996C18.324,4.498,17.257,4,16.077,4c-2.266,0-4.103,1.837-4.103,4.103 c0,0.322,0.036,0.635,0.106,0.935C8.67,8.867,5.647,7.234,3.623,4.751C3.27,5.357,3.067,6.062,3.067,6.814 c0,1.424,0.724,2.679,1.825,3.415c-0.673-0.021-1.305-0.206-1.859-0.513c0,0.017,0,0.034,0,0.052c0,1.988,1.414,3.647,3.292,4.023 c-0.344,0.094-0.707,0.144-1.081,0.144c-0.264,0-0.521-0.026-0.772-0.074c0.522,1.63,2.038,2.816,3.833,2.85 c-1.404,1.1-3.174,1.756-5.096,1.756c-0.331,0-0.658-0.019-0.979-0.057c1.816,1.164,3.973,1.843,6.29,1.843 c7.547,0,11.675-6.252,11.675-11.675c0-0.178-0.004-0.355-0.012-0.531C20.985,7.47,21.68,6.747,22.23,5.924z"></path>
    401429</svg>',
    402430
    403431        'vimeo'       => '
    404432<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    405     <path d="M22.396,7.164c-0.093,2.026-1.507,4.799-4.245,8.32C15.322,19.161,12.928,21,10.97,21c-1.214,0-2.24-1.119-3.079-3.359 c-0.56-2.053-1.119-4.106-1.68-6.159C5.588,9.243,4.921,8.122,4.206,8.122c-0.156,0-0.701,0.328-1.634,0.98L1.594,7.841 c1.027-0.902,2.04-1.805,3.037-2.708C6.001,3.95,7.03,3.327,7.715,3.264c1.619-0.156,2.616,0.951,2.99,3.321 c0.404,2.557,0.685,4.147,0.841,4.769c0.467,2.121,0.981,3.181,1.542,3.181c0.435,0,1.09-0.688,1.963-2.065 c0.871-1.376,1.338-2.422,1.401-3.142c0.125-1.187-0.343-1.782-1.401-1.782c-0.498,0-1.012,0.115-1.541,0.341 c1.023-3.35,2.977-4.977,5.862-4.884C21.511,3.066,22.52,4.453,22.396,7.164z"/>
     433    <path d="M22.396,7.164c-0.093,2.026-1.507,4.799-4.245,8.32C15.322,19.161,12.928,21,10.97,21c-1.214,0-2.24-1.119-3.079-3.359 c-0.56-2.053-1.119-4.106-1.68-6.159C5.588,9.243,4.921,8.122,4.206,8.122c-0.156,0-0.701,0.328-1.634,0.98L1.594,7.841 c1.027-0.902,2.04-1.805,3.037-2.708C6.001,3.95,7.03,3.327,7.715,3.264c1.619-0.156,2.616,0.951,2.99,3.321 c0.404,2.557,0.685,4.147,0.841,4.769c0.467,2.121,0.981,3.181,1.542,3.181c0.435,0,1.09-0.688,1.963-2.065 c0.871-1.376,1.338-2.422,1.401-3.142c0.125-1.187-0.343-1.782-1.401-1.782c-0.498,0-1.012,0.115-1.541,0.341 c1.023-3.35,2.977-4.977,5.862-4.884C21.511,3.066,22.52,4.453,22.396,7.164z"></path>
    406434</svg>',
    407435
    408436        'vk'          => '
    409437<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    410     <path d="M22,7.1c0.2,0.4-0.4,1.5-1.6,3.1c-0.2,0.2-0.4,0.5-0.7,0.9c-0.5,0.7-0.9,1.1-0.9,1.4c-0.1,0.3-0.1,0.6,0.1,0.8 c0.1,0.1,0.4,0.4,0.8,0.9h0l0,0c1,0.9,1.6,1.7,2,2.3c0,0,0,0.1,0.1,0.1c0,0.1,0,0.1,0.1,0.3c0,0.1,0,0.2,0,0.4 c0,0.1-0.1,0.2-0.3,0.3c-0.1,0.1-0.4,0.1-0.6,0.1l-2.7,0c-0.2,0-0.4,0-0.6-0.1c-0.2-0.1-0.4-0.1-0.5-0.2l-0.2-0.1 c-0.2-0.1-0.5-0.4-0.7-0.7s-0.5-0.6-0.7-0.8c-0.2-0.2-0.4-0.4-0.6-0.6C14.8,15,14.6,15,14.4,15c0,0,0,0-0.1,0c0,0-0.1,0.1-0.2,0.2 c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.1,0.3-0.2,0.5c-0.1,0.2-0.1,0.5-0.1,0.8c0,0.1,0,0.2,0,0.3c0,0.1-0.1,0.2-0.1,0.2l0,0.1 c-0.1,0.1-0.3,0.2-0.6,0.2h-1.2c-0.5,0-1,0-1.5-0.2c-0.5-0.1-1-0.3-1.4-0.6s-0.7-0.5-1.1-0.7s-0.6-0.4-0.7-0.6l-0.3-0.3 c-0.1-0.1-0.2-0.2-0.3-0.3s-0.4-0.5-0.7-0.9s-0.7-1-1.1-1.6c-0.4-0.6-0.8-1.3-1.3-2.2C2.9,9.4,2.5,8.5,2.1,7.5C2,7.4,2,7.3,2,7.2 c0-0.1,0-0.1,0-0.2l0-0.1c0.1-0.1,0.3-0.2,0.6-0.2l2.9,0c0.1,0,0.2,0,0.2,0.1S5.9,6.9,5.9,7L6,7c0.1,0.1,0.2,0.2,0.3,0.3 C6.4,7.7,6.5,8,6.7,8.4C6.9,8.8,7,9,7.1,9.2l0.2,0.3c0.2,0.4,0.4,0.8,0.6,1.1c0.2,0.3,0.4,0.5,0.5,0.7s0.3,0.3,0.4,0.4 c0.1,0.1,0.3,0.1,0.4,0.1c0.1,0,0.2,0,0.3-0.1c0,0,0,0,0.1-0.1c0,0,0.1-0.1,0.1-0.2c0.1-0.1,0.1-0.3,0.1-0.5c0-0.2,0.1-0.5,0.1-0.8 c0-0.4,0-0.8,0-1.3c0-0.3,0-0.5-0.1-0.8c0-0.2-0.1-0.4-0.1-0.5L9.6,7.6C9.4,7.3,9.1,7.2,8.7,7.1C8.6,7.1,8.6,7,8.7,6.9 C8.9,6.7,9,6.6,9.1,6.5c0.4-0.2,1.2-0.3,2.5-0.3c0.6,0,1,0.1,1.4,0.1c0.1,0,0.3,0.1,0.3,0.1c0.1,0.1,0.2,0.1,0.2,0.3 c0,0.1,0.1,0.2,0.1,0.3s0,0.3,0,0.5c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.7c0,0.3,0,0.6,0,0.9c0,0.1,0,0.2,0,0.4c0,0.2,0,0.4,0,0.5 c0,0.1,0,0.3,0,0.4s0.1,0.3,0.1,0.4c0.1,0.1,0.1,0.2,0.2,0.3c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.2-0.2,0.4-0.4 s0.3-0.4,0.5-0.7c0.2-0.3,0.5-0.7,0.7-1.1c0.4-0.7,0.8-1.5,1.1-2.3c0-0.1,0.1-0.1,0.1-0.2c0-0.1,0.1-0.1,0.1-0.1l0,0l0.1,0 c0,0,0,0,0.1,0s0.2,0,0.2,0l3,0c0.3,0,0.5,0,0.7,0S21.9,7,21.9,7L22,7.1z"/>
     438    <path d="M22,7.1c0.2,0.4-0.4,1.5-1.6,3.1c-0.2,0.2-0.4,0.5-0.7,0.9c-0.5,0.7-0.9,1.1-0.9,1.4c-0.1,0.3-0.1,0.6,0.1,0.8 c0.1,0.1,0.4,0.4,0.8,0.9h0l0,0c1,0.9,1.6,1.7,2,2.3c0,0,0,0.1,0.1,0.1c0,0.1,0,0.1,0.1,0.3c0,0.1,0,0.2,0,0.4 c0,0.1-0.1,0.2-0.3,0.3c-0.1,0.1-0.4,0.1-0.6,0.1l-2.7,0c-0.2,0-0.4,0-0.6-0.1c-0.2-0.1-0.4-0.1-0.5-0.2l-0.2-0.1 c-0.2-0.1-0.5-0.4-0.7-0.7s-0.5-0.6-0.7-0.8c-0.2-0.2-0.4-0.4-0.6-0.6C14.8,15,14.6,15,14.4,15c0,0,0,0-0.1,0c0,0-0.1,0.1-0.2,0.2 c-0.1,0.1-0.2,0.2-0.2,0.3c-0.1,0.1-0.1,0.3-0.2,0.5c-0.1,0.2-0.1,0.5-0.1,0.8c0,0.1,0,0.2,0,0.3c0,0.1-0.1,0.2-0.1,0.2l0,0.1 c-0.1,0.1-0.3,0.2-0.6,0.2h-1.2c-0.5,0-1,0-1.5-0.2c-0.5-0.1-1-0.3-1.4-0.6s-0.7-0.5-1.1-0.7s-0.6-0.4-0.7-0.6l-0.3-0.3 c-0.1-0.1-0.2-0.2-0.3-0.3s-0.4-0.5-0.7-0.9s-0.7-1-1.1-1.6c-0.4-0.6-0.8-1.3-1.3-2.2C2.9,9.4,2.5,8.5,2.1,7.5C2,7.4,2,7.3,2,7.2 c0-0.1,0-0.1,0-0.2l0-0.1c0.1-0.1,0.3-0.2,0.6-0.2l2.9,0c0.1,0,0.2,0,0.2,0.1S5.9,6.9,5.9,7L6,7c0.1,0.1,0.2,0.2,0.3,0.3 C6.4,7.7,6.5,8,6.7,8.4C6.9,8.8,7,9,7.1,9.2l0.2,0.3c0.2,0.4,0.4,0.8,0.6,1.1c0.2,0.3,0.4,0.5,0.5,0.7s0.3,0.3,0.4,0.4 c0.1,0.1,0.3,0.1,0.4,0.1c0.1,0,0.2,0,0.3-0.1c0,0,0,0,0.1-0.1c0,0,0.1-0.1,0.1-0.2c0.1-0.1,0.1-0.3,0.1-0.5c0-0.2,0.1-0.5,0.1-0.8 c0-0.4,0-0.8,0-1.3c0-0.3,0-0.5-0.1-0.8c0-0.2-0.1-0.4-0.1-0.5L9.6,7.6C9.4,7.3,9.1,7.2,8.7,7.1C8.6,7.1,8.6,7,8.7,6.9 C8.9,6.7,9,6.6,9.1,6.5c0.4-0.2,1.2-0.3,2.5-0.3c0.6,0,1,0.1,1.4,0.1c0.1,0,0.3,0.1,0.3,0.1c0.1,0.1,0.2,0.1,0.2,0.3 c0,0.1,0.1,0.2,0.1,0.3s0,0.3,0,0.5c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.7c0,0.3,0,0.6,0,0.9c0,0.1,0,0.2,0,0.4c0,0.2,0,0.4,0,0.5 c0,0.1,0,0.3,0,0.4s0.1,0.3,0.1,0.4c0.1,0.1,0.1,0.2,0.2,0.3c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.2-0.2,0.4-0.4 s0.3-0.4,0.5-0.7c0.2-0.3,0.5-0.7,0.7-1.1c0.4-0.7,0.8-1.5,1.1-2.3c0-0.1,0.1-0.1,0.1-0.2c0-0.1,0.1-0.1,0.1-0.1l0,0l0.1,0 c0,0,0,0,0.1,0s0.2,0,0.2,0l3,0c0.3,0,0.5,0,0.7,0S21.9,7,21.9,7L22,7.1z"></path>
    411439</svg>',
    412440
    413441        'wordpress'   => '
    414442<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    415     <path d="M12.158,12.786L9.46,20.625c0.806,0.237,1.657,0.366,2.54,0.366c1.047,0,2.051-0.181,2.986-0.51 c-0.024-0.038-0.046-0.079-0.065-0.124L12.158,12.786z M3.009,12c0,3.559,2.068,6.634,5.067,8.092L3.788,8.341 C3.289,9.459,3.009,10.696,3.009,12z M18.069,11.546c0-1.112-0.399-1.881-0.741-2.48c-0.456-0.741-0.883-1.368-0.883-2.109 c0-0.826,0.627-1.596,1.51-1.596c0.04,0,0.078,0.005,0.116,0.007C16.472,3.904,14.34,3.009,12,3.009 c-3.141,0-5.904,1.612-7.512,4.052c0.211,0.007,0.41,0.011,0.579,0.011c0.94,0,2.396-0.114,2.396-0.114 C7.947,6.93,8.004,7.642,7.52,7.699c0,0-0.487,0.057-1.029,0.085l3.274,9.739l1.968-5.901l-1.401-3.838 C9.848,7.756,9.389,7.699,9.389,7.699C8.904,7.67,8.961,6.93,9.446,6.958c0,0,1.484,0.114,2.368,0.114 c0.94,0,2.397-0.114,2.397-0.114c0.485-0.028,0.542,0.684,0.057,0.741c0,0-0.488,0.057-1.029,0.085l3.249,9.665l0.897-2.996 C17.841,13.284,18.069,12.316,18.069,11.546z M19.889,7.686c0.039,0.286,0.06,0.593,0.06,0.924c0,0.912-0.171,1.938-0.684,3.22 l-2.746,7.94c2.673-1.558,4.47-4.454,4.47-7.771C20.991,10.436,20.591,8.967,19.889,7.686z M12,22C6.486,22,2,17.514,2,12 C2,6.486,6.486,2,12,2c5.514,0,10,4.486,10,10C22,17.514,17.514,22,12,22z"/>
     443    <path d="M12.158,12.786L9.46,20.625c0.806,0.237,1.657,0.366,2.54,0.366c1.047,0,2.051-0.181,2.986-0.51 c-0.024-0.038-0.046-0.079-0.065-0.124L12.158,12.786z M3.009,12c0,3.559,2.068,6.634,5.067,8.092L3.788,8.341 C3.289,9.459,3.009,10.696,3.009,12z M18.069,11.546c0-1.112-0.399-1.881-0.741-2.48c-0.456-0.741-0.883-1.368-0.883-2.109 c0-0.826,0.627-1.596,1.51-1.596c0.04,0,0.078,0.005,0.116,0.007C16.472,3.904,14.34,3.009,12,3.009 c-3.141,0-5.904,1.612-7.512,4.052c0.211,0.007,0.41,0.011,0.579,0.011c0.94,0,2.396-0.114,2.396-0.114 C7.947,6.93,8.004,7.642,7.52,7.699c0,0-0.487,0.057-1.029,0.085l3.274,9.739l1.968-5.901l-1.401-3.838 C9.848,7.756,9.389,7.699,9.389,7.699C8.904,7.67,8.961,6.93,9.446,6.958c0,0,1.484,0.114,2.368,0.114 c0.94,0,2.397-0.114,2.397-0.114c0.485-0.028,0.542,0.684,0.057,0.741c0,0-0.488,0.057-1.029,0.085l3.249,9.665l0.897-2.996 C17.841,13.284,18.069,12.316,18.069,11.546z M19.889,7.686c0.039,0.286,0.06,0.593,0.06,0.924c0,0.912-0.171,1.938-0.684,3.22 l-2.746,7.94c2.673-1.558,4.47-4.454,4.47-7.771C20.991,10.436,20.591,8.967,19.889,7.686z M12,22C6.486,22,2,17.514,2,12 C2,6.486,6.486,2,12,2c5.514,0,10,4.486,10,10C22,17.514,17.514,22,12,22z"></path>
    416444</svg>',
    417445
    418446        'yelp'        => '
    419447<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    420     <path d="M12.271,16.718v1.417q-.011,3.257-.067,3.4a.707.707,0,0,1-.569.446,4.637,4.637,0,0,1-2.024-.424A4.609,4.609,0,0,1,7.8,20.565a.844.844,0,0,1-.19-.4.692.692,0,0,1,.044-.29,3.181,3.181,0,0,1,.379-.524q.335-.412,2.019-2.409.011,0,.669-.781a.757.757,0,0,1,.44-.274.965.965,0,0,1,.552.039.945.945,0,0,1,.418.324.732.732,0,0,1,.139.468Zm-1.662-2.8a.783.783,0,0,1-.58.781l-1.339.435q-3.067.981-3.257.981a.711.711,0,0,1-.6-.4,2.636,2.636,0,0,1-.19-.836,9.134,9.134,0,0,1,.011-1.857,3.559,3.559,0,0,1,.335-1.389.659.659,0,0,1,.625-.357,22.629,22.629,0,0,1,2.253.859q.781.324,1.283.524l.937.379a.771.771,0,0,1,.4.34A.982.982,0,0,1,10.609,13.917Zm9.213,3.313a4.467,4.467,0,0,1-1.021,1.8,4.559,4.559,0,0,1-1.512,1.417.671.671,0,0,1-.7-.078q-.156-.112-2.052-3.2l-.524-.859a.761.761,0,0,1-.128-.513.957.957,0,0,1,.217-.513.774.774,0,0,1,.926-.29q.011.011,1.327.446,2.264.736,2.7.887a2.082,2.082,0,0,1,.524.229.673.673,0,0,1,.245.68Zm-7.5-7.049q.056,1.137-.6,1.361-.647.19-1.272-.792L6.237,4.08a.7.7,0,0,1,.212-.691,5.788,5.788,0,0,1,2.314-1,5.928,5.928,0,0,1,2.5-.352.681.681,0,0,1,.547.5q.034.2.245,3.407T12.327,10.181Zm7.384,1.2a.679.679,0,0,1-.29.658q-.167.112-3.67.959-.747.167-1.015.257l.011-.022a.769.769,0,0,1-.513-.044.914.914,0,0,1-.413-.357.786.786,0,0,1,0-.971q.011-.011.836-1.137,1.394-1.908,1.673-2.275a2.423,2.423,0,0,1,.379-.435A.7.7,0,0,1,17.435,8a4.482,4.482,0,0,1,1.372,1.489,4.81,4.81,0,0,1,.9,1.868v.034Z"/>
     448    <path d="M12.271,16.718v1.417q-.011,3.257-.067,3.4a.707.707,0,0,1-.569.446,4.637,4.637,0,0,1-2.024-.424A4.609,4.609,0,0,1,7.8,20.565a.844.844,0,0,1-.19-.4.692.692,0,0,1,.044-.29,3.181,3.181,0,0,1,.379-.524q.335-.412,2.019-2.409.011,0,.669-.781a.757.757,0,0,1,.44-.274.965.965,0,0,1,.552.039.945.945,0,0,1,.418.324.732.732,0,0,1,.139.468Zm-1.662-2.8a.783.783,0,0,1-.58.781l-1.339.435q-3.067.981-3.257.981a.711.711,0,0,1-.6-.4,2.636,2.636,0,0,1-.19-.836,9.134,9.134,0,0,1,.011-1.857,3.559,3.559,0,0,1,.335-1.389.659.659,0,0,1,.625-.357,22.629,22.629,0,0,1,2.253.859q.781.324,1.283.524l.937.379a.771.771,0,0,1,.4.34A.982.982,0,0,1,10.609,13.917Zm9.213,3.313a4.467,4.467,0,0,1-1.021,1.8,4.559,4.559,0,0,1-1.512,1.417.671.671,0,0,1-.7-.078q-.156-.112-2.052-3.2l-.524-.859a.761.761,0,0,1-.128-.513.957.957,0,0,1,.217-.513.774.774,0,0,1,.926-.29q.011.011,1.327.446,2.264.736,2.7.887a2.082,2.082,0,0,1,.524.229.673.673,0,0,1,.245.68Zm-7.5-7.049q.056,1.137-.6,1.361-.647.19-1.272-.792L6.237,4.08a.7.7,0,0,1,.212-.691,5.788,5.788,0,0,1,2.314-1,5.928,5.928,0,0,1,2.5-.352.681.681,0,0,1,.547.5q.034.2.245,3.407T12.327,10.181Zm7.384,1.2a.679.679,0,0,1-.29.658q-.167.112-3.67.959-.747.167-1.015.257l.011-.022a.769.769,0,0,1-.513-.044.914.914,0,0,1-.413-.357.786.786,0,0,1,0-.971q.011-.011.836-1.137,1.394-1.908,1.673-2.275a2.423,2.423,0,0,1,.379-.435A.7.7,0,0,1,17.435,8a4.482,4.482,0,0,1,1.372,1.489,4.81,4.81,0,0,1,.9,1.868v.034Z"></path>
    421449</svg>',
    422450
    423451        'youtube'     => '
    424452<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    425     <path d="M21.8,8.001c0,0-0.195-1.378-0.795-1.985c-0.76-0.797-1.613-0.801-2.004-0.847c-2.799-0.202-6.997-0.202-6.997-0.202 h-0.009c0,0-4.198,0-6.997,0.202C4.608,5.216,3.756,5.22,2.995,6.016C2.395,6.623,2.2,8.001,2.2,8.001S2,9.62,2,11.238v1.517 c0,1.618,0.2,3.237,0.2,3.237s0.195,1.378,0.795,1.985c0.761,0.797,1.76,0.771,2.205,0.855c1.6,0.153,6.8,0.201,6.8,0.201 s4.203-0.006,7.001-0.209c0.391-0.047,1.243-0.051,2.004-0.847c0.6-0.607,0.795-1.985,0.795-1.985s0.2-1.618,0.2-3.237v-1.517 C22,9.62,21.8,8.001,21.8,8.001z M9.935,14.594l-0.001-5.62l5.404,2.82L9.935,14.594z"/>
     453    <path d="M21.8,8.001c0,0-0.195-1.378-0.795-1.985c-0.76-0.797-1.613-0.801-2.004-0.847c-2.799-0.202-6.997-0.202-6.997-0.202 h-0.009c0,0-4.198,0-6.997,0.202C4.608,5.216,3.756,5.22,2.995,6.016C2.395,6.623,2.2,8.001,2.2,8.001S2,9.62,2,11.238v1.517 c0,1.618,0.2,3.237,0.2,3.237s0.195,1.378,0.795,1.985c0.761,0.797,1.76,0.771,2.205,0.855c1.6,0.153,6.8,0.201,6.8,0.201 s4.203-0.006,7.001-0.209c0.391-0.047,1.243-0.051,2.004-0.847c0.6-0.607,0.795-1.985,0.795-1.985s0.2-1.618,0.2-3.237v-1.517 C22,9.62,21.8,8.001,21.8,8.001z M9.935,14.594l-0.001-5.62l5.404,2.82L9.935,14.594z"></path>
    426454</svg>',
    427455

  • trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php

    r43808 r44149  
    55 * @package WordPress
    66 * @subpackage Twenty_Nineteen
     7 * @since 1.0.0
    78 */
    89
    … …  
    3536                            $comment_author_link = get_comment_author_link( $comment );
    3637                            $comment_author_url  = get_comment_author_url( $comment );
     38                            $comment_author      = get_comment_author( $comment );
    3739                            $avatar              = get_avatar( $comment, $args['avatar_size'] );
    3840                            if ( 0 != $args['avatar_size'] ) {
    … …  
    4042                                    echo $avatar;
    4143                                } else {
    42                                     echo preg_replace( '/>[^<]+</', sprintf( '>%s<', $avatar ), $comment_author_link );
     44                                    printf( '<a href="%s" rel="external nofollow" class="url">', $comment_author_url );
     45                                    echo $avatar;
    4346                                }
    4447                            }
    … …  
    5356                            }
    5457
    55                             /* translators: %s: comment author link */
    5658                            printf(
    57                                 __( '%s <span class="screen-reader-text says">says:</span>' ),
    58                                 sprintf( '<b class="fn">%s</b>', get_comment_author_link( $comment ) )
     59                                /* translators: %s: comment author link */
     60                                __( '%s <span class="screen-reader-text says">says:</span>', 'twentynineteen' ),
     61                                sprintf( '<span class="fn">%s</span>', $comment_author )
    5962                            );
     63
     64                            if ( ! empty( $comment_author_url ) ) {
     65                                echo '</a>';
     66                            }
    6067                        ?>
    6168                    </div><!-- .comment-author -->
    … …  
    6370                    <div class="comment-metadata">
    6471                        <a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
    65                             <?php /* translators: 1: comment date, 2: comment time */ ?>
    66                             <time datetime="<?php comment_time( 'c' ); ?>" title="<?php printf( __( '%1$s at %2$s', 'twentynineteen' ), get_comment_date( '', $comment ), get_comment_time() ); ?>">
    67                                 <?php printf( __( '%1$s at %2$s', 'twentynineteen' ), get_comment_date( '', $comment ), get_comment_time() ); ?>
     72                            <?php
     73                                /* translators: 1: comment date, 2: comment time */
     74                                $comment_timestamp = sprintf( __( '%1$s at %2$s', 'twentynineteen' ), get_comment_date( '', $comment ), get_comment_time() );
     75                            ?>
     76                            <time datetime="<?php comment_time( 'c' ); ?>" title="<?php echo $comment_timestamp; ?>">
     77                                <?php echo $comment_timestamp; ?>
    6878                            </time>
    6979                        </a>
    7080                        <?php
    7181                            $edit_comment_icon = twentynineteen_get_icon_svg( 'edit', 16 );
    72                             edit_comment_link( __( 'Edit' ), '<span class="edit-link-sep">&mdash;</span> <span class="edit-link">' . $edit_comment_icon, '</span>' );
     82                            edit_comment_link( __( 'Edit', 'twentynineteen' ), '<span class="edit-link-sep">&mdash;</span> <span class="edit-link">' . $edit_comment_icon, '</span>' );
    7383                        ?>
    7484                    </div><!-- .comment-metadata -->
    7585
    7686                    <?php if ( '0' == $comment->comment_approved ) : ?>
    77                     <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
     87                    <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentynineteen' ); ?></p>
    7888                    <?php endif; ?>
    7989                </footer><!-- .comment-meta -->

  • trunk/src/wp-content/themes/twentynineteen/comments.php

    r43808 r44149  
    1010 * @package WordPress
    1111 * @subpackage Twenty_Nineteen
     12 * @since 1.0.0
    1213 */
    1314
    1415/*
    15 If the current post is protected by a password and
     16 * If the current post is protected by a password and
    1617 * the visitor has not yet entered the password we will
    1718 * return early without loading the comments.
    … …  
    2122}
    2223
     24$discussion = twentynineteen_get_discussion_data();
    2325?>
    2426
    2527<div id="comments" class="<?php echo comments_open() ? 'comments-area' : 'comments-area comments-closed'; ?>">
    26     <div class="<?php echo twentynineteen_get_discussion_data()->responses > 0 ? 'comments-title-wrap' : 'comments-title-wrap no-responses'; ?>">
     28    <div class="<?php echo $discussion->responses > 0 ? 'comments-title-wrap' : 'comments-title-wrap no-responses'; ?>">
    2729        <h2 class="comments-title">
    2830        <?php
    2931            if ( comments_open() ) {
    3032                if ( have_comments() ) {
    31                     echo esc_html_e( 'Join the Conversation', 'twentynineteen' );
     33                    _e( 'Join the Conversation', 'twentynineteen' );
    3234                } else {
    33                     echo esc_html_e( 'Leave a comment', 'twentynineteen' );
     35                    _e( 'Leave a comment', 'twentynineteen' );
    3436                }
    3537            } else {
    36                 $comments_number = get_comments_number();
    37                 if ( '1' === $comments_number ) {
     38                if ( '1' == $discussion->responses ) {
    3839                    /* translators: %s: post title */
    3940                    printf( _x( 'One reply on &ldquo;%s&rdquo;', 'comments title', 'twentynineteen' ), get_the_title() );
    … …  
    4445                            '%1$s reply on &ldquo;%2$s&rdquo;',
    4546                            '%1$s replies on &ldquo;%2$s&rdquo;',
    46                             $comments_number,
     47                            $discussion->responses,
    4748                            'comments title',
    4849                            'twentynineteen'
    4950                        ),
    50                         number_format_i18n( $comments_number ),
     51                        number_format_i18n( $discussion->responses ),
    5152                        get_the_title()
    5253                    );
    … …  
    8586        <?php
    8687
    87         // Show comment form at bottom if showing newest comments at the bottom.
    88         if ( comments_open() && 'asc' === strtolower( get_option( 'comment_order', 'asc' ) ) ) :
    89             ?>
    90             <div class="comment-form-flex">
    91                 <span class="screen-reader-text"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></span>
    92                 <?php twentynineteen_comment_form( 'asc' ); ?>
    93                 <h2 class="comments-title" aria-hidden="true"><?php esc_html_e( 'Leave a comment', 'twentynineteen' ); ?></h2>
    94             </div>
    95             <?php
    96         endif;
    97 
    9888        // Show comment navigation
    9989        if ( have_comments() ) :
    … …  
    10999        endif;
    110100
     101        // Show comment form at bottom if showing newest comments at the bottom.
     102        if ( comments_open() && 'asc' === strtolower( get_option( 'comment_order', 'asc' ) ) ) :
     103            ?>
     104            <div class="comment-form-flex">
     105                <span class="screen-reader-text"><?php _e( 'Leave a comment', 'twentynineteen' ); ?></span>
     106                <?php twentynineteen_comment_form( 'asc' ); ?>
     107                <h2 class="comments-title" aria-hidden="true"><?php _e( 'Leave a comment', 'twentynineteen' ); ?></h2>
     108            </div>
     109            <?php
     110        endif;
     111
    111112        // If comments are closed and there are comments, let's leave a little note, shall we?
    112113        if ( ! comments_open() ) :
    113114            ?>
    114115            <p class="no-comments">
    115                 <?php esc_html_e( 'Comments are closed.', 'twentynineteen' ); ?>
     116                <?php _e( 'Comments are closed.', 'twentynineteen' ); ?>
    116117            </p>
    117118            <?php

  • trunk/src/wp-content/themes/twentynineteen/footer.php

    r43808 r44149  
    99 * @package WordPress
    1010 * @subpackage Twenty_Nineteen
     11 * @since 1.0.0
    1112 */
    1213
    … …  
    1617
    1718    <footer id="colophon" class="site-footer">
     19        <?php get_template_part( 'template-parts/footer/footer', 'widgets' ); ?>
    1820        <div class="site-info">
    19             <a class="site-name" href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>,
     21            <?php $blog_info = get_bloginfo( 'name' ); ?>
     22            <?php if ( ! empty( $blog_info ) ) : ?>
     23                <a class="site-name" href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>,
     24            <?php endif; ?>
    2025            <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentynineteen' ) ); ?>" class="imprint">
    21                 <?php printf( __( 'Proudly powered by %s', 'twentynineteen' ), 'WordPress' ); ?>.
     26                <?php
     27                /* translators: %s: WordPress. */
     28                printf( __( 'Proudly powered by %s.', 'twentynineteen' ), 'WordPress' );
     29                ?>
    2230            </a>
    2331            <?php
    … …  
    2634            }
    2735            ?>
     36            <?php if ( has_nav_menu( 'footer' ) ) : ?>
     37                <nav class="footer-navigation" aria-label="<?php esc_attr_e( 'Footer Menu', 'twentynineteen' ); ?>">
     38                    <?php
     39                    wp_nav_menu(
     40                        array(
     41                            'theme_location' => 'footer',
     42                            'menu_class'     => 'footer-menu',
     43                            'depth'          => 1,
     44                        )
     45                    );
     46                    ?>
     47                </nav><!-- .footer-navigation -->
     48            <?php endif; ?>
    2849        </div><!-- .site-info -->
    2950    </footer><!-- #colophon -->

  • trunk/src/wp-content/themes/twentynineteen/functions.php

    r43808 r44149  
    77 * @package WordPress
    88 * @subpackage Twenty_Nineteen
    9  */
     9 * @since 1.0.0
     10 */
     11
     12/**
     13 * Twenty Nineteen only works in WordPress 4.7 or later.
     14 */
     15if ( version_compare( $GLOBALS['wp_version'], '4.7', '<' ) ) {
     16    require get_template_directory() . '/inc/back-compat.php';
     17    return;
     18}
    1019
    1120if ( ! function_exists( 'twentynineteen_setup' ) ) :
    … …  
    4857        register_nav_menus(
    4958            array(
    50                 'menu-1' => esc_html__( 'Primary', 'twentynineteen' ),
     59                'menu-1' => __( 'Primary', 'twentynineteen' ),
     60                'footer' => __( 'Footer Menu', 'twentynineteen' ),
    5161                'social' => __( 'Social Links Menu', 'twentynineteen' ),
    5262            )
    … …  
    6878        );
    6979
    70         // Set up the WordPress core custom background feature.
    71         add_theme_support(
    72             'custom-background',
    73             apply_filters(
    74                 'twentynineteen_custom_background_args',
    75                 array(
    76                     'default-color' => 'ffffff',
    77                     'default-image' => '',
    78                 )
    79             )
    80         );
    81 
    8280        /**
    8381         * Add support for core custom logo.
    … …  
    9593        );
    9694
    97         // Add support for Block Styles
     95        // Add theme support for selective refresh for widgets.
     96        add_theme_support( 'customize-selective-refresh-widgets' );
     97
     98        // Add support for Block Styles.
    9899        add_theme_support( 'wp-block-styles' );
    99100
    … …  
    101102        add_theme_support( 'align-wide' );
    102103
    103         // Add support for editor styles
     104        // Add support for editor styles.
    104105        add_theme_support( 'editor-styles' );
    105106
    106         // Enqueue editor styles
     107        // Enqueue editor styles.
    107108        add_editor_style( 'style-editor.css' );
    108109
     110        // Add custom editor font sizes.
     111        add_theme_support(
     112            'editor-font-sizes',
     113            array(
     114                array(
     115                    'name'      => __( 'Small', 'twentynineteen' ),
     116                    'shortName' => __( 'S', 'twentynineteen' ),
     117                    'size'      => 19.5,
     118                    'slug'      => 'small',
     119                ),
     120                array(
     121                    'name'      => __( 'Normal', 'twentynineteen' ),
     122                    'shortName' => __( 'M', 'twentynineteen' ),
     123                    'size'      => 22,
     124                    'slug'      => 'normal',
     125                ),
     126                array(
     127                    'name'      => __( 'Large', 'twentynineteen' ),
     128                    'shortName' => __( 'L', 'twentynineteen' ),
     129                    'size'      => 36.5,
     130                    'slug'      => 'large',
     131                ),
     132                array(
     133                    'name'      => __( 'Huge', 'twentynineteen' ),
     134                    'shortName' => __( 'XL', 'twentynineteen' ),
     135                    'size'      => 49.5,
     136                    'slug'      => 'huge',
     137                ),
     138            )
     139        );
     140
     141        // Editor color palette.
     142        add_theme_support(
     143            'editor-color-palette',
     144            array(
     145                array(
     146                    'name'  => __( 'Primary', 'twentynineteen' ),
     147                    'slug'  => 'primary',
     148                    'color' => twentynineteen_hsl_hex( 'default' === get_theme_mod( 'primary_color' ) ? 199 : get_theme_mod( 'primary_color_hue', 199 ), 100, 33 ),
     149                ),
     150                array(
     151                    'name'  => __( 'Secondary', 'twentynineteen' ),
     152                    'slug'  => 'secondary',
     153                    'color' => twentynineteen_hsl_hex( 'default' === get_theme_mod( 'primary_color' ) ? 199 : get_theme_mod( 'primary_color_hue', 199 ), 100, 23 ),
     154                ),
     155                array(
     156                    'name'  => __( 'Dark Gray', 'twentynineteen' ),
     157                    'slug'  => 'dark-gray',
     158                    'color' => '#111',
     159                ),
     160                array(
     161                    'name'  => __( 'Light Gray', 'twentynineteen' ),
     162                    'slug'  => 'light-gray',
     163                    'color' => '#767676',
     164                ),
     165                array(
     166                    'name'  => __( 'White', 'twentynineteen' ),
     167                    'slug'  => 'white',
     168                    'color' => '#FFF',
     169                ),
     170            )
     171        );
     172
     173        // Add support for responsive embedded content.
     174        add_theme_support( 'responsive-embeds' );
    109175    }
    110176endif;
    … …  
    112178
    113179/**
     180 * Register widget area.
     181 *
     182 * @link https://developer.wordpress.org/themes/functionality/sidebars/#registering-a-sidebar
     183 */
     184function twentynineteen_widgets_init() {
     185
     186    register_sidebar(
     187        array(
     188            'name'          => __( 'Footer', 'twentynineteen' ),
     189            'id'            => 'sidebar-1',
     190            'description'   => __( 'Add widgets here to appear in your footer.', 'twentynineteen' ),
     191            'before_widget' => '<section id="%1$s" class="widget %2$s">',
     192            'after_widget'  => '</section>',
     193            'before_title'  => '<h2 class="widget-title">',
     194            'after_title'   => '</h2>',
     195        )
     196    );
     197
     198}
     199add_action( 'widgets_init', 'twentynineteen_widgets_init' );
     200
     201/**
    114202 * Set the content width in pixels, based on the theme's design and stylesheet.
    115203 *
    116204 * Priority 0 to make it available to lower priority callbacks.
    117205 *
    118  * @global int $content_width
     206 * @global int $content_width Content width.
    119207 */
    120208function twentynineteen_content_width() {
    … …  
    130218 */
    131219function twentynineteen_scripts() {
    132     wp_enqueue_style( 'twentynineteen-style', get_stylesheet_uri() );
     220    wp_enqueue_style( 'twentynineteen-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
    133221
    134222    wp_style_add_data( 'twentynineteen-style', 'rtl', 'replace' );
    … …  
    136224    wp_enqueue_script( 'twentynineteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20151215', true );
    137225
     226    if ( has_nav_menu( 'menu-1' ) ) {
     227        wp_enqueue_script( 'twentynineteen-priority-menu', get_theme_file_uri( '/js/priority-menu.js' ), array(), '1.0', true );
     228        wp_enqueue_script( 'twentynineteen-touch-navigation', get_theme_file_uri( '/js/touch-keyboard-navigation.js' ), array(), '1.0', true );
     229    }
     230
    138231    wp_enqueue_style( 'twentynineteen-print-style', get_template_directory_uri() . '/print.css', array(), wp_get_theme()->get( 'Version' ), 'print' );
    139 
    140     if ( is_singular() && twentynineteen_can_show_post_thumbnail() ) {
    141         wp_add_inline_style( 'twentynineteen-style', twentynineteen_header_featured_image_css() );
    142     }
    143232
    144233    if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
    … …  
    149238
    150239/**
    151  * Enqueue supplemental block editor styles
    152  */
    153 function twentynineteen_editor_frame_styles() {
    154     wp_enqueue_style( 'twentynineteen-editor-frame-styles', get_theme_file_uri( '/style-editor-frame.css' ), false, '1.0', 'all' );
    155 }
    156 
    157 add_action( 'enqueue_block_editor_assets', 'twentynineteen_editor_frame_styles' );
     240 * Enqueue supplemental block editor styles.
     241 */
     242function twentynineteen_editor_customizer_styles() {
     243
     244    wp_enqueue_style( 'twentynineteen-editor-customizer-styles', get_theme_file_uri( '/style-editor-customizer.css' ), false, '1.0', 'all' );
     245
     246    if ( 'custom' === get_theme_mod( 'primary_color' ) ) {
     247        // Include color patterns.
     248        require_once get_parent_theme_file_path( '/inc/color-patterns.php' );
     249        wp_add_inline_style( 'twentynineteen-editor-customizer-styles', twentynineteen_custom_colors_css() );
     250    }
     251}
     252add_action( 'enqueue_block_editor_assets', 'twentynineteen_editor_customizer_styles' );
     253
     254/**
     255 * Display custom color CSS in customizer and on frontend.
     256 */
     257function twentynineteen_colors_css_wrap() {
     258
     259    // Only include custom colors in customizer or frontend.
     260    if ( ( ! is_customize_preview() && 'default' === get_theme_mod( 'primary_color', 'default' ) ) || is_admin() ) {
     261        return;
     262    }
     263
     264    require_once get_parent_theme_file_path( '/inc/color-patterns.php' );
     265
     266    if ( 'default' === get_theme_mod( 'primary_color', 'default' ) ) {
     267        $primary_color = 199;
     268    } else {
     269        $primary_color = absint( get_theme_mod( 'primary_color_hue', 199 ) );
     270    }
     271    ?>
     272
     273    <style type="text/css" id="custom-theme-colors" <?php echo is_customize_preview() ? 'data-hue="' . $primary_color . '"' : ''; ?>>
     274        <?php echo twentynineteen_custom_colors_css(); ?>
     275    </style>
     276    <?php
     277}
     278add_action( 'wp_head', 'twentynineteen_colors_css_wrap' );
    158279
    159280/**

  • trunk/src/wp-content/themes/twentynineteen/header.php

    r43808 r44149  
    99 * @package WordPress
    1010 * @subpackage Twenty_Nineteen
     11 * @since 1.0.0
    1112 */
    1213?><!doctype html>
    … …  
    2122<body <?php body_class(); ?>>
    2223<div id="page" class="site">
    23     <a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'twentynineteen' ); ?></a>
     24    <a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'twentynineteen' ); ?></a>
    2425
    2526        <header id="masthead" class="<?php echo is_singular() && twentynineteen_can_show_post_thumbnail() ? 'site-header featured-image' : 'site-header'; ?>">
     27
    2628            <div class="site-branding-container">
    2729                <?php get_template_part( 'template-parts/header/site', 'branding' ); ?>
    … …  
    2931
    3032            <?php if ( is_singular() && twentynineteen_can_show_post_thumbnail() ) : ?>
    31                 <div class="hentry">
     33                <div class="site-featured-image">
     34                    <?php twentynineteen_post_thumbnail(); ?>
    3235                    <?php the_post(); ?>
    33                     <div class="entry-header">
    34                         <?php if ( ! is_page() ) : ?>
    35                         <?php $discussion = twentynineteen_can_show_post_thumbnail() ? twentynineteen_get_discussion_data() : null; ?>
    36                         <?php endif; ?>
    37                         <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
    38                         <?php if ( ! is_page() ) : ?>
    39                         <div class="<?php echo ( ! empty( $discussion ) && count( $discussion->authors ) > 0 ) ? 'entry-meta has-discussion' : 'entry-meta'; ?>">
    40                             <?php twentynineteen_posted_by(); ?>
    41                             <?php twentynineteen_posted_on(); ?>
    42                             <span class="comment-count">
    43                                 <?php
    44                                 if ( ! empty( $discussion ) ) {
    45                                 twentynineteen_discussion_avatars_list( $discussion->authors );}
    46                                 ?>
    47                                 <?php twentynineteen_comment_count(); ?>
    48                             </span>
    49                             <?php
    50                             // Edit post link.
    51                                 edit_post_link(
    52                                     sprintf(
    53                                         wp_kses(
    54                                             /* translators: %s: Name of current post. Only visible to screen readers. */
    55                                             __( 'Edit <span class="screen-reader-text">%s</span>', 'twentynineteen' ),
    56                                             array(
    57                                                 'span' => array(
    58                                                     'class' => array(),
    59                                                 ),
    60                                             )
    61                                         ),
    62                                         get_the_title()
    63                                     ),
    64                                     '<span class="edit-link">' . twentynineteen_get_icon_svg( 'edit', 16 ),
    65                                     '</span>'
    66                                 );
    67                             ?>
    68                         </div><!-- .meta-info -->
    69                         <?php endif; ?>
     36                    <?php $discussion = ! is_page() && twentynineteen_can_show_post_thumbnail() ? twentynineteen_get_discussion_data() : null; ?>
     37                    <div class="<?php echo ( ! empty( $discussion ) && count( $discussion->responses ) > 0 ) ? 'entry-header has-discussion' : 'entry-header'; ?>">
     38                        <?php get_template_part( 'template-parts/header/entry', 'header' ); ?>
    7039                    </div><!-- .entry-header -->
    7140                    <?php rewind_posts(); ?>

  • trunk/src/wp-content/themes/twentynineteen/image.php

    r43842 r44149  
    6767                            if ( $metadata ) {
    6868                                printf(
    69                                     '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
    70                                     esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentynineteen' ),
     69                                    '<span class="full-size-link"><span class="screen-reader-text">%1$s</span><a href="%2$s">%3$s &times; %4$s</a></span>',
     70                                    _x( 'Full size', 'Used before full size attachment link.', 'twentynineteen' ),
    7171                                    esc_url( wp_get_attachment_url() ),
    7272                                    absint( $metadata['width'] ),
    … …  
    101101    </section><!-- .content-area -->
    102102
    103 <?php get_footer(); ?>
     103<?php
     104get_footer();

  • trunk/src/wp-content/themes/twentynineteen/inc/color-patterns.php

    r43842 r44149  
    99
    1010/**
    11  * Generate the CSS for the current custom color scheme.
     11 * Generate the CSS for the current primary color.
    1212 */
    1313function twentynineteen_custom_colors_css() {
    1414
    15     $default_primary_color       = 199;
    16     $primary_color               = absint( get_theme_mod( 'colorscheme_hue', $default_primary_color ) );
     15    if ( 'default' === get_theme_mod( 'primary_color', 'default' ) ) {
     16        $primary_color = 199;
     17    } else {
     18        $primary_color = absint( get_theme_mod( 'primary_color_hue', 199 ) );
     19    }
    1720
    1821    /**
    … …  
    2427     */
    2528
    26     $saturation = absint( apply_filters( 'twentynineteen_custom_colors_saturation', 100 ) );
    27     $reduced_saturation = ( .8 * $saturation ) . '%';
    28     $saturation = $saturation . '%';
     29    $saturation           = absint( apply_filters( 'twentynineteen_custom_colors_saturation', 100 ) );
     30    $saturation           = $saturation . '%';
     31
     32    $saturation_selection = absint( apply_filters( 'twentynineteen_custom_colors_saturation_selection', 50 ) );
     33    $saturation_selection = $saturation_selection . '%';
     34
     35    $lightness            = absint( apply_filters( 'twentynineteen_custom_colors_lightness', 33 ) );
     36    $lightness            = $lightness . '%';
     37
     38    $lightness_hover      = absint( apply_filters( 'twentynineteen_custom_colors_lightness_hover', 23 ) );
     39    $lightness_hover      = $lightness_hover . '%';
     40
     41    $lightness_selection  = absint( apply_filters( 'twentynineteen_custom_colors_lightness_selection', 90 ) );
     42    $lightness_selection  = $lightness_selection . '%';
    2943
    3044    $theme_css = '
    … …  
    4761        .main-navigation .sub-menu,
    4862        .sticky-post,
    49         .entry-content .wp-block-button .wp-block-button__link,
    50         .button, button, input[type="button"], input[type="reset"], input[type="submit"],
    51         .entry-content > .has-primary-background-color,
    52         .entry-content > *[class^="wp-block-"].has-primary-background-color,
    53         .entry-content > *[class^="wp-block-"] .has-primary-background-color,
    54         .entry-content > *[class^="wp-block-"].is-style-solid-color,
    55         .entry-content > *[class^="wp-block-"].is-style-solid-color .has-primary-background-color,
    56         .entry-content .wp-block-file .wp-block-file__button {
    57             background-color: hsl( ' . $primary_color . ', ' . $saturation . ', 33% ); /* base: #0073a8; */
     63        .entry .entry-content .wp-block-button .wp-block-button__link:not(.has-background),
     64        .entry .button, button, input[type="button"], input[type="reset"], input[type="submit"],
     65        .entry .entry-content > .has-primary-background-color,
     66        .entry .entry-content > *[class^="wp-block-"].has-primary-background-color,
     67        .entry .entry-content > *[class^="wp-block-"] .has-primary-background-color,
     68        .entry .entry-content > *[class^="wp-block-"].is-style-solid-color,
     69        .entry .entry-content > *[class^="wp-block-"].is-style-solid-color.has-primary-background-color,
     70        .entry .entry-content .wp-block-file .wp-block-file__button {
     71            background-color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness . ' ); /* base: #0073a8; */
    5872        }
    5973
    … …  
    8094        .entry .entry-content .more-link:hover,
    8195        .main-navigation .main-menu > li > a + svg,
    82         .comment-navigation .nav-previous a:hover,
    83         .comment-navigation .nav-next a:hover,
     96        .comment .comment-metadata > a:hover,
    8497        .comment .comment-metadata .comment-edit-link:hover,
    8598        #colophon .site-info a:hover,
    8699        .widget a,
    87         .entry-content .wp-block-button.is-style-outline .wp-block-button__link,
    88         .entry-content .wp-block-button.is-style-outline .wp-block-button__link,
    89         .entry-content .wp-block-button.is-style-outline .wp-block-button__link,
    90         .entry-content > *[class^="wp-block-"] .has-primary-color,
    91         .entry-content > *[class^="wp-block-"].is-style-solid-color .has-primary-color {
    92             color: hsl( ' . $primary_color . ', ' . $saturation . ', 33% ); /* base: #0073a8; */
     100        .entry .entry-content .wp-block-button.is-style-outline .wp-block-button__link:not(.has-text-color),
     101        .entry .entry-content > .has-primary-color,
     102        .entry .entry-content > *[class^="wp-block-"] .has-primary-color,
     103        .entry .entry-content > *[class^="wp-block-"].is-style-solid-color blockquote.has-primary-color,
     104        .entry .entry-content > *[class^="wp-block-"].is-style-solid-color blockquote.has-primary-color p {
     105            color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness . ' ); /* base: #0073a8; */
    93106        }
    94107
    … …  
    97110         * wp block quote
    98111         */
    99         .entry-content blockquote,
    100         .entry-content .wp-block-quote:not(.is-large),
    101         .entry-content .wp-block-quote:not(.is-style-large) {
    102             border-left-color: hsl( ' . $primary_color . ', ' . $saturation . ', 33% ); /* base: #0073a8; */
     112        blockquote,
     113        .entry .entry-content blockquote,
     114        .entry .entry-content .wp-block-quote:not(.is-large),
     115        .entry .entry-content .wp-block-quote:not(.is-style-large) {
     116            border-left-color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness . ' ); /* base: #0073a8; */
    103117        }
    104118
    … …  
    123137        input[type="color"]:focus,
    124138        textarea:focus {
    125             border-color: hsl( ' . $primary_color . ', ' . $saturation . ', 33% ); /* base: #0073a8; */
     139            border-color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness . ' ); /* base: #0073a8; */
    126140        }
    127141
    128142        .gallery-item > div > a:focus {
    129             box-shadow: 0 0 0 2px hsl( ' . $primary_color . ', ' . $saturation . ', 33% ); /* base: #0073a8; */
     143            box-shadow: 0 0 0 2px hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness . ' ); /* base: #0073a8; */
    130144        }
    131145
    … …  
    134148        .main-navigation .main-menu > li > a:hover,
    135149        .main-navigation .main-menu > li > a:hover + svg,
     150        .post-navigation .nav-links a:hover,
    136151        .post-navigation .nav-links a:hover .post-title,
    137152        .author-bio .author-description .author-link:hover,
     153        .entry .entry-content > .has-secondary-color,
     154        .entry .entry-content > *[class^="wp-block-"] .has-secondary-color,
     155        .entry .entry-content > *[class^="wp-block-"].is-style-solid-color blockquote.has-secondary-color,
     156        .entry .entry-content > *[class^="wp-block-"].is-style-solid-color blockquote.has-secondary-color p,
    138157        .comment .comment-author .fn a:hover,
    139158        .comment-reply-link:hover,
     159        .comment-navigation .nav-previous a:hover,
     160        .comment-navigation .nav-next a:hover,
    140161        #cancel-comment-reply-link:hover,
    141162        .widget a:hover {
    142             color: hsl( ' . $primary_color . ', ' . $saturation . ', 23% ); /* base: #005177; */
     163            color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness_hover . ' ); /* base: #005177; */
    143164        }
    144165
    … …  
    147168        .main-navigation .sub-menu > li > a:hover:after,
    148169        .main-navigation .sub-menu > li > a:focus:after,
    149         .main-navigation .sub-menu > li > a:not(.mobile-submenu-expand):hover,
    150         .main-navigation .sub-menu > li > a:not(.mobile-submenu-expand):focus {
    151             background: hsl( ' . $primary_color . ', ' . $saturation . ', 23% ); /* base: #005177; */
     170        .main-navigation .sub-menu > li > .menu-item-link-return:hover,
     171        .main-navigation .sub-menu > li > .menu-item-link-return:focus,
     172        .main-navigation .sub-menu > li > a:not(.submenu-expand):hover,
     173        .main-navigation .sub-menu > li > a:not(.submenu-expand):focus,
     174        .entry .entry-content > .has-secondary-background-color,
     175        .entry .entry-content > *[class^="wp-block-"].has-secondary-background-color,
     176        .entry .entry-content > *[class^="wp-block-"] .has-secondary-background-color,
     177        .entry .entry-content > *[class^="wp-block-"].is-style-solid-color.has-secondary-background-color {
     178            background-color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness_hover . ' ); /* base: #005177; */
     179        }
     180
     181        /* Text selection colors */
     182        ::selection {
     183            background-color: hsl( ' . $primary_color . ', ' . $saturation_selection . ', ' . $lightness_selection . ' ); /* base: #005177; */
     184        }
     185        ::-moz-selection {
     186            background-color: hsl( ' . $primary_color . ', ' . $saturation_selection . ', ' . $lightness_selection . ' ); /* base: #005177; */
    152187        }';
    153188
    … …  
    164199        .editor-block-list__layout .editor-block-list__block .wp-block-button.is-style-outline:hover .wp-block-button__link:not(.has-text-color),
    165200        .editor-block-list__layout .editor-block-list__block .wp-block-button.is-style-outline:focus .wp-block-button__link:not(.has-text-color),
    166         .editor-block-list__layout .editor-block-list__block .wp-block-button.is-style-outline:active .wp-block-button__link:not(.has-text-color) {
    167             color: hsl( ' . $primary_color . ', ' . $saturation . ', 33% ); /* base: #0073a8; */
     201        .editor-block-list__layout .editor-block-list__block .wp-block-button.is-style-outline:active .wp-block-button__link:not(.has-text-color),
     202        .editor-block-list__layout .editor-block-list__block .wp-block-file .wp-block-file__textlink {
     203            color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness . ' ); /* base: #0073a8; */
    168204        }
    169205
    170206        .editor-block-list__layout .editor-block-list__block .wp-block-quote:not(.is-large):not(.is-style-large),
    171207        .editor-styles-wrapper .editor-block-list__layout .wp-block-freeform blockquote {
    172             border-left: 2px solid hsl( ' . $primary_color . ', ' . $saturation . ', 33% ); /* base: #0073a8; */
     208            border-left: 2px solid hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness . ' ); /* base: #0073a8; */
    173209        }
    174210
    175211        .editor-block-list__layout .editor-block-list__block .wp-block-pullquote.is-style-solid-color:not(.has-background-color) {
    176             background-color: hsl( ' . $primary_color . ', ' . $saturation . ', 33% ); /* base: #0073a8; */
     212            background-color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness . ' ); /* base: #0073a8; */
    177213        }
    178214
    … …  
    182218        .editor-block-list__layout .editor-block-list__block .wp-block-button:not(.is-style-outline) .wp-block-button__link:focus,
    183219        .editor-block-list__layout .editor-block-list__block .wp-block-button:not(.is-style-outline) .wp-block-button__link:hover {
    184             background-color: hsl( ' . $primary_color . ', ' . $saturation . ', 33% ); /* base: #0073a8; */
     220            background-color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness . ' ); /* base: #0073a8; */
    185221        }
    186222
    187223        /* Hover colors */
    188224        .editor-block-list__layout .editor-block-list__block a:hover,
    189         .editor-block-list__layout .editor-block-list__block a:active {
    190             color: hsl( ' . $primary_color . ', ' . $saturation . ', 23% ); /* base: #005177; */
     225        .editor-block-list__layout .editor-block-list__block a:active,
     226        .editor-block-list__layout .editor-block-list__block .wp-block-file .wp-block-file__textlink:hover {
     227            color: hsl( ' . $primary_color . ', ' . $saturation . ', ' . $lightness_hover . ' ); /* base: #005177; */
    191228        }
    192229

  • trunk/src/wp-content/themes/twentynineteen/inc/customizer.php

    r43808 r44149  
    11<?php
    22/**
    3  * Twenty Nineteen Theme Customizer
     3 * Twenty Nineteen: Customizer
    44 *
    55 * @package WordPress
    66 * @subpackage Twenty_Nineteen
     7 * @since 1.0.0
    78 */
    89
    … …  
    3334        );
    3435    }
     36
     37    /**
     38     * Primary color.
     39     */
     40    $wp_customize->add_setting(
     41        'primary_color',
     42        array(
     43            'default'           => 'default',
     44            'transport'         => 'postMessage',
     45            'sanitize_callback' => 'twentynineteen_sanitize_color_option',
     46        )
     47    );
     48
     49    $wp_customize->add_control(
     50        'primary_color',
     51        array(
     52            'type'     => 'radio',
     53            'label'    => __( 'Primary Color', 'twentynineteen' ),
     54            'choices'  => array(
     55                'default'  => _x( 'Default', 'primary color', 'twentynineteen' ),
     56                'custom' => _x( 'Custom', 'primary color', 'twentynineteen' ),
     57            ),
     58            'section'  => 'colors',
     59            'priority' => 5,
     60        )
     61    );
     62
     63    // Add primary color hue setting and control.
     64    $wp_customize->add_setting(
     65        'primary_color_hue',
     66        array(
     67            'default'           => 199,
     68            'transport'         => 'postMessage',
     69            'sanitize_callback' => 'absint',
     70        )
     71    );
     72
     73    $wp_customize->add_control(
     74        new WP_Customize_Color_Control(
     75            $wp_customize,
     76            'primary_color_hue',
     77            array(
     78                'description' => __( 'Apply a custom color for buttons, links, featured images, etc.', 'twentynineteen' ),
     79                'section'     => 'colors',
     80                'mode'        => 'hue',
     81            )
     82        )
     83    );
     84
     85    // Add image filter setting and control.
     86    $wp_customize->add_setting(
     87        'image_filter',
     88        array(
     89            'default'           => 1,
     90            'sanitize_callback' => 'absint',
     91            'transport'         => 'postMessage',
     92        )
     93    );
     94
     95    $wp_customize->add_control(
     96        'image_filter',
     97        array(
     98            'label'   => __( 'Apply a filter to featured images using the primary color', 'twentynineteen' ),
     99            'section' => 'colors',
     100            'type'    => 'checkbox',
     101        )
     102    );
    35103}
    36104add_action( 'customize_register', 'twentynineteen_customize_register' );
    … …  
    55123
    56124/**
    57  * Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
     125 * Bind JS handlers to instantly live-preview changes.
    58126 */
    59127function twentynineteen_customize_preview_js() {
    60     wp_enqueue_script( 'twentynineteen-customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20151215', true );
     128    wp_enqueue_script( 'twentynineteen-customize-preview', get_theme_file_uri( '/js/customize-preview.js' ), array( 'customize-preview' ), '20151215', true );
    61129}
    62130add_action( 'customize_preview_init', 'twentynineteen_customize_preview_js' );
     131
     132/**
     133 * Load dynamic logic for the customizer controls area.
     134 */
     135function twentynineteen_panels_js() {
     136    wp_enqueue_script( 'twentynineteen-customize-controls', get_theme_file_uri( '/js/customize-controls.js' ), array(), '1.0', true );
     137}
     138add_action( 'customize_controls_enqueue_scripts', 'twentynineteen_panels_js' );
     139
     140/**
     141 * Sanitize custom color choice.
     142 *
     143 * @param string $choice Whether image filter is active.
     144 *
     145 * @return string
     146 */
     147function twentynineteen_sanitize_color_option( $choice ) {
     148    $valid = array(
     149        'default',
     150        'custom',
     151    );
     152
     153    if ( in_array( $choice, $valid, true ) ) {
     154        return $choice;
     155    }
     156
     157    return 'default';
     158}

  • trunk/src/wp-content/themes/twentynineteen/inc/icon-functions.php

    r43808 r44149  
    55 * @package WordPress
    66 * @subpackage Twenty_Nineteen
     7 * @since 1.0.0
    78 */
    89

  • trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php

    r43808 r44149  
    55 * @package WordPress
    66 * @subpackage Twenty_Nineteen
     7 * @since 1.0.0
    78 */
    89
    … …  
    3334
    3435/**
     36 * Adds custom class to the array of posts classes.
     37 */
     38function twentynineteen_post_classes( $classes, $class, $post_id ) {
     39    $classes[] = 'entry';
     40
     41    return $classes;
     42}
     43add_filter( 'post_class', 'twentynineteen_post_classes', 10, 3 );
     44
     45
     46/**
    3547 * Add a pingback url auto-discovery header for single posts, pages, or attachments.
    3648 */
    … …  
    6072function twentynineteen_get_the_archive_title() {
    6173    if ( is_category() ) {
    62         $title = esc_html__( 'Category Archives:', 'twentynineteen' );
     74        $title = __( 'Category Archives: ', 'twentynineteen' ) . '<span class="page-description">' . single_term_title( '', false ) . '</span>';
    6375    } elseif ( is_tag() ) {
    64         $title = esc_html__( 'Tag Archives:', 'twentynineteen' );
     76        $title = __( 'Tag Archives: ', 'twentynineteen' ) . '<span class="page-description">' . single_term_title( '', false ) . '</span>';
    6577    } elseif ( is_author() ) {
    66         $title = esc_html__( 'Author Archives:', 'twentynineteen' );
     78        $title = __( 'Author Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_author_meta( 'display_name' ) . '</span>';
    6779    } elseif ( is_year() ) {
    68         $title = esc_html__( 'Yearly Archives:', 'twentynineteen' );
     80        $title = __( 'Yearly Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentynineteen' ) ) . '</span>';
    6981    } elseif ( is_month() ) {
    70         $title = esc_html__( 'Monthly Archives:', 'twentynineteen' );
     82        $title = __( 'Monthly Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentynineteen' ) ) . '</span>';
    7183    } elseif ( is_day() ) {
    72         $title = esc_html__( 'Daily Archives:', 'twentynineteen' );
     84        $title = __( 'Daily Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_date() . '</span>';
    7385    } elseif ( is_post_type_archive() ) {
    74         $title = esc_html__( 'Post Type Archives:', 'twentynineteen' );
     86        $title = __( 'Post Type Archives: ', 'twentynineteen' ) . '<span class="page-description">' . post_type_archive_title( '', false ) . '</span>';
    7587    } elseif ( is_tax() ) {
    7688        $tax = get_taxonomy( get_queried_object()->taxonomy );
    77         /* translators: 1: Taxonomy singular name */
    78         $title = sprintf( __( '%s Archives: ' ), $tax->labels->singular_name );
     89        /* translators: %s: Taxonomy singular name */
     90        $title = sprintf( esc_html__( '%s Archives:', 'twentynineteen' ), $tax->labels->singular_name );
    7991    } else {
    80         $title = esc_html__( 'Archives:', 'twentynineteen' );
     92        $title = __( 'Archives:', 'twentynineteen' );
    8193    }
    8294    return $title;
    … …  
    8597
    8698/**
    87  * Filters the default archive descriptions.
    88  */
    89 function twentynineteen_get_the_archive_description() {
    90     if ( is_category() || is_tag() || is_tax() ) {
    91         $description = single_term_title( '', false );
    92     } elseif ( is_author() ) {
    93         $description = get_the_author_meta( 'display_name' );
    94     } elseif ( is_post_type_archive() ) {
    95         $description = post_type_archive_title( '', false );
    96     } elseif ( is_year() ) {
    97         $description = get_the_date( _x( 'Y', 'yearly archives date format', 'twentynineteen' ) );
    98     } elseif ( is_month() ) {
    99         $description = get_the_date( _x( 'F Y', 'monthly archives date format', 'twentynineteen' ) );
    100     } elseif ( is_day() ) {
    101         $description = get_the_date();
    102     } else {
    103         $description = null;
    104     }
    105     return $description;
    106 }
    107 add_filter( 'get_the_archive_description', 'twentynineteen_get_the_archive_description' );
    108 
    109 /**
    11099 * Determines if post thumbnail can be displayed.
    111100 */
    112101function twentynineteen_can_show_post_thumbnail() {
    113     return ! post_password_required() && ! is_attachment() && has_post_thumbnail();
     102    return apply_filters( 'twentynineteen_can_show_post_thumbnail', ! post_password_required() && ! is_attachment() && has_post_thumbnail() );
    114103}
    115104
    … …  
    118107 */
    119108function twentynineteen_image_filters_enabled() {
    120     return true;
    121 }
     109    if ( get_theme_mod( 'image_filter', 1 ) ) {
     110        return true;
     111    }
     112    return false;
     113}
     114
     115/**
     116 * Add custom sizes attribute to responsive image functionality for post thumbnails.
     117 *
     118 * @origin Twenty Nineteen 1.0
     119 *
     120 * @param array $attr  Attributes for the image markup.
     121 * @return string Value for use in post thumbnail 'sizes' attribute.
     122 */
     123function twentynineteen_post_thumbnail_sizes_attr( $attr ) {
     124
     125    if ( is_admin() ) {
     126        return $attr;
     127    }
     128
     129    if ( ! is_singular() ) {
     130        $attr['sizes'] = '(max-width: 34.9rem) calc(100vw - 2rem), (max-width: 53rem) calc(8 * (100vw / 12)), (min-width: 53rem) calc(6 * (100vw / 12)), 100vw';
     131    }
     132
     133    return $attr;
     134}
     135add_filter( 'wp_get_attachment_image_attributes', 'twentynineteen_post_thumbnail_sizes_attr', 10, 1 );
    122136
    123137/**
    … …  
    149163function twentynineteen_get_discussion_data() {
    150164    static $discussion, $post_id;
     165
    151166    $current_post_id = get_the_ID();
    152     if ( $current_post_id === $post_id ) { /* If we have discussion information for post ID, return cached object */
    153         return $discussion;
    154     }
    155     $authors    = array();
    156     $commenters = array();
    157     $user_id    = is_user_logged_in() ? get_current_user_id() : -1;
    158     $comments   = get_comments(
     167    if ( $current_post_id === $post_id ) {
     168        return $discussion; /* If we have discussion information for post ID, return cached object */
     169    } else {
     170        $post_id = $current_post_id;
     171    }
     172
     173    $comments = get_comments(
    159174        array(
    160175            'post_id' => $current_post_id,
    … …  
    162177            'order'   => get_option( 'comment_order', 'asc' ), /* Respect comment order from Settings » Discussion. */
    163178            'status'  => 'approve',
     179            'number'  => 20, /* Only retrieve the last 20 comments, as the end goal is just 6 unique authors */
    164180        )
    165181    );
     182
     183    $authors = array();
    166184    foreach ( $comments as $comment ) {
    167         $comment_user_id = (int) $comment->user_id;
    168         if ( $comment_user_id !== $user_id ) {
    169             $authors[]    = ( $comment_user_id > 0 ) ? $comment_user_id : $comment->comment_author_email;
    170             $commenters[] = $comment->comment_author_email;
    171         }
    172     }
     185        $authors[] = ( (int) $comment->user_id > 0 ) ? (int) $comment->user_id : $comment->comment_author_email;
     186    }
     187
    173188    $authors    = array_unique( $authors );
    174     $responses  = count( $commenters );
    175     $commenters = array_unique( $commenters );
    176     $post_id    = $current_post_id;
    177189    $discussion = (object) array(
    178         'authors'    => array_slice( $authors, 0, 6 ), /* Unique authors commenting on post (a subset of), excluding current user. */
    179         'commenters' => count( $commenters ),          /* Number of commenters involved in discussion, excluding current user. */
    180         'responses'  => $responses,                    /* Number of responses, excluding responses from current user. */
     190        'authors'   => array_slice( $authors, 0, 6 ),           /* Six unique authors commenting on the post. */
     191        'responses' => get_comments_number( $current_post_id ), /* Number of responses. */
    181192    );
     193
    182194    return $discussion;
    183195}
     196
     197/**
     198 * Add an extra menu to our nav for our priority+ navigation to use
     199 *
     200 * @param object $nav_menu  Nav menu.
     201 * @param object $args      Nav menu args.
     202 * @return string More link for hidden menu items.
     203 */
     204function twentynineteen_add_ellipses_to_nav( $nav_menu, $args ) {
     205
     206    if ( 'menu-1' === $args->theme_location ) :
     207
     208        $nav_menu .= '<div class="main-menu-more">';
     209        $nav_menu .= '<ul class="main-menu" tabindex="0">';
     210        $nav_menu .= '<li class="menu-item menu-item-has-children">';
     211        $nav_menu .= '<a href="#" class="screen-reader-text" aria-label="More" aria-haspopup="true" aria-expanded="false">' . esc_html__( 'More', 'twentynineteen' ) . '</a>';
     212        $nav_menu .= '<span class="submenu-expand main-menu-more-toggle is-empty" tabindex="-1">';
     213        $nav_menu .= twentynineteen_get_icon_svg( 'arrow_drop_down_ellipsis' );
     214        $nav_menu .= '</span>';
     215        $nav_menu .= '<ul class="sub-menu hidden-links">';
     216        $nav_menu .= '<li id="menu-item--1" class="mobile-parent-nav-menu-item menu-item--1">';
     217        $nav_menu .= '<span class="menu-item-link-return">';
     218        $nav_menu .= twentynineteen_get_icon_svg( 'chevron_left' );
     219        $nav_menu .= esc_html__( 'Back', 'twentynineteen' );
     220        $nav_menu .= '</span>';
     221        $nav_menu .= '</li>';
     222        $nav_menu .= '</ul>';
     223        $nav_menu .= '</li>';
     224        $nav_menu .= '</ul>';
     225        $nav_menu .= '</div>';
     226
     227    endif;
     228
     229    return $nav_menu;
     230}
     231add_filter( 'wp_nav_menu', 'twentynineteen_add_ellipses_to_nav', 10, 2 );
    184232
    185233/**
    … …  
    205253
    206254/**
     255 * Add a dropdown icon to top-level menu items.
     256 *
     257 * @param string $output Nav menu item start element.
     258 * @param object $item   Nav menu item.
     259 * @param int    $depth  Depth.
     260 * @param object $args   Nav menu args.
     261 * @return string Nav menu item start element.
    207262 * Add a dropdown icon to top-level menu items
    208263 */
    … …  
    210265
    211266    // Only add class to 'top level' items on the 'primary' menu.
    212     if ( 'menu-1' == $args->theme_location && 0 === $depth ) {
    213 
    214         if ( in_array( 'menu-item-has-children', $item->classes ) ) {
    215             $output .= twentynineteen_get_icon_svg( 'arrow_drop_down_circle', 16 );
     267    if ( ! isset( $args->theme_location ) || 'menu-1' !== $args->theme_location ) {
     268        return $output;
     269    }
     270
     271    if ( in_array( 'mobile-parent-nav-menu-item', $item->classes, true ) && isset( $item->original_id ) ) {
     272        // Inject the keyboard_arrow_left SVG inside the parent nav menu item, and let the item link to the parent item.
     273        // @todo Only do this for nested submenus? If on a first-level submenu, then really the link could be "#" since the desire is to remove the target entirely.
     274        $link = sprintf(
     275            '<span class="menu-item-link-return" tabindex="-1">%s',
     276            twentynineteen_get_icon_svg( 'chevron_left', 24 )
     277        );
     278
     279        // replace opening <a> with <span>
     280        $output = preg_replace(
     281            '/<a\s.*?>/',
     282            $link,
     283            $output,
     284            1 // Limit.
     285        );
     286
     287        // replace closing </a> with </span>
     288        $output = preg_replace(
     289            '#</a>#i',
     290            '</span>',
     291            $output,
     292            1 // Limit.
     293        );
     294
     295    } elseif ( in_array( 'menu-item-has-children', $item->classes, true ) ) {
     296
     297        // Add SVG icon to parent items.
     298        $icon = twentynineteen_get_icon_svg( 'keyboard_arrow_down', 24 );
     299
     300        $output .= sprintf(
     301            '<span class="submenu-expand" tabindex="-1">%s</span>',
     302            $icon
     303        );
     304    }
     305
     306    return $output;
     307}
     308add_filter( 'walker_nav_menu_start_el', 'twentynineteen_add_dropdown_icons', 10, 4 );
     309
     310/**
     311 * Create a nav menu item to be displayed on mobile to navigate from submenu back to the parent.
     312 *
     313 * This duplicates each parent nav menu item and makes it the first child of itself.
     314 *
     315 * @param array  $sorted_menu_items Sorted nav menu items.
     316 * @param object $args              Nav menu args.
     317 * @return array Amended nav menu items.
     318 */
     319function twentynineteen_add_mobile_parent_nav_menu_items( $sorted_menu_items, $args ) {
     320    static $pseudo_id = 0;
     321    if ( ! isset( $args->theme_location ) || 'menu-1' !== $args->theme_location ) {
     322        return $sorted_menu_items;
     323    }
     324
     325    $amended_menu_items = array();
     326    foreach ( $sorted_menu_items as $nav_menu_item ) {
     327        $amended_menu_items[] = $nav_menu_item;
     328        if ( in_array( 'menu-item-has-children', $nav_menu_item->classes, true ) ) {
     329            $parent_menu_item                   = clone $nav_menu_item;
     330            $parent_menu_item->original_id      = $nav_menu_item->ID;
     331            $parent_menu_item->ID               = --$pseudo_id;
     332            $parent_menu_item->db_id            = $parent_menu_item->ID;
     333            $parent_menu_item->object_id        = $parent_menu_item->ID;
     334            $parent_menu_item->classes          = array( 'mobile-parent-nav-menu-item' );
     335            $parent_menu_item->menu_item_parent = $nav_menu_item->ID;
     336
     337            $amended_menu_items[] = $parent_menu_item;
    216338        }
    217     } else if ( 'menu-1' == $args->theme_location && $depth >= 1 ) {
    218 
    219         if ( in_array( 'menu-item-has-children', $item->classes ) ) {
    220             $output .= twentynineteen_get_icon_svg( 'keyboard_arrow_right', 24 );
     339    }
     340
     341    return $amended_menu_items;
     342}
     343add_filter( 'wp_nav_menu_objects', 'twentynineteen_add_mobile_parent_nav_menu_items', 10, 2 );
     344
     345/**
     346 * Convert HSL to HEX colors
     347 */
     348function twentynineteen_hsl_hex( $h, $s, $l, $to_hex = true ) {
     349
     350    $h /= 360;
     351    $s /= 100;
     352    $l /= 100;
     353
     354    $r = $l;
     355    $g = $l;
     356    $b = $l;
     357    $v = ( $l <= 0.5 ) ? ( $l * ( 1.0 + $s ) ) : ( $l + $s - $l * $s );
     358    if ( $v > 0 ) {
     359        $m;
     360        $sv;
     361        $sextant;
     362        $fract;
     363        $vsf;
     364        $mid1;
     365        $mid2;
     366
     367        $m = $l + $l - $v;
     368        $sv = ( $v - $m ) / $v;
     369        $h *= 6.0;
     370        $sextant = floor( $h );
     371        $fract = $h - $sextant;
     372        $vsf = $v * $sv * $fract;
     373        $mid1 = $m + $vsf;
     374        $mid2 = $v - $vsf;
     375
     376        switch ( $sextant ) {
     377            case 0:
     378                $r = $v;
     379                $g = $mid1;
     380                $b = $m;
     381                break;
     382            case 1:
     383                $r = $mid2;
     384                $g = $v;
     385                $b = $m;
     386                break;
     387            case 2:
     388                $r = $m;
     389                $g = $v;
     390                $b = $mid1;
     391                break;
     392            case 3:
     393                $r = $m;
     394                $g = $mid2;
     395                $b = $v;
     396                break;
     397            case 4:
     398                $r = $mid1;
     399                $g = $m;
     400                $b = $v;
     401                break;
     402            case 5:
     403                $r = $v;
     404                $g = $m;
     405                $b = $mid2;
     406                break;
    221407        }
    222408    }
    223 
    224     return $output;
    225 }
    226 add_filter( 'walker_nav_menu_start_el', 'twentynineteen_add_dropdown_icons', 10, 4 );
     409    $r = round( $r * 255, 0 );
     410    $g = round( $g * 255, 0 );
     411    $b = round( $b * 255, 0 );
     412
     413    if ( $to_hex ) {
     414
     415        $r = ( $r < 15 ) ? '0' . dechex( $r ) : dechex( $r );
     416        $g = ( $g < 15 ) ? '0' . dechex( $g ) : dechex( $g );
     417        $b = ( $b < 15 ) ? '0' . dechex( $b ) : dechex( $b );
     418
     419        return "#$r$g$b";
     420
     421    } else {
     422
     423        return "rgb($r, $g, $b)";
     424    }
     425}

  • trunk/src/wp-content/themes/twentynineteen/inc/template-tags.php

    r43808 r44149  
    55 * @package WordPress
    66 * @subpackage Twenty_Nineteen
     7 * @since 1.0.0
    78 */
    89
    … …  
    2627
    2728        printf(
    28             '<span class="posted-on">%1$s<a href="%2$s" rel="bookmark">' . $time_string . '</a></span>',
     29            '<span class="posted-on">%1$s<a href="%2$s" rel="bookmark">%3$s</a></span>',
    2930            twentynineteen_get_icon_svg( 'watch', 16 ),
    3031            esc_url( get_permalink() ),
    … …  
    4344            /* translators: 1: SVG icon. 2: post author, only visible to screen readers. 3: author link. */
    4445            twentynineteen_get_icon_svg( 'person', 16 ),
    45             esc_html__( 'Posted by', 'twentynineteen' ),
     46            __( 'Posted by', 'twentynineteen' ),
    4647            esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
    4748            esc_html( get_the_author() )
    … …  
    7374    function twentynineteen_entry_footer() {
    7475
    75         // Posted by
    76         twentynineteen_posted_by();
    77 
    78         // Hide category and tag text for pages.
     76        // Hide author, post date, category and tag text for pages.
    7977        if ( 'post' === get_post_type() ) {
     78
     79            // Posted by
     80            twentynineteen_posted_by();
     81
     82            // Posted on
     83            twentynineteen_posted_on();
     84
    8085            /* translators: used between list items, there is a space after the comma. */
    81             $categories_list = get_the_category_list( esc_html__( ', ', 'twentynineteen' ) );
     86            $categories_list = get_the_category_list( __( ', ', 'twentynineteen' ) );
    8287            if ( $categories_list ) {
    8388                /* translators: 1: SVG icon. 2: posted in label, only visible to screen readers. 3: list of categories. */
    … …  
    8590                    '<span class="cat-links">%1$s<span class="screen-reader-text">%2$s</span>%3$s</span>',
    8691                    twentynineteen_get_icon_svg( 'archive', 16 ),
    87                     esc_html__( 'Posted in', 'twentynineteen' ),
     92                    __( 'Posted in', 'twentynineteen' ),
    8893                    $categories_list
    8994                ); // WPCS: XSS OK.
    … …  
    9196
    9297            /* translators: used between list items, there is a space after the comma. */
    93             $tags_list = get_the_tag_list( '', esc_html__( ', ', 'twentynineteen' ) );
     98            $tags_list = get_the_tag_list( '', __( ', ', 'twentynineteen' ) );
    9499            if ( $tags_list ) {
    95100                /* translators: 1: SVG icon. 2: posted in label, only visible to screen readers. 3: list of tags. */
    96101                printf(
    97                     '<span class="cat-links">%1$s<span class="screen-reader-text">%2$s </span>%3$s</span>',
     102                    '<span class="tags-links">%1$s<span class="screen-reader-text">%2$s </span>%3$s</span>',
    98103                    twentynineteen_get_icon_svg( 'tag', 16 ),
    99                     esc_html__( 'Tags:', 'twentynineteen' ),
     104                    __( 'Tags:', 'twentynineteen' ),
    100105                    $tags_list
    101106                ); // WPCS: XSS OK.
    … …  
    151156            ?>
    152157
    153             <figure class="post-thumbnail">
    154                 <a class="post-thumbnail-inner" href="<?php the_permalink(); ?>" aria-hidden="true" tabindex="-1">
    155                     <?php
    156                     the_post_thumbnail(
    157                         'post-thumbnail',
    158                         array(
    159                             'alt' => the_title_attribute(
    160                                 array( 'echo' => false )
    161                             ),
    162                         )
    163                     );
    164                     ?>
    165                 </a>
    166             </figure><!-- .post-thumbnail -->
     158        <figure class="post-thumbnail">
     159            <a class="post-thumbnail-inner" href="<?php the_permalink(); ?>" aria-hidden="true" tabindex="-1">
     160                <?php
     161                the_post_thumbnail( 'post-thumbnail' );
     162                ?>
     163            </a>
     164        </figure>
    167165
    168166            <?php
    … …  
    171169endif;
    172170
    173 if ( ! function_exists( 'twentynineteen_header_featured_image_css' ) ) :
    174     /**
    175      * Returns the CSS for the header featured image background.
    176      */
    177     function twentynineteen_header_featured_image_css() {
    178         $img_url = get_the_post_thumbnail_url( get_the_ID(), 'post-thumbnail' );
    179         return sprintf( 'body.singular .site-header.featured-image .site-branding-container:before { background-image: url(%s); }', esc_url( $img_url ) );
    180     }
    181 endif;
    182 
    183171if ( ! function_exists( 'twentynineteen_comment_avatar' ) ) :
    184172    /**
    … …  
    186174     */
    187175    function twentynineteen_get_user_avatar_markup( $id_or_email = null ) {
     176
    188177        if ( ! isset( $id_or_email ) ) {
    189178            $id_or_email = get_current_user_id();
    190179        }
    191180
    192         $classes = array( 'comment-author', 'vcard' );
    193 
    194181        return sprintf( '<div class="comment-user-avatar comment-author vcard">%s</div>', get_avatar( $id_or_email, twentynineteen_get_avatar_size() ) );
    195182    }
    … …  
    201188     */
    202189    function twentynineteen_discussion_avatars_list( $comment_authors ) {
    203         if ( ! empty( $comment_authors ) ) {
    204             $out = array( '<ol class="discussion-avatar-list">' );
    205             foreach ( $comment_authors as $id_or_email ) {
    206                 $out[] = sprintf( '<li>%s</li>', twentynineteen_get_user_avatar_markup( $id_or_email ) );
    207             }
    208             $out[] = '</ol><!-- .discussion-avatar-list -->';
    209             echo implode( "\n", $out );
    210         }
    211         return null;
     190        if ( empty( $comment_authors ) ) {
     191            return;
     192        }
     193        echo '<ol class="discussion-avatar-list">', "\n";
     194        foreach ( $comment_authors as $id_or_email ) {
     195            printf(
     196                "<li>%s</li>\n",
     197                twentynineteen_get_user_avatar_markup( $id_or_email )
     198            );
     199        }
     200        echo '</ol><!-- .discussion-avatar-list -->', "\n";
    212201    }
    213202endif;
    … …  
    219208    function twentynineteen_comment_form( $order ) {
    220209        if ( true === $order || strtolower( $order ) === strtolower( get_option( 'comment_order', 'asc' ) ) ) {
     210
    221211            comment_form(
    222212                array(
    223                     'title_reply_before' => twentynineteen_get_user_avatar_markup(),
    224213                    'logged_in_as'       => null,
    225214                    'title_reply'        => null,

  • trunk/src/wp-content/themes/twentynineteen/index.php

    r43808 r44149  
    1212 * @package WordPress
    1313 * @subpackage Twenty_Nineteen
     14 * @since 1.0.0
    1415 */
    1516
    … …  
    1718?>
    1819
    19     <div id="primary" class="content-area">
     20    <section id="primary" class="content-area">
    2021        <main id="main" class="site-main">
    2122
    22 <?php
    23     if ( have_posts() ) {
     23        <?php
     24        if ( have_posts() ) {
    2425
    25         // Load posts loop.
    26         while ( have_posts() ) {
    27             the_post();
    28             get_template_part( 'template-parts/content/content' );
     26            // Load posts loop.
     27            while ( have_posts() ) {
     28                the_post();
     29                get_template_part( 'template-parts/content/content' );
     30            }
     31
     32            // Previous/next page navigation.
     33            twentynineteen_the_posts_navigation();
     34
     35        } else {
     36
     37            // If no content, include the "No posts found" template.
     38            get_template_part( 'template-parts/content/content', 'none' );
     39
    2940        }
    30 
    31         // Previous/next page navigation.
    32         twentynineteen_the_posts_navigation();
    33 
    34     } else {
    35 
    36         // If no content, include the "No posts found" template.
    37         get_template_part( 'template-parts/content/content', 'none' );
    38 
    39     }
    40 ?>
     41        ?>
     42       
    4143        </main><!-- .site-main -->
    42     </div><!-- .content-area -->
     44    </section><!-- .content-area -->
    4345
    4446<?php

  • trunk/src/wp-content/themes/twentynineteen/js/customize-controls.js

    r43842 r44149  
    1111    wp.customize.bind( 'ready', function() {
    1212
    13         // Only show the color hue control when there's a custom color scheme.
    14         wp.customize( 'colorscheme', function( setting ) {
    15             wp.customize.control( 'colorscheme_hue', function( control ) {
     13        // Only show the color hue control when there's a custom primary color.
     14        wp.customize( 'primary_color', function( setting ) {
     15            wp.customize.control( 'primary_color_hue', function( control ) {
    1616                var visibility = function() {
    1717                    if ( 'custom' === setting.get() ) {

  • trunk/src/wp-content/themes/twentynineteen/js/customize-preview.js

    r43842 r44149  
    99(function( $ ) {
    1010
    11     // Default color.
    12     wp.customize( 'colorscheme', function( value ) {
     11    // Primary color.
     12    wp.customize( 'primary_color', function( value ) {
    1313        value.bind( function( to ) {
    14 
    1514            // Update custom color CSS.
    1615            var style = $( '#custom-theme-colors' ),
    1716                hue = style.data( 'hue' ),
    18                 css = style.html();
     17                css = style.html(),
     18                color;
     19
     20            if( 'custom' === to ){
     21                // If a custom primary color is selected, use the currently set primary_color_hue
     22                color = wp.customize.get().primary_color_hue;
     23            } else {
     24                // If the "default" option is selected, get the default primary_color_hue
     25                color = 199;
     26            }
    1927
    2028            // Equivalent to css.replaceAll, with hue followed by comma to prevent values with units from being changed.
    21             css = css.split( hue + ',' ).join( to + ',' );
    22             style.html( css ).data( 'hue', to );
     29            css = css.split( hue + ',' ).join( color + ',' );
     30            style.html( css ).data( 'hue', color );
    2331        });
    2432    });
    2533
    26     // Primary color.
    27     wp.customize( 'colorscheme_hue', function( value ) {
     34    // Primary color hue.
     35    wp.customize( 'primary_color_hue', function( value ) {
    2836        value.bind( function( to ) {
    2937
    … …  
    4250    wp.customize( 'image_filter', function( value ) {
    4351        value.bind( function( to ) {
    44             if ( 'active' === to ) {
     52            if ( to ) {
    4553                $( 'body' ).addClass( 'image-filters-enabled' );
    4654            } else {

  • trunk/src/wp-content/themes/twentynineteen/js/priority-menu.js

    r43892 r44149  
    11(function() {
     2
     3    /**
     4     * Debounce
     5     *
     6     * @param {Function} func
     7     * @param {number} wait
     8     * @param {boolean} immediate
     9     */
     10    function debounce(func, wait, immediate) {
     11        'use strict';
     12
     13        var timeout;
     14        wait      = (typeof wait !== 'undefined') ? wait : 20;
     15        immediate = (typeof immediate !== 'undefined') ? immediate : true;
     16
     17        return function() {
     18
     19            var context = this, args = arguments;
     20            var later = function() {
     21                timeout = null;
     22
     23                if (!immediate) {
     24                    func.apply(context, args);
     25                }
     26            };
     27
     28            var callNow = immediate && !timeout;
     29
     30            clearTimeout(timeout);
     31            timeout = setTimeout(later, wait);
     32
     33            if (callNow) {
     34                func.apply(context, args);
     35            }
     36        };
     37    }
     38
    239    /**
    340     * Prepends an element to a container.
    … …  
    1956     * @param {Element} element
    2057     */
    21     function showElement(element) {
     58    function showButton(element) {
    2259        // classList.remove is not supported in IE11
    23         element.className = element.className.replace('is-hidden', '');
     60        element.className = element.className.replace('is-empty', '');
    2461    }
    2562
    … …  
    2966     * @param {Element} element
    3067     */
    31     function hideElement(element) {
     68    function hideButton(element) {
    3269        // classList.add is not supported in IE11
    33         if (!element.classList.contains('is-hidden')) {
    34             element.className += ' is-hidden';
    35         }
    36     }
    37 
    38     /**
    39      * Toggles the element visibility.
    40      *
    41      * @param {Element} element
    42      */
    43     function toggleElementVisibility(element) {
    44         if (element.classList.contains('is-hidden')) {
    45             showElement(element);
     70        if (!element.classList.contains('is-empty')) {
     71            element.className += ' is-empty';
     72        }
     73    }
     74
     75    /**
     76     * Returns the currently available space in the menu container.
     77     *
     78     * @returns {number} Available space
     79     */
     80    function getAvailableSpace( button, container ) {
     81        return container.offsetWidth - button.offsetWidth - 22;
     82    }
     83
     84    /**
     85     * Returns whether the current menu is overflowing or not.
     86     *
     87     * @returns {boolean} Is overflowing
     88     */
     89    function isOverflowingNavivation( list, button, container ) {
     90        return list.offsetWidth > getAvailableSpace( button, container );
     91    }
     92
     93    /**
     94     * Set menu container variable
     95     */
     96    var navContainer = document.querySelector('.main-navigation');
     97    var breaks       = [];
     98
     99    /**
     100     * Let’s bail if we our menu doesn't exist
     101     */
     102    if ( ! navContainer ) {
     103        return;
     104    }
     105
     106    /**
     107     * Refreshes the list item from the menu depending on the menu size
     108     */
     109    function updateNavigationMenu( container ) {
     110
     111        /**
     112         * Let’s bail if our menu is empty
     113         */
     114        if ( ! container.parentNode.querySelector('.main-menu[id]') ) {
     115            return;
     116        }
     117
     118        // Adds the necessary UI to operate the menu.
     119        var visibleList  = container.parentNode.querySelector('.main-menu[id]');
     120        var hiddenList   = visibleList.parentNode.nextElementSibling.querySelector('.hidden-links');
     121        var toggleButton = visibleList.parentNode.nextElementSibling.querySelector('.main-menu-more-toggle');
     122
     123        if ( isOverflowingNavivation( visibleList, toggleButton, container ) ) {
     124
     125            // Record the width of the list
     126            breaks.push( visibleList.offsetWidth );
     127            // Move last item to the hidden list
     128            prependElement( hiddenList, ! visibleList.lastChild || null === visibleList.lastChild ? visibleList.previousElementSibling : visibleList.lastChild );
     129            // Show the toggle button
     130            showButton( toggleButton );
     131
    46132        } else {
    47             hideElement(element);
    48         }
    49     }
    50 
    51     var navContainer = document.querySelector('.main-navigation');
    52     // Adds the necessary UI to operate the menu.
    53     var toggleButton = document.querySelector('.main-navigation .main-menu-more-toggle');
    54     var visibleList = document.querySelector('.main-navigation .main-menu[id]');
    55     var hiddenList = document.querySelector('.main-navigation .hidden-links');
    56     var breaks = [];
    57 
    58     /**
    59      * Returns the currently available space in the menu container.
    60      *
    61      * @returns {number} Available space
    62      */
    63     function getAvailableSpace() {
    64         return toggleButton.classList.contains('hidden') ? navContainer.offsetWidth : navContainer.offsetWidth - toggleButton.offsetWidth - 50;
    65     }
    66 
    67     /**
    68      * Returns whether the current menu is overflowing or not.
    69      *
    70      * @returns {boolean} Is overflowing
    71      */
    72     function isOverflowingNavivation() {
    73         return visibleList.offsetWidth > getAvailableSpace();
    74     }
    75 
    76     /**
    77      * Refreshes the list item from the menu depending on the menu size
    78      */
    79     function updateNavigationMenu() {
    80 
    81         if (isOverflowingNavivation()) {
    82             // Record the width of the list
    83             breaks.push(visibleList.offsetWidth);
    84             // Move item to the hidden list
    85             prependElement(hiddenList, visibleList.lastChild);
    86             // Show the toggle button
    87             showElement(toggleButton);
    88         } else {
     133
    89134            // There is space for another item in the nav
    90             if (getAvailableSpace() > breaks[breaks.length - 1]) {
     135            if ( getAvailableSpace( toggleButton, container ) > breaks[breaks.length - 1] ) {
    91136                // Move the item to the visible list
    92                 visibleList.appendChild(hiddenList.firstChild.nextSibling);
     137                visibleList.appendChild( hiddenList.firstChild.nextSibling );
    93138                breaks.pop();
    94139            }
    … …  
    96141            // Hide the dropdown btn if hidden list is empty
    97142            if (breaks.length < 2) {
    98                 hideElement(toggleButton);
    99                 hideElement(hiddenList);
     143                hideButton( toggleButton );
    100144            }
    101145        }
    102146
    103147        // Recur if the visible list is still overflowing the nav
    104         if (isOverflowingNavivation()) {
    105             updateNavigationMenu();
    106         }
    107     }
    108 
    109     // Event listeners
    110     // Run our sub-menu function as soon as the document is `ready`
     148        if ( isOverflowingNavivation( visibleList, toggleButton, container ) ) {
     149            updateNavigationMenu( container );
     150        }
     151    }
     152
     153    /**
     154     * Run our priority+ function as soon as the document is `ready`
     155     */
    111156    document.addEventListener( 'DOMContentLoaded', function() {
    112         updateNavigationMenu();
     157
     158        updateNavigationMenu( navContainer );
     159
     160        // Also, run our priority+ function on selective refresh in the customizer
     161        var hasSelectiveRefresh = (
     162            'undefined' !== typeof wp &&
     163            wp.customize &&
     164            wp.customize.selectiveRefresh &&
     165            wp.customize.navMenusPreview.NavMenuInstancePartial
     166        );
     167
     168        if ( hasSelectiveRefresh ) {
     169            // Re-run our priority+ function on Nav Menu partial refreshes
     170            wp.customize.selectiveRefresh.bind( 'partial-content-rendered', function ( placement ) {
     171
     172                var isNewNavMenu = (
     173                    placement &&
     174                    placement.partial.id.includes( 'nav_menu_instance' ) &&
     175                    'null' !== placement.container[0].parentNode &&
     176                    placement.container[0].parentNode.classList.contains( 'main-navigation' )
     177                );
     178
     179                if ( isNewNavMenu ) {
     180                    updateNavigationMenu( placement.container[0].parentNode );
     181                }
     182            });
     183        }
    113184    });
    114185
    115     window.addEventListener('load', function() {
    116         updateNavigationMenu();
     186    /**
     187     * Run our priority+ function on load
     188     */
     189    window.addEventListener( 'load', function() {
     190        updateNavigationMenu( navContainer );
    117191    });
    118192
    119     window.addEventListener('resize', function() {
    120         updateNavigationMenu();
    121     });
    122 
    123     toggleButton.addEventListener('click', function() {
    124         toggleElementVisibility(hiddenList);
    125     });
    126 
    127     updateNavigationMenu();
     193    /**
     194     * Run our priority+ function every time the window resizes
     195     */
     196    var isResizing = false;
     197    window.addEventListener( 'resize',
     198        debounce( function() {
     199            if ( isResizing ) {
     200                return;
     201            }
     202
     203            isResizing = true;
     204            setTimeout( function() {
     205                updateNavigationMenu( navContainer );
     206                isResizing = false;
     207            }, 150 );
     208        } )
     209    );
     210
     211    /**
     212     * Run our priority+ function
     213     */
     214    updateNavigationMenu( navContainer );
     215
    128216})();

  • trunk/src/wp-content/themes/twentynineteen/js/touch-keyboard-navigation.js

    r43892 r44149  
    77(function() {
    88
    9     // Debounce
     9    /**
     10     * Debounce
     11     *
     12     * @param {Function} func
     13     * @param {number} wait
     14     * @param {boolean} immediate
     15     */
    1016    function debounce(func, wait, immediate) {
    1117        'use strict';
    … …  
    3743    }
    3844
    39     // Add Class
     45    /**
     46     * Add class
     47     *
     48     * @param {Object} el
     49     * @param {string} cls
     50     */
    4051    function addClass(el, cls) {
    4152        if ( ! el.className.match( '(?:^|\\s)' + cls + '(?!\\S)') ) {
    … …  
    4455    }
    4556
    46     // Delete Class
     57    /**
     58     * Delete class
     59     *
     60     * @param {Object} el
     61     * @param {string} cls
     62     */
    4763    function deleteClass(el, cls) {
    4864        el.className = el.className.replace( new RegExp( '(?:^|\\s)' + cls + '(?!\\S)' ),'' );
    4965    }
    5066
    51     // Has Class?
     67    /**
     68     * Has class?
     69     *
     70     * @param {Object} el
     71     * @param {string} cls
     72     *
     73     * @returns {boolean} Has class
     74     */
    5275    function hasClass(el, cls) {
    5376
    … …  
    5780    }
    5881
    59     // Toggle Aria Expanded state for screenreaders
     82    /**
     83     * Toggle Aria Expanded state for screenreaders
     84     *
     85     * @param {Object} ariaItem
     86     */
    6087    function toggleAriaExpandedState( ariaItem ) {
    6188        'use strict';
    … …  
    7299    }
    73100
    74     // Open sub-menu
     101    /**
     102     * Open sub-menu
     103     *
     104     * @param {Object} currentSubMenu
     105     */
    75106    function openSubMenu( currentSubMenu ) {
    76107        'use strict';
    … …  
    85116    }
    86117
    87     // Close sub-menu
     118    /**
     119     * Close sub-menu
     120     *
     121     * @param {Object} currentSubMenu
     122     */
    88123    function closeSubMenu( currentSubMenu ) {
    89124        'use strict';
    … …  
    117152    }
    118153
    119     // Find first ancestor of an element by selector
     154    /**
     155     * Find first ancestor of an element by selector
     156     *
     157     * @param {Object} child
     158     * @param {String} selector
     159     * @param {String} stopSelector
     160     */
    120161    function getCurrentParent( child, selector, stopSelector ) {
    121162
    … …  
    140181    }
    141182
    142     // Remove all off-canvas states
     183    /**
     184     * Remove all off-canvas states
     185     */
    143186    function removeAllFocusStates() {
    144187        'use strict';
    145188
    146         var getFocusedElements = document.querySelectorAll(':hover, :focus, :focus-within');
     189        var siteBranding            = document.getElementsByClassName( 'site-branding' )[0];
     190        var getFocusedElements      = siteBranding.querySelectorAll(':hover, :focus, :focus-within');
     191        var getFocusedClassElements = siteBranding.querySelectorAll('.is-focused');
    147192        var i;
     193        var o;
    148194
    149195        for ( i = 0; i < getFocusedElements.length; i++) {
    150196            getFocusedElements[i].blur();
    151197        }
    152     }
    153 
    154     // Matches polyfill for IE11
     198
     199        for ( o = 0; o < getFocusedClassElements.length; o++) {
     200            deleteClass( getFocusedClassElements[o], 'is-focused' );
     201        }
     202    }
     203
     204    /**
     205     * Matches polyfill for IE11
     206     */
    155207    if (!Element.prototype.matches) {
    156208        Element.prototype.matches = Element.prototype.msMatchesSelector;
    157209    }
    158210
    159     // Toggle `focus` class to allow sub-menu access on touch screens.
     211    /**
     212     * Toggle `focus` class to allow sub-menu access on touch screens.
     213     */
    160214    function toggleSubmenuDisplay() {
    161215
    … …  
    211265                // Prevent default mouse events
    212266                event.preventDefault();
    213             }
    214 
    215             // Prevent default mouse events
    216             event.preventDefault();
     267            } else if (
     268                event.target.matches('.submenu-expand') ||
     269                null != getCurrentParent( event.target, '.submenu-expand' ) &&
     270                getCurrentParent( event.target, '.submenu-expand' ).matches( '.submenu-expand' ) ||
     271                event.target.matches('.menu-item-link-return') ||
     272                null != getCurrentParent( event.target, '.menu-item-link-return' ) &&
     273                getCurrentParent( event.target, '.menu-item-link-return' ).matches( '.menu-item-link-return' ) ) {
     274                    // Prevent default mouse events
     275                    event.preventDefault();
     276            }
    217277
    218278            // Prevent default mouse/focus events
    … …  
    223283        document.addEventListener('focus', function(event) {
    224284
    225             if ( event.target.matches('.main-navigation > div > ul > li > a') ) {
    226 
    227                 // Remove Focuse elements in sibling div
    228                 var currentDiv        = getCurrentParent( event.target, 'div' );
     285            if ( event.target.matches('.main-navigation > div > ul > li a') ) {
     286
     287                // Remove Focused elements in sibling div
     288                var currentDiv        = getCurrentParent( event.target, 'div', '.main-navigation' );
    229289                var currentDivSibling = currentDiv.previousElementSibling === null ? currentDiv.nextElementSibling : currentDiv.previousElementSibling;
    230290                var focusedElement    = currentDivSibling.querySelector( '.is-focused' );
    231291                var focusedClass      = 'is-focused';
    232                 var prevLi            = event.target.parentNode.previousElementSibling;
    233                 var nextLi            = event.target.parentNode.nextElementSibling;
     292                var prevLi            = getCurrentParent( event.target, '.main-navigation > div > ul > li', '.main-navigation' ).previousElementSibling;
     293                var nextLi            = getCurrentParent( event.target, '.main-navigation > div > ul > li', '.main-navigation' ).nextElementSibling;
    234294
    235295                if ( null !== focusedElement && null !== hasClass( focusedElement, focusedClass ) ) {
    … …  
    237297                }
    238298
    239                 // Add .is-focused class to top-level ul
    240                 if ( event.target.parentNode.querySelector( '.main-navigation ul ul') ) {
    241                     addClass( event.target.parentNode, focusedClass );
     299                // Add .is-focused class to top-level li
     300                if ( getCurrentParent( event.target, '.main-navigation > div > ul > li', '.main-navigation' ) ) {
     301                    addClass( getCurrentParent( event.target, '.main-navigation > div > ul > li', '.main-navigation' ), focusedClass );
    242302                }
    243303
    … …  
    252312                }
    253313            }
     314
    254315        }, true);
    255     }
    256 
    257     // Run our sub-menu function as soon as the document is `ready`
     316
     317        document.addEventListener('click', function(event) {
     318
     319            // Remove all focused menu states when clicking outside site branding
     320            if ( event.target !== document.getElementsByClassName( 'site-branding' )[0] ) {
     321                removeAllFocusStates();
     322            } else {
     323                // nothing
     324            }
     325
     326        }, false);
     327    }
     328
     329    /**
     330     * Run our sub-menu function as soon as the document is `ready`
     331     */
    258332    document.addEventListener( 'DOMContentLoaded', function() {
    259333        toggleSubmenuDisplay();
    260334    });
    261     // Annnnnd also every time the window resizes
     335
     336    /**
     337     * Run our sub-menu function on selective refresh in the customizer
     338     */
     339    document.addEventListener( 'customize-preview-menu-refreshed', function( e, params ) {
     340        if ( 'menu-1' === params.wpNavMenuArgs.theme_location ) {
     341            toggleSubmenuDisplay();
     342        }
     343    });
     344
     345    /**
     346     * Run our sub-menu function every time the window resizes
     347     */
    262348    var isResizing = false;
    263     window.addEventListener( 'resize',
     349    window.addEventListener( 'resize', function() {
     350        isResizing = true;
    264351        debounce( function() {
    265352            if ( isResizing ) {
    … …  
    267354            }
    268355
    269             isResizing = true;
    270             setTimeout( function() {
    271                 toggleSubmenuDisplay();
    272                 isResizing = false;
    273             }, 150 );
    274         } )
    275     );
     356            toggleSubmenuDisplay();
     357            isResizing = false;
     358
     359        }, 150 );
     360    } );
    276361
    277362})();

  • trunk/src/wp-content/themes/twentynineteen/package-lock.json

    r43808 r44149  
    929929      }
    930930    },
    931     "duplexer": {
    932       "version": "0.1.1",
    933       "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
    934       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
    935       "dev": true
    936     },
    937931    "ecc-jsbn": {
    938932      "version": "0.1.2",
    … …  
    996990      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
    997991      "dev": true
    998     },
    999     "event-stream": {
    1000       "version": "3.3.6",
    1001       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz",
    1002       "integrity": "sha512-dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==",
    1003       "dev": true,
    1004       "requires": {
    1005         "duplexer": "^0.1.1",
    1006         "flatmap-stream": "^0.1.0",
    1007         "from": "^0.1.7",
    1008         "map-stream": "0.0.7",
    1009         "pause-stream": "^0.0.11",
    1010         "split": "^1.0.1",
    1011         "stream-combiner": "^0.2.2",
    1012         "through": "^2.3.8"
    1013       }
    1014992    },
    1015993    "execa": {
    … …  
    11831161    },
    11841162    "fast-glob": {
    1185       "version": "2.2.2",
    1186       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz",
    1187       "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==",
     1163      "version": "2.2.3",
     1164      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.3.tgz",
     1165      "integrity": "sha512-NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA==",
    11881166      "dev": true,
    11891167      "requires": {
    … …  
    12451223      }
    12461224    },
    1247     "flatmap-stream": {
    1248       "version": "0.1.1",
    1249       "resolved": "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.1.tgz",
    1250       "integrity": "sha512-lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw==",
    1251       "dev": true
    1252     },
    12531225    "for-in": {
    12541226      "version": "1.0.2",
    … …  
    12931265        "map-cache": "^0.2.2"
    12941266      }
    1295     },
    1296     "from": {
    1297       "version": "0.1.7",
    1298       "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
    1299       "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
    1300       "dev": true
    13011267    },
    13021268    "fs-extra": {
    … …  
    26062572      "dev": true
    26072573    },
    2608     "map-stream": {
    2609       "version": "0.0.7",
    2610       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
    2611       "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
    2612       "dev": true
    2613     },
    26142574    "map-visit": {
    26152575      "version": "1.0.0",
    … …  
    26572617    },
    26582618    "merge2": {
    2659       "version": "1.2.2",
    2660       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz",
    2661       "integrity": "sha512-bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==",
     2619      "version": "1.2.3",
     2620      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz",
     2621      "integrity": "sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==",
    26622622      "dev": true
    26632623    },
    … …  
    29222882    },
    29232883    "npm-run-all": {
    2924       "version": "4.1.3",
    2925       "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.3.tgz",
    2926       "integrity": "sha512-aOG0N3Eo/WW+q6sUIdzcV2COS8VnTZCmdji0VQIAZF3b+a3YWb0AD0vFIyjKec18A7beLGbaQ5jFTNI2bPt9Cg==",
    2927       "dev": true,
    2928       "requires": {
    2929         "ansi-styles": "^3.2.0",
    2930         "chalk": "^2.1.0",
    2931         "cross-spawn": "^6.0.4",
     2884      "version": "4.1.5",
     2885      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
     2886      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
     2887      "dev": true,
     2888      "requires": {
     2889        "ansi-styles": "^3.2.1",
     2890        "chalk": "^2.4.1",
     2891        "cross-spawn": "^6.0.5",
    29322892        "memorystream": "^0.3.1",
    29332893        "minimatch": "^3.0.4",
    2934         "ps-tree": "^1.1.0",
     2894        "pidtree": "^0.3.0",
    29352895        "read-pkg": "^3.0.0",
    29362896        "shell-quote": "^1.6.1",
    … …  
    31613121    "p-is-promise": {
    31623122      "version": "1.1.0",
    3163       "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
     3123      "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
    31643124      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
    31653125      "dev": true
    … …  
    32423202      }
    32433203    },
    3244     "pause-stream": {
    3245       "version": "0.0.11",
    3246       "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
    3247       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
    3248       "dev": true,
    3249       "requires": {
    3250         "through": "~2.3"
    3251       }
    3252     },
    32533204    "performance-now": {
    32543205      "version": "2.1.0",
    … …  
    32573208      "dev": true
    32583209    },
     3210    "pidtree": {
     3211      "version": "0.3.0",
     3212      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.0.tgz",
     3213      "integrity": "sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==",
     3214      "dev": true
     3215    },
    32593216    "pify": {
    32603217      "version": "2.3.0",
    … …  
    32963253    },
    32973254    "postcss-cli": {
    3298       "version": "6.0.0",
    3299       "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-6.0.0.tgz",
    3300       "integrity": "sha512-7DuxMn1Wj6dJKbjKpZXOdAc5nl5NfPXiJbg0m/+tdObPvgk1xv4+lZgNKD3jL/kCrDRPf1jgFlmq1cHh8lBR2w==",
     3255      "version": "6.0.1",
     3256      "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-6.0.1.tgz",
     3257      "integrity": "sha512-M9GiEMzXVMlI4ln8e+mdeHT+qvoHVZdlN06hj5/EhrRZWDr+J1sniPeGJ4nghknl+du3Oj2UoqqhgpKKhiZ9+w==",
    33013258      "dev": true,
    33023259      "requires": {
    … …  
    33093266        "postcss": "^7.0.0",
    33103267        "postcss-load-config": "^2.0.0",
    3311         "postcss-reporter": "^5.0.0",
     3268        "postcss-reporter": "^6.0.0",
    33123269        "pretty-hrtime": "^1.0.3",
    33133270        "read-cache": "^1.0.0",
    … …  
    34503407      }
    34513408    },
     3409    "postcss-focus-within": {
     3410      "version": "3.0.0",
     3411      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
     3412      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
     3413      "dev": true,
     3414      "requires": {
     3415        "postcss": "^7.0.2"
     3416      }
     3417    },
    34523418    "postcss-load-config": {
    34533419      "version": "2.0.0",
    … …  
    34613427    },
    34623428    "postcss-reporter": {
    3463       "version": "5.0.0",
    3464       "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz",
    3465       "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==",
     3429      "version": "6.0.0",
     3430      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-6.0.0.tgz",
     3431      "integrity": "sha512-5xQXm1UPWuFObjbtyQzWvQaupru8yFcFi4HUlm6OPo1o2bUszYASuqRJ7bVArb3svGCdbYtqdMBKrqR1Aoy+tw==",
    34663432      "dev": true,
    34673433      "requires": {
    … …  
    34693435        "lodash": "^4.17.4",
    34703436        "log-symbols": "^2.0.0",
    3471         "postcss": "^6.0.8"
    3472       },
    3473       "dependencies": {
    3474         "postcss": {
    3475           "version": "6.0.23",
    3476           "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
    3477           "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
    3478           "dev": true,
    3479           "requires": {
    3480             "chalk": "^2.4.1",
    3481             "source-map": "^0.6.1",
    3482             "supports-color": "^5.4.0"
    3483           }
    3484         }
     3437        "postcss": "^7.0.2"
    34853438      }
    34863439    },
    … …  
    35023455      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
    35033456      "dev": true
    3504     },
    3505     "ps-tree": {
    3506       "version": "1.1.0",
    3507       "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz",
    3508       "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
    3509       "dev": true,
    3510       "requires": {
    3511         "event-stream": "~3.3.0"
    3512       }
    35133457    },
    35143458    "pseudomap": {
    … …  
    40303974      "dev": true
    40313975    },
    4032     "split": {
    4033       "version": "1.0.1",
    4034       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
    4035       "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
    4036       "dev": true,
    4037       "requires": {
    4038         "through": "2"
    4039       }
    4040     },
    40413976    "split-string": {
    40423977      "version": "3.1.0",
    … …  
    41014036      }
    41024037    },
    4103     "stream-combiner": {
    4104       "version": "0.2.2",
    4105       "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
    4106       "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
    4107       "dev": true,
    4108       "requires": {
    4109         "duplexer": "~0.1.1",
    4110         "through": "~2.3.4"
    4111       }
    4112     },
    41134038    "string-width": {
    41144039      "version": "1.0.2",
    … …  
    42004125        "inherits": "2"
    42014126      }
    4202     },
    4203     "through": {
    4204       "version": "2.3.8",
    4205       "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
    4206       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
    4207       "dev": true
    42084127    },
    42094128    "to-object-path": {

  • trunk/src/wp-content/themes/twentynineteen/package.json

    r43808 r44149  
    1212    "chokidar-cli": "^1.2.1",
    1313    "node-sass": "^4.9.3",
    14     "postcss-cli": "^6.0.0",
    15     "rtlcss": "^2.4.0",
    16     "npm-run-all": "^4.1.3"
     14    "npm-run-all": "^4.1.5",
     15    "postcss-cli": "^6.0.1",
     16    "postcss-focus-within": "^3.0.0",
     17    "rtlcss": "^2.4.0"
    1718  },
    1819  "rtlcssConfig": {
    … …  
    3536    "build:style": "node-sass style.scss style.css --output-style expanded && postcss -r style.css",
    3637    "build:style-editor": "node-sass style-editor.scss style-editor.css --output-style expanded && postcss -r style-editor.css",
    37     "build:style-editor-frame": "node-sass style-editor-frame.scss style-editor-frame.css --output-style expanded && postcss -r style-editor-frame.css",
     38    "build:style-editor-customizer": "node-sass style-editor-customizer.scss style-editor-customizer.css --output-style expanded && postcss -r style-editor-customizer.css",
    3839    "build:rtl": "rtlcss style.css style-rtl.css",
    3940    "build:print": "node-sass print.scss print.css --output-style expanded && postcss -r print.css",

  • trunk/src/wp-content/themes/twentynineteen/page.php

    r43808 r44149  
    77 * @package WordPress
    88 * @subpackage Twenty_Nineteen
     9 * @since 1.0.0
    910 */
    1011
    … …  
    1213?>
    1314
    14     <div id="primary" class="content-area">
     15    <section id="primary" class="content-area">
    1516        <main id="main" class="site-main">
    1617
    … …  
    3233
    3334        </main><!-- #main -->
    34     </div><!-- #primary -->
     35    </section><!-- #primary -->
    3536
    3637<?php

  • trunk/src/wp-content/themes/twentynineteen/postcss.config.js

    r43808 r44149  
     1var postcssFocusWithin = require('postcss-focus-within');
     2
    13module.exports = {
    24    plugins: {
    … …  
    46    }
    57};
     8
     9module.exports = {
     10    plugins: [
     11        postcssFocusWithin(/* pluginOptions */)
     12    ]
     13};

  • trunk/src/wp-content/themes/twentynineteen/print.css

    r43808 r44149  
    2020    margin: 2cm;
    2121  }
    22   .hentry .entry-header, .site-footer .site-info {
     22  .entry {
     23    margin-top: 1em;
     24  }
     25  .entry .entry-header, .site-footer .site-info {
    2326    margin: 0;
    2427  }
    … …  
    7376  a:link, a:visited, a {
    7477    background: transparent;
    75     color: #520;
    7678    font-weight: bold;
    7779    text-decoration: underline;
    … …  
    9597  /* Visibility */
    9698  .main-navigation,
     99  .site-title + .main-navigation,
    97100  .social-navigation,
    98101  .site-branding-container:before,
    99   .hentry .entry-title:before,
    100   .entry-meta, .entry-footer,
     102  .entry .entry-title:before,
     103  .entry-footer,
    101104  .author-description:before,
    102   .post-navigation {
     105  .post-navigation,
     106  .widget-area,
     107  .comment-form-flex,
     108  .comment-reply,
     109  .comment .comment-metadata .edit-link {
    103110    display: none;
    104111  }
     112  .entry .entry-content .wp-block-button .wp-block-button__link,
     113  .entry .entry-content .button {
     114    color: #000;
     115    background: none;
     116  }
     117  /* Site Header (With Featured Image) */
     118  .site-header.featured-image {
     119    min-height: 0;
     120  }
     121  .site-header.featured-image .main-navigation a,
     122  .site-header.featured-image .main-navigation a + svg,
     123  .site-header.featured-image .social-navigation a,
     124  .site-header.featured-image .site-title a,
     125  .site-header.featured-image .site-featured-image a,
     126  .site-header.featured-image .site-branding .site-title,
     127  .site-header.featured-image .site-branding .site-description,
     128  .site-header.featured-image .main-navigation a:after,
     129  .site-header.featured-image .main-navigation .main-menu > li.menu-item-has-children:after,
     130  .site-header.featured-image .main-navigation li,
     131  .site-header.featured-image .social-navigation li,
     132  .site-header.featured-image .entry-meta,
     133  .site-header.featured-image .entry-title,
     134  .site-header.featured-image#masthead .site-title a {
     135    color: #000;
     136    text-shadow: none;
     137  }
     138  .site-header.featured-image .site-featured-image .entry-header,
     139  .site-header.featured-image .site-branding-container {
     140    margin-top: 0;
     141    margin-bottom: 0;
     142  }
     143  .site-header.featured-image .site-featured-image .post-thumbnail img {
     144    position: relative;
     145    height: initial;
     146    width: initial;
     147    object-fit: none;
     148    min-width: 0;
     149    min-height: 0;
     150    max-width: 100%;
     151    margin-top: 1rem;
     152  }
     153  /* Remove image filters from featured image */
     154  .image-filters-enabled *:after {
     155    display: none !important;
     156  }
     157  .image-filters-enabled .site-header.featured-image .site-featured-image:before {
     158    display: none;
     159  }
     160  .image-filters-enabled .site-header.featured-image .site-featured-image .post-thumbnail img {
     161    filter: none;
     162  }
    105163}

  • trunk/src/wp-content/themes/twentynineteen/print.scss

    r43808 r44149  
    2424  }
    2525
    26   .hentry .entry-header, .site-footer .site-info {
     26  .entry {
     27    margin-top: 1em;
     28  }
     29
     30  .entry .entry-header, .site-footer .site-info {
    2731    margin: 0;
    2832  }
    … …  
    9094  a:link, a:visited, a {
    9195    background: transparent;
    92     color: #520;
    9396    font-weight: bold;
    9497    text-decoration: underline;
    … …  
    97100
    98101  a {
    99     page-break-inside: avoid
     102    page-break-inside: avoid;
    100103  }
    101104
    … …  
    118121  /* Visibility */
    119122  .main-navigation,
     123  .site-title + .main-navigation,
    120124  .social-navigation,
    121125  .site-branding-container:before,
    122   .hentry .entry-title:before,
    123   .entry-meta, .entry-footer,
     126  .entry .entry-title:before,
     127  .entry-footer,
    124128  .author-description:before,
    125   .post-navigation {
     129  .post-navigation,
     130  .widget-area,
     131  .comment-form-flex,
     132  .comment-reply,
     133  .comment .comment-metadata .edit-link {
    126134    display: none;
    127135  }
     136
     137  .entry .entry-content .wp-block-button .wp-block-button__link,
     138  .entry .entry-content .button {
     139    color: #000;
     140    background: none;
     141  }
     142
     143  /* Site Header (With Featured Image) */
     144  .site-header.featured-image {
     145    min-height: 0;
     146   
     147    .main-navigation a,
     148    .main-navigation a + svg,
     149    .social-navigation a,
     150    .site-title a,
     151    .site-featured-image a,
     152    .site-branding .site-title,
     153    .site-branding .site-description,
     154    .main-navigation a:after,
     155    .main-navigation .main-menu > li.menu-item-has-children:after,
     156    .main-navigation li,
     157    .social-navigation li,
     158    .entry-meta,
     159    .entry-title,
     160    &#masthead .site-title a {
     161      color: #000;
     162      text-shadow: none;
     163    }
     164
     165    .site-featured-image .entry-header,
     166    .site-branding-container {
     167      margin-top: 0;
     168      margin-bottom: 0;
     169    }
     170
     171    .site-featured-image .post-thumbnail img {
     172      position: relative;
     173      height: initial;
     174      width: initial;
     175      object-fit: none;
     176      min-width: 0;
     177      min-height: 0;
     178      max-width: 100%;
     179      margin-top: 1rem;
     180    }
     181  }
     182 
     183  /* Remove image filters from featured image */
     184  .image-filters-enabled {
     185
     186    *:after {
     187      display: none !important;
     188    }
     189
     190    .site-header.featured-image .site-featured-image:before {
     191      display: none;
     192    }
     193
     194    .site-header.featured-image .site-featured-image .post-thumbnail img {
     195      filter: none;
     196    }
     197  }
    128198}

  • trunk/src/wp-content/themes/twentynineteen/readme.txt

    r43808 r44149  
    1010**License URI:** http://www.gnu.org/licenses/gpl-2.0.html 
    1111**Tags:** one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready
    12 
    1312
    1413## Description
    … …  
    24235. Navigate to Appearance > Customize in your admin panel and customize to taste.
    2524
    26  
    2725## Copyright
    2826
    2927Twenty Nineteen WordPress Theme, Copyright 2018 WordPress.org
    30 Twenty Nineteen is distributed under the terms of the GNU GPL
     28Twenty Nineteen is distributed under the terms of the GNU GPL.
    3129
    3230This program is free software: you can redistribute it and/or modify
    … …  
    6159
    6260### X.X
     61
    6362* Released: XX-XX-XXXX
    6463

  • trunk/src/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss

    r43808 r44149  
    11/* !Block styles */
    22
    3 .entry-content > *,
    4 .entry-summary > * {
    5 
    6     margin: 32px $size__spacing-unit;
    7     max-width: calc(100vw - (2 * #{ $size__spacing-unit }));
     3.entry .entry-content > *,
     4.entry .entry-summary > * {
     5    margin: 32px 0;
     6    max-width: 100%;
     7
     8    @include postContentMaxWidth();
    89
    910    @include media(tablet) {
    10         margin: 32px calc(2 * (100vw / 12));
    11         max-width: calc(8 * (100vw / 12));
    12     }
    13 
    14     @include media(desktop) {
    15         max-width: calc(6 * (100vw / 12));
    16     }
    17 
    18 /*
    19     // Set top margins for headings
    20     & + h1:before,
    21     & + h2:before,
    22     & + h3,
    23     & + h4,
    24     & + h5,
    25     & + h6 {
    26         margin-top: calc(4 * #{ $size__spacing-unit});
    27     }
    28 */
     11        margin: 32px 0;
     12    }
    2913
    3014    > *:first-child {
    … …  
    3721
    3822    &.alignwide {
    39 
    4023        margin-left: auto;
    4124        margin-right: auto;
     25        clear: both;
    4226
    4327        @include media(tablet) {
    44             margin-left: calc(1 * (100vw / 12));
    45             margin-right: calc(1 * (100vw / 12));
    46             max-width: calc(10 * (100vw / 12));
     28            width: 100%;
     29            max-width: 100%;
    4730        }
    4831    }
    4932
    5033    &.alignfull {
    51         margin-top: calc(2 * #{$size__spacing-unit});
    52         margin-right: 0;
    53         margin-bottom: calc(2 * #{$size__spacing-unit});
    54         margin-left: 0;
    55         max-width: 100%;
     34        position: relative;
     35        left: -#{$size__spacing-unit };
     36        width: calc( 100% + (2 * #{$size__spacing-unit}));
     37        max-width: calc( 100% + (2 * #{$size__spacing-unit}));
     38        clear: both;
     39
     40        @include media(tablet) {
     41            margin-top: calc(2 * #{$size__spacing-unit});
     42            margin-bottom: calc(2 * #{$size__spacing-unit});
     43            left: calc( -12.5% - 75px );
     44            width: calc( 125% + 150px );
     45            max-width: calc( 125% + 150px );
     46        }
    5647    }
    5748
    5849    &.alignleft {
     50        /*rtl:ignore*/
    5951        float: left;
    6052        max-width: calc(5 * (100vw / 12));
    6153        margin-top: 0;
     54        margin-left: 0;
     55        /*rtl:ignore*/
     56        margin-right: $size__spacing-unit;
    6257
    6358        @include media(tablet) {
    6459            max-width: calc(4 * (100vw / 12));
     60            /*rtl:ignore*/
    6561            margin-right: calc(2 * #{$size__spacing-unit});
    6662        }
    67 
    68         @include media(desktop) {
    69             max-width: calc(3 * (100vw / 12));
    70         }
    7163    }
    7264
    7365    &.alignright {
     66        /*rtl:ignore*/
    7467        float: right;
    7568        max-width: calc(5 * (100vw / 12));
    7669        margin-top: 0;
     70        margin-right: 0;
     71        /*rtl:ignore*/
    7772        margin-left: $size__spacing-unit;
    78         margin-right: $size__spacing-unit;
    7973
    8074        @include media(tablet) {
    8175            max-width: calc(4 * (100vw / 12));
     76            margin-right: 0;
     77            /*rtl:ignore*/
    8278            margin-left: calc(2 * #{$size__spacing-unit});
    83             margin-right: calc(2 * (100vw / 12));
     79        }
     80    }
     81    &.aligncenter {
     82        margin-left: auto;
     83        margin-right: auto;
     84
     85        @include postContentMaxWidth();
     86
     87        @include media(tablet) {
     88            margin-left: 0;
     89            margin-right: 0;
    8490        }
    8591    }
    8692}
    8793
    88 .entry-content {
     94/*
     95 * Unset nested content selector styles
     96 * - Prevents layout styles from cascading too deeply
     97 * - helps with plugin compatibility
     98 */
     99.entry .entry-content,
     100.entry .entry-summary {
     101
     102    .entry-content,
     103    .entry-summary,
     104    .entry {
     105        margin: inherit;
     106        max-width: inherit;
     107        padding: inherit;
     108
     109        @include media(tablet) {
     110            margin: inherit;
     111            max-width: inherit;
     112            padding: inherit;
     113        }
     114    }
     115}
     116
     117.entry .entry-content {
     118
     119    //! Paragraphs
     120    p.has-background {
     121        padding: 20px 30px;
     122    }
    89123
    90124    //! Audio
    … …  
    100134        &.alignright audio {
    101135
    102             max-width: (0.5 * $mobile_width);
     136            max-width: (0.33 * $mobile_width);
    103137
    104138            @include media(tablet) {
    … …  
    126160            @include button-transition;
    127161            border: none;
    128             background: $color__background-button;
    129162            font-size: $font__size-sm;
    130163            font-family: $font__heading;
    … …  
    132165            box-sizing: border-box;
    133166            font-weight: bold;
    134             padding: ($size__spacing-unit * .66) $size__spacing-unit;
     167            text-decoration: none;
     168            padding: ($size__spacing-unit * .76) $size__spacing-unit;
    135169            outline: none;
    136             color: white;
    137170            outline: none;
    138171
     172            &:not(.has-background) {
     173                background-color: $color__background-button;
     174            }
     175
     176            &:not(.has-text-color) {
     177                color: white;
     178            }
     179
    139180            &:hover {
     181                color: white;
     182                background: $color__background-button-hover;
    140183                cursor: pointer;
    141184            }
    142185
    143             &:hover, &:focus {
     186            &:focus {
     187                color: white;
    144188                background: $color__background-button-hover;
    145             }
    146 
    147             &:focus {
    148189                outline: thin dotted;
    149190                outline-offset: -4px;
    … …  
    158199        &.is-style-outline .wp-block-button__link:focus,
    159200        &.is-style-outline .wp-block-button__link:active {
    160 
    161             @include button-all-transition;
    162             background: transparent;
    163             border: 2px solid $color__background-button;
     201            @include button-all-transition;
     202            border-width: 2px;
     203            border-style: solid;       
     204
     205            &:not(.has-background) {
     206                background: transparent;
     207            }
    164208
    165209            &:not(.has-text-color) {
    166210                color: $color__background-button;
     211                border-color: currentColor;
    167212            }
    168213        }
    169214
    170215        &.is-style-outline .wp-block-button__link:hover {
     216            color: white;
    171217            border-color: $color__background-button-hover;
    172             color: $color__background-button-hover;
    173218        }
    174219    }
    … …  
    184229            color: $color__text-light;
    185230            font-family: $font__heading;
    186             font-size: calc(#{$font__size_base} * #{$font__size-lg / 1em} );
     231            font-size: calc(#{$font__size_base} * #{$font__size-ratio});
    187232            font-weight: bold;
    188233            line-height: $font__line-height-heading;
    189 
    190             a:after {
    191                 color: $color__text-light;
    192                 content: ",";
    193             }
    194 
    195             &:last-child a:after {
    196                 color: $color__text-light;
    197                 content: ".";
    198             }
    199         }
     234            padding-bottom: ( .75 * $size__spacing-unit );
     235
     236            &.menu-item-has-children,
     237            &:last-child {
     238                padding-bottom: 0;
     239            }
     240
     241            a {
     242                text-decoration: none;
     243            }
     244        }
     245    }
     246
     247    //! Latest categories
     248    .wp-block-categories {
     249
     250        ul {
     251            padding-top: ( .75 * $size__spacing-unit );
     252        }
     253
     254        li ul {
     255            list-style: none;
     256            padding-left: 0;
     257        }
     258
     259        @include nestedSubMenuPadding();
    200260    }
    201261
    … …  
    234294    }
    235295
    236     // !Paragraphs
     296    //! Paragraphs
    237297    .has-drop-cap {
    238298        &:not(:focus):first-letter {
    … …  
    245305    }
    246306
    247     // !Pullquote
     307    //! Pullquote
    248308    .wp-block-pullquote {
    249         border: none;
     309        border-color: transparent;
     310        border-width: 2px;
    250311        padding: $size__spacing-unit;
    251312
    252313        blockquote {
     314            color: $color__text-main;
    253315            border: none;
    254             padding-bottom: calc(2 * #{$size__spacing-unit});
     316            margin-top: calc(4 * #{ $size__spacing-unit});
     317            margin-bottom: calc(4.33 * #{ $size__spacing-unit});
    255318            margin-right: 0;
    256319        }
    … …  
    262325            margin-bottom: 0.5em;
    263326            margin-top: 0.5em;
    264             color: $color__text-main;
    265327
    266328            em {
    … …  
    276338            display: inline-block;
    277339            font-family: $font__heading;
    278             font-size: $font__size-xs;
    279340            line-height: 1.6;
    280341            text-transform: none;
    281342            color: $color__text-light;
     343
     344            /*
     345             * This requires a rem-based font size calculation instead of our normal em-based one,
     346             * because the cite tag sometimes gets wrapped in a p tag. This is equivalent to $font-size_xs.
     347             */
     348            font-size: calc(1rem / (1.25 * #{$font__size-ratio}));
    282349        }
    283350
    284351        &.alignleft,
    285352        &.alignright {
     353            width: 100%;
    286354            padding: 0;
    287355
    … …  
    295363
    296364        &.is-style-solid-color {
     365            background-color: $color__link;
     366            padding-left: 0;
     367            padding-right: 0;
     368
     369            @include media(tablet) {
     370                padding-left: 10%;
     371                padding-right: 10%;
     372            }
    297373
    298374            p {
    … …  
    307383            }
    308384
     385            a {
     386                color: $color__background-body;
     387            }
     388
     389            cite {
     390                color: inherit;
     391            }
     392
    309393            blockquote {
    310                 margin: 0 auto;
    311             }
    312 
    313             blockquote:not(.has-text-color) p,
    314             cite {
    315                 color: white;
    316             }
    317 
    318             &:not(.has-background-color) {
    319                 background-color: $color__link;
    320             }
    321 
    322             &.alignleft,
    323             &.alignright {
    324                 padding: $size__spacing-unit $size__spacing-unit 0;
    325 
    326                 blockquote {
    327                     padding: 0 0 calc( 1.5 * #{$size__spacing-unit} );
     394                max-width: calc(100% - (2 * #{$size__spacing-unit}));
     395                color: $color__background-body;
     396                padding-left: 0;
     397                margin-left: $size__spacing-unit;
     398
     399                &.has-text-color p,
     400                &.has-text-color a,
     401                &.has-primary-color,
     402                &.has-secondary-color,
     403                &.has-dark-gray-color,
     404                &.has-light-gray-color,
     405                &.has-white-color {
     406                    color: inherit;
     407                }
     408
     409                @include media(tablet) {
    328410                    margin-left: 0;
    329                     margin-top: 0;
    330                 }
     411                    margin-right: 0;
     412                }
     413            }
     414
     415            &.alignfull {
    331416
    332417                @include media(tablet) {
    333                     padding: calc( 2 * #{$size__spacing-unit} ) calc( 2 * #{$size__spacing-unit} ) $size__spacing-unit;
     418                    padding-left: calc(10% + 58px + (2 * #{$size__spacing-unit}));
     419                    padding-right: calc(10% + 58px + (2 * #{$size__spacing-unit}));
    334420                }
    335421            }
    … …  
    354440
    355441        cite {
    356             font-size: $font__size-xs;
     442            /*
     443             * This requires a rem-based font size calculation instead of our normal em-based one,
     444             * because the cite tag sometimes gets wrapped in a p tag. This is equivalent to $font-size_xs.
     445             */
     446            font-size: calc(1rem / (1.25 * #{$font__size-ratio}));
    357447        }
    358448
    359449        &.is-large,
    360450        &.is-style-large {
    361             padding: $size__spacing-unit 0 ($size__spacing-unit) ($size__spacing-unit * 2);
    362451            margin: $size__spacing-unit 0;
     452            padding: 0;
    363453            border-left: none;
    364454
    … …  
    371461            cite,
    372462            footer {
    373                 font-size: $font__size-xs;
     463                /*
     464                 * This requires a rem-based font size calculation instead of our normal em-based one,
     465                 * because the cite tag sometimes gets wrapped in a p tag. This is equivalent to $font-size_xs.
     466                 */
     467                font-size: calc(1rem / (1.25 * #{$font__size-ratio}));
    374468            }
    375469
    376470            @include media(tablet) {
    377 
    378                 margin: $size__spacing-unit calc(2 * (100vw / 12));
    379                 max-width: calc(6 * (100vw / 12));
     471                margin: $size__spacing-unit 0;
     472                padding: $size__spacing-unit 0;
    380473
    381474                p {
    … …  
    400493        &.alignfull img {
    401494            width: 100vw;
    402             margin-left: auto;
    403             margin-right: auto;
     495
     496            @include media(tablet) {
     497                margin-left: auto;
     498                margin-right: auto;
     499            }
    404500        }
    405501    }
    406502
    407503    //! Cover Image
    408     .wp-block-cover-image {
     504    .wp-block-cover-image,
     505    .wp-block-cover {
     506        position: relative;
     507        min-height: 430px;
     508        padding: $size__spacing-unit;
     509
     510        @include media(tablet) {
     511            padding: $size__spacing-unit 10%;
     512        }
    409513
    410514        .wp-block-cover-image-text,
     515        .wp-block-cover-text,
    411516        h2 {
    412517            font-family: $font__heading;
    413518            font-size: $font__size-lg;
    414519            font-weight: bold;
    415 
    416             width: calc(100vw - (2 * #{ $size__spacing-unit }));
    417             max-width: calc(100vw - (2 * #{ $size__spacing-unit }));
     520            line-height: 1.25;
     521            padding: 0;
     522            color: #fff;
     523            -ms-hyphens: auto;
     524            -moz-hyphens: auto;
     525            -webkit-hyphens: auto;
     526            hyphens: auto;
    418527
    419528            @include media(tablet) {
    420529                font-size: $font__size-xl;
    421                 width: calc(8 * (100vw / 12));
    422                 max-width: calc(8 * (100vw / 12));
    423             }
    424 
    425             @include media(desktop) {
    426                 width: calc(6 * (100vw / 12 ));
    427                 max-width: calc(6 * (100vw / 12 ));
     530                max-width: 100%;
    428531            }
    429532        }
    430533
    431534        &.alignleft,
    432         &.alignright,
    433         &.aligncenter {
    434             h2,
    435             .wp-block-cover-image-text {
    436                 width: 100%;
    437                 z-index: 1;
    438                 left: 50%;
    439                 position: absolute;
    440                 transform: translate(-50%, -50%);
    441                 top: 50%;
    442             }
    443         }
    444 
    445         &.has-left-content {
    446             justify-content: center;
    447 
    448             h2,
    449             .wp-block-cover-image-text {
     535        &.alignright {
     536            width: 100%;
     537
     538            @include media(tablet) {
    450539                padding: $size__spacing-unit;
    451540            }
    452541        }
    453542
    454         &.has-right-content {
    455             justify-content: center;
    456 
    457             h2,
    458             .wp-block-cover-image-text {
    459                 padding: $size__spacing-unit;
     543        &.alignfull {
     544
     545            .wp-block-cover-image-text,
     546            .wp-block-cover-text,
     547            h2 {
     548                @include postContentMaxWidth();
     549            }
     550
     551            @include media(tablet) {
     552                padding-left: calc(10% + 58px + (2 * #{$size__spacing-unit}));
     553                padding-right: calc(10% + 58px + (2 * #{$size__spacing-unit}));
     554
     555                .wp-block-cover-image-text,
     556                .wp-block-cover-text,
     557                h2 {
     558                    padding: 0;
     559                }
    460560            }
    461561        }
    … …  
    463563
    464564    //! Galleries
    465     .wp-block-gallery .blocks-gallery-image:last-child,
    466     .wp-block-gallery .blocks-gallery-item:last-child {
    467         margin-bottom: 16px;
     565    .wp-block-gallery {
     566        list-style-type: none;
     567        padding-left: 0;
     568
     569        .blocks-gallery-image:last-child,
     570        .blocks-gallery-item:last-child {
     571            margin-bottom: 16px;
     572        }
    468573    }
    469574
    … …  
    479584        margin: 0;
    480585        padding: ( $size__spacing-unit * .5 );
    481         text-align: left;
     586        text-align: center;
    482587    }
    483588
    … …  
    485590    .wp-block-separator,
    486591    hr {
     592        background-color: $color__text-light;
     593        border: 0;
     594        height: 2px;
    487595        margin-bottom: (2 * $size__spacing-unit);
    488596        margin-top: (2 * $size__spacing-unit);
    489 
    490         &:not(.is-style-dots) {
    491             background-color: $color__text-light;
    492             border: 0;
    493             height: 2px;
    494         }
    495 
    496         &:not(.is-style-wide):not(.is-style-dots) {
    497             max-width: 2.25em;
     597        max-width: 2.25em;
     598        text-align: left;
     599
     600        &.is-style-wide {
     601            max-width: 100%;
     602            @include postContentMaxWidth();
     603        }
     604
     605        &.is-style-dots {
     606            max-width: 100%;
     607            @include postContentMaxWidth();
     608            background-color: inherit;
     609            border: inherit;
     610            height: inherit;
     611            text-align: center;
     612
     613            &:before {
     614                color: $color__text-light;
     615                font-size: $font__size-lg;
     616                letter-spacing: $font__size-sm;
     617                padding-left: $font__size-sm;
     618            }
    498619        }
    499620
    … …  
    507628            }
    508629        }
    509 
    510         &.is-style-dots:before {
    511             color: $color__text-light;
    512             font-size: $font__size-lg;
    513             letter-spacing: $font__size-sm;
    514             padding-left: $font__size-sm;
    515         }
    516630    }
    517631
    518632    //! Twitter Embed
    519633    .wp-block-embed-twitter {
    520         overflow: hidden;
     634        word-break: break-word;
    521635    }
    522636
    … …  
    524638    .wp-block-table {
    525639
    526         td, th {
     640        th,
     641        td {
    527642            border-color: $color__text-light;
    528643        }
    … …  
    534649
    535650        .wp-block-file__button {
     651            display: table;
    536652            @include button-transition;
    537653            border: none;
    … …  
    541657            font-family: $font__heading;
    542658            line-height: $font__line-height-heading;
     659            text-decoration: none;
    543660            font-weight: bold;
    544661            padding: ($size__spacing-unit * .75) $size__spacing-unit;
     662            color: #fff;
     663            margin-left: 0;
     664            margin-top: calc(0.75 * #{$size__spacing-unit});
    545665
    546666            @include media(desktop) {
    … …  
    550670
    551671            &:hover {
     672                background: $color__background-button-hover;
    552673                cursor: pointer;
    553674            }
    554675
    555             &:hover, &:focus {
     676            &:focus {
    556677                background: $color__background-button-hover;
    557             }
    558 
    559             &:focus {
    560678                outline: thin dotted;
    561679                outline-offset: -4px;
    … …  
    570688        code {
    571689            font-size: $font__size-md;
     690            white-space: pre-wrap;
     691                        word-break: break-word;
    572692        }
    573693    }
    … …  
    576696    .wp-block-columns {
    577697
    578         .wp-block-column > * {
    579 
    580             &:first-child {
    581                 margin-top: 0;
    582             }
    583 
    584             &:last-child {
    585                 margin-bottom: 0;
    586             }
    587         }
    588 
    589         &[class*='has-'] > * {
    590             margin-right: $size__spacing-unit;
    591 
    592             &:last-child {
    593                 margin-right: 0;
     698        &.alignfull {
     699            padding-left: $size__spacing-unit;
     700            padding-right: $size__spacing-unit;
     701        }
     702
     703        @include media(tablet) {
     704            .wp-block-column > * {
     705
     706                &:first-child {
     707                    margin-top: 0;
     708                }
     709
     710                &:last-child {
     711                    margin-bottom: 0;
     712                }
     713            }
     714
     715            &[class*='has-'] > * {
     716                margin-right: $size__spacing-unit;
     717
     718                &:last-child {
     719                    margin-right: 0;
     720                }
     721            }
     722
     723            &.alignfull,
     724            &.alignfull .wp-block-column {
     725                padding-left: calc(2 * #{$size__spacing-unit});
     726                padding-right: calc(2 * #{$size__spacing-unit});
    594727            }
    595728        }
    … …  
    629762        }
    630763    }
     764
     765    //! Font Sizes
     766    .has-small-font-size {
     767        font-size: $font__size-sm;
     768    }
     769
     770    .has-normal-font-size {
     771        font-size: $font__size-md;
     772    }
     773
     774    .has-large-font-size {
     775        font-size: $font__size-lg;
     776    }
     777
     778    .has-huge-font-size {
     779        font-size: $font__size-xl;
     780    }
     781
     782    //! Custom background colors
     783    .has-primary-background-color,
     784    .has-secondary-background-color,
     785    .has-dark-gray-background-color,
     786    .has-light-gray-background-color {
     787       
     788        // Use white text against these backgrounds by default.
     789        color: $color__background-body;
     790
     791        p,
     792        h1,
     793        h2,
     794        h3,
     795        h4,
     796        h5,
     797        h6,
     798        a {
     799            color: $color__background-body;
     800        }
     801    }
     802
     803    .has-white-background-color {
     804        color: $color__text-main;
     805
     806        // Use dark gray text against this background by default.
     807        p,
     808        h1,
     809        h2,
     810        h3,
     811        h4,
     812        h5,
     813        h6,
     814        a {
     815            color: $color__text-main;
     816        }
     817    }
     818
     819    .has-primary-background-color,
     820    .wp-block-pullquote.is-style-solid-color.has-primary-background-color {
     821        background-color: $color__link;
     822    }
     823
     824    .has-secondary-background-color,
     825    .wp-block-pullquote.is-style-solid-color.has-secondary-background-color {
     826        background-color: $color__border-link-hover;
     827    }
     828
     829    .has-dark-gray-background-color,
     830    .wp-block-pullquote.is-style-solid-color.has-dark-gray-background-color {
     831        background-color: $color__text-main;
     832    }
     833
     834    .has-light-gray-background-color,
     835    .wp-block-pullquote.is-style-solid-color.has-light-gray-background-color {
     836        background-color: $color__text-light;
     837    }
     838
     839    .has-white-background-color,
     840    .wp-block-pullquote.is-style-solid-color.has-white-background-color {
     841        background-color: #FFF;
     842    }
     843
     844    //! Custom foreground colors
     845    .has-primary-color,
     846    .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color,
     847    .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color p {
     848        color: $color__link;
     849    }
     850
     851    .has-secondary-color,
     852    .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color,
     853    .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color p {
     854        color: $color__border-link-hover;
     855    }
     856
     857    .has-dark-gray-color,
     858    .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color,
     859    .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color p {
     860        color: $color__text-main;
     861    }
     862
     863    .has-light-gray-color,
     864    .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color,
     865    .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color p {
     866        color: $color__text-light;
     867    }
     868
     869    .has-white-color,
     870    .wp-block-pullquote.is-style-solid-color blockquote.has-white-color {
     871        color: #FFF;
     872    }
    631873}

  • trunk/src/wp-content/themes/twentynineteen/sass/elements/_elements.scss

    r43808 r44149  
    44
    55::-moz-selection {
    6     background: $color__background_selection;
     6    background-color: $color__background_selection;
    77}
     8
    89::selection {
    9     background: $color__background_selection;
     10    background-color: $color__background_selection;
    1011}
    1112
    … …  
    1718
    1819body {
    19     background: $color__background-body;
     20    background-color: $color__background-body;
    2021}
    2122
    … …  
    3738
    3839a:focus {
    39     outline: 0;
     40    outline: thin;
     41    outline-style: dotted;
    4042    text-decoration: underline;
    4143}
    4244
    43 h1, h2, h3, h4, h5, h6 {
     45h1,
     46h2,
     47h3,
     48h4,
     49h5,
     50h6 {
    4451    clear: both;
    4552    margin: $size__spacing-unit 0;
    4653}
    4754
    48 h1:not(.site-title), h2 {
     55h1:not(.site-title),
     56h2 {
    4957    @include post-section-dash;
    5058}
    … …  
    6270    max-width: 100%;
    6371    position: relative;
    64     &:before {
    65         background-color: $color__background-pre;
    66         border: 1px dashed $color__background-hr;
    67         border-radius: 3px;
    68         content: " ";
    69         display: block;
    70         height: 100%;
    71         left: 0;
    72         position: absolute;
    73         top: 0;
    74         width: 100%;
    75     }
    76 
    77     &:after {
    78         color: $color__text-input;
    79         content: "This image is broken :-/ ( "attr(alt)" )";
    80         display: block;
    81         left: 50%;
    82         position: absolute;
    83         text-align: center;
    84         top: 50%;
    85         transform: translate(-50%, -50%);
    86         width: 100%;
    87     }
    8872}
    8973
    … …  
    9377
    9478blockquote {
    95 
    9679    border-left: 2px solid $color__link;
    97     margin-left: -($size__spacing-unit * 2);
    98     padding: $size__spacing-unit 0 ($size__spacing-unit * .5) ($size__spacing-unit * 2);
     80    margin-left: 0;
     81    padding: 0 0 0 $size__spacing-unit;
    9982
    10083    > p {

  • trunk/src/wp-content/themes/twentynineteen/sass/elements/_tables.scss

    r43808 r44149  
    11table {
    22    margin: 0 0 $size__spacing-unit;
     3    border-collapse: collapse;
    34    width: 100%;
     5    font-family: $font__heading;
    46
    5     td, th {
    6         border-color: $color__text-light;
     7    td,
     8    th {
     9        padding: 0.5em;
     10        border: 1px solid $color__text-light;
     11        word-break: break-all;
    712    }
    813}

  • trunk/src/wp-content/themes/twentynineteen/sass/forms/_buttons.scss

    r43808 r44149  
    1010    border-radius: 5px;
    1111    box-sizing: border-box;
    12     color: white;
     12    color: $color__background-body;
    1313    font-family: $font__heading;
    1414    font-size: $font__size-sm;
    15     font-weight: 600;
     15    font-weight: 700;
    1616    line-height: $font__line-height-heading;
    1717    outline: none;
    18     padding: ( $size__spacing-unit * .66 ) $size__spacing-unit;
     18    padding: ( $size__spacing-unit * .76 ) $size__spacing-unit;
     19    text-decoration: none;
     20    vertical-align: bottom;
    1921
    2022    &:hover {
     23        background: $color__background-button-hover;
    2124        cursor: pointer;
    2225    }
    2326
    24     &:hover,
    25     &:focus {
    26         background: $color__background-button-hover;
     27    &:visited {
     28        color: $color__background-body;
     29        text-decoration: none;
    2730    }
    2831
    2932    &:focus {
     33        background: $color__background-button-hover;
    3034        outline: thin dotted;
    3135        outline-offset: -4px;

  • trunk/src/wp-content/themes/twentynineteen/sass/forms/_fields.scss

    r43808 r44149  
    2020    box-sizing: border-box;
    2121    outline: none;
    22     padding: #{.5 * $size__spacing-unit} #{.66 * $size__spacing-unit};
     22    padding: #{.36 * $size__spacing-unit} #{.66 * $size__spacing-unit};
     23    -webkit-appearance: none;
     24    outline-offset: 0;
     25    border-radius: 0;
    2326
    2427    &:focus {
    … …  
    2629        outline: thin solid rgba( $color__link, 0.15 );
    2730        outline-offset: -4px;
     31    }
     32}
     33
     34input[type="search"] {
     35    &::-webkit-search-decoration {
     36        display: none;
    2837    }
    2938}

  • trunk/src/wp-content/themes/twentynineteen/sass/media/_captions.scss

    r43808 r44149  
    11.wp-caption {
    22    margin-bottom: calc(1.5 * #{$size__spacing-unit});
     3
     4    &.aligncenter {
     5
     6        @include media(tablet) {
     7            position: relative;
     8            left: calc( #{$size__site-tablet-content} / 2 );
     9            transform: translateX( -50% );
     10        }
     11
     12        @include media(desktop) {
     13            left: calc( #{$size__site-desktop-content} / 2 );
     14        }
     15    }
    316}
    417
    … …  
    922}
    1023
    11 .wp-caption .wp-captio