Browse Source

including license terms for brand icons in icon listing

davegandy 12 years ago
parent
commit
41b2eb9611

+ 4 - 0
src/_includes/brand-license.html

@@ -0,0 +1,4 @@
+<ul class="margin-bottom-none">
+  <li>All brand icons are trademarks of their respective owners.</li>
+  <li>The use of these trademarks does not indicate endorsement of the trademark holder by Font Awesome, nor vice versa.</li>
+</ul>

+ 4 - 1
src/_includes/icons/brand.html

@@ -1,6 +1,10 @@
 <section id="brand">
 <section id="brand">
   <h2 class="page-header">Brand Icons</h2>
   <h2 class="page-header">Brand Icons</h2>
 
 
+  <div class="alert alert-info">
+    {% include brand-license.html %}
+  </div>
+
   <div class="row the-icons">
   <div class="row the-icons">
     {% assign icons_brand = icons | expand_aliases | category:"Brand Icons" | sort_by:'class' %}
     {% assign icons_brand = icons | expand_aliases | category:"Brand Icons" | sort_by:'class' %}
 
 
@@ -8,5 +12,4 @@
       <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.class }}"></i> icon-{{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
       <div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.class }}"></i> icon-{{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
     {% endfor %}
     {% endfor %}
   </div>
   </div>
-
 </section>
 </section>

+ 1 - 4
src/_includes/license.html

@@ -53,8 +53,5 @@
 
 
 <section>
 <section>
   <h2 class="page-header">Brand Icons</h2>
   <h2 class="page-header">Brand Icons</h2>
-  <ul>
-    <li>All brand icons are trademarks of their respective owners.</li>
-    <li>The use of these trademarks does not indicate endorsement of the trademark holder by Font Awesome, nor vice versa.</li>
-  </ul>
+  {% include brand-license.html %}
 </section>
 </section>

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


+ 1 - 0
src/assets/font-awesome/less/core.less

@@ -10,6 +10,7 @@
 [class*=" icon-"]:before {
 [class*=" icon-"]:before {
   text-decoration: inherit;
   text-decoration: inherit;
   display: inline-block;
   display: inline-block;
+  cursor: default;
   speak: none;
   speak: none;
 }
 }