From 0d6aae119910c60cfff4f2e9f79d9c718ed72691 Mon Sep 17 00:00:00 2001 From: davegandy Date: Sat, 19 Oct 2013 15:39:26 -0400 Subject: [PATCH] changing alerts to alert-success, matching color --- src/_includes/examples/animated-spinner.html | 13 ++++++++++--- src/_includes/examples/button-dropdowns.html | 10 +++++----- src/_includes/examples/inline-icons.html | 2 +- src/_includes/examples/larger-icons.html | 2 +- src/_includes/examples/list-bullets.html | 2 +- src/_includes/examples/rotated-flipped.html | 2 +- src/_includes/icons/brand.html | 2 +- src/_includes/new-naming.html | 2 +- src/assets/less/site/bootstrap/variables.less | 8 ++++---- src/get-started.html | 2 +- src/license.html | 2 +- 11 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/_includes/examples/animated-spinner.html b/src/_includes/examples/animated-spinner.html index 9f244b1b7..a40b1f58e 100644 --- a/src/_includes/examples/animated-spinner.html +++ b/src/_includes/examples/animated-spinner.html @@ -2,8 +2,15 @@

Animated Spinner

- Use the fa-icon-spin class to get any icon to rotate. Works well with fa-icon-spinner, - fa-icon-refresh, and fa-icon-cog. +

+ Use the fa-icon-spin class to get any icon to rotate. Works well with fa-icon-spinner, + fa-icon-refresh, and fa-icon-cog. +

+

+ + + +

@@ -12,7 +19,7 @@ {% highlight html %} Spinner icon when loading content... {% endhighlight %} -

+

CSS3 animations aren't supported in IE8 - IE9.

diff --git a/src/_includes/examples/button-dropdowns.html b/src/_includes/examples/button-dropdowns.html index 35bff703a..326f17496 100644 --- a/src/_includes/examples/button-dropdowns.html +++ b/src/_includes/examples/button-dropdowns.html @@ -3,8 +3,8 @@
- User - + User +
  • Edit
    • @@ -18,8 +18,8 @@
    {% highlight html %}
    - User - + User +
    {% endhighlight %} -
    Don't forget to add the appropriate JavaScript to enable button dropdowns.
    +
    Don't forget to add the appropriate JavaScript to enable button dropdowns.
diff --git a/src/_includes/examples/inline-icons.html b/src/_includes/examples/inline-icons.html index 70b0fab74..d5fc45421 100644 --- a/src/_includes/examples/inline-icons.html +++ b/src/_includes/examples/inline-icons.html @@ -13,7 +13,7 @@ {% highlight html %} icon-camera-retro {% endhighlight %} -
Icon classes are echoed via CSS :before.
+
Icon classes are echoed via CSS :before.
diff --git a/src/_includes/examples/larger-icons.html b/src/_includes/examples/larger-icons.html index bf37e2176..91aadf58b 100644 --- a/src/_includes/examples/larger-icons.html +++ b/src/_includes/examples/larger-icons.html @@ -26,7 +26,7 @@

fa-icon-camera-retro

fa-icon-camera-retro

{% endhighlight %} -
+
If your icons are getting chopped off on top and bottom, make sure you have sufficient line-height.
diff --git a/src/_includes/examples/list-bullets.html b/src/_includes/examples/list-bullets.html index 3c52f620b..c2cfb321b 100644 --- a/src/_includes/examples/list-bullets.html +++ b/src/_includes/examples/list-bullets.html @@ -23,7 +23,7 @@
  • …and many more with custom CSS
    • {% endhighlight %} -
    Make sure to NOT include any whitespace after the icon declaration.
    +
    Make sure to NOT include any whitespace after the icon declaration.
    diff --git a/src/_includes/examples/rotated-flipped.html b/src/_includes/examples/rotated-flipped.html index b20762eff..f7663f07c 100644 --- a/src/_includes/examples/rotated-flipped.html +++ b/src/_includes/examples/rotated-flipped.html @@ -21,7 +21,7 @@   fa-icon-flip-horizontal
      icon-flip-vertical {% endhighlight %} -

    +

    Rotating and flipping icons aren't yet supported in IE7.

    diff --git a/src/_includes/icons/brand.html b/src/_includes/icons/brand.html index d64c5d53e..4447e32e9 100644 --- a/src/_includes/icons/brand.html +++ b/src/_includes/icons/brand.html @@ -1,7 +1,7 @@

    Brand Icons

    -
    +
    {% include brand-license.html %}
    diff --git a/src/_includes/new-naming.html b/src/_includes/new-naming.html index 929831734..4a69ba6f3 100644 --- a/src/_includes/new-naming.html +++ b/src/_includes/new-naming.html @@ -1,6 +1,6 @@

    New Naming Conventions in {{ site.fontawesome.minor_version }}

    -

    fa-icon-[name]-[shape]-[alt]-[direction]

    +

    fa-icon-[name]-[shape]-[alt]-[direction]

    A desire for better icon naming consistency and predictability are at the heart of the changes in naming conventions. Once you know the name of the base icon shape, you should be able to predict diff --git a/src/assets/less/site/bootstrap/variables.less b/src/assets/less/site/bootstrap/variables.less index 8f53b7736..b51e28392 100644 --- a/src/assets/less/site/bootstrap/variables.less +++ b/src/assets/less/site/bootstrap/variables.less @@ -57,7 +57,7 @@ // Brand colors //@brand-primary: @blue-dark; -@brand-success: lighten(@fa-green, 5%); +@brand-success: mix(@fa-green, #fff, 70%); //@brand-warning: @yellow-dark; //@brand-danger: @red; //@brand-info: @blue; @@ -112,9 +112,9 @@ //@state-danger-bg: @red-lighter; //@state-danger-border: darken(spin(@state-danger-bg, -10), 4%); // -//@state-success-text: mix(@green-darker, @green-dark, 30%); -//@state-success-bg: @green-lighter; -//@state-success-border: darken(spin(@state-success-bg, -10), 13%); +@state-success-text: @fa-green; +@state-success-bg: mix(@fa-green, #fff, 6%); +@state-success-border: darken(spin(@state-success-bg, -10), 13%); @state-info-text: mix(@blue-dark, @blue, 50%); @state-info-bg: @blue-lighter; diff --git a/src/get-started.html b/src/get-started.html index 1eb3c3fea..dfabce08b 100644 --- a/src/get-started.html +++ b/src/get-started.html @@ -93,7 +93,7 @@ $ gem install font-awesome-sass {% highlight scss %} @fa-font-path: "../font"; {% endhighlight %} -

    The font path is relative from your compiled CSS directory.

    +

    The font path is relative from your compiled CSS directory.

  • Re-compile your LESS or SCSS if using a static compiler. Otherwise, you should be good to go.
  • Check out the examples to start using Font Awesome!
    • diff --git a/src/license.html b/src/license.html index 56a2b8e8c..4e64f914f 100644 --- a/src/license.html +++ b/src/license.html @@ -20,7 +20,7 @@ relative_path: ../ {% include stripe-ad.html %}
    -
    +
    • Attribution is no longer required as of Font Awesome 3.0 but is much appreciated: