facades 1.0.0 → 1.0.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.
Files changed (24) hide show
  1. data/README.md +70 -73
  2. data/app/controllers/facades_controller.rb +4 -0
  3. data/app/views/facades/style_guide.html.erb +300 -0
  4. data/lib/facades/helpers/frontend.rb +55 -0
  5. data/lib/facades/helpers/navigation.rb +11 -4
  6. data/lib/facades/helpers/notifications.rb +1 -1
  7. data/lib/facades/helpers.rb +2 -0
  8. data/lib/facades/support/rails.rb +3 -0
  9. data/lib/facades/version.rb +1 -1
  10. data/lib/facades.rb +11 -3
  11. data/spec/internal/log/test.log +188 -0
  12. data/spec/unit/helpers/navigation_spec.rb +16 -2
  13. data/src/scss/facades/_config.scss +48 -37
  14. data/src/scss/facades/_debug.scss +1 -1
  15. data/src/scss/facades/_forms.scss +19 -3
  16. data/src/scss/facades/_global.scss +46 -46
  17. data/src/scss/facades/_icons.scss +39 -39
  18. data/src/scss/facades/_mixins.scss +10 -0
  19. data/src/scss/facades/_typography.scss +85 -142
  20. data/src/scss/facades/debug/_susy.scss +20 -0
  21. data/src/scss/facades/icons/_classes.scss +30 -30
  22. data/src/scss/facades/typography/_code.scss +27 -0
  23. data/src/scss/facades/typography/_extra.scss +34 -0
  24. metadata +10 -4
data/lib/facades.rb CHANGED
@@ -6,16 +6,24 @@ module Facades
6
6
  autoload :Helpers, 'facades/helpers'
7
7
  autoload :Patterns, 'facades/patterns'
8
8
 
9
+ def app_path
10
+ File.expand_path("../../app", __FILE__)
11
+ end
12
+
13
+ def view_path
14
+ File.join(File.expand_path("../../app", __FILE__), 'views')
15
+ end
16
+
9
17
  def scss_path
10
- File.expand_path("../../src", __FILE__) << "/scss"
18
+ File.join(File.expand_path("../../src", __FILE__), 'scss')
11
19
  end
12
20
 
13
21
  def image_path
14
- File.expand_path("../../src", __FILE__) << "/images"
22
+ File.join(File.expand_path("../../src", __FILE__), 'images')
15
23
  end
16
24
 
17
25
  def icon_path
18
- File.expand_path("../../src", __FILE__) << "/icons"
26
+ File.join(File.expand_path("../../src", __FILE__), 'icons')
19
27
  end
20
28
 
21
29
  end
data/spec/internal/log/test.log CHANGED
@@ -0,0 +1,188 @@
1
+ Rendered navigation/_single_list.html.erb (4.2ms)
2
+ Rendered navigation/_single_list.html.erb (0.5ms)
3
+ Rendered navigation/_single_list.html.erb (0.5ms)
4
+ Rendered navigation/_single_list.html.erb (0.4ms)
5
+ Rendered navigation/_multi_list.html.erb (1.2ms)
6
+ Rendered navigation/_multi_list.html.erb (0.7ms)
7
+ Rendered navigation/_multi_list.html.erb (0.7ms)
8
+ Rendered navigation/_multi_option_list.html.erb (1.2ms)
9
+ Rendered navigation/_multi_option_list.html.erb (0.7ms)
10
+ Rendered navigation/_single_list.html.erb (0.5ms)
11
+ Rendered navigation/_single_list.html.erb (2.7ms)
12
+ Rendered navigation/_single_list.html.erb (0.5ms)
13
+ Rendered navigation/_single_list.html.erb (0.4ms)
14
+ Rendered navigation/_single_list.html.erb (0.6ms)
15
+ Rendered navigation/_multi_list.html.erb (1.1ms)
16
+ Rendered navigation/_multi_list.html.erb (0.7ms)
17
+ Rendered navigation/_multi_list.html.erb (0.7ms)
18
+ Rendered navigation/_multi_option_list.html.erb (1.7ms)
19
+ Rendered navigation/_multi_option_list.html.erb (0.6ms)
20
+ Rendered navigation/_single_list.html.erb (0.5ms)
21
+ Rendered navigation/_single_list.html.erb (0.5ms)
22
+ Rendered navigation/_single_list.html.erb (0.5ms)
23
+ Rendered navigation/_single_list.html.erb (43.3ms)
24
+ Rendered navigation/_single_list.html.erb (4.6ms)
25
+ Rendered navigation/_single_list.html.erb (0.5ms)
26
+ Rendered navigation/_single_list.html.erb (0.4ms)
27
+ Rendered navigation/_single_list.html.erb (0.4ms)
28
+ Rendered navigation/_multi_list.html.erb (1.2ms)
29
+ Rendered navigation/_multi_list.html.erb (0.7ms)
30
+ Rendered navigation/_multi_list.html.erb (0.6ms)
31
+ Rendered navigation/_multi_option_list.html.erb (1.3ms)
32
+ Rendered navigation/_multi_option_list.html.erb (0.6ms)
33
+ Rendered navigation/_single_list.html.erb (0.5ms)
34
+ Rendered navigation/_single_list.html.erb (0.5ms)
35
+ Rendered navigation/_single_list.html.erb (0.5ms)
36
+ Rendered navigation/_single_list.html.erb (0.4ms)
37
+ Rendered navigation/_single_list.html.erb (2.8ms)
38
+ Rendered navigation/_single_list.html.erb (0.4ms)
39
+ Rendered navigation/_single_list.html.erb (0.4ms)
40
+ Rendered navigation/_single_list.html.erb (0.8ms)
41
+ Rendered navigation/_multi_list.html.erb (1.3ms)
42
+ Rendered navigation/_multi_list.html.erb (0.7ms)
43
+ Rendered navigation/_multi_list.html.erb (0.6ms)
44
+ Rendered navigation/_multi_option_list.html.erb (1.3ms)
45
+ Rendered navigation/_multi_option_list.html.erb (0.6ms)
46
+ Rendered navigation/_single_list.html.erb (1.0ms)
47
+ Rendered navigation/_single_list.html.erb (0.5ms)
48
+ Rendered navigation/_single_list.html.erb (0.5ms)
49
+ Rendered navigation/_single_list.html.erb (0.4ms)
50
+ Rendered navigation/_single_list.html.erb (0.6ms)
51
+ Rendered navigation/_single_list.html.erb (0.5ms)
52
+ Rendered navigation/_single_list.html.erb (0.5ms)
53
+ Rendered navigation/_single_list.html.erb (0.4ms)
54
+ Rendered navigation/_single_list.html.erb (0.5ms)
55
+ Rendered navigation/_single_list.html.erb (0.4ms)
56
+ Rendered navigation/_single_list.html.erb (0.5ms)
57
+ Rendered navigation/_single_list.html.erb (0.2ms)
58
+ Rendered navigation/_single_list.html.erb (0.5ms)
59
+ Rendered navigation/_single_list.html.erb (0.3ms)
60
+ Rendered navigation/_single_list.html.erb (0.5ms)
61
+ Rendered navigation/_single_list.html.erb (0.5ms)
62
+ Rendered navigation/_single_list.html.erb (0.4ms)
63
+ Rendered navigation/_single_list.html.erb (0.5ms)
64
+ Rendered navigation/_single_list.html.erb (0.4ms)
65
+ Rendered navigation/_single_list.html.erb (0.5ms)
66
+ Rendered navigation/_single_list.html.erb (0.4ms)
67
+ Rendered navigation/_single_list.html.erb (4.0ms)
68
+ Rendered navigation/_single_list.html.erb (0.4ms)
69
+ Rendered navigation/_single_list.html.erb (0.4ms)
70
+ Rendered navigation/_single_list.html.erb (0.5ms)
71
+ Rendered navigation/_multi_list.html.erb (1.1ms)
72
+ Rendered navigation/_multi_list.html.erb (0.7ms)
73
+ Rendered navigation/_multi_list.html.erb (0.8ms)
74
+ Rendered navigation/_multi_option_list.html.erb (1.1ms)
75
+ Rendered navigation/_multi_option_list.html.erb (0.6ms)
76
+ Rendered navigation/_single_list.html.erb (0.5ms)
77
+ Rendered navigation/_single_list.html.erb (0.5ms)
78
+ Rendered navigation/_single_list.html.erb (0.5ms)
79
+ Rendered navigation/_single_list.html.erb (0.4ms)
80
+ Rendered navigation/_single_list.html.erb (0.5ms)
81
+ Rendered navigation/_single_list.html.erb (0.9ms)
82
+ Rendered navigation/_single_list.html.erb (4.9ms)
83
+ Rendered navigation/_single_list.html.erb (0.5ms)
84
+ Rendered navigation/_single_list.html.erb (0.5ms)
85
+ Rendered navigation/_single_list.html.erb (0.3ms)
86
+ Rendered navigation/_single_list.html.erb (0.5ms)
87
+ Rendered navigation/_single_list.html.erb (0.3ms)
88
+ Rendered navigation/_single_list.html.erb (0.5ms)
89
+ Rendered navigation/_single_list.html.erb (0.3ms)
90
+ Rendered navigation/_single_list.html.erb (0.5ms)
91
+ Rendered navigation/_single_list.html.erb (0.5ms)
92
+ Rendered navigation/_single_list.html.erb (0.4ms)
93
+ Rendered navigation/_single_list.html.erb (0.5ms)
94
+ Rendered navigation/_single_list.html.erb (0.4ms)
95
+ Rendered navigation/_single_list.html.erb (0.5ms)
96
+ Rendered navigation/_single_list.html.erb (0.4ms)
97
+ Rendered navigation/_single_list.html.erb (2.7ms)
98
+ Rendered navigation/_single_list.html.erb (0.5ms)
99
+ Rendered navigation/_single_list.html.erb (0.4ms)
100
+ Rendered navigation/_single_list.html.erb (0.4ms)
101
+ Rendered navigation/_multi_list.html.erb (1.4ms)
102
+ Rendered navigation/_multi_list.html.erb (0.7ms)
103
+ Rendered navigation/_multi_list.html.erb (0.7ms)
104
+ Rendered navigation/_multi_option_list.html.erb (1.2ms)
105
+ Rendered navigation/_multi_option_list.html.erb (0.7ms)
106
+ Rendered navigation/_single_list.html.erb (0.5ms)
107
+ Rendered navigation/_single_list.html.erb (0.5ms)
108
+ Rendered navigation/_single_list.html.erb (0.5ms)
109
+ Rendered navigation/_single_list.html.erb (0.5ms)
110
+ Rendered navigation/_single_list.html.erb (0.5ms)
111
+ Rendered navigation/_single_list.html.erb (0.5ms)
112
+ Rendered navigation/_single_list.html.erb (0.8ms)
113
+ Rendered navigation/_single_list.html.erb (0.5ms)
114
+ Rendered navigation/_single_list.html.erb (0.4ms)
115
+ Rendered navigation/_single_list.html.erb (0.5ms)
116
+ Rendered navigation/_single_list.html.erb (0.3ms)
117
+ Rendered navigation/_single_list.html.erb (0.6ms)
118
+ Rendered navigation/_single_list.html.erb (0.3ms)
119
+ Rendered navigation/_single_list.html.erb (1.2ms)
120
+ Rendered navigation/_single_list.html.erb (0.3ms)
121
+ Rendered navigation/_single_list.html.erb (0.5ms)
122
+ Rendered navigation/_single_list.html.erb (0.6ms)
123
+ Rendered navigation/_single_list.html.erb (0.4ms)
124
+ Rendered navigation/_single_list.html.erb (0.5ms)
125
+ Rendered navigation/_single_list.html.erb (0.7ms)
126
+ Rendered navigation/_single_list.html.erb (0.5ms)
127
+ Rendered navigation/_single_list.html.erb (0.4ms)
128
+ Rendered navigation/_single_list.html.erb (2.9ms)
129
+ Rendered navigation/_single_list.html.erb (0.4ms)
130
+ Rendered navigation/_single_list.html.erb (0.5ms)
131
+ Rendered navigation/_single_list.html.erb (0.4ms)
132
+ Rendered navigation/_multi_list.html.erb (1.1ms)
133
+ Rendered navigation/_multi_list.html.erb (0.7ms)
134
+ Rendered navigation/_multi_list.html.erb (0.6ms)
135
+ Rendered navigation/_multi_option_list.html.erb (1.2ms)
136
+ Rendered navigation/_multi_option_list.html.erb (0.6ms)
137
+ Rendered navigation/_single_list.html.erb (0.5ms)
138
+ Rendered navigation/_single_list.html.erb (0.5ms)
139
+ Rendered navigation/_single_list.html.erb (0.5ms)
140
+ Rendered navigation/_single_list.html.erb (0.4ms)
141
+ Rendered navigation/_single_list.html.erb (0.4ms)
142
+ Rendered navigation/_single_list.html.erb (1.7ms)
143
+ Rendered navigation/_single_list.html.erb (0.5ms)
144
+ Rendered navigation/_single_list.html.erb (0.5ms)
145
+ Rendered navigation/_single_list.html.erb (0.5ms)
146
+ Rendered navigation/_single_list.html.erb (0.5ms)
147
+ Rendered navigation/_single_list.html.erb (0.3ms)
148
+ Rendered navigation/_single_list.html.erb (0.5ms)
149
+ Rendered navigation/_single_list.html.erb (0.2ms)
150
+ Rendered navigation/_single_list.html.erb (0.5ms)
151
+ Rendered navigation/_single_list.html.erb (0.4ms)
152
+ Rendered navigation/_single_list.html.erb (0.5ms)
153
+ Rendered navigation/_single_list.html.erb (0.5ms)
154
+ Rendered navigation/_single_list.html.erb (0.4ms)
155
+ Rendered navigation/_single_list.html.erb (0.5ms)
156
+ Rendered navigation/_single_list.html.erb (0.4ms)
157
+ Rendered navigation/_single_list.html.erb (0.5ms)
158
+ Rendered navigation/_single_list.html.erb (0.4ms)
159
+ Rendered navigation/_single_list.html.erb (2.9ms)
160
+ Rendered navigation/_single_list.html.erb (0.4ms)
161
+ Rendered navigation/_single_list.html.erb (0.5ms)
162
+ Rendered navigation/_single_list.html.erb (0.5ms)
163
+ Rendered navigation/_multi_list.html.erb (1.4ms)
164
+ Rendered navigation/_multi_list.html.erb (0.7ms)
165
+ Rendered navigation/_multi_list.html.erb (0.7ms)
166
+ Rendered navigation/_multi_option_list.html.erb (1.1ms)
167
+ Rendered navigation/_multi_option_list.html.erb (0.6ms)
168
+ Rendered navigation/_single_list.html.erb (0.5ms)
169
+ Rendered navigation/_single_list.html.erb (0.6ms)
170
+ Rendered navigation/_single_list.html.erb (0.5ms)
171
+ Rendered navigation/_single_list.html.erb (0.4ms)
172
+ Rendered navigation/_single_list.html.erb (0.5ms)
173
+ Rendered navigation/_single_list.html.erb (0.5ms)
174
+ Rendered navigation/_single_list.html.erb (0.5ms)
175
+ Rendered navigation/_single_list.html.erb (0.4ms)
176
+ Rendered navigation/_single_list.html.erb (0.5ms)
177
+ Rendered navigation/_single_list.html.erb (0.5ms)
178
+ Rendered navigation/_single_list.html.erb (0.5ms)
179
+ Rendered navigation/_single_list.html.erb (0.2ms)
180
+ Rendered navigation/_single_list.html.erb (0.5ms)
181
+ Rendered navigation/_single_list.html.erb (0.3ms)
182
+ Rendered navigation/_single_list.html.erb (0.5ms)
183
+ Rendered navigation/_single_list.html.erb (0.5ms)
184
+ Rendered navigation/_single_list.html.erb (0.4ms)
185
+ Rendered navigation/_single_list.html.erb (0.5ms)
186
+ Rendered navigation/_single_list.html.erb (0.4ms)
187
+ Rendered navigation/_single_list.html.erb (0.5ms)
188
+ Rendered navigation/_single_list.html.erb (0.4ms)
data/spec/unit/helpers/navigation_spec.rb CHANGED
@@ -132,9 +132,23 @@ describe 'Navigation helpers', :type => :view do
132
132
  it 'adds any options passed to the wrapping list' do
133
133
  rendered.should have_xpath('//ul', :id => 'main_nav_list')
134
134
  end
135
-
136
- end # options
135
+ end
137
136
 
137
+ context 'when setting :wrapper to false' do
138
+
139
+ before do
140
+ assign(:options, {
141
+ :wrapper => false
142
+ })
143
+ render('navigation/single_list')
144
+ end
145
+
146
+ it 'does not render the wrapping nav tag' do
147
+ rendered.should_not(
148
+ have_selector('nav')
149
+ )
150
+ end
151
+ end
138
152
  end
139
153
 
140
154
  describe 'links matching request.path' do
data/src/scss/facades/_config.scss CHANGED
@@ -1,4 +1,4 @@
1
- //
1
+ // ----------------------------------------------------------------------------------------
2
2
  // Global configuration variables
3
3
  // ----------------------------------------------------------------------------------------
4
4
 
@@ -6,19 +6,19 @@
6
6
  // checks against adding duplicate css based on this value
7
7
  $facades-global-import-used: false !default;
8
8
 
9
- $font-color: #222 !default;
10
- $font-size: 13px !default;
11
- $line-height: 20px !default;
9
+ $font-color: #222 !default;
10
+ $font-size: 13px !default;
11
+ $line-height: 20px !default;
12
12
 
13
- $font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
13
+ $font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
14
14
  $fixed-font-family: "Monaco", 'Courier New', monospace !default;
15
15
  $serif-font-family: "Georgia", "Times", "Times New Roman", serif !default;
16
16
 
17
17
  // font sizes for headings, h1 through h4
18
18
  $heading-font-sizes: 30px 24px 18px 14px !default;
19
19
 
20
- $selection-background-color: #fe57a1 !default; // hot pink selection action!
21
- $selection-color: #fff !default;
20
+ $selection-background-color: #fe57a1 !default; // hot pink selection action!
21
+ $selection-color: #fff !default;
22
22
 
23
23
  // set to false to disable misc transition properties.
24
24
  // for when you need to sacrifice beauty for file size
@@ -27,12 +27,21 @@ $enable-transitions: true !default;
27
27
  $transition-property: all !default;
28
28
  $transition-duration: .2s !default;
29
29
 
30
- /*
30
+ $include-headline-styles: true !default;
31
+
32
+ //---------------------------------------------------
33
+ // Compass overrides
34
+ //---------------------------------------------------
35
+
36
+ $support-for-original-webkit-gradients: false;
37
+
38
+ // ----------------------------------------------------------------------------------------
31
39
  // Icon Packs
32
- // --------------------------
33
- Available packs include
34
- - Facades
35
- - FontAwesome
40
+ // ----------------------------------------------------------------------------------------
41
+ /*
42
+ Available packs include
43
+ - Facades
44
+ - FontAwesome
36
45
  */
37
46
  $icon-pack:'facades' !default;
38
47
  $icon-font-family:icon-font($icon-pack) !default;
@@ -41,9 +50,9 @@ $link-color: #00e !default;
41
50
  $link-visited-color: darken($link-color, 5%) !default;
42
51
  $link-hover-color: lighten($link-color, 5%) !default;
43
52
 
44
- //
53
+ // ----------------------------------------------------------------------------------------
45
54
  // General colors
46
- // --------------------------
55
+ // ----------------------------------------------------------------------------------------
47
56
 
48
57
  $horizontal-rule-color: #e5e5e5 !default;
49
58
 
@@ -51,49 +60,51 @@ $table-border-color: #ddd !default;
51
60
  $table-stripe-color: #f5f5f5 !default;
52
61
 
53
62
 
54
- //
63
+ // ----------------------------------------------------------------------------------------
55
64
  // Notification colors
56
- // --------------------------
65
+ // ----------------------------------------------------------------------------------------
57
66
 
58
- $notice-color: #339BB9 !default;
67
+ $notice-color: #339BB9 !default;
59
68
  $success-color: #57A957 !default;
60
- $error-color: #C43C35 !default;
69
+ $error-color: #C43C35 !default;
61
70
  $warning-color: #EED74F !default;
62
71
 
63
- //
72
+ // ----------------------------------------------------------------------------------------
64
73
  // Forms and inputs
65
- // --------------------------
66
-
67
- $input-border-color: #ccc !default;
68
- $input-focus-color: $font-color !default;
69
- $input-focus-border-color: $notice-color !default;
70
- $input-error-color: $error-color !default;
71
- $input-error-border-color: $error-color !default;
72
- $input-border-radius: 3px !default;
73
- $input-disabled-color: #ccc;
74
+ // ----------------------------------------------------------------------------------------
75
+
76
+ $enable-input-transitions: $enable-transitions !default;
77
+ $input-height: 1.7em !default;
78
+ $input-border-color: #ccc !default;
79
+ $input-focus-color: $font-color !default;
80
+ $input-focus-border-color: $notice-color !default;
81
+ $input-error-color: $error-color !default;
82
+ $input-error-border-color: $error-color !default;
83
+ $input-border-radius: 3px !default;
84
+ $input-disabled-color: #ccc;
74
85
  $input-disabled-border-color: #ddd;
75
86
 
76
- $input-box-shadow: #efefef 3px 3px 6px 0px inset !default;
77
- $input-focus-box-shadow: rgba($input-focus-border-color, .6) 0 0 5px 0 !default;
87
+ $input-box-shadow: #efefef 3px 3px 6px 0px inset !default;
88
+ $input-focus-box-shadow: rgba($input-focus-border-color, .6) 0 0 5px 0 !default;
78
89
 
79
90
  $field-hint-color: #aaa;
80
91
 
81
- //
92
+ // ----------------------------------------------------------------------------------------
82
93
  // UI elements
83
- // --------------------------
94
+ // ----------------------------------------------------------------------------------------
84
95
 
85
96
  $button-border-radius: 3px !default;
86
- $button-font-size: $font-size * 0.95 !default;
87
- $tooltip-color: rgba(0,0,0,.8) !default;
97
+ $button-font-size: $font-size * 0.95 !default;
98
+ $tooltip-color: rgba(0,0,0,.8) !default;
88
99
 
89
100
  $tab-border-color: #ccc !default;
90
101
  $tab-accent-color: $notice-color !default; // the border color used on active tabs
91
- $pill-color: $notice-color !default; // color of active pills
102
+ $pill-color: $notice-color !default; // color of active pills
92
103
  $pill-border-radius: 20px !default; // border radius of pill items
93
104
 
94
- //
105
+ // ----------------------------------------------------------------------------------------
95
106
  // Special colors
96
- //
107
+ // ----------------------------------------------------------------------------------------
97
108
 
98
109
  $facebook-blue:#39589d;
99
110
  $twitter-blue:#00abf5;
data/src/scss/facades/_debug.scss CHANGED
@@ -1,6 +1,6 @@
1
1
  @import 'compass/layout/grid-background';
2
2
 
3
- $grid-background-baseline-color: #efefef;
3
+ $grid-background-baseline-color: #efefef !default;
4
4
  $grid-align: ($line-height / $font-size) * 1em;
5
5
 
6
6
  @mixin debug-baseline{
data/src/scss/facades/_forms.scss CHANGED
@@ -1,6 +1,11 @@
1
1
  @import 'facades/config';
2
2
  @import 'facades/mixins';
3
3
 
4
+ $input-padding:rhythm(.15) .25em !default;
5
+ $input-focus-padding:false !default;
6
+ $input-disabled-padding:false !default;
7
+ $input-error-padding:false !default;
8
+
4
9
  /*
5
10
  General form styles. By default this creates a 'stacked' forms
6
11
  where the label placement is above each field.
@@ -96,13 +101,16 @@
96
101
  border-width:1px;
97
102
  border-color:$input-border-color;
98
103
  outline:none;
99
- @if $enable-transitions == true{
104
+ @if $enable-input-transitions == true{
100
105
  @include transition-property(all);
101
106
  @include transition-duration($transition-duration);
102
107
  }
103
108
 
104
109
  &:focus{
105
110
  border-color:$input-focus-border-color;
111
+ @if $input-focus-padding != false{
112
+ padding:$input-focus-padding;
113
+ }
106
114
  @if $input-box-shadow != false and $input-box-shadow != none{
107
115
  @include box-shadow($input-focus-box-shadow);
108
116
  }
@@ -121,9 +129,13 @@
121
129
  #{input-types(text)}, textarea{
122
130
  @include optional-border-radius($input-border-radius);
123
131
  margin:border-rhythm(1px, .35) 0;
124
- padding:rhythm(.15) .25em;
132
+ @if $input-padding != false{
133
+ padding:$input-padding;
134
+ }
125
135
  line-height:normal !important;
126
- height:1.7em;
136
+ @if $input-height != false{
137
+ height:$input-height;
138
+ }
127
139
  }
128
140
 
129
141
  input[type=file]{
@@ -185,6 +197,9 @@
185
197
  @if $input-box-shadow != false and $input-box-shadow != none{
186
198
  @include box-shadow(none);
187
199
  }
200
+ @if $input-disabled-padding != false{
201
+ padding:$input-disabled-padding;
202
+ }
188
203
  }
189
204
 
190
205
 
@@ -215,6 +230,7 @@
215
230
  @include box-shadow(rgba($input-error-color, .15) 3px 3px 6px 0 inset);
216
231
  }
217
232
  border-color: $input-error-border-color;
233
+ @if $input-error-padding != false{ padding:$input-error-padding; }
218
234
  color: $input-error-color;
219
235
  }
220
236
 
data/src/scss/facades/_global.scss CHANGED
@@ -20,85 +20,85 @@
20
20
  $facades-global-import-used: true;
21
21
 
22
22
  .label{
23
- @include label;
23
+ @include label;
24
24
  }
25
25
 
26
26
  .notification{
27
- @include notification;
27
+ @include notification;
28
28
  }
29
29
 
30
30
  table.bordered{
31
- @include bordered-table;
31
+ @include bordered-table;
32
32
  }
33
33
 
34
34
  table.striped{
35
- @include striped-table;
35
+ @include striped-table;
36
36
  }
37
37
 
38
38
  table.compressed{
39
- @include compressed-table;
39
+ @include compressed-table;
40
40
  }
41
41
 
42
42
  div.tabbed{
43
- @include tabbed;
44
- .tab-navigation, .pill-navigation{
45
- @include inline-list;
46
- }
47
- .tab-navigation{
48
- @include tab-navigation;
49
- }
50
- .pill-navigation{
51
- @include pill-navigation;
52
- }
43
+ @include tabbed;
44
+ .tab-navigation, .pill-navigation{
45
+ @include inline-list;
46
+ }
47
+ .tab-navigation{
48
+ @include tab-navigation;
49
+ }
50
+ .pill-navigation{
51
+ @include pill-navigation;
52
+ }
53
53
  }
54
54
 
55
55
  ul, ol{
56
- &.inline-list{
57
- @include inline-list;
58
- }
59
-
56
+ &.inline-list{
57
+ @include inline-list;
58
+ }
59
+
60
60
  }
61
61
 
62
62
  html.lt-ie8{
63
- ul, ol{
64
- &.inline-list li{
65
- display:inline;
66
- }
67
- }
63
+ ul, ol{
64
+ &.inline-list li{
65
+ display:inline;
66
+ }
67
+ }
68
68
  }
69
69
 
70
70
  .button, input[type=button], input[type=submit]{
71
- @include simple-button;
72
- &.glossy{
73
- @include glossy-button;
74
- }
75
- &.gradient{
76
- @include gradient-button;
77
- }
71
+ @include simple-button;
72
+ &.glossy{
73
+ @include glossy-button;
74
+ }
75
+ &.gradient{
76
+ @include gradient-button;
77
+ }
78
78
  }
79
79
 
80
80
  form{
81
- @include form;
82
-
83
- ul, ol{
84
- @include field-list;
85
- }
86
-
87
- ul.columns, ol.columns{
88
- @include field-column-list;
89
- }
90
-
91
- li.select-group, fieldset.select-group{
92
- @include select-group;
93
- }
81
+ @include form;
82
+
83
+ ul, ol{
84
+ @include field-list;
85
+ }
86
+
87
+ ul.columns, ol.columns{
88
+ @include field-column-list;
89
+ }
90
+
91
+ li.select-group, fieldset.select-group{
92
+ @include select-group;
93
+ }
94
94
  }
95
95
 
96
96
  @include form-fields;
97
97
 
98
98
  input.invalid, textarea.invalid, select.invalid{
99
- @include invalid-field;
99
+ @include invalid-field;
100
100
  }
101
101
 
102
102
  fieldset{
103
- @include fieldset;
103
+ @include fieldset;
104
104
  }