feathers 0.1.4 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c9e87030fb37a398115e93e4cdda5c685333bcbb
4
- data.tar.gz: 865f052d511bb4e9e73e0586cf4ec3c86a838cc4
3
+ metadata.gz: 15675287e5c469f62927f5a1bbc4d84148d6ac4a
4
+ data.tar.gz: f3d5218e1e98711394786b70f934d426505868b3
5
5
  SHA512:
6
- metadata.gz: f5a45b994ebf4ae0fe236bf61e8a2f66ed5054f0578fe3e7b72631674397035932ae3aa7bbf2d8e6b8a56ecc80b97780dc97edc05fe46def6f16a8dd62503e32
7
- data.tar.gz: 8ddd35b603389e64183a6e3b1a8c0aa7c5103c87a1e381e501cb8d6b74d3bf005a832a40f95c8089b4911529c49a10668ee3d2f41fc61495a67263ff5a4270e3
6
+ metadata.gz: e51b346cccb604ae0ea535510a06be22c63844114382f93bd08ef51857cbbec414f26c76219ee61a9bf678e3feb64bc566f251fc27ac7ac01c824b512b24081b
7
+ data.tar.gz: 201974911ec14361414d64d4aa87199350f788389d6c6069268ea223d0dcbd973197b550958ceecd85167fa1ef72c1aec129e9ff2127a5a9128d1e9e1e9ca80d
data/README.md CHANGED
@@ -43,18 +43,14 @@ Then simply override the Feathers color presets. You can change any or all value
43
43
  module Feathers
44
44
  class Config
45
45
 
46
- @light_1 = "#efefef"
47
- @light_2 = "#ddd"
48
- @medium_1 = "#ccc"
49
- @medium_2 = "#aaa"
50
- @dark_1 = "#777"
46
+ @light = "#efefef"
47
+ @medium = "#ccc"
51
48
  @dark_2 = "#444"
52
49
  @highlight = "#ffe"
53
50
  @notice_background = "#ecffd6"
54
51
  @warning_background = "#fbefb9"
55
52
  @error_background = "#ffebeb"
56
53
  @note_background = "#d8f2ff"
57
- @default_element = "#ccc"
58
54
  @danger_element = "#cf0404"
59
55
  @info_element = "#448ccb"
60
56
  @success_element = "#7ba900"
@@ -67,10 +63,25 @@ Then simply override the Feathers color presets. You can change any or all value
67
63
 
68
64
  Borders and gradients are calculated automatically based on the defined values for their element.
69
65
 
70
- ToDo
66
+ Changes
71
67
  ----
72
68
 
