FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-12-28 14:31:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

reordering navbar again, updating getting started to make bootstrapcdn the preferred method

Browse Source
This commit is contained in:
davegandy 2013-05-05 20:06:36 -04:00
parent ad76df63c7
commit efe3b15b1d
8 changed files with 109 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_config.yml
View File

@ -2,7 +2,7 @@ safe: false
auto: true auto: true
server: true server: true
server_port: 7998 server_port: 7998
baseurl: /Font-Awesome/ baseurl: /Font-Awesome/ # Where GitHub serves the project up from
url: http://localhost:7998 url: http://localhost:7998
source: build source: build

124
build/_includes/get-started.html
View File

@ -1,23 +1,43 @@
<section id="integration"> <section>
<div class="row margin-bottom"> <div class="row">
<div class="span8"> <div class="span8">
<h2 class="page-header">Integration</h2> <h2 class="page-header">Ways to use Font Awesome</h2>
<p>It's easy to get started with Font Awesome. And it plays really nicely with <a href="{{ site.bootstrap.url }}">Bootstrap</a>.</p> <p>It's easy to get started with Font Awesome. And it plays really nicely with <a href="{{ site.bootstrap.url }}">Bootstrap</a>!</p>
</div> </div>
<div class="span4"> <div class="span4">
<br> <br>
{% include ads/carbon-light-horizontal.html %} {% include ads/carbon-light-horizontal.html %}
</div> </div>
</div> </div>
</section>
<div class="row"> <section class="margin-top-large">
<div class="span12"> <h3>EASIEST: <a href="http://www.bootstrapcdn.com/#tab_fontawesome">BootstrapCDN</a></h3>
<h4>Easy Bootstrap + Font Awesome Integration</h4> <p>Add Font Awesome + Bootstrap into your website with two lines of code. You don't even have to download or install anything!</p>
<ol>
<li>
Paste the following code into the <code>&lt;head&gt;</code> section of your site's HTML.
{% highlight html %}
<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css" rel="stylesheet">
{% endhighlight %}
<div class="alert alert-info margin-top">
<i class="icon-info-sign"></i> Want to use Font Awesome by itself without Bootstrap? Just skip pasting in the first line.
</div> </div>
<div class="span3"> </li>
<p>Use this method to integrate Font Awesome with the default Bootstrap CSS.</p> <li>
</div> Pat yourself on the back for your scalable-vector-icons-on-the-website
<div class="span9"> <a href="http://37signals.com/svn/posts/312-lingo-judo">judo solution</a> in two lines of code.
</li>
<li>
Check out the <a href="{{ site.baseurl }}examples/">examples</a> to start using Font Awesome!
</li>
</ol>
</section>
<section>
<h3>EASY: Default CSS</h3>
<p>Use this method to get the default Font Awesome CSS with the default Bootstrap CSS.</p>
<ol> <ol>
<li>Copy the Font Awesome font directory into your project.</li> <li>Copy the Font Awesome font directory into your project.</li>
<li>Copy font-awesome.min.css into your project.</li> <li>Copy font-awesome.min.css into your project.</li>
@ -27,84 +47,60 @@
</li> </li>
<li> <li>
In the <code>&lt;head&gt;</code> of your html, reference the location to your font-awesome.min.css. In the <code>&lt;head&gt;</code> of your html, reference the location to your font-awesome.min.css.
<pre class="prettyprint linenums"> {% highlight html %}
&lt;link rel="stylesheet" href="../css/bootstrap.min.css"&gt; <link rel="stylesheet" href="../css/bootstrap.min.css">
&lt;link rel="stylesheet" href="../css/font-awesome.min.css"&gt; <link rel="stylesheet" href="../css/font-awesome.min.css">
</pre> {% endhighlight %}
</li> </li>
<li>Check out the examples to start using Font Awesome!</li> <li>Check out the <a href="{{ site.baseurl }}examples/">examples</a> to start using Font Awesome!</li>
</ol> </ol>
</div> </section>
</div>
<div class="row"> <section>
<div class="span12"> <h3>PRO: Custom LESS</h3>
<h4>Custom Bootstrap + Font Awesome Integration using LESS</h4> <p>Use this method to customize Font Awesome and Bootstrap using LESS.</p>
</div>
<div class="span3">
<p>Use this method to integrate Font Awesome with Twitter Bootstrap using LESS.</p>
</div>
<div class="span9">
<ol> <ol>
<li>Copy the Font Awesome font directory into your project.</li> <li>Copy the Font Awesome font directory into your project.</li>
<li>Copy font-awesome.less into your bootstrap/less directory.</li> <li>Copy font-awesome.less into your bootstrap/less directory.</li>
<li>Open bootstrap.less and replace <code>@import "sprites.less";</code> with <code>@import "font-awesome.less";</code></li> <li>Open bootstrap.less and replace <code>@import "sprites.less";</code> with <code>@import "font-awesome.less";</code></li>
<li> <li>
Open your project's font-awesome.less and edit the <code>@FontAwesomePath</code> variable to point to your font directory. Open your project's font-awesome.less and edit the <code>@FontAwesomePath</code> variable to point to your font directory.
<pre class="prettyprint linenums"> {% highlight html %}
@FontAwesomePath: "../font"; @FontAwesomePath: "../font";
</pre> {% endhighlight %}
<p class="alert alert-info"><i class="icon-info-sign"></i> The font path is relative from your compiled CSS directory.</p> <p class="alert alert-info"><i class="icon-info-sign"></i> The font path is relative from your compiled CSS directory.</p>
</li> </li>
<li>Re-compile your LESS if using a static compiler. Otherwise, you should be good to go.</li> <li>Re-compile your LESS if using a static compiler. Otherwise, you should be good to go.</li>
<li>Check out the examples to start using Font Awesome!</li> <li>Check out the <a href="{{ site.baseurl }}examples/">examples</a> to start using Font Awesome!</li>
</ol> </ol>
</div> </section>
</div>
<div class="row"> <section>
<div class="span12"> <h3>Not using Bootstrap?</h3>
<h4>Custom Bootstrap + Font Awesome Integration using SASS or SCSS</h4> <p>Font Awesome works just as well without Bootstrap.</p>
<p>I have never used either, so let me know if the included SCSS or SASS files have issues.</p>
</div>
</div>
<div class="row">
<div class="span12">
<h4>Not using Bootstrap?</h4>
</div>
<div class="span3">
<p>Font Awesome works just as well without Twitter Bootstrap.</p>
</div>
<div class="span9">
<ol> <ol>
<li>Copy the Font Awesome font directory into your project.</li> <li>Copy the Font Awesome font directory into your project.</li>
<li>Copy font-awesome.less or font-awesome.min.css into your project.</li> <li>Copy font-awesome.less or font-awesome.min.css into your project.</li>
<li>Open your project's font-awesome.less or font-awesome.min.css and edit the font location to point it to your font directory (see above examples).</li> <li>Open your project's font-awesome.less or font-awesome.min.css and edit the font location to point it to your font directory (see above examples).</li>
<li>Check out the examples to start using Font Awesome!</li> <li>Check out the <a href="{{ site.baseurl }}examples/">examples</a> to start using Font Awesome!</li>
</ol> </ol>
</div> </section>
</div>
<div class="row"> <section>
<div class="span12"> <h3>Need IE7 Support?</h3>
<h4>Need IE7 Support?</h4>
</div>
<div class="span3">
<p>Font Awesome supports IE7. If you need it, you have my condolences.</p> <p>Font Awesome supports IE7. If you need it, you have my condolences.</p>
</div>
<div class="span9">
<ol> <ol>
<li>Get Font Awesome working properly in a modern browser.</li> <li>Get Font Awesome working properly in a modern browser.</li>
<li>Copy font-awesome-ie7.min.css into your project.</li> <li>Copy font-awesome-ie7.min.css into your project.</li>
<li> <li>
In the <code>&lt;head&gt;</code> of your html, reference the location to your font-awesome-ie7.min.css. In the <code>&lt;head&gt;</code> of your html, reference the location to your font-awesome-ie7.min.css.
<pre class="prettyprint linenums"> {% highlight html %}
&lt;link rel="stylesheet" href="../css/bootstrap.min.css"&gt; <link rel="stylesheet" href="../css/bootstrap.min.css">
&lt;link rel="stylesheet" href="../css/font-awesome.min.css"&gt; <link rel="stylesheet" href="../css/font-awesome.min.css">
&lt;!--[if IE 7]&gt; <!--[if IE 7]>
&lt;link rel=&quot;stylesheet&quot; href=&quot;assets/css/font-awesome-ie7.min.css&quot;&gt; <link rel="stylesheet" href="assets/css/font-awesome-ie7.min.css">
&lt;![endif]--&gt; <![endif]-->{% endhighlight %}
</pre>
</li> </li>
<li>Go complain to whoever decided your project needs IE7 support.</li> <li>Go complain to whoever decided your project needs IE7 support.</li>
</ol> </ol>
</div>
</div>
</section> </section>

2
build/_includes/navbar.html
View File

@ -6,8 +6,8 @@
<li{% if page.navbar_active == "home" %} class="active"{% endif %}><a href="{{ site.baseurl }}">Home</a></li> <li{% if page.navbar_active == "home" %} class="active"{% endif %}><a href="{{ site.baseurl }}">Home</a></li>
<li{% if page.navbar_active == "get-started" %} class="active"{% endif %}><a href="{{ site.baseurl }}get-started/">Get Started</a></li> <li{% if page.navbar_active == "get-started" %} class="active"{% endif %}><a href="{{ site.baseurl }}get-started/">Get Started</a></li>
<li{% if page.navbar_active == "icons" %} class="active"{% endif %}><a href="{{ site.baseurl }}icons/">Icons</a></li> <li{% if page.navbar_active == "icons" %} class="active"{% endif %}><a href="{{ site.baseurl }}icons/">Icons</a></li>
<li{% if page.navbar_active == "whats-new" %} class="active"{% endif %}><a href="{{ site.baseurl }}whats-new/">What's New</a></li>
<li{% if page.navbar_active == "examples" %} class="active"{% endif %}><a href="{{ site.baseurl }}examples/">Examples</a></li> <li{% if page.navbar_active == "examples" %} class="active"{% endif %}><a href="{{ site.baseurl }}examples/">Examples</a></li>
<li{% if page.navbar_active == "whats-new" %} class="active"{% endif %}><a href="{{ site.baseurl }}whats-new/">What's New</a></li>
<li{% if page.navbar_active == "roadmap" %} class="active"{% endif %}><a href="{{ site.baseurl }}roadmap/">Roadmap</a></li> <li{% if page.navbar_active == "roadmap" %} class="active"{% endif %}><a href="{{ site.baseurl }}roadmap/">Roadmap</a></li>
<li{% if page.navbar_active == "thanks" %} class="active"{% endif %}><a href="{{ site.baseurl }}thanks/">Say Thanks</a></li> <li{% if page.navbar_active == "thanks" %} class="active"{% endif %}><a href="{{ site.baseurl }}thanks/">Say Thanks</a></li>
</ul> </ul>

