groundworkcss 0.2.2 → 0.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (58) hide show
  1. data/README.md +11 -33
  2. data/lib/groundworkcss/generators/install_generator.rb +1 -1
  3. data/lib/groundworkcss/version.rb +1 -1
  4. data/vendor/assets/fonts/groundworkcss/FontAwesome.otf +0 -0
  5. data/vendor/assets/fonts/groundworkcss/fontawesome-webfont.eot +0 -0
  6. data/vendor/assets/fonts/groundworkcss/fontawesome-webfont.svg +153 -38
  7. data/vendor/assets/fonts/groundworkcss/fontawesome-webfont.ttf +0 -0
  8. data/vendor/assets/fonts/groundworkcss/fontawesome-webfont.woff +0 -0
  9. data/vendor/assets/stylesheets/groundworkcss/_settings.scss +301 -1
  10. data/vendor/assets/stylesheets/groundworkcss/base/{_all.scss → _all-base.scss} +2 -3
  11. data/vendor/assets/stylesheets/groundworkcss/base/_animations.scss +1 -1
  12. data/vendor/assets/stylesheets/groundworkcss/base/_global.scss +4 -23
  13. data/vendor/assets/stylesheets/groundworkcss/base/_grid.scss +53 -26
  14. data/vendor/assets/stylesheets/groundworkcss/base/_helpers.scss +105 -56
  15. data/vendor/assets/stylesheets/groundworkcss/base/_reset.scss +34 -34
  16. data/vendor/assets/stylesheets/groundworkcss/core/{_all.scss → _all-core.scss} +1 -1
  17. data/vendor/assets/stylesheets/groundworkcss/core/_breakpoints.scss +22 -0
  18. data/vendor/assets/stylesheets/groundworkcss/core/_defaults.scss +196 -93
  19. data/vendor/assets/stylesheets/groundworkcss/core/_mixins.scss +132 -131
  20. data/vendor/assets/stylesheets/groundworkcss/form/_all-form.scss +11 -0
  21. data/vendor/assets/stylesheets/groundworkcss/form/_forms.scss +57 -112
  22. data/vendor/assets/stylesheets/groundworkcss/form/_tiles.scss +9 -11
  23. data/vendor/assets/stylesheets/groundworkcss/groundwork-ie.scss +7 -8
  24. data/vendor/assets/stylesheets/groundworkcss/groundwork.scss +11 -14
  25. data/vendor/assets/stylesheets/groundworkcss/nav/_all-nav.scss +12 -0
  26. data/vendor/assets/stylesheets/groundworkcss/nav/_buttons.scss +22 -15
  27. data/vendor/assets/stylesheets/groundworkcss/nav/_navigation.scss +26 -29
  28. data/vendor/assets/stylesheets/groundworkcss/nav/_tabs.scss +39 -37
  29. data/vendor/assets/stylesheets/groundworkcss/responsive/_all-responsive.scss +14 -0
  30. data/vendor/assets/stylesheets/groundworkcss/responsive/_desktop.scss +5 -3
  31. data/vendor/assets/stylesheets/groundworkcss/responsive/_ipad.scss +5 -3
  32. data/vendor/assets/stylesheets/groundworkcss/responsive/_mobile.scss +6 -4
  33. data/vendor/assets/stylesheets/groundworkcss/responsive/_small-tablet.scss +20 -16
  34. data/vendor/assets/stylesheets/groundworkcss/social-icons-png.scss +295 -0
  35. data/vendor/assets/stylesheets/groundworkcss/{misc/_social-icons.scss → social-icons-svg.scss} +8 -5
  36. data/vendor/assets/stylesheets/groundworkcss/type/{_all.scss → _all-type.scss} +0 -1
  37. data/vendor/assets/stylesheets/groundworkcss/type/_typography.scss +168 -161
  38. data/vendor/assets/stylesheets/groundworkcss/type/_webfonts.scss +1 -1
  39. data/vendor/assets/stylesheets/groundworkcss/ui/_all-ui.scss +14 -0
  40. data/vendor/assets/stylesheets/groundworkcss/ui/_callouts.scss +31 -18
  41. data/vendor/assets/stylesheets/groundworkcss/ui/_messages.scss +31 -18
  42. data/vendor/assets/stylesheets/groundworkcss/ui/_modals.scss +6 -8
  43. data/vendor/assets/stylesheets/groundworkcss/ui/_tables.scss +6 -5
  44. data/vendor/assets/stylesheets/groundworkcss/ui/_tooltips.scss +15 -14
  45. metadata +28 -25
  46. checksums.yaml +0 -7
  47. data/vendor/assets/stylesheets/groundworkcss/_rails-settings.scss +0 -202
  48. data/vendor/assets/stylesheets/groundworkcss/font-awesome-ie7.min.css +0 -22
  49. data/vendor/assets/stylesheets/groundworkcss/form/_all.scss +0 -10
  50. data/vendor/assets/stylesheets/groundworkcss/index.scss +0 -3
  51. data/vendor/assets/stylesheets/groundworkcss/magnific-popup.css +0 -393
  52. data/vendor/assets/stylesheets/groundworkcss/misc/_all.scss +0 -9
  53. data/vendor/assets/stylesheets/groundworkcss/nav/_all.scss +0 -11
  54. data/vendor/assets/stylesheets/groundworkcss/no-svg.scss +0 -355
  55. data/vendor/assets/stylesheets/groundworkcss/placeholder_polyfill.css +0 -32
  56. data/vendor/assets/stylesheets/groundworkcss/responsive/_all.scss +0 -13
  57. data/vendor/assets/stylesheets/groundworkcss/type/_font-awesome.scss +0 -542
  58. data/vendor/assets/stylesheets/groundworkcss/ui/_all.scss +0 -13
@@ -6,259 +6,254 @@
6
6
 
7
7
 
8
8
 
9
- /* vertical rhythm */
9
+ // vertical rhythm
10
10
  @include establish-baseline;
11
11
 
12
12
  %document {
13
- font-family:$font-family;
14
- color:$font-color;
13
+ font-family: $font-family;
14
+ color: $font-color;
15
15
  }
16
16
 
17
17
  @mixin _selection {
18
- background:$selection-color;
19
- color:$selection-text;
20
- text-shadow:none;
18
+ background: $selection-color;
19
+ color: $selection-text;
20
+ text-shadow: none;
21
21
  }
22
22
 
23
23
  %links {
24
- color:$link-color;
24
+ color: $link-color;
25
25
  @include transition(color 0.25s);
26
26
  &:hover, &:focus {
27
- color:$link-active;
28
- text-decoration:underline;
27
+ color: $link-active;
28
+ text-decoration: underline;
29
29
  }
30
30
  }
31
31
 
32
32
  %heading {
33
- margin-bottom:15px;
33
+ margin-bottom: 15px;
34
34
  }
35
35
 
36
36
  %h1 {
37
37
  @extend %heading;
38
- font-weight:200;
38
+ font-weight: 200;
39
39
  @include adjust-font-size-to($base-font-size * 2.3333333333);
40
40
  }
41
41
 
42
42
  %h2 {
43
43
  @extend %heading;
44
- font-weight:200;
44
+ font-weight: 200;
45
45
  @include adjust-font-size-to($base-font-size * 2);
46
46
  }
47
47
 
48
48
  %h3 {
49
49
  @extend %heading;
50
- font-weight:500;
50
+ font-weight: 500;
51
51
  @include adjust-font-size-to($base-font-size * 1.5);
52
52
  }
53
53
 
54
54
  %h4 {
55
55
  @extend %heading;
56
- font-weight:500;
56
+ font-weight: 500;
57
57
  @include adjust-font-size-to($base-font-size * 1.3333333333);
58
58
  }
59
59
 
60
60
  %h5 {
61
61
  @extend %heading;
62
- font-weight:900;
62
+ font-weight: 900;
63
63
  @include adjust-font-size-to($base-font-size * 1.1666666667);
64
64
  }
65
65
 
