Prechádzať zdrojové kódy

adding spinner, updating styles

davegandy 12 rokov pred
rodič
commit
35e27eab96

+ 0 - 1
docs/.idea/.name

@@ -1 +0,0 @@
-docs

+ 0 - 9
docs/.idea/docs.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

+ 0 - 5
docs/.idea/encodings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-

+ 0 - 8
docs/.idea/misc.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectResources">
-    <default-html-doctype>$APPLICATION_HOME_DIR$/lib/webide.jar!/resources/html5-schema/html5.rnc</default-html-doctype>
-  </component>
-  <component name="ProjectRootManager" version="2" />
-</project>
-

+ 0 - 9
docs/.idea/modules.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/docs.iml" filepath="$PROJECT_DIR$/.idea/docs.iml" />
-    </modules>
-  </component>
-</project>
-

+ 0 - 7
docs/.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-

+ 15 - 15
docs/.idea/workspace.xml

@@ -32,7 +32,7 @@
       <file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="282" column="0" selection-start="12881" selection-end="12881" vertical-scroll-proportion="-27.625">
+            <state line="283" column="0" selection-start="12966" selection-end="13019" vertical-scroll-proportion="-27.625">
               <folding />
             </state>
           </provider>
@@ -41,7 +41,7 @@
       <file leaf-file-name="test.html" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="38" column="73" selection-start="1295" selection-end="1295" vertical-scroll-proportion="-15.625">
+            <state line="40" column="0" selection-start="1149" selection-end="1425" vertical-scroll-proportion="-16.25">
               <folding>
                 <element signature="n#style#0;n#div#0;n#div#0;n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
               </folding>
@@ -52,7 +52,7 @@
       <file leaf-file-name="font-awesome.less" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/assets/less/font-awesome.less">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="37" column="0" selection-start="1614" selection-end="1614" vertical-scroll-proportion="0.5684931">
+            <state line="37" column="0" selection-start="1614" selection-end="1614" vertical-scroll-proportion="0.24657534">
               <folding />
             </state>
           </provider>
@@ -61,7 +61,7 @@
       <file leaf-file-name="font-awesome-ie7.less" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/assets/less/font-awesome-ie7.less">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="293" column="46" selection-start="13464" selection-end="13464" vertical-scroll-proportion="0.0">
+            <state line="297" column="46" selection-start="13624" selection-end="13624" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -243,12 +243,12 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="56" y="22" width="1384" height="878" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24981631" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24981631" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
@@ -316,30 +316,30 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/assets/less/font-awesome-ie7.less">
+    <entry file="file://$PROJECT_DIR$/assets/less/twbs-222/bootstrap.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="293" column="46" selection-start="13464" selection-end="13464" vertical-scroll-proportion="0.0">
+        <state line="29" column="2" selection-start="631" selection-end="631" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/assets/less/site.less">
+    <entry file="file://$PROJECT_DIR$/assets/less/font-awesome-ie7.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="225" column="21" selection-start="5004" selection-end="5004" vertical-scroll-proportion="0.0">
+        <state line="297" column="46" selection-start="13624" selection-end="13624" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/assets/less/twbs-222/bootstrap.less">
+    <entry file="file://$PROJECT_DIR$/assets/less/site.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="29" column="2" selection-start="631" selection-end="631" vertical-scroll-proportion="0.0">
+        <state line="225" column="21" selection-start="5004" selection-end="5004" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="38" column="73" selection-start="1295" selection-end="1295" vertical-scroll-proportion="-15.625">
+        <state line="40" column="0" selection-start="1149" selection-end="1425" vertical-scroll-proportion="-16.25">
           <folding>
             <element signature="n#style#0;n#div#0;n#div#0;n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>
@@ -348,14 +348,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="282" column="0" selection-start="12881" selection-end="12881" vertical-scroll-proportion="-27.625">
+        <state line="283" column="0" selection-start="12966" selection-end="13019" vertical-scroll-proportion="-27.625">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/assets/less/font-awesome.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="37" column="0" selection-start="1614" selection-end="1614" vertical-scroll-proportion="0.5684931">
+        <state line="37" column="0" selection-start="1614" selection-end="1614" vertical-scroll-proportion="0.24657534">
           <folding />
         </state>
       </provider>