6
build/assets/css/font-awesome.css vendored
View File

@ -129,12 +129,12 @@ li [class*=" icon-"].icon-large,
} }
ul.icons-ul { ul.icons-ul {
list-style-type: none; list-style-type: none;
text-indent: -0.6428571428571429em; text-indent: -0.7142857142857143em;
margin-left: 2em; margin-left: 2.142857142857143em;
} }
ul.icons-ul > li [class^="icon-"], ul.icons-ul > li [class^="icon-"],
ul.icons-ul > li .icon-li { ul.icons-ul > li .icon-li {
width: 0.6428571428571429em; width: 0.7142857142857143em;
} }
[class^="icon-"].hide, [class^="icon-"].hide,
[class*=" icon-"].hide { [class*=" icon-"].hide {

2
build/assets/css/site.css
View File

@ -5702,7 +5702,7 @@ h6 {
color: #333333; color: #333333;
} }
section { section {
padding-top: 40px; margin-top: 40px;
} }
#social-buttons { #social-buttons {
padding: 22px 0 17px; padding: 22px 0 17px;

6
build/assets/less/font-awesome.less vendored
View File

@ -134,13 +134,13 @@ li, .nav li {
ul.icons-ul { ul.icons-ul {
list-style-type: none; list-style-type: none;
text-indent: -9/14em; text-indent: -10/14em;
margin-left: 28/14em; margin-left: 30/14em;
> li { > li {
[class^="icon-"], [class^="icon-"],
.icon-li { .icon-li {
width: 9/14em; width: 10/14em;
} }
} }
} }

2
build/assets/less/site.less
View File

@ -192,7 +192,7 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
} }
section { section {
padding-top: 40px; margin-top: 40px;
} }
#social-buttons { #social-buttons {

2
build/get-started/index.html
View File

@ -4,7 +4,7 @@ title: Get Started with Font Awesome
navbar_active: get-started navbar_active: get-started
--- ---
{% capture jumbotron_h1 %}<i class="icon-cogs icon-large"></i>&nbsp; Get Started{% endcapture %} {% capture jumbotron_h1 %}<i class="icon-cogs icon-large"></i>&nbsp; Get Started{% endcapture %}
{% capture jumbotron_p %}Easy ways to get Font Awesome {{ site.font-awesome.version }} up and running{% endcapture %} {% capture jumbotron_p %}Easy ways to get Font Awesome {{ site.font-awesome.version }} on your website{% endcapture %}
{% include jumbotron.html %} {% include jumbotron.html %}
{% include stripe-social.html %} {% include stripe-social.html %}