66
66
  %h6 {
67
67
  @extend %heading;
68
- font-weight:900;
68
+ font-weight: 900;
69
69
  @include adjust-font-size-to($base-font-size * 1.1666666667);
70
- text-transform:uppercase;
70
+ text-transform: uppercase;
71
71
  }
72
72
 
73
73
  %p, %ul, %ol, %dl {
74
- margin-bottom:10px;
75
- font-weight:normal;
74
+ margin-bottom: 10px;
75
+ font-weight: normal;
76
76
  }
77
77
 
78
78
  %list {
79
- margin-left:20px;
79
+ margin-left: 20px;
80
80
  %list-item {
81
- display:list-item;
81
+ display: list-item;
82
82
  }
83
83
  }
84
84
 
85
85
  %dl {
86
86
  %dt {
87
- font-weight:bold;
87
+ font-weight: bold;
88
88
  }
89
89
  %dd {
90
- padding-left:1em;
91
- margin-bottom:$gutter;
90
+ padding-left: 1em;
91
+ margin-bottom: $gutter;
92
92
  }
93
93
  }
94
94
 
95
95
  %unstyled {
96
- list-style:none;
96
+ list-style: none;
97
97
  }
98
98
 
99
99
  %ul-list {
100
100
  @extend %unstyled;
101
- margin-left:0;
101
+ margin-left: 0;
102
102
  %list-item {
103
103
  &:before {
104
- content:'\f00c';
105
- display:inline-block;
106
- width:1.1em;
107
- margin-right:0.25em;
108
- font-family:FontAwesome;
109
- font-weight:normal;
110
- font-style:normal;
111
- @include adjust-font-size-to($base-font-size * 1.1);
112
- text-decoration:inherit;
113
- -webkit-font-smoothing:antialiased;
114
- vertical-align:baseline;
115
- background-image:none;
116
- background-position:0% 0%;
117
- background-repeat:repeat;
118
- margin-top:0;
104
+ content: '\f00c';
105
+ display: inline-block;
106
+ width: 1.1em;
107
+ margin-right: 0.25em;
108
+ @include icon-FontAwesome();
109
+ font-size: 1.2em;
110
+ vertical-align: baseline;
111
+ background-image: none;
112
+ background-position: 0% 0%;
113
+ background-repeat: repeat;
114
+ margin-top: 0;
119
115
  }
120
116
  }
121
117
  }
122
118
 
123
119
  %ol-list {
124
120
  @extend %unstyled;
125
- counter-reset:li;
126
- margin-left:1.5em;
127
- @include adjust-font-size-to($base-font-size);
128
- line-height:1.6;
121
+ counter-reset: li;
122
+ margin-left: 1.5em;
123
+ line-height: 1.6;
129
124
  %list-item {
130
- position:relative;
131
- padding:2px 6px 0;
125
+ position: relative;
126
+ padding: 2px 6px 0;
132
127
  &:before {
133
- content:counter(li);
134
- counter-increment:li;
135
- position:absolute;
136
- top:2px;
137
- left:-2em;
138
- width:2em;
139
- text-align:center;
140
- padding:2px;
141
- font-size:0.8em;
142
- line-height:1.5;
143
- color:$background-color;
144
- background:$font-color;
145
- font-weight:bold;
146
- @include rounded(4px);
128
+ content: counter(li);
129
+ counter-increment: li;
130
+ position: absolute;
131
+ top: 0.1em;
132
+ left: -2em;
133
+ width: 2em;
134
+ text-align: center;
135
+ padding: 0.3em 0.1em 0.1em;
136
+ font-size: 0.8em;
137
+ line-height: 1.5;
138
+ color: $background-color;
139
+ background: $font-color;
140
+ font-weight: bold;
141
+ @include rounded($default-radius);
147
142
  }
148
143
  }
149
144
  }
150
145
 
151
146
  %blockquote {
152
- padding:1.3em 4em 1em;
153
- color:$font-color;
147
+ padding: 1.3em 4em 1em;
148
+ color: $font-color;
154
149
  @include adjust-font-size-to($base-font-size, 1.15);
155
- font-weight:bold;
156
- position:relative;
157
- z-index:0;
158
- background:darken($background-color, 10%);
159
- @include border-radius($radius);
150
+ font-weight: bold;
151
+ position: relative;
152
+ z-index: 0;
153
+ background: darken($background-color, 10%);
154
+ @include border-radius($default-radius);
160
155
  &:before {
161
- content:'\201C';
162
- color:darken($background-color, 20%);
163
- font-size:6em;
164
- display:block;
165
- position:absolute;
166
- top:0.4em;
167
- left:0.1em;
168
- z-index:-1;
156
+ content: '\201C';
157
+ color: darken($background-color, 20%);
158
+ font-size: 6em;
159
+ display: block;
160
+ position: absolute;
161
+ top: 0.4em;
162
+ left: 0.1em;
163
+ z-index: -1;
169
164
  }
170
165
  &:after {
171
- content:'\201D';
172
- color:darken($background-color, 20%);
173
- font-size:6em;
174
- display:block;
175
- position:absolute;
176
- top:0.4em;
177
- right:0.1em;
178
- z-index:-1;
166
+ content: '\201D';
167
+ color: darken($background-color, 20%);
168
+ font-size: 6em;
169
+ display: block;
170
+ position: absolute;
171
+ top: 0.4em;
172
+ right: 0.1em;
173
+ z-index: -1;
179
174
  }
180
175
  }
181
176
 
182
177
  %cite {
183
- display:block;
184
- position:relative;
185
- left:-1em;
186
- margin-top:0.25em;
178
+ display: block;
179
+ position: relative;
180
+ left: -1em;
181
+ margin-top: 0.25em;
187
182
  @include adjust-font-size-to($base-font-size, 0.95);
188
- font-weight:normal;
189
- font-style:normal;
190
- color:lighten($font-color, 15%);
183
+ font-weight: normal;
184
+ font-style: normal;
185
+ color: lighten($font-color, 15%);
191
186
  &:before {
192
- content:'\2014';
187
+ content: '\2014';
193
188
  }
194
189
  }
195
190
 
196
191
  %abbr {
197
- border-bottom:1px dotted;
198
- cursor:help;
192
+ border-bottom: 1px dotted;
193
+ cursor: help;
199
194
  }
200
195
 
201
196
  %small { @extend %small; }
202
197
  %big, %large { @extend %large; }
203
- %em, %italic { font-style:italic; }
204
- %b, %bold, %strong { font-weight:900; }
198
+ %em, %italic { font-style: italic; }
199
+ %b, %bold, %strong { font-weight: 900; }
205
200
  %sup { @extend %small; }
206
201
  %sub { @extend %small; }
207
- %monospace { font-family:monospace; }
202
+ %monospace { font-family: monospace; }
208
203
  %del, %strike { text-decoration: line-through; }
209
204
 
210
205
  @for $i from 1 through length($modifier-name) {
211
206
  %#{nth($modifier-name, $i)} {
212
- color:#{nth($modifier-text, $i)};
207
+ color: #{nth($modifier-text, $i)};
213
208
  }
214
209
  }
215
210
 
216
211
  %code {
217
212
  @extend %monospace;
218
- white-space:pre-wrap;
219
- word-wrap:break-word;
220
- min-height:1em;
221
- display:inline-block;
222
- background:lighten(gray, 30%);
223
- border:none;
224
- padding:0 0.3em;
225
- margin:0 0.2em;
226
- font-weight:normal;
227
- line-height:inherit;
213
+ white-space: pre-wrap;
214
+ word-wrap: break-word;
215
+ min-height: 1em;
216
+ display: inline-block;
217
+ background: lighten(gray, 30%);
218
+ border: none;
219
+ padding: 0 0.3em;
220
+ margin: 0 0.2em;
221
+ font-weight: normal;
222
+ line-height: inherit;
228
223
  }
229
224
 
230
225
  %pre {
231
226
  @extend %monospace;
232
- $border:2.6em;
233
- color:darken(white, 5%);
234
- background:#050505;
227
+ $gutter-column: 2.6em;
228
+ color: darken(white, 5%);
229
+ background: #050505;
235
230
  @include adjust-font-size-to($base-font-size, 1);
236
- padding:0.5em;
237
- display:block;
238
- border-left:#{$border} solid lighten(#050505, 20%);
239
- counter-reset:linenumber;
231
+ padding: 0.5em;
232
+ display: block;
233
+ border-left: #{$gutter-column} solid lighten(#050505, 20%);
234
+ counter-reset: linenumber;
240
235
  %code {
241
- display:block;
242
- background:inherit;
243
- margin:0;
244
- padding:0;
236
+ display: block;
237
+ background: inherit;
238
+ margin: 0;
239
+ padding: 0;
245
240
  &:before {
246
- text-align:right;
247
- color:lighten(gray, 10%);
248
- counter-increment:linenumber;
249
- content:counter(linenumber) ".";
250
- position:absolute;
251
- left:0.65em;
252
- width:#{$border};
241
+ text-align: right;
242
+ color: lighten(gray, 10%);
243
+ counter-increment: linenumber;
244
+ content: counter(linenumber) ".";
245
+ position: absolute;
246
+ left: 0.65em;
247
+ width: #{$gutter-column};
253
248
  }
254
249
  }
255
250
  }
256
251
 
257
- %info { color:$info-color; }
258
- %alert { color:$alert-color; }
259
- %warning { color:$warning-color; }
260
- %error, %invalid { color:$error-color; }
261
- %success, %valid { color:$success-color; }
252
+ %info { color: $info-color; }
253
+ %alert { color: $alert-color; }
254
+ %warning { color: $warning-color; }
255
+ %error, %invalid { color: $error-color; }
256
+ %success, %valid { color: $success-color; }
262
257
 
263
258
  // responsive headings
264
259
  .js {
@@ -268,7 +263,7 @@
268
263
  }
269
264
  }
270
265
 