+ 9 - 0
docs/assets/css/font-awesome-ie7.css

@@ -752,3 +752,12 @@
 .icon-quote-right {
   *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10e;');
 }
+.icon-spinner {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf110;');
+}
+.icon-circle {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf111;');
+}
+.icon-reply {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf112;');
+}

+ 9 - 0
docs/assets/css/site.css

@@ -5647,6 +5647,15 @@ ul.icons li .icon-large:before {
 .icon-quote-right:before {
   content: "\f10e";
 }
+.icon-spinner:before {
+  content: "\f110";
+}
+.icon-circle:before {
+  content: "\f111";
+}
+.icon-reply:before {
+  content: "\f112";
+}
 .text-align-right {
   text-align: right;
 }

BIN
docs/assets/font/FontAwesome.otf


BIN
docs/assets/font/fontawesome-webfont.eot


BIN
docs/assets/font/fontawesome-webfont.ttf


BIN
docs/assets/font/fontawesome-webfont.woff


+ 4 - 0
docs/assets/less/font-awesome-ie7.less

@@ -292,3 +292,7 @@
 .icon-circle-blank         { .ie7icon('&#xf10c;'); }
 .icon-quote-left           { .ie7icon('&#xf10d;'); }
 .icon-quote-right          { .ie7icon('&#xf10e;'); }
+
+.icon-spinner              { .ie7icon('&#xf110;'); }
+.icon-circle               { .ie7icon('&#xf111;'); }
+.icon-reply                { .ie7icon('&#xf112;'); }

+ 4 - 0
docs/assets/less/font-awesome.less

@@ -492,3 +492,7 @@ ul.icons {
 .icon-circle-blank:before         { content: "\f10c"; }
 .icon-quote-left:before           { content: "\f10d"; }
 .icon-quote-right:before          { content: "\f10e"; }
+
+.icon-spinner:before              { content: "\f110"; }
+.icon-circle:before               { content: "\f111"; }
+.icon-reply:before                { content: "\f112"; }

+ 18 - 15
docs/index.html

@@ -137,7 +137,7 @@
 </div>
 </div>
 
-<section id="social-buttons">
+<div id="social-buttons">
   <div class="container">
     <span class="watch">
       <a class="btn btn-mini" href="https://github.com/FortAwesome/Font-Awesome" target="_blank"><i class="icon-github icon-large"></i> Watch</a>
@@ -152,7 +152,7 @@
       <span id="followers" class="count btn btn-mini">2500+</span>
     </span>
   </div>
-</section>
+</div>
 
 <div class="container">
 <section id="why">
@@ -214,7 +214,7 @@
   </div>
   <div class="row">
     <div class="span4">
-      <h4><i class="icon-beaker icon-large"></i> 27 New Icons in 3.0.0</h4>
+      <h4><i class="icon-beaker icon-large"></i> 35 New Icons in 3.0.0</h4>
       All requested by our active community on the <a href="https://github.com/FortAwesome/Font-Awesome" target="_blank">Font Awesome GitHub project</a>.
     </div>
     <div class="span4">
@@ -227,38 +227,38 @@
 <section id="icons-new" class="row">
   <div class="span12">
     <h2 class="page-header">New Icons in 3.0</h2>
-    <p>You asked, Font Awesome delivers with 70 shiny new icons in version 2.0. This giant set of new icons was requested on the Font Awesome GitHub project and includes icon parity with Bootstrap 2.0.3.</p>
+    <p>You asked, Font Awesome delivers with 35 shiny new icons in version 3.0. This giant set of new icons was requested on the Font Awesome GitHub project and includes icon parity with Bootstrap 2.0.3.</p>
   </div>
 
   <div class="span3">
     <ul class="the-icons">
-      <li><i class="icon-lightbulb"></i> icon-lightbulb</li>
-      <li><i class="icon-exchange"></i> icon-exchange</li>
       <li><i class="icon-cloud-download"></i> icon-cloud-download</li>
       <li><i class="icon-cloud-upload"></i> icon-cloud-upload</li>
-      <li><i class="icon-user-md"></i> icon-user-md</li>
-      <li><i class="icon-stethoscope"></i> icon-stethoscope</li>
-      <li><i class="icon-suitcase"></i> icon-suitcase</li>
+      <li><i class="icon-lightbulb"></i> icon-lightbulb</li>
+      <li><i class="icon-exchange"></i> icon-exchange</li>
       <li><i class="icon-bell-alt"></i> icon-bell-alt</li>
+      <li><i class="icon-file-alt"></i> icon-file-alt</li>
+      <li><i class="icon-beer"></i> icon-beer</li>
       <li><i class="icon-coffee"></i> icon-coffee</li>
+      <li><i class="icon-food"></i> icon-food</li>
+      <li><i class="icon-fighter-jet"></i> icon-figher-jet</li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
-      <li><i class="icon-food"></i> icon-food</li>
-      <li><i class="icon-file-alt"></i> icon-file-alt</li>
+      <li><i class="icon-user-md"></i> icon-user-md</li>
+      <li><i class="icon-stethoscope"></i> icon-stethoscope</li>
+      <li><i class="icon-suitcase"></i> icon-suitcase</li>
       <li><i class="icon-building"></i> icon-building</li>
       <li><i class="icon-hospital"></i> icon-hospital</li>
       <li><i class="icon-ambulance"></i> icon-ambulance</li>
       <li><i class="icon-medkit"></i> icon-medkit</li>
-      <li><i class="icon-fighter-jet"></i> icon-figher-jet</li>
-      <li><i class="icon-beer"></i> icon-beer</li>
       <li><i class="icon-h-sign"></i> icon-h-sign</li>
+      <li><i class="icon-plus-sign-alt"></i> icon-plus-sign-alt</li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
-      <li><i class="icon-plus-sign-alt"></i> icon-plus-sign-alt</li>
       <li><i class="icon-angle-left"></i> icon-angle-left</li>
       <li><i class="icon-angle-right"></i> icon-angle-right</li>
       <li><i class="icon-angle-up"></i> icon-angle-up</li>
@@ -266,18 +266,21 @@
       <li><i class="icon-double-angle-left"></i> icon-double-angle-left</li>
       <li><i class="icon-double-angle-right"></i> icon-double-angle-right</li>
       <li><i class="icon-double-angle-up"></i> icon-double-angle-up</li>
+      <li><i class="icon-double-angle-down"></i> icon-double-angle-down</li>
+      <li><i class="icon-spinner"></i> icon-spinner</li>
     </ul>
   </div>
   <div class="span3">
     <ul class="the-icons">
-      <li><i class="icon-double-angle-down"></i> icon-double-angle-down</li>
       <li><i class="icon-desktop"></i> icon-desktop</li>
       <li><i class="icon-laptop"></i> icon-laptop</li>
       <li><i class="icon-tablet"></i> icon-tablet</li>
       <li><i class="icon-mobile-phone"></i> icon-mobile-phone</li>
       <li><i class="icon-circle-blank"></i> icon-circle-blank</li>
+      <li><i class="icon-circle"></i> icon-circle</li>
       <li><i class="icon-quote-left"></i> icon-quote-left</li>
       <li><i class="icon-quote-right"></i> icon-quote-right</li>
+      <li><i class="icon-reply"></i> icon-reply</li>
     </ul>
   </div>
 </section>

+ 4 - 4
docs/test.html

@@ -34,10 +34,10 @@
   <h1>Visual tests</h1>
 
   <h3>Spinning icons</h3>
-  <p class="lead">
-    <i class="icon-refresh icon-spin"></i> Loading...
-    <button class="btn"><i class="icon-refresh icon-spin"></i> Loading...</button>
-   </p>
+  <i class="icon-refresh icon-spin"></i> Loading...
+  <button class="btn"><i class="icon-refresh icon-spin"></i> Loading...</button>
+  <i class="icon-spinner icon-spin"></i> Loading...
+  <button class="btn btn-large"><i class="icon-spinner icon-spin"></i> Loading...</button>
 
   <h3>Icons <small>Icons should not be clipped</small></h3>
   <div class="row">