Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

changed all pixel margins, font-sizes, and padding to rem - changed l…

…ine-heights to em
  • Loading branch information...
commit 3cfd00eca4cfdf35dc4ac0fcf5630402f5b3d2a7 1 parent f79572c
Edwin authored
8 app/assets/stylesheets/_defaults.scss
... ... @@ -1,6 +1,6 @@
1 1 body {
2 2 color: #333;
3   - font-size: 13px;
  3 + font-size: 100%;
4 4 font-family: "helvetica neue", arial, helvetica, "lucida grande", sans-serif;
5 5 }
6 6
@@ -14,8 +14,8 @@ h1, h2, h3, h4, h5, h6 {
14 14 /* Use a .box to create a padded box inside a column. */
15 15 .box {
16 16 background: #eee;
17   - margin-bottom: 16px;
18   - padding: 16px;
  17 + margin-bottom: 1rem;
  18 + padding: 1rem;
19 19 }
20 20
21 21 /* Use this to create a horizontal ruler across a column. */
@@ -26,7 +26,7 @@ hr {
26 26 color: #ddd;
27 27 float: none;
28 28 height: 1px;
29   - margin: 0 0 12px;
  29 + margin: 0 0 .75rem;
30 30 width: 100%;
31 31 }
32 32
10 app/assets/stylesheets/_flashes.scss
... ... @@ -1,11 +1,11 @@
1 1 /* Success, error & notice boxes for messages and errors. */
2 2 div.error, div.notice, div.success, #flash_failure, #flash_success, #flash_notice {
3 3 border: 1px solid #ddd;
4   - -moz-border-radius: 8px;
5   - -webkit-border-radius: 8px;
6   - border-radius: 8px;
7   - margin-bottom: 12px;
8   - padding: 10px;
  4 + -moz-border-radius: .5rem;
  5 + -webkit-border-radius: .5rem;
  6 + border-radius: .5rem;
  7 + margin-bottom: .75rem;
  8 + padding: .75rem;
9 9 }
10 10
11 11 div.error, #flash_failure {
38 app/assets/stylesheets/_forms.scss
@@ -11,7 +11,7 @@ input[type="submit"]::-moz-focus-inner {
11 11
12 12 form ol {
13 13 list-style: none;
14   - margin: 0 0 12px 0;
  14 + margin: 0 0 .75rem 0;
15 15 }
16 16
17 17 form ol ol {
@@ -20,13 +20,13 @@ form ol ol {
20 20
21 21 form ol li {
22 22 list-style-position: outside;
23   - margin: 0 0 12px 0;
  23 + margin: 0 0 .75rem 0;
24 24 }
25 25
26 26 /*list-style-position fixes IE label margin bug*/
27 27 form ol ol li {
28 28 list-style-position: outside;
29   - margin: 0 0 4px 0;
  29 + margin: 0 0 .25rem 0;
30 30 }
31 31
32 32 form ol li.error input {
@@ -40,7 +40,7 @@ p.inline-errors {
40 40 form ol li.file {
41 41 background: #e1e1e1;
42 42 border: 1px solid #c8c8c8;
43   - padding: 10px;
  43 + padding: .75rem;
44 44 }
45 45
46 46 form abbr {
@@ -66,16 +66,16 @@ a.cancel {
66 66
67 67 .inline-hints {
68 68 color: #666;
69   - font-size: 11px;
70   - margin-bottom: 4px;
  69 + font-size: .75rem;
  70 + margin-bottom: .25rem;
71 71 }
72 72
73 73 /* Fieldsets */
74 74 fieldset {
75 75 background: #f1f1f1;
76 76 border: 1px solid #e3e3e3;
77   - margin: 0 0 16px 0;
78   - padding: 16px 16px 12px 16px;
  77 + margin: 0 0 1rem 0;
  78 + padding: 1rem 1rem .75rem 1rem;
79 79 }
80 80
81 81 fieldset fieldset, fieldset fieldset fieldset {
@@ -86,7 +86,7 @@ fieldset fieldset, fieldset fieldset fieldset {
86 86 legend {
87 87 font-weight: bold;
88 88 }
89   -.ie6 legend, .ie7 legend { margin-left: -7px; }
  89 +.ie6 legend, .ie7 legend { margin-left: .5rem; }
90 90
91 91 fieldset.buttons {
92 92 background: inherit;
@@ -120,8 +120,7 @@ input[type="time"],
120 120 input[type="url"],
121 121 input[type="week"] {
122 122 font-size: inherit;
123   - padding: 3px 2px;
124   - width: 300px;
  123 + padding: .25rem;
125 124 }
126 125 .ie6 input {
127 126 vertical-align: text-bottom;
@@ -133,9 +132,8 @@ input[disabled='disabled'] {
133 132 }
134 133
135 134 input[type="checkbox"] {
136   - margin: 0 3px 0 0;
  135 + margin: 0 .25rem 0 0;
137 136 position: relative;
138   - top: -2px;
139 137 vertical-align: middle;
140 138 }
141 139 .ie7 input[type="checkbox"] {
@@ -143,9 +141,8 @@ input[type="checkbox"] {
143 141 }
144 142
145 143 input[type="radio"] {
146   - margin: 0 3px 0 0;
  144 + margin: 0 .25rem 0 0;
147 145 position: relative;
148   - top: -2px;
149 146 vertical-align: middle;
150 147 }
151 148
@@ -162,21 +159,18 @@ input[type="radio"] {
162 159 /* Textareas */
163 160 textarea {
164 161 font-size: inherit;
165   - height: 200px;
166   - margin: 0 6px 6px 0;
167   - padding: 5px;
168   - width: 440px;
  162 + margin: 0 .5rem .5rem 0;
  163 + padding: .5rem;
169 164 overflow: auto;
170 165 }
171 166
172 167 /* Select fields */
173 168 fieldset .select select {
174   - width: 200px;
175   - font-size: 11px;
  169 + font-size: .75rem;
176 170 }
177 171
178 172 optgroup {
179   - margin: 0 0 6px 0;
  173 + margin: 0 0 .5rem 0;
180 174 }
181 175
182 176 /* Date & Time */
16 app/assets/stylesheets/_lists.scss
@@ -2,7 +2,7 @@
2 2
3 3 ul, ol {
4 4 list-style-position: inside;
5   - margin-bottom: 16px;
  5 + margin-bottom: 1rem;
6 6 }
7 7
8 8 ul {
@@ -14,27 +14,27 @@ ol {
14 14 }
15 15
16 16 dl {
17   - line-height: 1.4;
18   - margin-bottom: 16px;
  17 + line-height: 1.4em;
  18 + margin-bottom: 1rem;
19 19 }
20 20
21 21 dl dt {
22 22 font-weight: bold;
23   - margin-top: 6px;
  23 + margin-top: .5rem;
24 24 }
25 25
26 26 dl dd {
27   - margin-bottom: 0em;
  27 + margin-bottom: 0;
28 28 }
29 29
30 30 dd {
31   - margin-left: 6px;
  31 + margin-left: .5rem;
32 32 }
33 33
34 34 li {
35   - line-height: 1.4;
  35 + line-height: 1.4em;
36 36 }
37 37
38 38 ol ol, ol ul, ul ul, ul ol {
39   - margin-left: 12px;
  39 + margin-left: .75rem;
40 40 }
8 app/assets/stylesheets/_tables.scss
... ... @@ -1,7 +1,7 @@
1 1 /* Tables */
2 2
3 3 table {
4   - margin-bottom: 24px;
  4 + margin-bottom: 1.5rem;
5 5 width: 100%;
6 6 }
7 7
@@ -16,13 +16,13 @@ td {
16 16 }
17 17
18 18 caption, th, td {
19   - padding: 4px 10px 4px 0;
  19 + padding: .25rem .75rem .25rem 0;
20 20 }
21 21
22 22 caption {
23 23 background: #f1f1f1;
24   - margin-bottom: 12px;
25   - padding: 10px 0;
  24 + margin-bottom: .75rem;
  25 + padding: .75rem 0;
26 26 }
27 27
28 28 tr, td, th {
46 app/assets/stylesheets/_type.scss
... ... @@ -1,46 +1,36 @@
1 1 /* Headings */
2 2 h1, h2, h3, h4, h5, h6 {
3 3 font-weight: bold;
  4 + line-height: 1.2em;
4 5 }
5 6
6 7 h1 {
7   - font-size: 28px;
8   - line-height: 1.2;
9   - margin-bottom: 12px;
  8 + font-size: 1.75rem;
10 9 }
11 10
12 11 h2 {
13   - font-size: 24px;
14   - line-height: 1.2;
15   - margin-bottom: 6px;
  12 + font-size: 1.5rem;
16 13 }
17 14
18 15 h3 {
19   - font-size: 18px;
20   - line-height: 1.2;
21   - margin-bottom: 4px;
  16 + font-size: 1.25rem;
22 17 }
23 18
24 19 h4 {
25   - font-size: 16px;
26   - line-height: 1.3;
27   - margin-bottom: 4px;
  20 + font-size: 1rem;
28 21 }
29 22
30 23 h5 {
31   - font-size: 14px;
32   - margin-bottom: 4px;
  24 + font-size: .75rem;
33 25 }
34 26
35 27 h6 {
36   - font-size: 12px;
37   - margin-bottom: 4px;
  28 + font-size: .5rem;
38 29 }
39 30
40 31 /* Text elements */
41 32 p {
42   - line-height: 1.4;
43   - margin-bottom: 12px;
  33 + line-height: 1.4rem;
44 34 }
45 35
46 36 /* Use this if the image is at the top of the <p>. */
@@ -49,7 +39,7 @@ p img.top {
49 39 }
50 40
51 41 img {
52   - margin: 0 0 12px;
  42 + margin: 0 0 .75rem;
53 43 }
54 44
55 45 abbr, acronym {
@@ -59,7 +49,7 @@ abbr, acronym {
59 49
60 50 address {
61 51 font-style: italic;
62   - margin-top: 16px;
  52 + margin-top: 1rem;
63 53 }
64 54
65 55 del {
@@ -87,8 +77,8 @@ blockquote {
87 77 border-left: 4px solid #d1d1d1;
88 78 color: #666;
89 79 font-style: italic;
90   - margin: 16px 0;
91   - padding-left: 12px;
  80 + margin: 1rem 0;
  81 + padding-left: .75rem;
92 82 }
93 83
94 84 strong {
@@ -105,25 +95,25 @@ dfn {
105 95 }
106 96
107 97 pre, code {
108   - margin: 12px 0;
  98 + margin: .75rem 0;
109 99 white-space: pre; /* CSS2 */
110 100 white-space: pre-wrap; /* CSS 2.1 */
111 101 word-wrap: break-word; /* IE */
112 102 }
113 103
114 104 pre, code, tt {
115   - font: 12px 'andale mono', 'monotype.com', 'lucida console', monospace;
116   - line-height: 1.5;
  105 + font: .75rem 'andale mono', 'monotype.com', 'lucida console', monospace;
  106 + line-height: 1.4em;
117 107 }
118 108
119 109 pre.code {
120 110 background: #000;
121 111 color: #fff;
122   - padding: 20px;
  112 + padding: 1.25em;
123 113 }
124 114
125 115 tt {
126 116 display: block;
127   - line-height: 1.5;
128   - margin: 16px 0;
  117 + line-height: 1.4em;
  118 + margin: 1rem 0;
129 119 }

1 comment on commit 3cfd00e

Edwin
Owner

Also removed unnecessary margins on headers and paragraphs

Please sign in to comment.
Something went wrong with that request. Please try again.