integrate font awesome, combine webfonts (photo)

s9y · Aug 19, 2014 · 4f4a985 · 4f4a985
1 parent 6e8db68
commit 4f4a985
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 12 deletions.
diff --git a/photo/font/fa.eot b/photo/font/fa.eot
diff --git a/photo/font/fa.svg b/photo/font/fa.svg
diff --git a/photo/font/fa.ttf b/photo/font/fa.ttf
diff --git a/photo/font/fa.woff b/photo/font/fa.woff
diff --git a/photo/index.tpl b/photo/index.tpl
@@ -12,27 +12,29 @@
     {if $template_option.headlines_webfonts == 'aleo'}
         <link rel="stylesheet" href="//brick.a.ssl.fastly.net/Aleo:700">
     {elseif $template_option.headlines_webfonts == 'philo'}
-        <link href='http://fonts.googleapis.com/css?family=Philosopher:700' rel='stylesheet' type='text/css'>
+        {$gfonts[]="Philosopher:700"}
     {/if}
     {if $template_option.webfonts == 'droid'}
-        <link  rel="stylesheet" href="//fonts.googleapis.com/css?family=Droid+Sans:400,700&subset=latin">
+        {$gfonts[]="Droid+Sans:400,700"}
     {elseif $template_option.webfonts == 'ptsans'}
-        <link rel="stylesheet" href="//fonts.googleapis.com/css?family=PT+Sans:400,400italic,700,700italic&subset=latin">
+        {$gfonts[]="PT+Sans:400,400italic,700,700italic"}
     {elseif $template_option.webfonts == 'osans'}
-        <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:400,400italic,700,700italic&subset=latin">
+        {$gfonts[]="Open+Sans:400,400italic,700,700italic"}
     {elseif $template_option.webfonts == 'lato'}
-        <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Lato:400,400italic,700,700italic&subset=latin">
+        {$gfonts[]="Lato:400,400italic,700,700italic"}
     {elseif $template_option.webfonts == 'cabin'}
-        <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Cabin:400,400italic,700,700italic&subset=latin">
+        {$gfonts[]="Cabin:400,400italic,700,700italic"}
     {elseif $template_option.webfonts == 'ubuntu'}
-        <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Ubuntu:400,400italic,700,700italic&subset=latin">
+        {$gfonts[]="Ubuntu:400,400italic,700,700italic"}
     {elseif $template_option.webfonts == 'dserif'}
-        <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic&subset=latin">
+        {$gfonts[]="Droid+Serif:400,400italic,700,700italic"}
     {/if}
     {if $template_option.quote_webfonts}
-        <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Crimson+Text:400,400italic,700,700italic&subset=latin">
+        {$gfonts[]="Crimson+Text:400,400italic,700,700italic"}
+    {/if}
+    {if $gfonts}
+        <link rel="stylesheet" href="//fonts.googleapis.com/css?family={foreach $gfonts as $gfont}{$gfont}{if not $gfont@last}|{/if}{/foreach}&amp;subset=latin">
     {/if}
-    <link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="{$head_link_stylesheet}">
 
     {if $template_option.colorset != "bright"}
@@ -75,7 +77,7 @@
             <div>
                 <input type="hidden" name="serendipity[action]" value="search">
                 <input id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" type="search" placeholder=" Search…" value="">
-                <button type="submit" id="searchsend" name="serendipity[searchButton]"><span class="fa fa-search"></span><span class="visuallyhidden">{$CONST.GO}</span></button>
+                <button type="submit" id="searchsend" name="serendipity[searchButton]"><span class="icon-search-1"></span><span class="visuallyhidden">{$CONST.GO}</span></button>
             </div>
         </form>
         {serendipity_hookPlugin hook="quicksearch_plugin" hookAll="true"}

diff --git a/photo/style.css b/photo/style.css
@@ -956,4 +956,29 @@ img.mfp-img {
 }
 .bx-wrapper .bx-controls-direction a.disabled {
 	display: none;
-}
+}
+
+@font-face {
+  font-family: 'fa';
+  src: url('{TEMPLATE_PATH}/font/fa.eot?20691182');
+  src: url('{TEMPLATE_PATH}/font/fa.eot?20691182#iefix') format('embedded-opentype'),
+       url('{TEMPLATE_PATH}/font/fa.woff?20691182') format('woff'),
+       url('{TEMPLATE_PATH}/font/fa.ttf?20691182') format('truetype'),
+       url('{TEMPLATE_PATH}/font/fa.svg?20691182#fa') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+
+ [class^="icon-"]:before, [class*=" icon-"]:before {
+  font-family: "fa";
+  speak: none;
+
+  display: inline-block;
+  text-decoration: inherit;
+  width: 1em;
+  margin-right: .2em;
+  text-align: center;
+}
+
+.icon-search-1:before { content: '\e801'; } /* '' */