Delta Between Two Patch Sets: html/content.html
Issue 29361647:
Issue 4607 - Default content styles (Closed)
Left Patch Set: Added container & simplified html/scss
Created Nov. 10, 2016, 1:22 p.m.
Right Patch Set: Removed extra list items and changed image text capitilization
Created Nov. 17, 2016, 4:17 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« gulpfile.js ('K')
|
« gulpfile.js ('k')
|
package.json » ('j')
|
scss/_content.scss » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <!-- | 2 <!-- |
| 3 This file is part of universal-design-language | 3 This file is part of universal-design-language |
| 4 Copyright (C) 2016 Eyeo GmbH | 4 Copyright (C) 2016 Eyeo GmbH |
| 5 | 5 |
| 6 universal-design-language is free software: you can redistribute it and/or | 6 universal-design-language is free software: you can redistribute it and/or |
| 7 modify it under the terms of the GNU General Public License as published by | 7 modify it under the terms of the GNU General Public License as published by |
| 8 the Free Software Foundation, either version 3 of the License, or | 8 the Free Software Foundation, either version 3 of the License, or |
| 9 (at your option) any later version. | 9 (at your option) any later version. |
| 10 | 10 |
| 11 universal-design-language is distributed in the hope that it will be useful, | 11 universal-design-language is distributed in the hope that it will be useful, |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 GNU General Public License for more details. | 14 GNU General Public License for more details. |
| 15 | 15 |
| 16 You should have received a copy of the GNU General Public License | 16 You should have received a copy of the GNU General Public License |
| 17 along with web.starter-kit. If not, see <http://www.gnu.org/licenses/>. | 17 along with web.starter-kit. If not, see <http://www.gnu.org/licenses/>. |
| 18 --> | 18 --> |
| 19 <html dir="ltr"> | 19 <html dir="ltr"> |
| 20 <head> | 20 <head> |
| 21 <meta charset="utf-8"> | 21 <meta charset="utf-8"> |
| 22 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to- fit=no"> | 22 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to- fit=no"> |
| 23 <meta http-equiv="x-ua-compatible" content="ie=edge"> | 23 <meta http-equiv="x-ua-compatible" content="ie=edge"> |
| 24 <title>Content</title> | 24 <title>Content</title> |
| 25 <link rel="stylesheet" href="/css/main.css"> | 25 <link rel="stylesheet" href="/css/main.css"> |
| 26 </head> | 26 </head> |
| 27 <body> | 27 <body style="margin-bottom: 3em;"> |
|
saroyanm
2016/11/21 18:44:35
Detail: let's not encourage people to use inline s
juliandoucette
2016/11/22 00:54:02
Do we really want to create a new <style> for *jus
saroyanm
2016/11/24 13:26:49
I see couple of reasons:
* Overwriting inline-styl
saroyanm
2016/11/24 15:18:42
Acknowledged.
We gonna use <style> tag
juliandoucette
2016/11/25 16:28:41
Done.
| |
| 28 <main class="container"> | 28 <div class="container"> |
| 29 | 29 |
| 30 <h1>Content</h1> | 30 <h1>Content</h1> |
| 31 <p>This document outlines a subset of HTML5 that we recommend supporting acc ross all websites.</p> | 31 <p>This document outlines a subset of HTML5 that we recommend supporting acc ross all websites.</p> |
| 32 | 32 |
| 33 <h3>Headings</h3> | 33 <h2>Headings</h2> |
| 34 | 34 |
| 35 <h1>Heading 1</h1> | 35 <h1>Heading 1</h1> |
| 36 <h2>Heading 2</h2> | 36 <h2>Heading 2</h2> |
| 37 <h3>Heading 3</h3> | 37 <h3>Heading 3</h3> |
| 38 <h4>Heading 4</h4> | 38 <h4>Heading 4</h4> |
| 39 <h5>Heading 5</h5> | 39 <h5>Heading 5</h5> |
| 40 <h6>Heading 6</h6> | 40 <h6>Heading 6</h6> |
| 41 | 41 |
| 42 <h3>Inline styles</h3> | 42 <h2>Body content</h2> |
| 43 | 43 |
| 44 <p>This is a normal.</p> | 44 <p>This is a normal.</p> |
| 45 <p>This is <em>emphasized</em>.</p> | 45 <p>This is <em>emphasized</em>.</p> |
| 46 <p>This is <strong>strong</strong>.</p> | 46 <p>This is <strong>strong</strong>.</p> |
| 47 <p>This is inline <code>code</code>.</p> | |
| 48 <p>This is an <abbr title="Abbreviation">abbr</abbr>.</p> | 47 <p>This is an <abbr title="Abbreviation">abbr</abbr>.</p> |
| 49 <p>This is a <a href="#">link</a>.</p> | 48 <p>This is a <a href="#">link</a>.</p> |
| 50 <p>This has a footnote. <sup>[<a href="#">1</a>]</sup></p> | 49 <p>This has a footnote. <sup><a href="#" class="footnote-ref">1</a></sup></p > |
| 51 | 50 <blockquote>This is a blockquote.</blockquote> |
| 52 <h3>Blockquotes</h3> | 51 <p>This is followed by a thematic break.</p> |
| 53 | 52 <hr> |
| 54 <blockquote> | 53 <p>Like a change of scene in a story, or a shift of topic within a section.< /p> |
| 55 <p>This is a blockquote.</p> | |
| 56 </blockquote> | |
| 57 | |
| 58 <h3>Code blocks</h3> | |
| 59 | |
| 60 <pre style="height: 100px;"><code> | |
| 61 Lorem ipsum dolor sit amet, consectetur | |
| 62 adipiscing elit, sed do eiusmod tempor | |
| 63 incididunt ut labore et dolore magna | |
| 64 aliqua. Ut enim ad minim veniam, quis | |
| 65 nostrud exercitation ullamco laboris | |
| 66 nisi ut aliquip ex ea commodo consequat. | |
| 67 Duis aute irure dolor in reprehenderit | |
| 68 in voluptate velit esse cillum dolore eu | |
| 69 fugiat nulla pariatur. Excepteur sint | |
| 70 occaecat cupidatat non proident, sunt in | |
| 71 culpa qui officia deserunt mollit anim | |
| 72 id est laborum. | |
| 73 </code></pre> | |
| 74 <pre><code> | |
| 75 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i ncididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostru d exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aut e irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat n ulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. | |
| 76 </code></pre> | |
| 77 | 54 |
| 78 <h3>Ordered lists</h3> | 55 <h3>Ordered lists</h3> |
| 79 | 56 |
| 80 <ol> | 57 <ol> |
| 81 <li>This is a list item.</li> | 58 <li>This is a list item</li> |
| 82 <li>This is a list item.</li> | 59 <li>This is a list item |
| 83 <li>This is a list item. | |
| 84 <ol> | 60 <ol> |
| 85 <li>This is a list item.</li> | 61 <li>This is a list item</li> |
| 86 <li>This is a list item.</li> | 62 <li>This is a list item</li> |
| 87 <li>This is a list item.</li> | |
| 88 <li>This is a list item.</li> | |
| 89 </ol> | 63 </ol> |
| 90 </li> | 64 </li> |
| 91 <li>This is a list item.</li> | 65 <li>This is a list item</li> |
| 92 </ol> | 66 </ol> |
| 93 | 67 |
| 94 <h3>Unordered lists</h3> | 68 <h3>Unordered lists</h3> |
| 95 | 69 |
| 96 <ul> | 70 <ul> |
| 97 <li>This is a list item.</li> | 71 <li>This is a list item</li> |
| 98 <li>This is a list item.</li> | 72 <li>This is a list item |
| 99 <li>This is a list item. | |
| 100 <ul> | 73 <ul> |
| 101 <li>This is a list item.</li> | 74 <li>This is a list item</li> |
| 102 <li>This is a list item.</li> | 75 <li>This is a list item</li> |
| 103 <li>This is a list item.</li> | |
| 104 <li>This is a list item.</li> | |
| 105 </ul> | 76 </ul> |
| 106 </li> | 77 </li> |
| 107 <li>This is a list item.</li> | 78 <li>This is a list item</li> |
| 108 </ul> | 79 </ul> |
| 109 | 80 |
| 110 <h3>Unstyled list</h3> | 81 <h3>Unstyled lists</h3> |
| 111 | 82 |
| 112 <ul class="unstyled-list"> | 83 <ul class="unstyled-list"> |
| 113 <li>This is a list item.</li> | 84 <li>This is a list item</li> |
| 114 <li>This is a list item.</li> | 85 <li>This is a list item |
| 115 <li>This is a list item. | 86 <ul class="unstyled-list"> |
| 116 <ul> | 87 <li>This is a list item</li> |
| 117 <li>This is a list item.</li> | 88 <li>This is a list item</li> |
| 118 <li>This is a list item.</li> | |
| 119 <li>This is a list item.</li> | |
| 120 <li>This is a list item.</li> | |
| 121 </ul> | 89 </ul> |
| 122 </li> | 90 </li> |
| 123 <li>This is a list item.</li> | 91 <li>This is a list item</li> |
| 124 </ul> | 92 </ul> |
| 125 | 93 |
| 126 <h3>Definition list</h3> | 94 <h3>Definition lists</h3> |
| 127 | 95 |
| 128 <dl> | 96 <dl> |
| 129 <dt>This is a definition title.</dt> | 97 <dt>This is a definition title</dt> |
| 130 <dd>This is a definition detail.</dd> | 98 <dd>This is a definition detail</dd> |
| 131 <dt>This is a definition title.</dt> | 99 <dt>This is a definition title</dt> |
| 132 <dd>This is a definition detail.</dd> | 100 <dd>This is a definition detail</dd> |
| 133 </dl> | 101 </dl> |
| 134 | 102 |
| 135 <h3>Embedded video</h3> | 103 <h2>Images</h2> |
| 136 | 104 |
| 137 <div class="youtube-16x9"> | 105 <img src="//placehold.it/480x240?text=Fixed width" /> |
| 138 <iframe src="//www.youtube.com/embed/zpOULjyy-n8?rel=0" allowfullscreen></ iframe> | 106 <img class="full-width" src="//placehold.it/960x240?text=Full width" /> |
| 139 </div> | |
| 140 | 107 |
| 141 <h3>Image alignment</h3> | 108 </div> |
| 142 | |
| 143 <p> | |
| 144 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod te mpor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. | |
| 145 | |
| 146 <img class="block" src="//placehold.it/992x140?text=Block"> | |
| 147 | |
| 148 Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolo re eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sun t in culpa qui officia deserunt mollit anim id est laborum. | |
| 149 </p> | |
| 150 | |
| 151 <img class="float-start" src="//placehold.it/120x120?text=Start"> | |
| 152 <p> | |
| 153 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod te mpor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Du is aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fu giat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in cul pa qui officia deserunt mollit anim id est laborum. | |
| 154 </p> | |
| 155 <img class="float-end" src="//placehold.it/120x120?text=End"> | |
| 156 <p> | |
| 157 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod te mpor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.Dui s aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fug iat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culp a qui officia deserunt mollit anim id est laborum. | |
| 158 </p> | |
| 159 <p> | |
| 160 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod te mpor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Du is aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fu giat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in cul pa qui officia deserunt mollit anim id est laborum. | |
| 161 </p> | |
| 162 | |
| 163 </main> | |
| 164 </body> | 109 </body> |
| 165 </html> | 110 </html> |
| LEFT | RIGHT |
« gulpfile.js ('k')
|
package.json » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