73
- * Currently checkbox, radio buttons, and select box stylings are webkit only
74
- * View Helpers for various Feathers elements
75
- * JavaScript for better handling of tap states for touch events (`:hover` isn't always accurate)
76
- * Add a demo and tests (tests don't really make sense until we have view helpers to test)
69
+ ####v0.2.0
70
+ * Cleaned up typography / resets
71
+ * Headings now use Apple system default font where available
72
+ * Placeholders or all icons, instead of Font Awesome
73
+ * Restyled dropdown menu slighlty
74
+ * Restyled horizontal nav bar
75
+ * Toned down border radi on all menus
76
+ * Title bar is lighter and now uses Apple system font where available
77
+ * Lightened icon bar
78
+ * Default label now has darker background
79
+ * Added some padding on the default table
80
+ * Fixed vertical alignment on checkboxes and radio buttons
81
+ * Removed `default_element` config color option
82
+ * Consolidated `light_1` and `light_2` config color options to `light`
83
+ * Consolidated `medium_1` and `medium_2` config color options to `medium`
84
+ * Consolidated `dark_1` and `dark_2` config color options to `dark`
85
+
86
+ ####v0.1.4
87
+ * Add support for Rails 4.1
@@ -5,19 +5,54 @@
5
5
  }
6
6
 
7
7
  ::-moz-selection {
8
- background:<%= Feathers::Config.dark_2 %>;
8
+ background:<%= Feathers::Config.dark %>;
9
9
  color:<%= Feathers::Config.white %>;
10
10
  text-shadow:none;
11
11
  }
12
12
 
13
13
  ::selection {
14
- background:<%= Feathers::Config.dark_2 %>;
14
+ background:<%= Feathers::Config.dark %>;
15
15
  color:<%= Feathers::Config.white %>;
16
16
  text-shadow:none;
17
17
  }
18
18
 
19
+ html {
20
+ font-family:Helvetica, Arial, sans-serif;
21
+ font-smoothing:antialiased;
22
+ -webkit-font-smoothing:antialiased;
23
+ -ms-text-size-adjust: 100%;
24
+ -webkit-text-size-adjust: 100%;
25
+ }
26
+
27
+ body {
28
+ background-color:<%= Feathers::Config.white %>;
29
+ margin:0;
30
+ overflow-scrolling:touch;
31
+ -webkit-overflow-scrolling:touch;
32
+ overflow-y:scroll;
33
+ }
34
+
35
+ article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary {
36
+ display: block;
37
+ }
38
+
39
+ audio,canvas,progress,video {
40
+ display: inline-block;
41
+ vertical-align: baseline;
42
+ }
43
+
44
+ audio:not([controls]) {
45
+ display: none;
46
+ height: 0;
47
+ }
48
+
49
+ [hidden],.hidden {
50
+ display: none;
51
+ }
52
+
19
53
  a {
20
- color:<%= Feathers::Config.dark_2 %>;
54
+ background: transparent;
55
+ color:<%= Feathers::Config.dark %>;
21
56
  outline:none;
22
57
  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
23
58
  -moz-tap-highlight-color:rgba(0, 0, 0, 0);
@@ -27,24 +62,16 @@ a {
27
62
  }
28
63
 
29
64
  a:hover {
30
- color:<%= Feathers::Config.dark_1 %>;
31
- }
32
-
33
- .align-center {
34
- text-align:center;
35
- }
36
-
37
- .align-right {
38
- text-align: right;
65
+ color:darken(<%= Feathers::Config.dark %>, 30%);
39
66
  }
40
67
 
41
- .align-left {
42
- text-align:left;
68
+ abbr[title] {
69
+ border-bottom: 1px dotted;
43
70
  }
44
71
 
45
72
  blockquote {
46
- border-left:3px solid <%= Feathers::Config.medium_1 %>;
47
- color:<%= Feathers::Config.dark_2 %>;
73
+ border-left:3px solid <%= Feathers::Config.medium %>;
74
+ color:<%= Feathers::Config.dark %>;
48
75
  margin:0 1em 0.5em 1em;
49
76
  padding:1em;
50
77
  cite {
@@ -55,75 +82,175 @@ blockquote {
55
82
  }
56
83
  }
57
84
 
58
- body {
59
- background-color:<%= Feathers::Config.white %>;
60
- font-family:helvetica, arial, sans-serif;
61
- font-size:16px;
62
- font-smoothing:antialiased;
63
- -webkit-font-smoothing:antialiased;
64
- line-height:150%;
65
- margin:0;
66
- overflow-scroll:touch;
67
- -webkit-overflow-scroll:touch;
68
- overflow-y:scroll;
69
- -webkit-text-size-adjust:100%;
70
- -ms-text-size-adjust:100%;
85
+ b,strong {
86
+ font-weight: bold;
71
87
  }
72
88
 
73
- footer, header, nav, section {
74
- display:block;
89
+ h1, h2, h3, h4, h5, h6 {
90
+ font-family: -apple-system-font, Helvetica, Arial, sans-serif;
91
+ margin: 16px 0;
75
92
  }
76
93
 
77
- fieldset, img {
78
- border:none;
94
+ h1 { font-size: 2em; }
95
+ h2 { font-size:1.75em; }
96
+ h3 { font-size:1.5em; }
97
+ h4 { font-size:1em; }
98
+ h5 { font-size:0.75em; }
99
+ h6 { font-size:0.67em; }
100
+
101
+ small {
102
+ font-size: 80%;
79
103
  }
80
104
 
81
- form, legend, li {
82
- margin:0;
83
- padding:0;
105
+ sub,sup {
106
+ font-size: 75%;
107
+ line-height: 0;
108
+ position: relative;
109
+ vertical-align: baseline;
84
110
  }
85
111
 
86
- h1, h2, h3, h4, h5, h6 {
87
- line-height:1.5rem;
88
- margin:0 0 0.5em 0;
89
- padding:0;
112
+ sup {
113
+ top: -0.5em;
114
+ }
115
+
116
+ sub {
117
+ bottom: -0.25em;
118
+ }
119
+
120
+ i {
121
+ color:<%= Feathers::Config.dark %>;
122
+ }
123
+
124
+ img {
125
+ border: 0;
90
126
  }
91
127
 
92
- h1 { font-size:200%; }
93
- h2 { font-size:180%; }
94
- h3 { font-size:160%; }
95
- h4 { font-size:140%; }
96
- h5 { font-size:120%; }
97
- h6 { font-size:100%; }
128
+ svg:not(:root) {
129
+ overflow: hidden;
130
+ }
98
131
 
99
- .hidden {
100
- display:none;
132
+ figure {
133
+ margin: 1em 40px;
101
134
  }
102
135
 
103
136
  hr {
104
- border:none;
105
- border-bottom:1px solid <%= Feathers::Config.medium_1 %>;
106
- height:0;
107
- margin:1em 0;
108
- padding:0;
137
+ border-bottom:1px solid <%= Feathers::Config.medium %>;
138
+ -moz-box-sizing: content-box;
139
+ box-sizing: content-box;
140
+ height: 1px;
109
141
  }
110
142
 
111
- i {
112
- color:<%= Feathers::Config.dark_2 %>;
143
+ pre {
144
+ overflow-x:scroll;
145
+ overflow-y:hidden;
146
+ }
147
+
148
+ code,kbd,pre,samp {
149
+ font-family: monospace, monospace;
150
+ font-size: 1em;
151
+ }
152
+
153
+ button,input,optgroup,select,textarea {
154
+ color: inherit;
155
+ font: inherit;
156
+ margin: 0;
157
+ }
158
+
159
+ button {
160
+ overflow: visible;
161
+ }
162
+
163
+ button,select {
164
+ text-transform: none;
165
+ }
166
+
167
+ button,html input[type="button"],input[type="reset"],input[type="submit"] {
168
+ -webkit-appearance: button;
169
+ cursor: pointer;
170
+ }
171
+
172
+ button[disabled],html input[disabled] {
173
+ cursor: default;
174
+ }
175
+
176
+ button::-moz-focus-inner,input::-moz-focus-inner {
177
+ border: 0;
178
+ padding: 0;
113
179
  }
114
180
 
115
181
  input, select, textarea {
116
182
  color:#444;
117
183
  font-family:helvetica, arial, sans-serif;
118
- font-size:0.8em;
184
+ font-size:1em;
185
+ line-height: normal;
119
186
  }
120
187
 
121
- p {
122
- margin:0 0 1em 0;
188
+
189
+ input[type="checkbox"],input[type="radio"] {
190
+ box-sizing: border-box;
191
+ padding: 0;
123
192
  }
124
193
 
125
- small {
126
- font-size:70%;
194
+ input[type="number"]::-webkit-inner-spin-button,
195
+ input[type="number"]::-webkit-outer-spin-button {
196
+ height: auto;
197
+ }
198
+
199
+ input[type="search"] {
200
+ -webkit-appearance: textfield;
201
+ -moz-box-sizing: content-box;
202
+ -webkit-box-sizing: content-box;
203
+ box-sizing: content-box;
204
+ }
205
+
206
+ input[type="search"]::-webkit-search-cancel-button,
207
+ input[type="search"]::-webkit-search-decoration {
208
+ -webkit-appearance: none;
209
+ }
210
+
211
+ fieldset {
212
+ border: 1px solid #c0c0c0;
213
+ margin: 0 2px;
214
+ padding: 0.35em 0.625em 0.75em;
215
+ }
216
+
217
+ legend {
218
+ border: 0;
219
+ padding: 0;
220
+ }
221
+
222
+ textarea {
223
+ overflow: auto;
224
+ }
225
+
226
+
227
+ optgroup {
228
+ font-weight: bold;
229
+ }
230
+
231
+ table {
232
+ border-collapse: collapse;
233
+ border-spacing: 0;
234
+ }
235
+
236
+ td,th {
237
+ padding: 0;
238
+ }
239
+
240
+ .align-center {
241
+ text-align:center;
242
+ }
243
+
244
+ .align-right {
245
+ text-align: right;
246
+ }
247
+
248
+ .align-left {
249
+ text-align:left;
250
+ }
251
+
252
+ p {
253
+ margin:0 0 1em 0;
127
254
  }
128
255
 
129
256
  ul, ol {
@@ -1,15 +1,23 @@
1
1
  @import 'mixins';
2
2
 
3
3
  .button {
4
- border:1px solid darken(<%= Feathers::Config.default_element %>, 30%);
4
+ border:1px solid darken(<%= Feathers::Config.light %>, 30%);
5
5
  display:inline-block;
6
+ font-weight:bold;
6
7
  line-height:1.5em;
7
8
  padding:0.25em 0.5em;
8
- @include background-gradient(lighten(<%= Feathers::Config.default_element %>, 10%), <%= Feathers::Config.default_element %>);
9
+ text-align:center;
10
+ @include background-gradient(lighten(<%= Feathers::Config.light %>, 10%), <%= Feathers::Config.light %>);
9
11
  @include border-radius(0.25em);
10
12
  i {
11
13
  margin-right:0.5em;
12
14
  }
15
+ i.icon-empty {
16
+ display:inline-block;
17
+ height:0.75em;
18
+ width:0.75em;
19
+ border:1px solid <%= Feathers::Config.dark %>;
20
+ }
13
21
  }
14
22
 
15
23
  .button:active {
@@ -17,22 +25,21 @@
17
25
  }
18
26
 
19
27
  .button:hover {
20
- @include background-gradient(darken(<%= Feathers::Config.default_element %>, 10%), darken(<%= Feathers::Config.default_element %>, 20%));
21
28
  color:<%= Feathers::Config.white %>;
22
- @include background-gradient(darken(<%= Feathers::Config.default_element %>, 10%), darken(<%= Feathers::Config.default_element %>, 20%));
29
+ @include background-gradient(darken(<%= Feathers::Config.light %>, 10%), darken(<%= Feathers::Config.light %>, 20%));
23
30
  i {
24
31
  color:<%= Feathers::Config.white %>;
25
32
  }
26
33
  }
27
34
 
28
35
  .button.cancel {
29
- border:1px solid darken(<%= Feathers::Config.default_element %>, 30%);
30
- @include background-gradient(lighten(<%= Feathers::Config.default_element %>, 10%), <%= Feathers::Config.default_element %>);
36
+ border:1px solid darken(<%= Feathers::Config.light %>, 30%);
37
+ @include background-gradient(<%= Feathers::Config.light %>, darken(<%= Feathers::Config.light %>, 10%));
31
38
  }
32
39
 
33
40
  .button.cancel:hover {
34
41
  color:<%= Feathers::Config.white %>;
35
- @include background-gradient(darken(<%= Feathers::Config.default_element %>, 10%), darken(<%= Feathers::Config.default_element %>, 20%));
42
+ @include background-gradient(darken(<%= Feathers::Config.light %>, 20%), darken(<%= Feathers::Config.light %>, 30%));
36
43
  i {
37
44
  color:<%= Feathers::Config.white %>;
38
45
  }
@@ -45,6 +52,9 @@
45
52
  i {
46
53
  color:<%= Feathers::Config.white %>;
47
54
  }
55
+ i.icon-empty {
56
+ border:1px solid #fff;
57
+ }
48
58
  }
49
59
 
50
60
  .button.delete:hover {
@@ -66,6 +76,9 @@
66
76
  i {
67
77
  color:<%= Feathers::Config.white %>;
68
78
  }
79
+ i.icon-empty {
80
+ border:1px solid #fff;
81
+ }
69
82
  }
70
83
 
71
84
  .button.action:hover {
@@ -79,6 +92,9 @@
79
92
  i {
80
93
  color:<%= Feathers::Config.white %>;
81
94
  }
95
+ i.icon-empty {
96
+ border:1px solid #fff;
97
+ }
82
98
  }
83
99
 
84
100
  .button.success:hover {
@@ -92,6 +108,9 @@
92
108
  i {
93
109
  color:<%= Feathers::Config.white %>;
94
110
  }
111
+ i.icon-empty {
112
+ border:1px solid #fff;
113
+ }
95
114
  }
96
115
 
97
116
  .button.warning:hover {
@@ -5,6 +5,11 @@ div.notice, div.error, div.note, div.warning {
5
5
  i {
6
6
  margin-right:1em;
7
7
  }
8
+ i.icon-empty {
9
+ display:inline-block;
10
+ height:1em;
11
+ width:1em;
12
+ }
8
13
  }
9
14
 
10
15
  div.error {
@@ -13,6 +18,9 @@ div.error {
13
18
  i {
14
19
  color:darken(<%= Feathers::Config.error_background %>, 50%);
15
20
  }
21
+ i.icon-empty {
22
+ background:darken(<%= Feathers::Config.error_background %>, 50%);
23
+ }
16
24
  }
17
25
 
18
26
  div.notice {
@@ -21,6 +29,9 @@ div.notice {
21
29
  i {
22
30
  color:darken(<%= Feathers::Config.notice_background %>, 50%);
23
31
  }
32
+ i.icon-empty {
33
+ background:darken(<%= Feathers::Config.notice_background %>, 50%);
34
+ }
24
35
  }
25
36
 
26
37
  div.warning {
@@ -29,5 +40,8 @@ div.warning {
29
40
  i {
30
41
  color:darken(<%= Feathers::Config.warning_background %>, 50%);
31
42
  }
43
+ i.icon-empty {
44
+ background:darken(<%= Feathers::Config.warning_background %>, 50%);
45
+ }
32
46
  }
33
47
 
@@ -17,7 +17,7 @@ fieldset, div.field, div.actions {
17
17
  input[type=search],
18
18
  input[type=password] {
19
19
  background:<%= Feathers::Config.white %>;
20
- border:1px solid <%= Feathers::Config.medium_1 %>;
20
+ border:1px solid <%= Feathers::Config.medium %>;
21
21
  padding:0.5em;
22
22
  @include border-radius(0.25em);
23
23
  }
@@ -62,11 +62,17 @@ fieldset, div.field, div.actions {
62
62
  input[type=checkbox]:checked {
63
63
  background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAoCAYAAAD+MdrbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAWtJREFUeNrslU2LglAUhl/lUou2LhWCdubGsk1B/oKZHzvTDwgEd4lFm0Aoog8XgpswXVjTvaD0Nc2YzjAMvosr5yIP77n33HO44/GIIkXownHcSxGwk7l3cha85YGdTL3SL4+CVQJLYAksgb8DJNf9LK+4okfAz6T8v2dKGIbFnOHhcIBlWRiNRvmBcRxjOBxiOp2iWq3er8MMB89g6/WaxZVKJZ9D6iqBUe33++eBruvCtu2bvadSjqIIhmHg/GU1Gg10Op2vHXqeh8FggOVyme5NJpOL9FRVRa/XuzlDcu2CloHjOCwej8eQJAm73Q6z2Sz9r91uo9lsPu42VNvtFpvNJo1938d8PsdqtWJ1RyXL8qewG2C9XocoijBNE4vFgu3R4k1SFQQBrVYrW7chhKDf70NRFBYHQcAughawruvgef659kWd0PQSdbtd1Gq173fse9I0LX239HIyjYBH0Cxd/e/PlA8BBgA6gpuyV9X9zQAAAABJRU5ErkJggg==) bottom left no-repeat;
64
64
  }
65
+
66
+ input[type=radio], input[type=checkbox] {
67
+ outline:none;
68
+ position:relative;
69
+ top:0.3em;
70
+ }
65
71
  }
66
72
 
67
73
  legend {
68
- background:<%= Feathers::Config.light_1 %>;
69
- color:<%= Feathers::Config.dark_1 %>;
74
+ background:<%= Feathers::Config.light %>;
75
+ color:<%= Feathers::Config.dark %>;
70
76
  padding:0.5em;
71
77
  @include border-radius(0.25em);
72
78
  }
@@ -76,7 +82,7 @@ fieldset, div.field, div.actions {
76
82
  -moz-appearance:none;
77
83
  appearance:none;
78
84
  background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAJCAIAAAC9o5sfAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAH1JREFUeNqkUTsKwCAMNaGDk4qDoGcQZwdHj+1pHLyFpE6l1P5o3xRCHu8TICL2Fch+YNmmUkpr7fSIc55Scs4d9rC3PfMBwBjjvbfWIuIdeeYrpYam1vpV5pzzZk8IEUIY/KvMcNr20O+9xxillHeN0QVqrfQE+PPnVYABAAwmZGpbdzcOAAAAAElFTkSuQmCC) 100% 50% no-repeat <%= Feathers::Config.white %>;
79
- border:1px solid <%= Feathers::Config.medium_1 %>;
85
+ border:1px solid <%= Feathers::Config.medium %>;
80
86
  line-height:1.25em;
81
87
  min-width:16em;
82
88
  padding:0.5em 3em 0.5em 0.5em;
@@ -87,7 +93,7 @@ fieldset, div.field, div.actions {
87
93
  -webkit-appearance:none;
88
94
  -moz-appearance:none;
89
95
  appearance:none;
90
- border:1px solid <%= Feathers::Config.medium_1 %>;
96
+ border:1px solid <%= Feathers::Config.medium %>;
91
97
  line-height:1.25em;
92
98
  padding:0.5em;
93
99
  @include border-radius(0.25em);
@@ -119,11 +125,11 @@ form {
119
125
 
120
126
  input[type=reset], input[type=submit], input[type=button] {
121
127
  display:inline-block;
122
- border:1px solid darken(<%= Feathers::Config.default_element %>, 30%);
128
+ border:1px solid darken(<%= Feathers::Config.light %>, 30%);
123
129
  display:inline-block;
124
130
  line-height:1.5em;
125
131
  padding:0.25em 0.5em;
126
- @include background-gradient(lighten(<%= Feathers::Config.default_element %>, 10%), <%= Feathers::Config.default_element %>);
132
+ @include background-gradient(<%= Feathers::Config.light %>, darken(<%= Feathers::Config.light %>, 10%));
127
133
  @include border-radius(0.25em);
128
134
  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
129
135
  -moz-tap-highlight-color:rgba(0, 0, 0, 0);
@@ -1,65 +1,53 @@
1
1
  .breadcrumbs {
2
- background:<%= Feathers::Config.light_1 %>;
3
- border:1px solid <%= Feathers::Config.light_2 %>;
4
- color:<%= Feathers::Config.dark_1 %>;
2
+ background:<%= Feathers::Config.light %>;
3
+ border:1px solid darken(<%= Feathers::Config.light %>, 30%);
4
+ color:<%= Feathers::Config.dark %>;
5
5
  padding:1em;
6
6
  span {
7
- color:<%= Feathers::Config.dark_2 %>;
7
+ color:darken(<%= Feathers::Config.dark %>, 30%);
8
8
  }
9
9
  }
10
10
 
11
11
  .drop-menu {
12
- background:<%= Feathers::Config.light_1 %>;
12
+ background:<%= Feathers::Config.light %>;
13
13
  display:inline-block;
14
14
  padding:0.5em 1em;
15
15
  position:relative;
16
- @include border-radius(0.5em);
16
+ @include border-radius(0.25em);
17
17
  ul {
18
- background:<%= Feathers::Config.light_1 %>;
18
+ background:<%= Feathers::Config.light %>;
19
19
  display:none;
20
- left:0.5em;
20
+ left:0;
21
21
  margin:0;
22
22
  min-width:12em;
23
23
  padding:0;
24
24
  position:absolute;
25
- top:2.5em;
25
+ top:2em;
26
26
  z-index:1000;
27
- @include border-radius(0.5em);
27
+ @include border-radius(0.25em);
28
28
  li {
29
29
  list-style:none;
30
30
  margin:0;
31
31
  padding:0;
32
32
  a {
33
- background:<%= Feathers::Config.light_1 %>;
33
+ background:<%= Feathers::Config.light %>;
34
34
  display:block;
35
35
  padding:0.5em;
36
36
  }
37
37
  a:hover {
38
- color:<%= Feathers::Config.light_1 %>;
39
- background:<%= Feathers::Config.dark_1 %>;
40
- @include border-radius(0.5em);
38
+ color:<%= Feathers::Config.light %>;
39
+ background:<%= Feathers::Config.dark %>;
40
+ @include border-radius(0.25em);
41
41
  }
42
42
  }
43
43
  }
44
- ul:before {
45
- content: "";
46
- position: absolute;
47
- width: 0;
48
- height: 0;
49
- border-width: 12px;
50
- border-style: solid;
51
- border-color: transparent transparent <%= Feathers::Config.light_1 %> transparent;
52
- top: -24px;
53
- left: 1em;
54
- z-index:1000;
55
- }
56
44
  }
57
45
  .drop-menu:hover {
58
- background:<%= Feathers::Config.medium_1 %>;
46
+ background:<%= Feathers::Config.medium %>;
59
47
  > a {
60
- color:<%= Feathers::Config.dark_2 %>;
48
+ color:<%= Feathers::Config.dark %>;
61
49
  i {
62
- color:<%= Feathers::Config.dark_2 %>;
50
+ color:<%= Feathers::Config.dark %>;
63
51
  }
64
52
  }
65
53
  ul {
@@ -78,22 +66,27 @@ ul.horizontal-menu, ul.vertical-menu {
78
66
  }
79
67
 
80
68
  ul.horizontal-menu {
81
- background:<%= Feathers::Config.light_1 %>;
69
+ background:<%= Feathers::Config.light %>;
70
+ font-weight:bold;
71
+ height:2em;
72
+ line-height:2em;
82
73
  overflow:hidden;
83
- padding:0.5em 0;
84
- @include border-radius(0.5em);
74
+ padding:0;
75
+ @include border-radius(0.25em);
85
76
  li {
86
77
  display:inline;
87
78
  a {
88
79
  display:inline-block;
89
80
  float:left;
90
- margin:0 0.5em;
81
+ height:2em;
82
+ line-height:2em;
83
+ margin:0;
91
84
  padding:0 1em;
92
85
  }
93
86
  a:hover {
94
- background:<%= Feathers::Config.dark_1 %>;
87
+ background:<%= Feathers::Config.dark %>;
95
88
  color:<%= Feathers::Config.white %>;
96
- @include border-radius(0.5em);
89
+ @include border-radius(0.25em);
97
90
  }
98
91
  }
99
92
  }
@@ -103,11 +96,11 @@ ul.vertical-menu {
103
96
  margin:0;
104
97
  padding:0;
105
98
  a {
106
- background:<%= Feathers::Config.light_1 %>;
99
+ background:<%= Feathers::Config.light %>;
107
100
  display:block;
108
101
  margin-bottom:0.5em;
109
102
  padding:0.5em 1em;
110
- @include border-radius(0.5em);
103
+ @include border-radius(0.25em);
111
104
  i {
112
105
  display:inline-block;
113
106
  float:right;
@@ -116,7 +109,7 @@ ul.vertical-menu {
116
109
  }
117
110
  }
118
111
  a:hover {
119
- background:<%= Feathers::Config.dark_1 %>;
112
+ background:<%= Feathers::Config.dark %>;
120
113
  color:<%= Feathers::Config.white %>;
121
114
  i {
122
115
  color:<%= Feathers::Config.white %>;
@@ -127,21 +120,28 @@ ul.vertical-menu {
127
120
  }
128
121
 
129
122
  .icon-bar {
130
- border:1px solid <%= Feathers::Config.medium_1 %>;
123
+ border:1px solid <%= Feathers::Config.medium %>;
131
124
  display:block;
132
125
  height:3em;
133
126
  line-height:2em;
134
127
  padding:0.5em;
135
128
  text-align:center;
136
- @include background-gradient(lighten(<%= Feathers::Config.light_2 %>, 10%), <%= Feathers::Config.light_2 %>);
129
+ @include background-gradient(lighten(<%= Feathers::Config.light %>, 10%), <%= Feathers::Config.light %>);
137
130
  a {
138
131
  display:inline-block;
139
132
  margin:0 2em;
140
133
  i {
141
134
  font-size:180%;
142
- color:<%= Feathers::Config.dark_1 %>;
135
+ color:<%= Feathers::Config.dark %>;
143
136
  @include text-shadow(1px 1px 1px <%= Feathers::Config.white %>);
144
137
  }
138
+ i.icon-empty {
139
+ @include border-radius(0.25em);
140
+ background:<%= Feathers::Config.dark %>;
141
+ display:inline-block;
142
+ height:1em;
143
+ width:1em;
144
+ }
145
145
  }
146
146
  a:hover, a:active {
147
147
  i {
@@ -163,9 +163,9 @@ ul.link-list {
163
163
  display:block;
164
164
  padding:0.5em;
165
165
  margin:0;
166
- border-bottom:1px solid <%= Feathers::Config.medium_1 %>;
166
+ border-bottom:1px solid <%= Feathers::Config.medium %>;
167
167
  i {
168
- color:<%= Feathers::Config.dark_1 %>;
168
+ color:<%= Feathers::Config.dark %>;
169
169
  display:inline-block;
170
170
  float:right;
171
171
  line-height:1.5em;
@@ -173,7 +173,7 @@ ul.link-list {
173
173
  }
174
174
  }
175
175
  a:hover {
176
- background:<%= Feathers::Config.light_2 %>;
176
+ background:<%= Feathers::Config.light %>;
177
177
  }
178
178
  }
179
179
  li:last-child {
@@ -9,39 +9,39 @@
9
9
 
10
10
  .avatar.framed {
11
11
  background:<%= Feathers::Config.white %>;
12
- border:1px solid <%= Feathers::Config.medium_1 %>;
12
+ border:1px solid <%= Feathers::Config.medium %>;
13
13
  padding:3px;
14
14
  }
15
15
 
16
16
  .pagination {
17
17
  overflow:hidden;
18
18
  a {
19
- border:1px solid <%= Feathers::Config.light_2 %>;
19
+ border:1px solid <%= Feathers::Config.light %>;
20
20
  display:inline-block;
21
21
  float:left;
22
22
  margin-right:0.5em;
23
23
  padding:0.25em 0.5em;
24
24
  }
25
25
  a.current {
26
- background:#f6f6f6;
27
- color:<%= Feathers::Config.dark_1 %>;
26
+ border:1px solid <%= Feathers::Config.light %>;
27
+ color:<%= Feathers::Config.dark %>;
28
28
  }
29
29
  a.disabled {
30
30
  border:none;
31
- color:<%= Feathers::Config.medium_1 %>;
31
+ color:<%= Feathers::Config.medium %>;
32
32
  }
33
33
  a:hover {
34
- background:<%= Feathers::Config.dark_2 %>;
34
+ background:<%= Feathers::Config.dark %>;
35
35
  color:<%= Feathers::Config.white %>;
36
36
  }
37
37
  a.disabled:hover {
38
- background:<%= Feathers::Config.medium_1 %>;
38
+ background:<%= Feathers::Config.medium %>;
39
39
  color:<%= Feathers::Config.white %>;
40
40
  }
41
41
  }
42
42
 
43
43
  .progress-bar {
44
- background:<%= Feathers::Config.light_1 %>;
44
+ background:<%= Feathers::Config.light %>;
45
45
  height:16px;
46
46
  margin:1em 0;
47
47
  @include border-radius(1em);
@@ -58,7 +58,7 @@
58
58
  }
59
59
 
60
60
  span.label {
61
- background:<%= Feathers::Config.default_element %>;
61
+ background:<%= Feathers::Config.dark %>;
62
62
  color:<%= Feathers::Config.white %>;
63
63
  font-size:80%;
64
64
  font-weight:bold;
@@ -83,18 +83,20 @@ div.note {
83
83
  }
84
84
 
85
85
  .tag-line {
86
- color:<%= Feathers::Config.dark_1 %>;
86
+ color:<%= Feathers::Config.dark %>;
87
87
  font-size:125%;
88
88
  }
89
89
 
90
90
  .title-bar {
91
- border:1px solid <%= Feathers::Config.medium_2 %>;
91
+ border:1px solid <%= Feathers::Config.medium %>;
92
+ font-family: -apple-system-font, Helvetica, Arial, sans-serif;
92
93
  padding:0.5em;
93
94
  text-align:center;
94
- @include background-gradient(lighten(<%= Feathers::Config.default_element %>, 10%), <%= Feathers::Config.default_element %>);
95
+ @include background-gradient(lighten(<%= Feathers::Config.light %>, 10%), <%= Feathers::Config.light %>);
95
96
  h1 {
96
- color:<%= Feathers::Config.dark_1 %>;
97
+ color:<%= Feathers::Config.dark %>;
97
98
  font-size:180%;
99
+ font-weight:normal;
98
100
  margin:0;
99
101
  @include text-shadow(1px 1px 1px <%= Feathers::Config.white %>);
100
102
  }
@@ -3,28 +3,33 @@
3
3
  table.data-table {
4
4
  thead {
5
5
  th {
6
- border-bottom:1px solid <%= Feathers::Config.medium_1 %>;
7
- border-right:1px solid <%= Feathers::Config.medium_1 %>;
8
- border-top:1px solid <%= Feathers::Config.medium_1 %>;
9
- color:<%= Feathers::Config.dark_2 %>;
6
+ border-bottom:1px solid <%= Feathers::Config.medium %>;
7
+ border-right:1px solid <%= Feathers::Config.medium %>;
8
+ border-top:1px solid <%= Feathers::Config.medium %>;
9
+ color:<%= Feathers::Config.dark %>;
10
10
  font-weight:bold;
11
11
  text-align:left;
12
- @include background-gradient(lighten(<%= Feathers::Config.default_element %>, 10%), <%= Feathers::Config.default_element %>);
12
+ padding:0.25em;
13
+ @include background-gradient(lighten(<%= Feathers::Config.light %>, 10%), <%= Feathers::Config.light %>);
13
14
  }
14
15
  th:first-child {
15
- border-left:1px solid <%= Feathers::Config.medium_1 %>;
16
+ border-left:1px solid <%= Feathers::Config.medium %>;
16
17
  }
17
18
  }
18
19
  tbody {
19
20
  td {
20
- border-bottom:1px solid <%= Feathers::Config.light_2 %>;
21
+ border-bottom:1px solid <%= Feathers::Config.light %>;
22
+ padding:0.25em;
21
23
  }
22
24
  tr:hover {
23
25
  background:<%= Feathers::Config.highlight %>;
24
26
  }
25
27
  }
26
28
  tfoot {
27
- background:<%= Feathers::Config.light_2 %>;
28
- color:<%= Feathers::Config.dark_1 %>;
29
+ background:<%= Feathers::Config.light %>;
30
+ color:<%= Feathers::Config.dark %>;
31
+ th, td {
32
+ padding:0.25em;
33
+ }
29
34
  }
30
35
  }
@@ -2,18 +2,14 @@ module Feathers
2
2
  class Config
3
3
  class << self
4
4
 
5
- attr_reader :light_1,
6
- :light_2,
7
- :medium_1,
8
- :medium_2,
9
- :dark_1,
10
- :dark_2,
5
+ attr_reader :light,
6
+ :medium,
7
+ :dark,
11
8
  :highlight,
12
9
  :notice_background,
13
10
  :warning_background,
14
11
  :error_background,
15
12
  :note_background,
16
- :default_element,
17
13
  :danger_element,
18
14
  :info_element,
19
15
  :success_element,
@@ -21,19 +17,15 @@ module Feathers
21
17
  :black,
22
18
  :white
23
19
 
24
- attr_writer :light_1,
25
- :light_2,
26
- :medium_1,
27
- :medium_2,
28
- :dark_1,
29
- :dark_2,
20
+ attr_writer :light,
21
+ :medium,
22
+ :dark,
30
23
  :highlight,
31
24
  :notice_background,
32
25
  :warning_border,
33
26
  :warning_background,
34
27
  :error_background,
35
28
  :note_background,
36
- :default_element,
37
29
  :danger_element,
38
30
  :info_element,
39
31
  :success_element,
@@ -42,18 +34,14 @@ module Feathers
42
34
  :white
43
35
 
44
36
  def set_defaults
45
- @light_1 = "#efefef"
46
- @light_2 = "#ddd"
47
- @medium_1 = "#ccc"
48
- @medium_2 = "#aaa"
49
- @dark_1 = "#777"
50
- @dark_2 = "#444"
37
+ @light = "#efefef"
38
+ @medium = "#ccc"
39
+ @dark = "#777"
51
40
  @highlight = "#ffe"
52
41
  @notice_background = "#ecffd6"
53
42
  @warning_background = "#fbefb9"
54
43
  @error_background = "#ffebeb"
55
44
  @note_background = "#d8f2ff"
56
- @default_element = "#ccc"
57
45
  @danger_element = "#cf0404"
58
46
  @info_element = "#448ccb"
59
47
  @success_element = "#7ba900"
@@ -1,3 +1,3 @@
1
1
  module Feathers
2
- VERSION = "0.1.4"
2
+ VERSION = "0.2.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: feathers
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kelli Shaver
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-19 00:00:00.000000000 Z
11
+ date: 2014-08-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails