Browse Source

fixing responsive phone

davegandy 12 years ago
parent
commit
0f5fd63a5c

+ 2 - 3
src/_includes/footer.html

@@ -3,11 +3,10 @@
     <div>
     <div>
       <i class="icon-flag"></i> Font Awesome {{ site.fontawesome.version }}
       <i class="icon-flag"></i> Font Awesome {{ site.fontawesome.version }}
       <span class="hidden-phone">&middot;</span><br class="visible-phone">
       <span class="hidden-phone">&middot;</span><br class="visible-phone">
-      Created and Maintained by Dave Gandy &middot;
-      <a href="http://twitter.com/byscuits">@byscuits</a>
+      Created and Maintained by <a href="http://twitter.com/byscuits">Dave Gandy</a>
     </div>
     </div>
     <div>
     <div>
-      Font Awesome font licensed under <a href="{{ site.fontawesome.license.font.url }}">{{ site.fontawesome.license.font.version }}</a>
+      Font Awesome licensed under <a href="{{ site.fontawesome.license.font.url }}">{{ site.fontawesome.license.font.version }}</a>
       <span class="hidden-phone">&middot;</span><br class="visible-phone">
       <span class="hidden-phone">&middot;</span><br class="visible-phone">
       Code licensed under <a href="{{ site.fontawesome.license.code.url }}">{{ site.fontawesome.license.code.version }}</a>
       Code licensed under <a href="{{ site.fontawesome.license.code.url }}">{{ site.fontawesome.license.code.version }}</a>
       <span class="hidden-phone hidden-tablet">&middot;</span><br class="visible-phone visible-tablet">
       <span class="hidden-phone hidden-tablet">&middot;</span><br class="visible-phone visible-tablet">

+ 9 - 1
src/_includes/get-started.html

@@ -52,7 +52,15 @@
   <p>Use this method to customize Font Awesome and Bootstrap {{ site.bootstrap.version }} using LESS.</p>
   <p>Use this method to customize Font Awesome and Bootstrap {{ site.bootstrap.version }} using LESS.</p>
   <ol>
   <ol>
     <li>Copy the <code>font-awesome</code> directory into your project.</li>
     <li>Copy the <code>font-awesome</code> directory into your project.</li>
-    <li>Open bootstrap.less and replace <code>@import "sprites.less";</code> with <code>@import "path/to/font-awesome/less/font-awesome.less";</code></li>
+    <li>Open bootstrap.less and replace
+{% highlight html %}
+@import "sprites.less";
+{% endhighlight %}
+      with
+{% highlight html %}
+@import "path/to/font-awesome/less/font-awesome.less";
+{% endhighlight %}
+    </li>
     <li>
     <li>
       Open your project's font-awesome.less and edit the <code>@FontAwesomePath</code> variable to point to your font directory.
       Open your project's font-awesome.less and edit the <code>@FontAwesomePath</code> variable to point to your font directory.
 {% highlight html %}
 {% highlight html %}

+ 1 - 1
src/_includes/jumbotron-slider.html

@@ -16,7 +16,7 @@
             <a href="{{ site.fontawesome.github.url }}"
             <a href="{{ site.fontawesome.github.url }}"
                onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'View Project on GitHub']);">
                onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'View Project on GitHub']);">
               GitHub Project</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
               GitHub Project</a> &nbsp;&nbsp;&middot;&nbsp;&nbsp;
-            Version {{ site.fontawesome.version }} <span class="hidden-phone">&nbsp;&nbsp;&middot;&nbsp;&nbsp;</span><br class="visible-phone">
+            Version {{ site.fontawesome.version }} &nbsp;&nbsp;&middot;&nbsp;&nbsp;
             Created &amp; Maintained by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
             Created &amp; Maintained by <a href="http://twitter.com/{{ site.fontawesome.author.twitter }}">Dave Gandy</a>
           </div>
           </div>
         </div>
         </div>

+ 1 - 1
src/_includes/license.html

@@ -11,7 +11,7 @@
     <ul class="icons-ul margin-bottom-none">
     <ul class="icons-ul margin-bottom-none">
       <li>
       <li>
         <i class="icon-li icon-info-sign icon-large"></i>Attribution is no longer required as of Font Awesome 3.0 but is much appreciated:
         <i class="icon-li icon-info-sign icon-large"></i>Attribution is no longer required as of Font Awesome 3.0 but is much appreciated:
-        <code>Font Awesome by Dave Gandy - http://fontawesome.io</code>.
+        "Font Awesome by Dave Gandy - http://fontawesome.io".
       </li>
       </li>
     </ul>
     </ul>
   </div>
   </div>

+ 1 - 1
src/_includes/stripe-social.html

@@ -10,7 +10,7 @@
       <li class="follow-btn">
       <li class="follow-btn">
         <a href="https://twitter.com/{{ site.fontawesome.twitter }}" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @{{ site.fontawesome.twitter }}</a>
         <a href="https://twitter.com/{{ site.fontawesome.twitter }}" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @{{ site.fontawesome.twitter }}</a>
       </li>
       </li>
