Browse Source

fixing background hilite rollover, making cheatsheet more prominent

davegandy 12 years ago
parent
commit
c5864054ff

+ 17 - 0
build/_includes/icons.html

@@ -0,0 +1,17 @@
+{% capture stripe_ad_content %}
+<p class="lead">
+  You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}.
+  Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
+  <!--The ever-expanding list of Font Awesome {{ site.font_awesome.version }} icons.-->
+  Need vectors or want to use on the desktop? Check the <a href="{{ page.relative_path }}cheatsheet/">cheatsheet</a>.
+</p>
+{% endcapture %}
+{% include stripe-ad.html %}
+
+{% include icons/new.html %}
+{% include icons/web-application.html %}
+{% include icons/text-editor.html %}
+{% include icons/directional.html %}
+{% include icons/video-player.html %}
+{% include icons/brand.html %}
+{% include icons/medical.html %}

+ 8 - 19
build/_includes/icons/new.html

@@ -1,22 +1,13 @@
-  <section id="new">
-  {% if page.navbar_active == "icons" %}
-  <div class="row">
-    <div class="span8">
-  {% endif %}
-      <h2 class="page-header">New Icons in {{ site.font_awesome.version }}</h2>
-      <p>
-        You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}.
-        Want to request new icons? Here's how to <a href="{{ page.relative_path }}community/#requesting-new-icons">request new icons</a>.
-      </p>
-  {% if page.navbar_active == "icons" %}
-    </div>
-    <div class="span4">
-      <br>
-      {% include ads/carbon-light-horizontal.html %}
+<{% if page.navbar_active == "icons" %}div{% else %}section{% endif %} id="new">
+  <h2 class="page-header">New Icons in {{ site.font_awesome.version }}</h2>
+  {% if page.navbar_active != "icons" %}
+    <div class="margin-botom-large">
+      You asked, Font Awesome delivers with {{ site.font_awesome.new_icon_count }} shiny new icons in version {{ site.font_awesome.version }}.
+      Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
     </div>
-  </div>
   {% endif %}
 
+
   <div class="row margin-top">
     <div class="span3">
       <ul class="the-icons">
@@ -87,6 +78,4 @@
       </ul>
     </div>
   </div>
-</section>
-
-
+</{% if page.navbar_active == "icons" %}div{% else %}section{% endif %}>

+ 2 - 2
build/_includes/whats-new.html

@@ -7,7 +7,7 @@
 {% endcapture %}
 {% include stripe-ad.html %}
 
-<section id="whats-new">
+<div id="whats-new">
   <div class="row">
     <div class="span4">
       <h4><i class="icon-lightbulb"></i> {{ site.font_awesome.new_icon_count }} New Icons in {{ site.font_awesome.version }}</h4>
@@ -40,4 +40,4 @@
       what's new and changed.
     </div>
   </div>
-</section>
+</div>

+ 1 - 5
build/assets/css/site.css

@@ -5801,10 +5801,6 @@ section {
   width: 1.2857142857142858em;
   text-align: center;
 }
-.the-icons li [class^="icon-"].icon-large,
-.the-icons li [class*=" icon-"].icon-large {
-  width: 1.5714285714285714em;
-}
 .the-icons li a {
   display: block;
   cursor: pointer;
@@ -5825,8 +5821,8 @@ section {
   font-size: 14px;
 }
 .the-icons li a:hover {
+  background-color: #fff0f0;
   text-decoration: none;
-  background-color: #ffffff;
 }
 .the-icons li a:hover [class^="icon-"],
 .the-icons li a:hover [class*=" icon-"] {

+ 1 - 4
build/assets/less/site.less

@@ -229,9 +229,6 @@ section {
       display: inline-block;
       width: 18/14em;
       text-align: center;
-      &.icon-large {
-        width: 22/14em;
-      }
     }
     a {
       display: block;
@@ -250,8 +247,8 @@ section {
       }
 
       &:hover {
+        background-color: @errorBackground;
         text-decoration: none;
-        background-color: lighten(@errorBackground, 6%);
         [class^="icon-"], [class*=" icon-"] {
           *font-size: 28px;
           *vertical-align: middle;

+ 1 - 1
build/cheatsheet/index.html

@@ -3,7 +3,7 @@ layout: base
 title: Font Awesome Cheatsheet
 relative_path: ../
 ---
-{% capture jumbotron_h1 %}<i class="icon-list-ul"></i>&nbsp; Cheatsheet{% endcapture %}
+{% capture jumbotron_h1 %}<i class="icon-list-ul icon-large"></i>&nbsp; Cheatsheet{% endcapture %}
 {% capture jumbotron_p %}The complete Font Awesome {{ site.font_awesome.version }} icon reference{% endcapture %}
 
 {% include jumbotron.html %}

+ 1 - 7
build/icons/index.html

@@ -11,11 +11,5 @@ relative_path: ../
 {% include stripe-social.html %}
 
 <div class="container">
-  {% include icons/new.html %}
-  {% include icons/web-application.html %}
-  {% include icons/text-editor.html %}
-  {% include icons/directional.html %}
-  {% include icons/video-player.html %}
-  {% include icons/brand.html %}
-  {% include icons/medical.html %}
+  {% include icons.html %}
 </div>