271
- @if $tags {
266
+ @if $type-tags {
272
267
  body {
273
268
  @extend %document;
274
269
  }
@@ -300,27 +295,14 @@
300
295
  abbr[data-title], dfn[data-title] {
301
296
  @extend %abbr;
302
297
  }
303
- $elements: h1 h2 h3 h4 h5 h6 p ul ol dl blockquote cite small big em b strong sup sub del strike code pre;
304
- @for $i from 1 through length($elements) {
305
- @if not index($tag-elements, nth($elements, $i)) == false {
306
- #{nth($elements, $i)} {
307
- @extend %#{nth($elements, $i)};
308
- }
298
+ @for $i from 1 through length($type-elements) {
299
+ #{nth($type-elements, $i)} {
300
+ @extend %#{nth($type-elements, $i)};
309
301
  }
310
302
  }
311
303
  }
312
- @if $classes {
313
- $names: h1 h2 h3 h4 h5 h6 p blockquote cite small big large em italic b bold strong sup sub del strike code pre info alert warning error invalid success valid unstyled;
314
- @for $i from 1 through length($names) {
315
- .#{nth($names, $i)} {
316
- @extend %#{nth($names, $i)};
317
- }
318
- }
319
- @for $i from 1 through length($modifier-name) {
320
- .#{nth($modifier-name, $i)} {
321
- color:#{nth($modifier-code, $i)};
322
- }
323
- }
304
+
305
+ @if $styled-lists {
324
306
  ul, ol {
325
307
  &.unstyled {
326
308
  @extend %unstyled;
@@ -335,26 +317,51 @@
335
317
  ol.list {
336
318
  @extend %ol-list;
337
319
 
338
- @for $i from 1 through length($modifier-name) {
339
- &.#{nth($modifier-name, $i)} {
340
- li {
341
- &:before {
342
- background:#{nth($modifier-code, $i)};
320
+ @if $type-colors {
321
+ @for $i from 1 through length($modifier-name) {
322
+ &.#{nth($modifier-name, $i)} {
323
+ li {
324
+ &:before {
325
+ background: #{nth($modifier-code, $i)};
326
+ }
343
327
  }
344
328
  }
345
329
  }
346
- }
347
- li {
348
- @for $i from 1 through length($modifier-name) {
349
- &.#{nth($modifier-name, $i)} {
350
- &:before {
351
- background:#{nth($modifier-code, $i)};
330
+ li {
331
+ @for $i from 1 through length($modifier-name) {
332
+ &.#{nth($modifier-name, $i)} {
333
+ &:before {
334
+ background: #{nth($modifier-code, $i)};
335
+ }
352
336
  }
353
337
  }
354
338
  }
355
339
  }
340
+
356
341
  > li {
357
342
  @extend %list-item;
358
343
  }
359
344
  }
360
345
  }
346
+
347
+ @if $type-colors {
348
+ @for $i from 1 through length($modifier-name) {
349
+ .#{nth($modifier-name, $i)} {
350
+ color: #{nth($modifier-code, $i)};
351
+ }
352
+ }
353
+ }
354
+
355
+ @for $i from 1 through length($ui-states) {
356
+ .#{nth($ui-states, $i)} {
357
+ @extend %#{nth($ui-states, $i)};
358
+ }
359
+ }
360
+
361
+ @if $type-classes {
362
+ @for $i from 1 through length($type-classnames) {
363
+ .#{nth($type-classnames, $i)} {
364
+ @extend %#{nth($type-classnames, $i)};
365
+ }
366
+ }
367
+ }
@@ -20,7 +20,7 @@
20
20
  %#{nth($web-font-names, $i)} {
21
21
  @include font-stack(#{nth($web-font-names, $i)});
22
22
  }
23
- @if $classes {
23
+ @if $webfont-classes {
24
24
  .#{nth($web-font-names, $i)} {
25
25
  @extend %#{nth($web-font-names, $i)};
26
26
  }
@@ -0,0 +1,14 @@
1
+ // =============================================
2
+ // UI Elements
3
+ // Last Updated:2013-6-25
4
+ // =============================================
5
+
6
+
7
+
8
+
9
+ // ui elements
10
+ @import "messages";
11
+ @import "callouts";
12
+ @import "tables";
13
+ @import "tooltips";
14
+ @import "modals";
@@ -13,8 +13,8 @@
13
13
  background:$button-color;
14
14
  border:1px solid $button-active;
15
15
  color:$button-text;
16
- margin-bottom:15px;
17
- @include rounded($radius);
16
+ margin-bottom: $gutter;
17
+ @include rounded($default-radius);
18
18
  // content overrides
19
19
  h1, h2, h3, h4, h5, h6, p {
20
20
  color:inherit;
@@ -78,15 +78,14 @@
78
78
  %callout-dismissible {
79
79
  padding-right:3em;
80
80
  &:after {
81
- content:'X';
82
- display:block;
83
- padding:0.5em 0;
84
- font-size:0.8em;
85
- text-align:center;
86
- position:absolute;
87
- top:0;
88
- right:1em;
89
- line-height:1.5;
81
+ @include icon-FontAwesome();
82
+ content: "\f00d";
83
+ position: absolute;
84
+ top: 0;
85
+ right: 0;
86
+ padding: 0.2em 0.3em;
87
+ font-size: 1.2em;
88
+ cursor: pointer;
90
89
  }
91
90
  }
92
91
 
@@ -99,10 +98,24 @@
99
98
  }
100
99
 
101
100
  @mixin callout_modifiers() {
102
- $modifiers: small large info alert warning error success square round disabled;
103
- @for $i from 1 through length($modifiers) {
104
- &.#{nth($modifiers, $i)} {
105
- @extend %callout-#{nth($modifiers, $i)};
101
+ @for $i from 1 through length($ui-modifiers) {
102
+ &.#{nth($ui-modifiers, $i)} {
103
+ @extend %callout-#{nth($ui-modifiers, $i)};
104
+ }
105
+ }
106
+ @for $i from 1 through length($ui-states) {
107
+ &.#{nth($ui-states, $i)} {
108
+ @extend %callout-#{nth($ui-states, $i)};
109
+ }
110
+ }
111
+ @for $i from 1 through length($radius-helpers) {
112
+ &.#{nth($radius-helpers, $i)} {
113
+ @extend %callout-#{nth($radius-helpers, $i)};
114
+ }
115
+ }
116
+ @for $i from 1 through length($size-helpers) {
117
+ &.#{nth($size-helpers, $i)} {
118
+ @extend %callout-#{nth($size-helpers, $i)};
106
119
  }
107
120
  }
108
121
  @for $i from 1 through length($modifier-name) {
@@ -112,18 +125,18 @@
112
125
  }
113
126
  }
