From 4ad04663f8109b63872ed4fcec6f7124de6758b9 Mon Sep 17 00:00:00 2001 From: davegandy Date: Sat, 5 Oct 2013 20:02:46 -0400 Subject: [PATCH] simplifying list items a bit more, updating tests --- css/font-awesome.css | 7 +++--- css/font-awesome.min.css | 4 +-- less/core.less | 17 ++++++------- src/_includes/examples.html | 2 +- ...{bulleted-lists.html => list-bullets.html} | 8 +++--- src/assets/font-awesome/less/core.less | 18 ++++++------- src/test.html | 25 ++++++++----------- 7 files changed, 34 insertions(+), 47 deletions(-) rename src/_includes/examples/{bulleted-lists.html => list-bullets.html} (83%) diff --git a/css/font-awesome.css b/css/font-awesome.css index 833671c3e..200cefea7 100644 --- a/css/font-awesome.css +++ b/css/font-awesome.css @@ -45,17 +45,16 @@ /* makes the font 33% larger relative to the icon container */ .fa-lg { font-size: 1.3333333333333333em; - vertical-align: -10%; + vertical-align: -15%; line-height: 0.75em; } /* increased font size for icon-lg */ -.fa.fa-fixed-width { - display: inline-block; +.fa-fixed-width { width: 1.1428571428571428em; padding-right: 0.2857142857142857em; text-align: right; } -.fa.fa-fixed-width.fa-lg { +.fa-fixed-width.fa-lg { width: 1.4285714285714286em; } .fa-ul { diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index 1c5cb4560..3ad2f2c8f 100644 --- a/css/font-awesome.min.css +++ b/css/font-awesome.min.css @@ -1,6 +1,6 @@ @font-face{font-family:'FontAwesome';src:url('../fonts/FontAwesome.otf') format('opentype');font-weight:normal;font-style:normal;}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;} -.fa-lg{font-size:1.3333333333333333em;vertical-align:-10%;line-height:0.75em;} -.fa.fa-fixed-width{display:inline-block;width:1.1428571428571428em;padding-right:0.2857142857142857em;text-align:right;}.fa.fa-fixed-width.fa-lg{width:1.4285714285714286em;} +.fa-lg{font-size:1.3333333333333333em;vertical-align:-15%;line-height:0.75em;} +.fa-fixed-width{width:1.1428571428571428em;padding-right:0.2857142857142857em;text-align:right;}.fa-fixed-width.fa-lg{width:1.4285714285714286em;} .fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none;}.fa-ul>li{position:relative;} .fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:0.14285714285714285em;text-align:center;}.fa-li.fa-lg{left:-1.8571428571428572em;} .fa.hide{display:none;} diff --git a/less/core.less b/less/core.less index 67313b0d4..f904771f5 100644 --- a/less/core.less +++ b/less/core.less @@ -9,19 +9,16 @@ /* makes the font 33% larger relative to the icon container */ .fa-lg { font-size: (4em / 3); - vertical-align: -10%; + vertical-align: -15%; line-height: (3em / 4); } /* increased font size for icon-lg */ -.fa { - &.fa-fixed-width { - display: inline-block; - width: (16em / 14); - padding-right: (4em / 14); - text-align: right; - &.fa-lg { - width: (20em / 14); - } +.fa-fixed-width { + width: (16em / 14); + padding-right: (4em / 14); + text-align: right; + &.fa-lg { + width: (20em / 14); } } diff --git a/src/_includes/examples.html b/src/_includes/examples.html index 0598e28be..d35e5f685 100644 --- a/src/_includes/examples.html +++ b/src/_includes/examples.html @@ -15,7 +15,7 @@ {% include examples/buttons.html %} {% include examples/button-groups.html %} {% include examples/button-dropdowns.html %} -{% include examples/bulleted-lists.html %} +{% include examples/list-bullets.html %} {% include examples/navigation.html %} {% include examples/form-inputs.html %} {% include examples/animated-spinner.html %} diff --git a/src/_includes/examples/bulleted-lists.html b/src/_includes/examples/list-bullets.html similarity index 83% rename from src/_includes/examples/bulleted-lists.html rename to src/_includes/examples/list-bullets.html index bcc10f3ae..57e60840b 100644 --- a/src/_includes/examples/bulleted-lists.html +++ b/src/_includes/examples/list-bullets.html @@ -1,9 +1,9 @@ -
-

Bulleted Lists

+
+

List Bullets

    -
  • Bulleted lists (like this one)
    • +
  • List bullets (like these)
  • Buttons
  • Button groups
  • Navigation
    • @@ -12,7 +12,7 @@
-

Easily replace individual bullets.

+

Easily replace individual list bullets.

{% highlight html %}
  • Bulleted lists (like this one)
    • diff --git a/src/assets/font-awesome/less/core.less b/src/assets/font-awesome/less/core.less index f3237fa2f..e02ba5c0b 100644 --- a/src/assets/font-awesome/less/core.less +++ b/src/assets/font-awesome/less/core.less @@ -11,19 +11,16 @@ /* makes the font 33% larger relative to the icon container */ .{{ site.fontawesome.css_prefix }}-lg { font-size: (4em / 3); - vertical-align: -10%; + vertical-align: -15%; line-height: (3em / 4); } /* increased font size for icon-lg */ -.{{ site.fontawesome.css_prefix }} { - &.{{ site.fontawesome.css_prefix }}-fixed-width { - display: inline-block; - width: (16em / 14); - padding-right: (4em / 14); - text-align: right; - &.{{ site.fontawesome.css_prefix }}-lg { - width: (20em / 14); - } +.{{ site.fontawesome.css_prefix }}-fixed-width { + width: (16em / 14); + padding-right: (4em / 14); + text-align: right; + &.{{ site.fontawesome.css_prefix }}-lg { + width: (20em / 14); } } @@ -45,7 +42,6 @@ top: (2em / 14); text-align: center; &.{{ site.fontawesome.css_prefix }}-lg { - top: (1em / 14); left: -@icons-li-width + (4em / 14); } } diff --git a/src/test.html b/src/test.html index 72014d790..ce39cb3d5 100644 --- a/src/test.html +++ b/src/test.html @@ -430,7 +430,7 @@ relative_path: ../
  • Nav Item 2 - +
- +
+ + Overview + + + Overview + +