Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: scss/_content.scss

Issue 29361647: Issue 4607 - Default content styles (Closed)
Left Patch Set: Removed extra list items and changed image text capitilization Created Nov. 17, 2016, 4:17 p.m.
Right Patch Set: See comments for details Created Dec. 1, 2016, 2:05 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « scss/_base.scss ('k') | scss/_variables.scss » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /*! 1 /*!
2 * This file is part of universal-design-language 2 * This file is part of website-defaults
3 * Copyright (C) 2016 Eyeo GmbH 3 * Copyright (C) 2016 Eyeo GmbH
4 * 4 *
5 * universal-design-language is free software: you can redistribute it and/or 5 * website-defaults is free software: you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License as published by 6 * modify it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation, either version 3 of the License, or 7 * the Free Software Foundation, either version 3 of the License, or
8 * (at your option) any later version. 8 * (at your option) any later version.
9 * 9 *
10 * universal-design-language is distributed in the hope that it will be useful, 10 * website-defaults is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details. 13 * GNU General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU General Public License 15 * You should have received a copy of the GNU General Public License
16 * along with web.starter-kit. If not, see <http://www.gnu.org/licenses/>. 16 * along with website-defaults. If not, see <http://www.gnu.org/licenses/>.
17 */ 17 */
18 18
19 /* UDL content styles 19 /*******************************************************************************
20 * Content styles
20 ******************************************************************************* 21 *******************************************************************************
21 * - Global 22 * 1. Document
22 * - Headings 23 * 2. Headings
23 * - Body content 24 * 3. Body content
24 * - Alignment
25 ******************************************************************************/ 25 ******************************************************************************/
26 26
27 /* Global 27 /* Document
juliandoucette 2016/11/22 00:54:04 @Manvel can you also acknowledge and review the re
saroyanm 2016/11/24 13:26:51 I've noticed that the ticket is out of sync, ex. w
saroyanm 2016/11/24 15:18:42 Acknowledged. We will move forward and add more c
juliandoucette 2016/11/25 16:28:43 Done.
28 ******************************************************************************/ 28 ******************************************************************************/
29
30 html
31 {
32 font-family: $primary-font;
33 font-size: $medium-font;
34 line-height: 1.15;
juliandoucette 2016/11/22 00:54:02 Note: I think I should set the primary foreground
saroyanm 2016/11/24 13:26:52 Agree.
juliandoucette 2016/11/25 16:28:42 Done.
35 }
36
37 /**
38 * Center content within a (responsive) fixed width
39 */
40 .container
juliandoucette 2016/11/22 00:54:04 I'm considering moving this to _reset.scss and ren
saroyanm 2016/11/24 13:26:50 I think we might need in future separate file for
saroyanm 2016/11/24 15:18:44 Acknowledged. We will leave here only "markdown"
juliandoucette 2016/11/25 16:28:41 Done.
41 {
42 width: $mobile-width;
43 max-width: 100%;
44 margin: 0px auto;
45 padding: 0px $small-space;
46 }
47
48 @media(min-width: $tablet-breakpoint)
saroyanm 2016/11/21 18:44:39 I thought we decided to move this rules to the bot
juliandoucette 2016/11/22 00:54:04 Acknowledged. I shouldn't have moved this back.
juliandoucette 2016/11/25 16:28:43 Done.
49 {
50 .container
51 {
52 width: $tablet-width;
saroyanm 2016/11/21 18:44:40 What about calculating container width according t
juliandoucette 2016/11/22 00:54:03 No. I said before that: - The breakpoints are e
saroyanm 2016/11/24 13:26:50 I was suggestion something like -> "$tablet-breakp
saroyanm 2016/11/24 15:18:43 Acknowledged. We will keep variables and not calc
juliandoucette 2016/11/25 16:28:42 Done.
53 }
54 }
55
56 @media(min-width: $desktop-breakpoint)
57 {
58 .container
59 {
60 width: $desktop-width;
61 }
62 }
63 29
64 p, 30 p,
65 ol, 31 ol,
66 ul, 32 ul,
67 dl, 33 dl,
68 pre, 34 pre,
69 blockquote 35 blockquote
70 { 36 {
71 /* Set consistent margins (opinionated) */ 37 /* Set consistent margins (opinionated) */
72 margin: $small-space 0px; 38 margin: 1em 0em;
73 } 39 }
74 40
75 /* Headings 41 /* Headings
76 ******************************************************************************/ 42 ******************************************************************************/
77 43
78 h1, 44 h1,
79 h2, 45 h2,
80 h3, 46 h3,
81 h4, 47 h4,
82 h5, 48 h5,
83 h6 49 h6
84 { 50 {
85 margin: $medium-space 0 $small-space 0; 51 /* Margin on top **only** (opinionated) */
52 margin: 2em 0em 0em 0em;
86 } 53 }
87 54
88 h1 55 h1
89 { 56 {
90 font-size: round($large-font * 1.6); 57 font-size: 2em;
saroyanm 2016/11/21 18:44:36 I would avoid using SASS methods(like round) until
saroyanm 2016/11/21 18:44:40 Thought: I think you already mentioned that and I
juliandoucette 2016/11/22 00:54:03 The idea here was to base the larger font sizes on
saroyanm 2016/11/24 13:26:49 What about having the floating pixel values ? Anyw
saroyanm 2016/11/24 15:18:43 Acknowledged. We will use Ems for everything conte
juliandoucette 2016/11/25 16:28:44 Done. Except for line-height because of https://d
91 } 58 }
92 59
93 h2 60 h2
94 { 61 {
95 font-size: round($large-font * 1.4); 62 font-size: 1.5em;
96 } 63 }
97 64
98 h3 65 h3
99 { 66 {
100 font-size: round($large-font * 1.2); 67 font-size: 1.25em;
101 } 68 }
102 69
103 h4 70 h4
104 { 71 {
105 font-size: $large-font; 72 font-size: 1em;
106 } 73 }
107 74
108 h5 75 h5
109 { 76 {
110 font-size: $medium-font; 77 font-size: 0.8em;
111 } 78 }
112 79
113 h6 80 h6
114 { 81 {
115 font-size: $small-font; 82 font-size: 0.7em;
116 } 83 }
117 84
118 /* Body content 85 /* Body content
119 ******************************************************************************/ 86 ******************************************************************************/
120 87
121 abbr 88 abbr
122 { 89 {
123 text-decoration: underline dotted; 90 text-decoration: underline;
saroyanm 2016/11/21 18:44:36 Apparently shorthand properties are only supported
juliandoucette 2016/11/22 00:54:03 Acknowledged.
juliandoucette 2016/11/25 16:28:43 Done.
124 cursor: help; 91 cursor: help;
125 } 92 }
126 93
127 b, 94 b,
128 strong 95 strong
129 { 96 {
130 font-weight: $bold-weight; 97 font-weight: $bold-weight;
131 } 98 }
132 99
133 small 100 small
134 { 101 {
135 font-size: $small-font; 102 font-size: $small-font;
136 } 103 }
137 104
138 sup 105 sup
139 { 106 {
140 position: relative; 107 position: relative;
141 font-size: 75%; 108 font-size: 75%;
142 vertical-align: super; 109 vertical-align: super;
143 } 110 }
144 111
145 a, 112 a,
146 a:visited 113 a:visited
147 { 114 {
148 color: $accent; 115 color: $accent;
149 /* Remove the gray background on active links in IE 10. */ 116 /* Remove the gray background on active links in IE 10. */
150 background-color: transparent; 117 background-color: transparent;
151 text-decoration: none; 118 text-decoration: none;
119 /* Set default pointer regardless of href (opinionated) */
120 cursor: pointer;
152 } 121 }
153 122
154 a:hover, 123 a:hover,
155 a:active, 124 a:active,
156 a:focus 125 a:focus
157 { 126 {
158 text-decoration: underline; 127 text-decoration: underline;
159 } 128 }
160 129
161 img 130 img
162 { 131 {
163 /* Make fixed width images responsive */ 132 /* Make fixed width images responsive */
164 max-width: 100%; 133 max-width: 100%;
165 /* Remove the border on images inside links in IE 10-. */ 134 /* Remove the border on images inside links in IE 10-. */
166 border-style: none; 135 border-style: none;
167 } 136 }
168 137
169 hr 138 hr
170 { 139 {
171 border: 1px solid $secondary-light; 140 border: 1px solid $secondary-light;
172 } 141 }
173 142
174 [dir="ltr"] blockquote 143 blockquote
175 { 144 {
176 padding-left: $small-space; 145 padding-left: 1em;
177 border-left: 5px solid $secondary-light; 146 border-left: 5px solid $secondary;
178 } 147 }
179 148
180 [dir="rtl"] blockquote 149 [dir="rtl"] blockquote
181 { 150 {
182 padding-right: $small-space; 151 padding-right: 1em;
152 padding-left: 0em;
183 border-right: 5px solid $secondary-light; 153 border-right: 5px solid $secondary-light;
154 border-left: 0px;
184 } 155 }
185 156
186 [dir="ltr"] ol, 157 ol,
187 [dir="ltr"] ul 158 ul
188 { 159 {
189 padding-left: $small-space * 1.5; 160 padding-left: 1.5em;
190 } 161 }
191 162
192 [dir="rtl"] ol, 163 [dir="rtl"] ol,
193 [dir="rtl"] ul 164 [dir="rtl"] ul
194 { 165 {
195 padding-right: $small-space * 1.5; 166 padding-right: 2em;
167 padding-left: 0em;
196 } 168 }
197 169
198 li 170 li
199 { 171 {
200 margin: $small-space / 2 0px; 172 margin: 0.5em 0em;
201 } 173 }
202 174
203 ol ol, 175 ol ol,
204 ul ul, 176 ul ul,
205 ol ul, 177 ol ul,
206 ul ol 178 ul ol
207 { 179 {
208 /* prevent double spacing lists */ 180 /* prevent double spacing lists */
209 margin: 0px; 181 margin: 0em;
210 } 182 }
211 183
212 ol ol 184 ol ol
213 { 185 {
214 list-style-type: lower-alpha; 186 list-style-type: lower-alpha;
215 } 187 }
216 188
217 dt 189 dt
218 { 190 {
219 /* undo browser default (opinionated)*/ 191 /* undo browser default (opinionated)*/
220 font-weight: $bold-weight; 192 font-weight: $bold-weight;
221 } 193 }
222 194
223 dd 195 dd
224 { 196 {
225 margin: $small-space / 2 0px $small-space 0px; 197 margin: 0.5em 0em 1em 0em;
226 } 198 }
227
228 /**
229 * Remove list style from vertical lists
juliandoucette 2016/11/27 21:45:36 Note. Removed .unstyled-list because it cannot be
230 */
231 .unstyled-list,
232 {
233 list-style-type: none;
234 }
235
236 [dir="ltr"] .unstyled-list
237 {
238 padding-left: 0px;
239 }
240
241 [dir="rtl"] .unstyled-list
242 {
243 padding-right: 0px;
244 }
245
246 [dir="ltr"] .unstyled-list .unstyled-list
247 {
248 padding-left: $medium-space;
249 }
250
251 [dir="rtl"] .unstyled-list .unstyled-list
252 {
253 padding-right: $small-space;
254 }
255
256 /* Alignment
257 ******************************************************************************/
258
259 .full-width
260 {
261 display: block;
262 width: 100%;
263 margin: $small-space 0px;
264 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld