twitter-bootstrap-rails 2.1.9 → 2.2.0

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.

@@ -1,4 +1,4 @@
1
- /* Font Awesome
1
+ /* Font Awesome 3.0
2
2
  the iconic font designed for use with Twitter Bootstrap
3
3
  -------------------------------------------------------
4
4
  The full suite of pictographic icons, examples, and documentation
@@ -6,13 +6,12 @@
6
6
 
7
7
  License
8
8
  -------------------------------------------------------
9
- The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
10
- http://creativecommons.org/licenses/by/3.0/ A mention of
11
- 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
12
- source code is considered acceptable attribution (most common on the web).
13
- If human readable source code is not available to the end user, a mention in
14
- an 'About' or 'Credits' screen is considered acceptable (most common in desktop
15
- or mobile software).
9
+ The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
10
+ Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
11
+ http://opensource.org/licenses/mit-license.html
12
+ The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
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"
16
15
 
17
16
  Contact
18
17
  -------------------------------------------------------
@@ -22,6 +21,10 @@
22
21
 
23
22
  */
24
23
 
24
+ @borderColor: #eee;
25
+ @iconMuted: #eee;
26
+ .border-radius(@radius) { -webkit-border-radius: @radius; -moz-border-radius: @radius; border-radius: @radius; }
27
+
25
28
  @font-face {
26
29
  font-family: "FontAwesome";
27
30
  src: url(@fontAwesomeEotPath);
@@ -35,68 +38,195 @@
35
38
 
36
39
  /* Font Awesome styles
37
40
  ------------------------------------------------------- */
38
- [class^="icon-"]:before,
39
- [class*="icon-"]:before {
41
+ /* includes sprites.less reset */
42
+ [class^="icon-"],
43
+ [class*=" icon-"] {
40
44
  font-family: FontAwesome;
41
45
  font-weight: normal;
42
46
  font-style: normal;
43
- display: inline-block;
44
47
  text-decoration: inherit;
48
+ display: inline;
49
+ width: auto;
50
+ height: auto;
51
+ line-height: normal;
52
+ vertical-align: baseline;
53
+ background-image: none !important;
54
+ background-position: 0% 0%;
55
+ background-repeat: repeat;
45
56
  }
46
57
 
47
- a [class^="icon-"],
48
- a [class*="icon-"] {
49
- display: inline-block;
58
+ [class^="icon-"]:before,
59
+ [class*=" icon-"]:before {
50
60
  text-decoration: inherit;
61
+ display: inline-block;
62
+ speak: none;
63
+ }
64
+
65
+ /* makes sure icons active on rollover in links */
66
+ a {
67
+ [class^="icon-"],
68
+ [class*=" icon-"] {
69
+ display: inline-block;
70
+ }
51
71
  }
52
72
 
53
73
  /* makes the font 33% larger relative to the icon container */
54
74
  .icon-large:before {
55
- vertical-align: middle;
75
+ vertical-align: -10%;
56
76
  font-size: 4/3em;
57
77
  }
58
78
 
59
- .btn, .nav-tabs {
79
+ .btn, .nav {
60
80
  [class^="icon-"],
61
- [class*="icon-"] {
62
- /* keeps button heights with and without icons the same */
63
- line-height: .9em;
81
+ [class*=" icon-"] {
82
+ display: inline;
83
+ /* keeps button heights with and without icons the same */
84
+ line-height: .6em;
85
+ &.icon-spin {
86
+ display: inline-block;
87
+ }
64
88
  }
65
89
  }
66
90
 
67
91
  li {
68
92
  [class^="icon-"],
69
- [class*="icon-"] {
93
+ [class*=" icon-"] {
70
94
  display: inline-block;
71
95
  width: 1.25em;
72
96
  text-align: center;
73
- }
74
- .icon-large:before,
75
- .icon-large:before {
76
- /* 1.5 increased font size for icon-large * 1.25 width */
77
- width: 1.5*1.25em;
97
+ &.icon-large {
98
+ /* increased font size for icon-large */
99
+ width: 1.25*1.25em;
100
+ }
78
101
  }
79
102
  }
80
103
 
81
104
  ul.icons {
82
105
  list-style-type: none;
83
- margin-left: 2em;
84
- text-indent: -.8em;
106
+ text-indent: -.75em;
85
107
 
86
108
  li {
87
109
  [class^="icon-"],
88
- [class*="icon-"] {
89
- width: .8em;
110
+ [class*=" icon-"] {
111
+ width: .75em;
112
+ }
113
+ }
114
+ }
115
+
116
+ .icon-muted {
117
+ color: @iconMuted;
118
+ }
119
+
120
+ // Icon Borders
121
+ // -------------------------
122
+
123
+ .icon-border {
124
+ border: solid 1px @borderColor;
125
+ padding: .2em .25em .15em;
126
+ .border-radius(3px);
127
+ }
128
+
129
+ // Icon Sizes
130
+ // -------------------------
131
+
132
+ .icon-2x {
133
+ font-size: 2em;
134
+ &.icon-border {
135
+ border-width: 2px;
136
+ .border-radius(4px);
137
+ }
138
+ }
139
+ .icon-3x {
140
+ font-size: 3em;
141
+ &.icon-border {
142
+ border-width: 3px;
143
+ .border-radius(5px);
144
+ }
145
+ }
146
+ .icon-4x {
147
+ font-size: 4em;
148
+ &.icon-border {
149
+ border-width: 4px;
150
+ .border-radius(6px);
151
+ }
152
+ }
153
+
154
+ // Floats
155
+ // -------------------------
156
+
157
+ // Quick floats
158
+ .pull-right { float: right; }
159
+ .pull-left { float: left; }
160
+
161
+ [class^="icon-"],
162
+ [class*=" icon-"] {
163
+ &.pull-left {
164
+ margin-right: .35em;
165
+ }
166
+ &.pull-right {
167
+ margin-left: .35em;
168
+ }
169
+ }
170
+
171
+ .btn {
172
+ [class^="icon-"],
173
+ [class*=" icon-"] {
174
+ &.pull-left, &.pull-right {
175
+ &.icon-2x { margin-top: .35em; }
90
176
  }
91
- .icon-large:before,
92
- .icon-large:before {
93
- /* 1.5 increased font size for icon-large * 1.25 width */
94
- vertical-align: initial;
95
- // width: 1.5*1.25em;
177
+ &.icon-spin.icon-large { height: .75em; }
178
+ }
179
+ }
180
+
181
+ .btn.btn-small {
182
+ [class^="icon-"],
183
+ [class*=" icon-"] {
184
+ &.pull-left, &.pull-right {
185
+ &.icon-2x { margin-top: .45em; }
186
+ }
187
+ }
188
+ }
189
+
190
+ .btn.btn-large {
191
+ [class^="icon-"],
192
+ [class*=" icon-"] {
193
+ &.pull-left, &.pull-right {
194
+ &.icon-2x { margin-top: .2em; }
96
195
  }
97
196
  }
98
197
  }
99
198
 
199
+
200
+ .icon-spin {
201
+ display: inline-block;
202
+ -moz-animation: spin 2s infinite linear;
203
+ -o-animation: spin 2s infinite linear;
204
+ -webkit-animation: spin 2s infinite linear;
205
+ animation: spin 2s infinite linear;
206
+ }
207
+
208
+ @-moz-keyframes spin {
209
+ 0% { -moz-transform: rotate(0deg); }
210
+ 100% { -moz-transform: rotate(359deg); }
211
+ }
212
+ @-webkit-keyframes spin {
213
+ 0% { -webkit-transform: rotate(0deg); }
214
+ 100% { -webkit-transform: rotate(359deg); }
215
+ }
216
+ @-o-keyframes spin {
217
+ 0% { -o-transform: rotate(0deg); }
218
+ 100% { -o-transform: rotate(359deg); }
219
+ }
220
+ @-ms-keyframes spin {
221
+ 0% { -ms-transform: rotate(0deg); }
222
+ 100% { -ms-transform: rotate(359deg); }
223
+ }
224
+ @keyframes spin {
225
+ 0% { transform: rotate(0deg); }
226
+ 100% { transform: rotate(359deg); }
227
+ }
228
+
229
+
100
230
  /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
101
231
  readers do not read off random characters that represent icons */
102
232
  .icon-glass:before { content: "\f000"; }
@@ -323,5 +453,46 @@ ul.icons {
323
453
  .icon-sitemap:before { content: "\f0e8"; }
324
454
  .icon-umbrella:before { content: "\f0e9"; }
325
455
  .icon-paste:before { content: "\f0ea"; }
456
+ .icon-lightbulb:before { content: "\f0eb"; }
457
+ .icon-exchange:before { content: "\f0ec"; }
458
+ .icon-cloud-download:before { content: "\f0ed"; }
459
+ .icon-cloud-upload:before { content: "\f0ee"; }
460
+
461
+ .icon-user-md:before { content: "\f0f0"; }
462
+ .icon-stethoscope:before { content: "\f0f1"; }
463
+ .icon-suitcase:before { content: "\f0f2"; }
464
+ .icon-bell-alt:before { content: "\f0f3"; }
465
+ .icon-coffee:before { content: "\f0f4"; }
466
+ .icon-food:before { content: "\f0f5"; }
467
+ .icon-file-alt:before { content: "\f0f6"; }
468
+ .icon-building:before { content: "\f0f7"; }
469
+ .icon-hospital:before { content: "\f0f8"; }
470
+ .icon-ambulance:before { content: "\f0f9"; }
471
+ .icon-medkit:before { content: "\f0fa"; }
472
+ .icon-fighter-jet:before { content: "\f0fb"; }
473
+ .icon-beer:before { content: "\f0fc"; }
474
+ .icon-h-sign:before { content: "\f0fd"; }
475
+ .icon-plus-sign-alt:before { content: "\f0fe"; }
476
+
477
+ .icon-double-angle-left:before { content: "\f100"; }
478
+ .icon-double-angle-right:before { content: "\f101"; }
479
+ .icon-double-angle-up:before { content: "\f102"; }
480
+ .icon-double-angle-down:before { content: "\f103"; }
481
+ .icon-angle-left:before { content: "\f104"; }
482
+ .icon-angle-right:before { content: "\f105"; }
483
+ .icon-angle-up:before { content: "\f106"; }
484
+ .icon-angle-down:before { content: "\f107"; }
485
+ .icon-desktop:before { content: "\f108"; }
486
+ .icon-laptop:before { content: "\f109"; }
487
+ .icon-tablet:before { content: "\f10a"; }
488
+ .icon-mobile-phone:before { content: "\f10b"; }
489
+ .icon-circle-blank:before { content: "\f10c"; }
490
+ .icon-quote-left:before { content: "\f10d"; }
491
+ .icon-quote-right:before { content: "\f10e"; }
326
492
 
327
- .icon-user-md:before { content: "\f200"; }
493
+ .icon-spinner:before { content: "\f110"; }
494
+ .icon-circle:before { content: "\f111"; }
495
+ .icon-reply:before { content: "\f112"; }
496
+ .icon-github-alt:before { content: "\f113"; }
497
+ .icon-folder-close-alt:before { content: "\f114"; }
498
+ .icon-folder-open-alt:before { content: "\f115"; }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: twitter-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.9
4
+ version: 2.2.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-12-12 00:00:00.000000000 Z
12
+ date: 2013-01-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
16
- requirement: &70187722249920 !ruby/object:Gem::Requirement
16
+ requirement: &70318163472560 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70187722249920
24
+ version_requirements: *70318163472560
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: actionpack
27
- requirement: &70187722246140 !ruby/object:Gem::Requirement
27
+ requirement: &70318163470480 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '3.1'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70187722246140
35
+ version_requirements: *70318163470480
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: execjs
38
- requirement: &70187722259860 !ruby/object:Gem::Requirement
38
+ requirement: &70318163469880 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70187722259860
46
+ version_requirements: *70318163469880
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rails
49
- requirement: &70187722256380 !ruby/object:Gem::Requirement
49
+ requirement: &70318163468940 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '3.1'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70187722256380
57
+ version_requirements: *70318163468940
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: less
60
- requirement: &70187722269380 !ruby/object:Gem::Requirement
60
+ requirement: &70318163468400 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,18 +65,18 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70187722269380
68
+ version_requirements: *70318163468400
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: therubyracer
71
- requirement: &70187722262020 !ruby/object:Gem::Requirement
71
+ requirement: &70318163467820 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - =
75
75
  - !ruby/object:Gem::Version
76
- version: 0.10.2
76
+ version: 0.11.0
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70187722262020
79
+ version_requirements: *70318163467820
80
80
  description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
81
81
  Rails 3.1 Asset Pipeline
82
82
  email:
@@ -150,7 +150,7 @@ files:
150
150
  - vendor/static-source/bootstrap.less
151
151
  - vendor/static-source/fontawesome.less
152
152
  - vendor/static-source/sprites.less
153
- - vendor/toolkit/font-awesome-ie7.less
153
+ - vendor/toolkit/fontawesome-ie7.less
154
154
  - vendor/toolkit/fontawesome.less
155
155
  - vendor/toolkit/twitter/bootstrap/accordion.less
156
156
  - vendor/toolkit/twitter/bootstrap/alerts.less