twitter-bootstrap-rails 2.2.0 → 2.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of twitter-bootstrap-rails might be problematic. Click here for more details.
- data/README.md +18 -3
- data/app/helpers/bootstrap_flash_helper.rb +15 -16
- data/lib/generators/bootstrap/install/install_generator.rb +9 -0
- data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +6 -7
- data/lib/generators/bootstrap/install/templates/en.bootstrap.yml +17 -0
- data/lib/generators/bootstrap/layout/templates/layout.html.erb +1 -1
- data/lib/generators/bootstrap/layout/templates/layout.html.haml +1 -1
- data/lib/generators/bootstrap/layout/templates/layout.html.slim +1 -1
- data/lib/twitter/bootstrap/rails/version.rb +1 -1
- data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
- data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
- data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
- data/vendor/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb +20 -13
- data/vendor/static-source/fontawesome.less +4 -5
- data/vendor/toolkit/fontawesome-ie7.less +49 -29
- data/vendor/toolkit/fontawesome.less +71 -37
- data/vendor/toolkit/twitter/bootstrap/sprites.less +2 -2
- metadata +16 -16
- data/vendor/assets/fonts/fontawesome-webfont.svg +0 -255
data/README.md
CHANGED
|
@@ -164,6 +164,17 @@ styles inheriting Bootstrap's mixins, you can do so inside bootstrap_and_overrid
|
|
|
164
164
|
@linkColor: #ff0000;
|
|
165
165
|
```
|
|
166
166
|
|
|
167
|
+
### Icons
|
|
168
|
+
|
|
169
|
+
By default, this gem overrides standard Bootstraps's Glyphicons with Font Awesome (http://fortawesome.github.com/Font-Awesome/).
|
|
170
|
+
If you would like to restore the default Glyphicons, inside the _bootstrap_and_overrides.css.less_ remove the FontAwesome declaration and uncomment the line:
|
|
171
|
+
|
|
172
|
+
```css
|
|
173
|
+
// Font Awesome
|
|
174
|
+
// @import "fontawesome";
|
|
175
|
+
// Glyphicons
|
|
176
|
+
@import "twitter/bootstrap/sprites.less";
|
|
177
|
+
```
|
|
167
178
|
|
|
168
179
|
## Using Javascripts
|
|
169
180
|
|
|
@@ -207,9 +218,12 @@ jQuery ->
|
|
|
207
218
|
## Using Helpers
|
|
208
219
|
|
|
209
220
|
### Flash helper
|
|
210
|
-
Add flash helper
|
|
221
|
+
Add flash helper `<%= bootstrap_flash %>` to your layout (built-in with layout generator)
|
|
211
222
|
|
|
212
223
|
### Breadcrumbs Helpers
|
|
224
|
+
|
|
225
|
+
Add breadcrumbs helper `<%= render_breadcrumbs %>` to your layout.
|
|
226
|
+
|
|
213
227
|
```ruby
|
|
214
228
|
class ApplicationController
|
|
215
229
|
add_breadcrumb :index, :root_path
|
|
@@ -242,8 +256,8 @@ en:
|
|
|
242
256
|
index: "Examples"
|
|
243
257
|
show: "Example"
|
|
244
258
|
```
|
|
245
|
-
|
|
246
|
-
|
|
259
|
+
NOTE: If you are using Devise in your project, you must have a devise locale file
|
|
260
|
+
for handling flash messages, even if those messages are blank. See https://github.com/plataformatec/devise/wiki/I18n
|
|
247
261
|
|
|
248
262
|
## Changelog
|
|
249
263
|
<ul>
|
|
@@ -290,6 +304,7 @@ Add breadcrumbs helper <%= render_breadcrumbs %> to your layout
|
|
|
290
304
|
<li>Released gem v.2.1.8 and updated to Twitter Bootstrap 2.2.2</li>
|
|
291
305
|
<li>Released gem v.2.1.9</li>
|
|
292
306
|
<li>Released gem v.2.2.0 (Font Awesome 3)</li>
|
|
307
|
+
<li>Released gem v.2.2.1 (minor fixes and updates)</li>
|
|
293
308
|
</ul>
|
|
294
309
|
|
|
295
310
|
|
|
@@ -1,17 +1,16 @@
|
|
|
1
|
-
module BootstrapFlashHelper
|
|
1
|
+
module BootstrapFlashHelper
|
|
2
2
|
def bootstrap_flash
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
end
|
|
3
|
+
flash_messages = []
|
|
4
|
+
flash.each do |type, message|
|
|
5
|
+
# Skip empty messages, e.g. for devise messages set to nothing in a locale file.
|
|
6
|
+
next if message.blank?
|
|
7
|
+
type = :success if type == :notice
|
|
8
|
+
type = :error if type == :alert
|
|
9
|
+
text = content_tag(:div,
|
|
10
|
+
content_tag(:button, raw("×"), :class => "close", "data-dismiss" => "alert") +
|
|
11
|
+
message, :class => "alert fade in alert-#{type}")
|
|
12
|
+
flash_messages << text if message
|
|
13
|
+
end
|
|
14
|
+
flash_messages.join("\n").html_safe
|
|
15
|
+
end
|
|
16
|
+
end
|
|
@@ -44,6 +44,15 @@ module Bootstrap
|
|
|
44
44
|
end
|
|
45
45
|
end
|
|
46
46
|
|
|
47
|
+
def add_locale
|
|
48
|
+
if File.exist?("config/locales/en.bootstrap.yml")
|
|
49
|
+
localez = File.read("config/locales/en.bootstrap.yml")
|
|
50
|
+
insert_into_file "config/locales/en.bootstrap.yml", localez, :after => "en\n"
|
|
51
|
+
else
|
|
52
|
+
copy_file "en.bootstrap.yml", "config/locales/en.bootstrap.yml"
|
|
53
|
+
end
|
|
54
|
+
end
|
|
55
|
+
|
|
47
56
|
def cleanup_legacy
|
|
48
57
|
# Remove old requires (if any) that included twitter/bootstrap directly:
|
|
49
58
|
gsub_file("app/assets/stylesheets/application.css", %r|\s*\*=\s*twitter/bootstrap\s*\n|, "")
|
|
@@ -2,17 +2,16 @@
|
|
|
2
2
|
@import "twitter/bootstrap/responsive";
|
|
3
3
|
|
|
4
4
|
// Set the correct sprite paths
|
|
5
|
-
@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
|
|
6
|
-
@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
|
|
5
|
+
@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings.png");
|
|
6
|
+
@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white.png");
|
|
7
7
|
|
|
8
8
|
// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
|
|
9
9
|
// Note: If you use asset_path() here, your compiled bootstrap_and_overrides.css will not
|
|
10
10
|
// have the proper paths. So for now we use the absolute path.
|
|
11
|
-
@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
|
|
12
|
-
@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot
|
|
13
|
-
@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
|
|
14
|
-
@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
|
|
15
|
-
@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
|
|
11
|
+
@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot?v=3.0.2");
|
|
12
|
+
@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot?#iefix&v=3.0.2");
|
|
13
|
+
@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff?v=3.0.2");
|
|
14
|
+
@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf?v=3.0.2");
|
|
16
15
|
|
|
17
16
|
// Font Awesome
|
|
18
17
|
@import "fontawesome";
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# Sample localization file for English. Add more files in this directory for other locales.
|
|
2
|
+
# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
|
|
3
|
+
|
|
4
|
+
en:
|
|
5
|
+
helpers:
|
|
6
|
+
actions: "Actions"
|
|
7
|
+
links:
|
|
8
|
+
back: "Back"
|
|
9
|
+
cancel: "Cancel"
|
|
10
|
+
confirm: "Confirm"
|
|
11
|
+
destroy: "Delete"
|
|
12
|
+
new: "New"
|
|
13
|
+
titles:
|
|
14
|
+
edit: "Edit"
|
|
15
|
+
save: "Save"
|
|
16
|
+
new: "New"
|
|
17
|
+
delete: "Delete"
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
@font-face{font-family:"FontAwesome";src:url("<%= asset_path 'fontawesome-webfont.eot' %>");src:url("<%= asset_path 'fontawesome-webfont.eot
|
|
1
|
+
@font-face{font-family:"FontAwesome";src:url("<%= asset_path 'fontawesome-webfont.eot?v=3.0.2' %>");src:url("<%= asset_path 'fontawesome-webfont.eot?#iefix&v=3.0.2' %>") format("embedded-opentype"),url("<%= asset_path 'fontawesome-webfont.woff?v=3.0.2' %>") format("woff"),url("<%= asset_path 'fontawesome-webfont.ttf?v=3.0.2' %>") format("truetype");font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0;}
|
|
2
|
+
.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none;}
|
|
2
3
|
[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;}
|
|
3
4
|
a [class^="icon-"],a [class*=" icon-"]{display:inline-block;}
|
|
4
5
|
.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;}
|
|
5
|
-
.btn [class^="icon-"],.nav [class^="icon-"],.btn [class*=" icon-"],.nav [class*=" icon-"]{display:inline;
|
|
6
|
-
|
|
6
|
+
.btn [class^="icon-"],.nav [class^="icon-"],.btn [class*=" icon-"],.nav [class*=" icon-"]{display:inline;}.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em;}
|
|
7
|
+
.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block;}
|
|
8
|
+
.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"]{}.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"],.nav-tabs [class^="icon-"].icon-large,.nav-pills [class^="icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large{line-height:.9em;}
|
|
9
|
+
li [class^="icon-"],.nav li [class^="icon-"],li [class*=" icon-"],.nav li [class*=" icon-"]{display:inline-block;width:1.25em;text-align:center;}li [class^="icon-"].icon-large,.nav li [class^="icon-"].icon-large,li [class*=" icon-"].icon-large,.nav li [class*=" icon-"].icon-large{width:1.5625em;}
|
|
7
10
|
ul.icons{list-style-type:none;text-indent:-0.75em;}ul.icons li [class^="icon-"],ul.icons li [class*=" icon-"]{width:.75em;}
|
|
8
11
|
.icon-muted{color:#eeeeee;}
|
|
9
12
|
.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
|
|
@@ -12,14 +15,16 @@ ul.icons{list-style-type:none;text-indent:-0.75em;}ul.icons li [class^="icon-"],
|
|
|
12
15
|
.icon-4x{font-size:4em;}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
|
|
13
16
|
.pull-right{float:right;}
|
|
14
17
|
.pull-left{float:left;}
|
|
15
|
-
[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.
|
|
16
|
-
[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.
|
|
17
|
-
.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.
|
|
18
|
-
.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{height:.
|
|
19
|
-
.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.
|
|
20
|
-
.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.
|
|
18
|
+
[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em;}
|
|
19
|
+
[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em;}
|
|
20
|
+
.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em;}
|
|
21
|
+
.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em;}
|
|
22
|
+
.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em;}
|
|
23
|
+
.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;}
|
|
24
|
+
.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;}
|
|
25
|
+
.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;}
|
|
21
26
|
.icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;}
|
|
22
|
-
@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);} 100%{-moz-transform:rotate(359deg);}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);} 100%{-webkit-transform:rotate(359deg);}}@-o-keyframes spin{0%{-o-transform:rotate(0deg);} 100%{-o-transform:rotate(359deg);}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg);} 100%{-ms-transform:rotate(359deg);}}@keyframes spin{0%{transform:rotate(0deg);} 100%{transform:rotate(359deg);}}.icon-glass:before{content:"\f000";}
|
|
27
|
+
@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);} 100%{-moz-transform:rotate(359deg);}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);} 100%{-webkit-transform:rotate(359deg);}}@-o-keyframes spin{0%{-o-transform:rotate(0deg);} 100%{-o-transform:rotate(359deg);}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg);} 100%{-ms-transform:rotate(359deg);}}@keyframes spin{0%{transform:rotate(0deg);} 100%{transform:rotate(359deg);}}@-moz-document url-prefix(){.icon-spin{height:.9em;} .btn .icon-spin{height:auto;} .icon-spin.icon-large{height:1.25em;} .btn .icon-spin.icon-large{height:.75em;}}.icon-glass:before{content:"\f000";}
|
|
23
28
|
.icon-music:before{content:"\f001";}
|
|
24
29
|
.icon-search:before{content:"\f002";}
|
|
25
30
|
.icon-envelope:before{content:"\f003";}
|
|
@@ -268,9 +273,11 @@ ul.icons{list-style-type:none;text-indent:-0.75em;}ul.icons li [class^="icon-"],
|
|
|
268
273
|
.icon-github-alt:before{content:"\f113";}
|
|
269
274
|
.icon-folder-close-alt:before{content:"\f114";}
|
|
270
275
|
.icon-folder-open-alt:before{content:"\f115";}
|
|
271
|
-
|
|
272
|
-
.icon-
|
|
273
|
-
.
|
|
276
|
+
.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle;}
|
|
277
|
+
.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%;}
|
|
278
|
+
.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px;}
|
|
279
|
+
.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit;}
|
|
280
|
+
.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em;}
|
|
274
281
|
a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
|
|
275
282
|
ul.icons{text-indent:-1.5em;margin-left:3em;}
|
|
276
283
|
.icon-glass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
@fontAwesomeEotPath: "<%= asset_path 'fontawesome-webfont.eot' %>";
|
|
2
|
-
@fontAwesomeEotPath_iefix: "<%= asset_path 'fontawesome-webfont.eot
|
|
3
|
-
@fontAwesomeWoffPath: "<%= asset_path 'fontawesome-webfont.woff' %>";
|
|
4
|
-
@fontAwesomeTtfPath: "<%= asset_path 'fontawesome-webfont.ttf' %>";
|
|
5
|
-
@fontAwesomeSvgPath: "<%= asset_path 'fontawesome-webfont.svg' %>";
|
|
1
|
+
@fontAwesomeEotPath: "<%= asset_path 'fontawesome-webfont.eot?v=3.0.2' %>";
|
|
2
|
+
@fontAwesomeEotPath_iefix: "<%= asset_path 'fontawesome-webfont.eot?#iefix&v=3.0.2' %>";
|
|
3
|
+
@fontAwesomeWoffPath: "<%= asset_path 'fontawesome-webfont.woff?v=3.0.2' %>";
|
|
4
|
+
@fontAwesomeTtfPath: "<%= asset_path 'fontawesome-webfont.ttf?v=3.0.2' %>";
|
|
6
5
|
// Font Awesome
|
|
7
6
|
@import "fontawesome";
|
|
8
7
|
@import "fontawesome-ie7";
|
|
@@ -1,30 +1,25 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
/*!
|
|
2
|
+
* Font Awesome 3.0.2
|
|
3
|
+
* the iconic font designed for use with Twitter Bootstrap
|
|
4
|
+
* -------------------------------------------------------
|
|
5
|
+
* The full suite of pictographic icons, examples, and documentation
|
|
6
|
+
* can be found at: http://fortawesome.github.com/Font-Awesome/
|
|
7
|
+
*
|
|
8
|
+
* License
|
|
9
|
+
* -------------------------------------------------------
|
|
10
|
+
* - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
|
|
11
|
+
* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
|
|
12
|
+
* http://opensource.org/licenses/mit-license.html
|
|
13
|
+
* - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
|
|
14
|
+
* - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
|
|
15
|
+
* "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
|
|
6
16
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
• Attribution is no longer required in Font Awesome 3.0, but much appreciated:
|
|
14
|
-
"Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
|
|
15
|
-
|
|
16
|
-
Contact
|
|
17
|
-
-------------------------------------------------------
|
|
18
|
-
Email: dave@davegandy.com
|
|
19
|
-
Twitter: http://twitter.com/fortaweso_me
|
|
20
|
-
Work: Lead Product Designer @ http://kyruus.com
|
|
21
|
-
|
|
22
|
-
*/
|
|
23
|
-
|
|
24
|
-
[class^="icon-"],
|
|
25
|
-
[class*=" icon-"] {
|
|
26
|
-
padding-right:.3em;
|
|
27
|
-
}
|
|
17
|
+
* Contact
|
|
18
|
+
* -------------------------------------------------------
|
|
19
|
+
* Email: dave@davegandy.com
|
|
20
|
+
* Twitter: http://twitter.com/fortaweso_me
|
|
21
|
+
* Work: Lead Product Designer @ http://kyruus.com
|
|
22
|
+
*/
|
|
28
23
|
|
|
29
24
|
.icon-large {
|
|
30
25
|
font-size: 4/3em;
|
|
@@ -32,10 +27,10 @@
|
|
|
32
27
|
padding-top: 3px;
|
|
33
28
|
margin-bottom: -4px;
|
|
34
29
|
padding-bottom: 3px;
|
|
35
|
-
vertical-align:
|
|
30
|
+
vertical-align: middle;
|
|
36
31
|
}
|
|
37
32
|
|
|
38
|
-
.
|
|
33
|
+
.nav {
|
|
39
34
|
[class^="icon-"],
|
|
40
35
|
[class*=" icon-"] {
|
|
41
36
|
vertical-align: inherit;
|
|
@@ -43,7 +38,32 @@
|
|
|
43
38
|
padding-top: 3px;
|
|
44
39
|
margin-bottom: -4px;
|
|
45
40
|
padding-bottom: 3px;
|
|
46
|
-
|
|
41
|
+
&.icon-large {
|
|
42
|
+
vertical-align: -25%;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
.nav-pills, .nav-tabs {
|
|
48
|
+
[class^="icon-"],
|
|
49
|
+
[class*=" icon-"] {
|
|
50
|
+
&.icon-large {
|
|
51
|
+
line-height: .75em;
|
|
52
|
+
margin-top: -7px;
|
|
53
|
+
padding-top: 5px;
|
|
54
|
+
margin-bottom: -5px;
|
|
55
|
+
padding-bottom: 4px;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
.btn {
|
|
61
|
+
[class^="icon-"],
|
|
62
|
+
[class*=" icon-"] {
|
|
63
|
+
&.pull-left, &.pull-right { vertical-align: inherit; }
|
|
64
|
+
&.icon-large {
|
|
65
|
+
margin-top: -.5em;
|
|
66
|
+
}
|
|
47
67
|
}
|
|
48
68
|
}
|
|
49
69
|
|
|
@@ -1,25 +1,25 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
1
|
+
/*!
|
|
2
|
+
* Font Awesome 3.0.2
|
|
3
|
+
* the iconic font designed for use with Twitter Bootstrap
|
|
4
|
+
* -------------------------------------------------------
|
|
5
|
+
* The full suite of pictographic icons, examples, and documentation
|
|
6
|
+
* can be found at: http://fortawesome.github.com/Font-Awesome/
|
|
7
|
+
*
|
|
8
|
+
* License
|
|
9
|
+
* -------------------------------------------------------
|
|
10
|
+
* - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
|
|
11
|
+
* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
|
|
12
|
+
* http://opensource.org/licenses/mit-license.html
|
|
13
|
+
* - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
|
|
14
|
+
* - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
|
|
15
|
+
* "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
|
|
16
|
+
|
|
17
|
+
* Contact
|
|
18
|
+
* -------------------------------------------------------
|
|
19
|
+
* Email: dave@davegandy.com
|
|
20
|
+
* Twitter: http://twitter.com/fortaweso_me
|
|
21
|
+
* Work: Lead Product Designer @ http://kyruus.com
|
|
22
|
+
*/
|
|
23
23
|
|
|
24
24
|
@borderColor: #eee;
|
|
25
25
|
@iconMuted: #eee;
|
|
@@ -30,29 +30,48 @@
|
|
|
30
30
|
src: url(@fontAwesomeEotPath);
|
|
31
31
|
src: url(@fontAwesomeEotPath_iefix) format("embedded-opentype"),
|
|
32
32
|
url(@fontAwesomeWoffPath) format("woff"),
|
|
33
|
-
url(@fontAwesomeTtfPath) format("truetype")
|
|
34
|
-
url(@fontAwesomeSvgPath) format("svg");
|
|
33
|
+
url(@fontAwesomeTtfPath) format("truetype");
|
|
35
34
|
font-weight: normal;
|
|
36
35
|
font-style: normal;
|
|
37
36
|
}
|
|
38
37
|
|
|
39
38
|
/* Font Awesome styles
|
|
40
39
|
------------------------------------------------------- */
|
|
41
|
-
/* includes sprites.less reset */
|
|
42
40
|
[class^="icon-"],
|
|
43
41
|
[class*=" icon-"] {
|
|
44
42
|
font-family: FontAwesome;
|
|
45
43
|
font-weight: normal;
|
|
46
44
|
font-style: normal;
|
|
47
45
|
text-decoration: inherit;
|
|
46
|
+
-webkit-font-smoothing: antialiased;
|
|
47
|
+
|
|
48
|
+
/* sprites.less reset */
|
|
48
49
|
display: inline;
|
|
49
50
|
width: auto;
|
|
50
51
|
height: auto;
|
|
51
52
|
line-height: normal;
|
|
52
53
|
vertical-align: baseline;
|
|
53
|
-
background-image: none
|
|
54
|
+
background-image: none;
|
|
54
55
|
background-position: 0% 0%;
|
|
55
56
|
background-repeat: repeat;
|
|
57
|
+
margin-top: 0;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/* more sprites.less reset */
|
|
61
|
+
.icon-white,
|
|
62
|
+
.nav-pills > .active > a > [class^="icon-"],
|
|
63
|
+
.nav-pills > .active > a > [class*=" icon-"],
|
|
64
|
+
.nav-list > .active > a > [class^="icon-"],
|
|
65
|
+
.nav-list > .active > a > [class*=" icon-"],
|
|
66
|
+
.navbar-inverse .nav > .active > a > [class^="icon-"],
|
|
67
|
+
.navbar-inverse .nav > .active > a > [class*=" icon-"],
|
|
68
|
+
.dropdown-menu > li > a:hover > [class^="icon-"],
|
|
69
|
+
.dropdown-menu > li > a:hover > [class*=" icon-"],
|
|
70
|
+
.dropdown-menu > .active > a > [class^="icon-"],
|
|
71
|
+
.dropdown-menu > .active > a > [class*=" icon-"],
|
|
72
|
+
.dropdown-submenu:hover > a > [class^="icon-"],
|
|
73
|
+
.dropdown-submenu:hover > a > [class*=" icon-"] {
|
|
74
|
+
background-image: none;
|
|
56
75
|
}
|
|
57
76
|
|
|
58
77
|
[class^="icon-"]:before,
|
|
@@ -81,14 +100,20 @@ a {
|
|
|
81
100
|
[class*=" icon-"] {
|
|
82
101
|
display: inline;
|
|
83
102
|
/* keeps button heights with and without icons the same */
|
|
84
|
-
line-height: .
|
|
85
|
-
&.icon-spin {
|
|
86
|
-
|
|
87
|
-
|
|
103
|
+
&.icon-large { line-height: .9em; }
|
|
104
|
+
&.icon-spin { display: inline-block; }
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
.nav-tabs, .nav-pills {
|
|
109
|
+
[class^="icon-"],
|
|
110
|
+
[class*=" icon-"] {
|
|
111
|
+
/* keeps button heights with and without icons the same */
|
|
112
|
+
&, &.icon-large { line-height: .9em; }
|
|
88
113
|
}
|
|
89
114
|
}
|
|
90
115
|
|
|
91
|
-
li {
|
|
116
|
+
li, .nav li {
|
|
92
117
|
[class^="icon-"],
|
|
93
118
|
[class*=" icon-"] {
|
|
94
119
|
display: inline-block;
|
|
@@ -161,10 +186,10 @@ ul.icons {
|
|
|
161
186
|
[class^="icon-"],
|
|
162
187
|
[class*=" icon-"] {
|
|
163
188
|
&.pull-left {
|
|
164
|
-
margin-right: .
|
|
189
|
+
margin-right: .3em;
|
|
165
190
|
}
|
|
166
191
|
&.pull-right {
|
|
167
|
-
margin-left: .
|
|
192
|
+
margin-left: .3em;
|
|
168
193
|
}
|
|
169
194
|
}
|
|
170
195
|
|
|
@@ -172,9 +197,9 @@ ul.icons {
|
|
|
172
197
|
[class^="icon-"],
|
|
173
198
|
[class*=" icon-"] {
|
|
174
199
|
&.pull-left, &.pull-right {
|
|
175
|
-
&.icon-2x { margin-top: .
|
|
200
|
+
&.icon-2x { margin-top: .18em; }
|
|
176
201
|
}
|
|
177
|
-
&.icon-spin.icon-large { height: .
|
|
202
|
+
&.icon-spin.icon-large { line-height: .8em; }
|
|
178
203
|
}
|
|
179
204
|
}
|
|
180
205
|
|
|
@@ -182,7 +207,7 @@ ul.icons {
|
|
|
182
207
|
[class^="icon-"],
|
|
183
208
|
[class*=" icon-"] {
|
|
184
209
|
&.pull-left, &.pull-right {
|
|
185
|
-
&.icon-2x { margin-top: .
|
|
210
|
+
&.icon-2x { margin-top: .25em; }
|
|
186
211
|
}
|
|
187
212
|
}
|
|
188
213
|
}
|
|
@@ -190,9 +215,12 @@ ul.icons {
|
|
|
190
215
|
.btn.btn-large {
|
|
191
216
|
[class^="icon-"],
|
|
192
217
|
[class*=" icon-"] {
|
|
218
|
+
margin-top: 0; // overrides bootstrap default
|
|
193
219
|
&.pull-left, &.pull-right {
|
|
194
|
-
&.icon-2x { margin-top: .
|
|
220
|
+
&.icon-2x { margin-top: .05em; }
|
|
195
221
|
}
|
|
222
|
+
&.pull-left.icon-2x { margin-right: .2em; }
|
|
223
|
+
&.pull-right.icon-2x { margin-left: .2em; }
|
|
196
224
|
}
|
|
197
225
|
}
|
|
198
226
|
|
|
@@ -226,6 +254,12 @@ ul.icons {
|
|
|
226
254
|
100% { transform: rotate(359deg); }
|
|
227
255
|
}
|
|
228
256
|
|
|
257
|
+
@-moz-document url-prefix() {
|
|
258
|
+
.icon-spin { height: .9em; }
|
|
259
|
+
.btn .icon-spin { height: auto; }
|
|
260
|
+
.icon-spin.icon-large { height: 1.25em; }
|
|
261
|
+
.btn .icon-spin.icon-large { height: .75em; }
|
|
262
|
+
}
|
|
229
263
|
|
|
230
264
|
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
|
|
231
265
|
readers do not read off random characters that represent icons */
|