114
127
 
115
- @if $classes {
128
+ @if $ui-classes {
116
129
  .callout {
117
130
  @extend %callout;
118
131
  @include callout_modifiers;
119
132
  }
120
133
  }
121
134
 
122
- @if $aria {
135
+ @if $aria-selectors {
123
136
  [role~=status] {
124
137
  @extend %callout;
125
138
 
126
- @if $classes {
139
+ @if $ui-classes {
127
140
  @include callout_modifiers;
128
141
  }
129
142
  }
@@ -15,7 +15,7 @@
15
15
  color:$button-text;
16
16
  font-weight:bold;
17
17
  text-decoration:none;
18
- @include rounded($radius);
18
+ @include rounded($default-radius);
19
19
  }
20
20
 
21
21
  %message-small { @include _small; }
@@ -70,17 +70,16 @@
70
70
  }
71
71
 
72
72
  %message-dismissible {
73
- padding-right:3em;
73
+ padding-right: 2em;
74
74
  &:after {
75
- content:'X';
76
- display:block;
77
- padding:0.5em 0;
78
- font-size:0.8em;
79
- text-align:center;
80
- position:absolute;
81
- top:0;
82
- right:1em;
83
- line-height:1.5;
75
+ @include icon-FontAwesome();
76
+ content: "\f00d";
77
+ position: absolute;
78
+ top: 0;
79
+ right: 0;
80
+ padding: 0.2em 0.3em;
81
+ font-size: 1.2em;
82
+ cursor: pointer;
84
83
  }
85
84
  }
86
85
 
@@ -93,10 +92,24 @@
93
92
  }
94
93
 
95
94
  @mixin message-modifiers() {
96
- $modifiers: small large info alert warning error success square round disabled dismissible;
97
- @for $i from 1 through length($modifiers) {
98
- &.#{nth($modifiers, $i)} {
99
- @extend %message-#{nth($modifiers, $i)};
95
+ @for $i from 1 through length($ui-modifiers) {
96
+ &.#{nth($ui-modifiers, $i)} {
97
+ @extend %message-#{nth($ui-modifiers, $i)};
98
+ }
99
+ }
100
+ @for $i from 1 through length($ui-states) {
101
+ &.#{nth($ui-states, $i)} {
102
+ @extend %message-#{nth($ui-states, $i)};
103
+ }
104
+ }
105
+ @for $i from 1 through length($radius-helpers) {
106
+ &.#{nth($radius-helpers, $i)} {
107
+ @extend %message-#{nth($radius-helpers, $i)};
108
+ }
109
+ }
110
+ @for $i from 1 through length($size-helpers) {
111
+ &.#{nth($size-helpers, $i)} {
112
+ @extend %message-#{nth($size-helpers, $i)};
100
113
  }
101
114
  }
102
115
  @for $i from 1 through length($modifier-name) {
@@ -106,18 +119,18 @@
106
119
  }
107
120
  }
108
121
 
109
- @if $classes {
122
+ @if $ui-classes {
110
123
  .message {
111
124
  @extend %message;
112
125
  @include message-modifiers;
113
126
  }
114
127
  }
115
128
 
116
- @if $aria {
129
+ @if $aria-selectors {
117
130
  [role~=alert] {
118
131
  @extend %message;
119
132
 
120
- @if $classes {
133
+ @if $ui-classes {
121
134
  @include message-modifiers;
122
135
  }
123
136
  }