-      <li class="tweet-btn">
+      <li class="tweet-btn hidden-phone">
         <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.fontawesome.url }}" data-text="Font Awesome, the iconic font designed for Bootstrap" data-counturl="{{ site.fontawesome.legacy_url }}" data-count="horizontal" data-via="{{ site.fontawesome.twitter }}" data-related="{{ site.fontawesome.author.twitter }}:Creator of Font Awesome">Tweet</a>
         <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.fontawesome.url }}" data-text="Font Awesome, the iconic font designed for Bootstrap" data-counturl="{{ site.fontawesome.legacy_url }}" data-count="horizontal" data-via="{{ site.fontawesome.twitter }}" data-related="{{ site.fontawesome.author.twitter }}:Creator of Font Awesome">Tweet</a>
       </li>
       </li>
     </ul>
     </ul>

+ 2 - 1
src/_layouts/base.html

@@ -9,8 +9,9 @@
  ================================================== -->
  ================================================== -->
   <meta charset="utf-8" />
   <meta charset="utf-8" />
   <title>{% if page.title %}{{ page.title }}{% endif %}</title>
   <title>{% if page.title %}{{ page.title }}{% endif %}</title>
-  <meta name="description" content="Font Awesome, the iconic font designed for use with Bootstrap">
+  <meta name="description" content="Font Awesome, the iconic font designed for Bootstrap">
   <meta name="author" content="Dave Gandy">
   <meta name="author" content="Dave Gandy">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <!--<meta name="viewport" content="initial-scale=1; maximum-scale=1">-->
   <!--<meta name="viewport" content="initial-scale=1; maximum-scale=1">-->
 
 
   <!--[if lt IE 9]>
   <!--[if lt IE 9]>

BIN
src/assets/font-awesome/font/FontAwesome.otf


+ 26 - 8
src/assets/less/responsive-767px-max.less

@@ -12,22 +12,24 @@
   }
   }
 
 
   #iconCarousel {
   #iconCarousel {
-    @size: 220px;
-    width: 352px;
+    @size: 180px;
+    font-size: @size;
+    line-height: @size;
+    width: 280px;
     margin: 30px auto 0;
     margin: 30px auto 0;
     .carousel-control {
     .carousel-control {
       top: @size / 2;
       top: @size / 2;
       .square(44px);
       .square(44px);
       font-size: 44px;
       font-size: 44px;
       line-height: 44px;
       line-height: 44px;
-      left: 0;
-      &.right { right: 0; }
+      left: -7px;
+      &.right { right: -7px; }
     }
     }
   }
   }
 
 
   .jumbotron-index {
   .jumbotron-index {
-    h1 { font-size: 50px; }
-    p { font-size: 20px; }
+    h1 { font-size: 58px; }
+    p { font-size: 24px; }
     .btn-large {
     .btn-large {
       font-size: 20px;
       font-size: 20px;
       padding: 14px 26px;
       padding: 14px 26px;
@@ -36,15 +38,16 @@
   }
   }
 
 
   .jumbotron-ad {
   .jumbotron-ad {
-    h1 { font-size: 48px; }
+    h1 { font-size: 39px; }
     p {
     p {
-      font-size: 24px;
+      font-size: 20px;
       margin-bottom: 20px;
       margin-bottom: 20px;
     }
     }
   }
   }
 
 
   .jumbotron-icon {
   .jumbotron-icon {
     .icon-1, .icon-2, .icon-3, .icon-4, .icon-5, .icon-6 { margin-right: 0; }
     .icon-1, .icon-2, .icon-3, .icon-4, .icon-5, .icon-6 { margin-right: 0; }
+    .icon-6 { font-size: 16em; }
     h1 small {
     h1 small {
       display: block;
       display: block;
       margin-top: 15px;
       margin-top: 15px;
@@ -57,6 +60,21 @@
     margin: 0 0 30px;
     margin: 0 0 30px;
   }
   }
 
 
+  #carbonads-container {
+    margin-right: -20px;
+    margin-left: -20px;
+    .carbonad {
+      width: 100%;
+      height: 120px;
+      border-right: none;
+      border-left: none;
+    }
+  }
+  #azcarbon {
+    width: 300px;
+    margin: 0 auto;
+  }
+
   .sticky-footer(170px, 40px, 40px, 60px); // sets default values for sticky footer
   .sticky-footer(170px, 40px, 40px, 60px); // sets default values for sticky footer
   .footer {
   .footer {
     padding-left: 20px;
     padding-left: 20px;

+ 6 - 6
src/assets/less/site.less

@@ -166,12 +166,12 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
   .icon-1, .icon-2, .icon-3, .icon-4, .icon-5, .icon-6 { margin-right: 1/14em; }
   .icon-1, .icon-2, .icon-3, .icon-4, .icon-5, .icon-6 { margin-right: 1/14em; }
 }
 }
 
 
-.info-ad {
-  float: right;
-  width: 154px;
-  height: 219px;
-  margin-left: 15px;
-}
+//.info-ad {
+//  float: right;
+//  width: 154px;
+//  height: 219px;
+//  margin-left: 15px;
+//}
 
 
 .stripe-ad {
 .stripe-ad {
   margin-bottom: 22px;
   margin-bottom: 22px;