diff --git a/source/_includes/examples/new.html b/source/_includes/examples/new.html index 883697960..7bcd489c0 100644 --- a/source/_includes/examples/new.html +++ b/source/_includes/examples/new.html @@ -14,7 +14,7 @@

Stacked Icons

-
+
diff --git a/source/_includes/examples/stacked.html b/source/_includes/examples/stacked.html index 8061e05c1..3e7240c12 100644 --- a/source/_includes/examples/stacked.html +++ b/source/_includes/examples/stacked.html @@ -21,7 +21,12 @@ - icon-terminal on icon-sign-blank + icon-terminal on icon-sign-blank
+ + + + + icon-camera on icon-ban-circle
{% highlight html %} @@ -38,7 +43,12 @@ icon-flag on icon-circle
-icon-terminal on icon-sign-blank +icon-terminal on icon-sign-blank
+ + + + +icon-camera on icon-ban-circle {% endhighlight %}
diff --git a/source/_includes/license.html b/source/_includes/license.html index 192e7c2e6..71306ce47 100644 --- a/source/_includes/license.html +++ b/source/_includes/license.html @@ -8,8 +8,12 @@
- Attribution is no longer required as of Font Awesome 3.0 but is much appreciated:
- Font Awesome by Dave Gandy - http://fontawesome.io. +
diff --git a/source/_layouts/icon.html b/source/_layouts/icon.html index 863fbe324..398876c8f 100644 --- a/source/_layouts/icon.html +++ b/source/_layouts/icon.html @@ -7,10 +7,12 @@ relative_path: ../../
   -    -    -    -   + +    +    +    +   +

@@ -23,7 +25,7 @@ relative_path: ../../ {% for category in page.icon.categories %} {{ category }}{% unless forloop.last %},{% endunless %} {% endfor %} - {% if page.icon.aliases %} + {% if page.icon.aliases | size == 0 %} · Aliases: {% for alias in page.icon.aliases %} icon-{{ alias }}{% unless forloop.last %},{% endunless %} diff --git a/source/assets/less/responsive-767px-max.less b/source/assets/less/responsive-767px-max.less index 924d9a95a..6fc717a5e 100755 --- a/source/assets/less/responsive-767px-max.less +++ b/source/assets/less/responsive-767px-max.less @@ -43,6 +43,16 @@ } } + .jumbotron-icon { + .icon-1, .icon-2, .icon-3, .icon-4, .icon-5, .icon-6 { margin-right: 0; } + h1 small { + display: block; + margin-top: 15px; + margin-left: 0; + line-height: 20px; + } + } + .stripe-ad .lead { margin: 0 0 30px; } diff --git a/source/assets/less/responsive-768px-979px.less b/source/assets/less/responsive-768px-979px.less index d4095fe62..e46a45c57 100755 --- a/source/assets/less/responsive-768px-979px.less +++ b/source/assets/less/responsive-768px-979px.less @@ -32,6 +32,15 @@ p { font-size: 28px; } } + .jumbotron-icon { + h1 small { + display: block; + margin-top: 15px; + margin-left: 0; + line-height: 20px; + } + } + .stripe-ad { .lead { margin: 0; @@ -42,7 +51,7 @@ .span4 { width: @ad-width; } } - #why, #whats-new { + #why, #whats-new, #new-styles { .span4 { width: 352px; } } diff --git a/source/assets/less/site.less b/source/assets/less/site.less index e9f820f46..9b4cc34b3 100644 --- a/source/assets/less/site.less +++ b/source/assets/less/site.less @@ -192,6 +192,11 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; } section { margin-top: 40px; } +.stacked { + padding-top: 35px; + height: 105px; +} + #social-buttons { ul.unstyled { margin: 0; }