diff --git a/build/_includes/examples/new.html b/build/_includes/examples/new.html index bb40843ec..32f17dd67 100644 --- a/build/_includes/examples/new.html +++ b/build/_includes/examples/new.html @@ -1,4 +1,4 @@ -
+<{% if page.navbar_active == "examples" %}div{% else %}section{% endif %} id="new-styles">
@@ -44,4 +44,4 @@
- + diff --git a/build/_includes/jumbotron-slider.html b/build/_includes/jumbotron-slider.html index b65ebf392..f3111c4cc 100644 --- a/build/_includes/jumbotron-slider.html +++ b/build/_includes/jumbotron-slider.html @@ -18,7 +18,7 @@ onClick="_gaq.push(['_trackEvent', 'Outbound Link', 'View Project on GitHub']);"> GitHub Project   ·   Version {{ site.font_awesome.version }}   ·   - Created & Maintained by Dave Gandy + Created & Maintained by Dave Gandy diff --git a/build/_includes/license.html b/build/_includes/license.html index f5eaafd7f..8ee629bc9 100644 --- a/build/_includes/license.html +++ b/build/_includes/license.html @@ -50,6 +50,7 @@
diff --git a/build/_includes/stripe-social.html b/build/_includes/stripe-social.html index 27134391f..d7dbbb327 100644 --- a/build/_includes/stripe-social.html +++ b/build/_includes/stripe-social.html @@ -8,10 +8,10 @@
  • - Follow @fortaweso_me + Follow @{{ site.font_awesome.twitter }}
  • - Tweet + Tweet
  • diff --git a/build/_includes/whats-new.html b/build/_includes/whats-new.html index 7a229dad2..f93584b36 100644 --- a/build/_includes/whats-new.html +++ b/build/_includes/whats-new.html @@ -26,7 +26,7 @@
    -
    +

    Pixel Perfection at 14px

    Version 3.0 was re-created from the ground up to be razor sharp at Bootstrap's default 14px.
    diff --git a/build/assets/css/site.css b/build/assets/css/site.css index 929e5896b..4fbd8cdcf 100644 --- a/build/assets/css/site.css +++ b/build/assets/css/site.css @@ -5723,45 +5723,11 @@ h6 { margin-top: 10px; margin-right: 30px; } -.btn-github { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #e7e7e7; - background-image: -moz-linear-gradient(top, #ffffff, #c4c4c4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#c4c4c4)); - background-image: -webkit-linear-gradient(top, #ffffff, #c4c4c4); - background-image: -o-linear-gradient(top, #ffffff, #c4c4c4); - background-image: linear-gradient(to bottom, #ffffff, #c4c4c4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffc4c4c4', GradientType=0); - border-color: #c4c4c4 #c4c4c4 #9d9d9d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #c4c4c4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-github:hover, -.btn-github:focus, -.btn-github:active, -.btn-github.active, -.btn-github.disabled, -.btn-github[disabled] { - color: #ffffff; - background-color: #c4c4c4; - *background-color: #b7b7b7; -} -.btn-github:active, -.btn-github.active { - background-color: #aaaaaa \9; -} -.btn-primary, -.btn-github { +.btn-primary { color: #333333; text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25); } -.btn-primary:hover, -.btn-github:hover { +.btn-primary:hover { text-shadow: 0 -1px 0 rgba(255, 255, 255, 0.25); color: #333333; } @@ -5782,15 +5748,12 @@ section { font-weight: bold; padding: 0px 5px; line-height: 17px; + margin: 0; } #social-buttons .count.btn { background: #ffffff; font-weight: normal; } -#social-buttons .watch, -#social-buttons .fork { - margin-right: 30px; -} .the-icons { list-style-type: none; margin: 0; diff --git a/build/assets/font-awesome/font/FontAwesome.otf b/build/assets/font-awesome/font/FontAwesome.otf index ea11e5de6..75c1aaee6 100644 Binary files a/build/assets/font-awesome/font/FontAwesome.otf and b/build/assets/font-awesome/font/FontAwesome.otf differ diff --git a/build/assets/js/site.js b/build/assets/js/site.js index 06ec96b6f..e0ccce1c4 100644 --- a/build/assets/js/site.js +++ b/build/assets/js/site.js @@ -14,6 +14,7 @@ $(function() { // e.preventDefault(); // e.stopPropagation(); // }); + // // inject twitter & github counts // $.ajax({ // url: 'http://api.twitter.com/1/users/show.json', diff --git a/build/assets/less/site.less b/build/assets/less/site.less index f2456a10e..932e64988 100644 --- a/build/assets/less/site.less +++ b/build/assets/less/site.less @@ -179,11 +179,7 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; } } } -.btn-github { - .buttonBackground(@white, mix(@grayLighter, @grayLight, 50%)); -} - -.btn-primary, .btn-github { +.btn-primary { color: @grayDark; text-shadow: 0 -1px 0 rgba(255,255,255,.25); &:hover { @@ -192,9 +188,7 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; } } } -section { - margin-top: 40px; -} +section { margin-top: 40px; } #social-buttons { ul.unstyled { margin: 0; } @@ -210,13 +204,14 @@ section { // font-size: @baseFontSize; padding: 0px 5px; line-height: @baseLineHeight - 3; + margin: 0; } .count.btn { background: @white; font-weight: normal; } .watch, .fork { - margin-right: 30px; +// margin-right: 30px; } } diff --git a/build/whats-new/index.html b/build/whats-new/index.html index b7446aecb..138ffe133 100644 --- a/build/whats-new/index.html +++ b/build/whats-new/index.html @@ -12,5 +12,6 @@ relative_path: ../
    {% include whats-new.html %} + {% include examples/new.html %} {% include icons/new.html %}