Skip to content

Commit c4b5ace

Browse files
committed
Merge pull request #1 from jquery/master
merge
2 parents aaece6d + 64a51ac commit c4b5ace

15 files changed

Lines changed: 850 additions & 20 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ style.css
66
# Folders
77
bower_components/
88
node_modules/
9-
external/
109
icons/svg-min/
1110
.sass-cache/
1211
dist/

Gruntfile.js

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ module.exports = function( grunt ) {
22
require( "load-grunt-tasks" )( grunt );
33

44
var config = {
5+
htmllint: {
6+
dist: {
7+
options: {},
8+
src: [ "demos/*.html" ]
9+
}
10+
},
511
autoprefixer: {
612
dist: {
713
options: {
@@ -44,7 +50,7 @@ var config = {
4450
}
4551
},
4652
csslint: {
47-
src: [ "dist/css/*.css" ]
53+
src: [ "dist/css/chassis.lint.css", "dist/css/chassis.lint.css", "demos/demos.css" ]
4854
},
4955
jscs: {
5056
all: [ "*.js", "performance/**/*.js" ]
@@ -55,7 +61,20 @@ var config = {
5561
jshintrc: ".jshintrc"
5662
}
5763
},
64+
npmcopy: {
65+
options: {
66+
destPrefix: "external"
67+
},
68+
normalize: {
69+
files: {
70+
"normalize.css/LICENSE.md": "normalize.css/LICENSE.md",
71+
"normalize.css/normalize.scss": "normalize.css/normalize.css"
72+
}
73+
}
74+
},
5875
sass: {
76+
77+
// This is the same as lint below except including normalize.css
5978
dist: {
6079
options: {
6180
sourceMap: true,
@@ -66,6 +85,19 @@ var config = {
6685
files: {
6786
"dist/css/chassis.css": "scss/style.scss"
6887
}
88+
},
89+
90+
// This is everything except normalize.css which won't pass our lint settings
91+
lint: {
92+
options: {
93+
sourceMap: true,
94+
95+
// This actually does nested until libsass updates to support expanded
96+
outputStyle: "expanded"
97+
},
98+
files: {
99+
"dist/css/chassis.lint.css": "scss/lint.scss"
100+
}
69101
}
70102
},
71103

@@ -155,7 +187,7 @@ grunt.initConfig( config );
155187
grunt.loadTasks( "tasks" );
156188
grunt.loadNpmTasks( "perfjankie" );
157189
grunt.registerTask( "default", [ "test" ] );
158-
grunt.registerTask( "test", [ "build", "jshint", "jscs", "csslint" ] );
190+
grunt.registerTask( "test", [ "build", "jshint", "jscs", "csslint", "htmllint" ] );
159191
grunt.registerTask( "build", [ "svg", "sass", "csscomb", "cssmin" ] );
160192
grunt.registerTask( "perf", [
161193
"start-selenium-server",

demos/demos.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
body {
2+
max-width: 700px;
3+
margin: 3em auto;
4+
padding: 0 1em;
5+
}

demos/typography.html

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>CSS Chassis - Typography</title>
6+
<meta name="description" content="Typography skeleton for styling">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
<link rel="stylesheet" href="../dist/css/chassis.css">
9+
<link rel="stylesheet" href="demos.css">
10+
<link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700,400italic,700italic" rel="stylesheet">
11+
</head>
12+
<body>
13+
14+
<h1>CSS Chassis</h1>
15+
16+
<hr>
17+
18+
<h1>Heading 1 &lt;h1&gt;</h1>
19+
<h2>Heading 2 &lt;h2&gt;</h2>
20+
<h3>Heading 3 &lt;h3&gt;</h3>
21+
<h4>Heading 4 &lt;h4&gt;</h4>
22+
<h5>Heading 5 &lt;h5&gt;</h5>
23+
<h6>Heading 6 &lt;h6&gt;</h6>
24+
25+
<hr>
26+
27+
<h1>Heading 1 &lt;h1&gt;</h1>
28+
<p>Many say exploration is part of our destiny, but it’s actually our duty to future generations and their quest to ensure the survival of the human species.</p>
29+
30+
<h2>Heading 2 &lt;h2&gt;</h2>
31+
<p>It suddenly struck me that that tiny pea, pretty and blue, was the Earth. I put up my thumb and shut one eye, and my thumb blotted out the planet Earth. I didn"t feel like a giant. I felt very, very small.</p>
32+
33+
<h3>Heading 3 &lt;h3&gt;</h3>
34+
<p>The Earth was small, light blue, and so touchingly alone, our home that must be defended like a holy relic. The Earth was absolutely round. I believe I never knew what the word round meant until I saw Earth from space.</p>
35+
36+
<h4>Heading 4 &lt;h4&gt;</h4>
37+
<p>To be the first to enter the cosmos, to engage, single-handed, in an unprecedented duel with nature—could one dream of anything more?</p>
38+
39+
<h5>Heading 5 &lt;h5&gt;</h5>
40+
<p>What was most significant about the lunar voyage was not that man set foot on the Moon but that they set eye on the earth.</p>
41+
42+
<h6>Heading 6 &lt;h6&gt;</h6>
43+
<p>Many say exploration is part of our destiny, but it’s actually our duty to future generations and their quest to ensure the survival of the human species.</p>
44+
45+
<hr>
46+
47+
<h2>Block-level elements</h2>
48+
49+
<p>Here"s a paragraph &lt;p&gt; filled with some <a href="http://spaceipsum.com/">Space Ipsum</a>. Never in all their history have men been able truly to conceive of the world as one: a single sphere, a globe, having the qualities of a globe, a round earth in which all the directions eventually meet, in which there is no center because every point, or none, is center — an equal earth which all men occupy as equals. The airman"s earth, if free men make it, will be truly round: a globe in practice, not in theory.</p>
50+
51+
<p>There can be no thought of finishing for ‘aiming for the stars.’ Both figuratively and literally, it is a task to occupy the generations. And no matter how much progress one makes, there is always the thrill of just beginning.</p>
52+
53+
<div>Here"s a div &lt;div&gt;. A Chinese tale tells of some men sent to harm a young girl who, upon seeing her beauty, become her protectors rather than her violators. That"s how I felt seeing the Earth for the first time. I could not help but love and cherish her
54+
</div>
55+
56+
<article>
57+
<h3>This is an article &lt;article&gt; with a paragraph</h3>
58+
<p>We want to explore. We’re curious people. Look back over history, people have put their lives at stake to go out and explore … We believe in what we’re doing. Now it’s time to go.</p>
59+
<p>End of the article.</p>
60+
</article>
61+
62+
<blockquote>Let"s light this fire one more time, Mike, and witness this great nation at its best. &lt;blockquote&gt; via <a href="http://spaceipsum.com/">Space Ipsum</a></blockquote>
63+
64+
<p>We choose to go to the moon in this decade and do the other things, not because they are easy, but because they are hard, because that goal will serve to organize and measure the best of our energies and skills, because that challenge is one that we are willing to accept, one we are unwilling to postpone, and one which we intend to win.</p>
65+
66+
<pre>
67+
* {
68+
font-family: "Comic Sans MS", "Comic Sans", "Marker Felt" !important;
69+
}
70+
&lt;pre&gt;
71+
</pre>
72+
73+
<p>Many say exploration is part of our destiny, but it’s actually our duty to future generations and their quest to ensure the survival of the human species.</p>
74+
75+
<address>
76+
<strong>Sherlock Holmes</strong><br>
77+
221B Baker Street<br>
78+
London, United Kingdom &lt;address&gt;
79+
</address>
80+
81+
<hr>
82+
83+
<h2>Lists &lt;li&gt;</h2>
84+
<p>The regret on our side is, they used to say years ago, we are reading about you in science class. Now they say, we are reading about you in history class.</p>
85+
86+
<ul>
87+
<li>Unordered list &lt;ul&gt;</li>
88+
<li>List element</li>
89+
<li>Across the sea of space, the stars are other suns.</li>
90+
<li>Science cuts two ways, of course; its products can be used for both good and evil. But there"s no turning back from science. The early warnings about technological dangers also come from science.</li>
91+
</ul>
92+
93+
<p>It suddenly struck me that that tiny pea, pretty and blue, was the Earth. I put up my thumb and shut one eye, and my thumb blotted out the planet Earth. I didn"t feel like a giant. I felt very, very small.</p>
94+
95+
<ol>
96+
<li>Ordered list &lt;ol&gt;</li>
97+
<li>List element</li>
98+
<li>The dreams of yesterday are the hopes of today and the reality of tomorrow.</li>
99+
<li>Curious that we spend more time congratulating people who have succeeded than encouraging people who have not.</li>
100+
</ol>
101+
102+
<p>For those who have seen the Earth from space, and for the hundreds and perhaps thousands more who will, the experience most certainly changes your perspective. The things that we share in our world are far more valuable than those which divide us.</p>
103+
104+
<dl>
105+
<dt>Definition term &lt;dt&gt;</dt>
106+
<dd>Definition &lt;dd&gt;</dd>
107+
<dt>Earth</dt>
108+
<dd>A kick-ass planet.</dd>
109+
<dt>Pluto</dt>
110+
<dd>A kick-ass former planet.</dd>
111+
<dt>Space Ipsum</dt>
112+
<dd>NASA is not about the ‘Adventure of Human Space Exploration’…We won’t be doing it just to get out there in space – we’ll be doing it because the things we learn out there will be making life better for a lot of people who won’t be able to go.</dd>
113+
</dl>
114+
115+
<p>Spaceflights cannot be stopped. This is not the work of any one man or even a group of men. It is a historical process which mankind is carrying out in accordance with the natural laws of human development.</p>
116+
117+
<hr>
118+
119+
<h2>Text-level elements</h2>
120+
121+
<ul>
122+
<li><a href="#">anchor link</a> &lt;a&gt;</li>
123+
<li>abbreviation: <abbr title="Syntactically Awesome Stylesheets">SASS</abbr> &lt;abbr&gt;</li>
124+
<li>citation: <cite>A Study in Scarlet</cite> &lt;cite&gt;</li>
125+
<li>Here"s the <code>&lt;code&gt;</code> element</li>
126+
<li>deleted text: <del>Episodes I, II, III</del> &lt;del&gt;</li>
127+
<li>definition: The <dfn>definition element</dfn> is the element being defined inline. &lt;dfn&gt;</li>
128+
<li><em>emphasis</em> &lt;em&gt;</li>
129+
<li><ins>inserted text</ins> &lt;ins&gt;</li>
130+
<li>keyboard input: <kbd>control + space</kbd> &lt;kbd&gt;</li>
131+
<li><mark>mark element</mark> &lt;mark&gt;</li>
132+
<li>meter: <meter min="200" max="500" value="423">awesomeness</meter> &lt;meter&gt;</li>
133+
<li>progress: <progress value="90" max="100">70 %</progress> &lt;progress&gt;</li>
134+
<li>quotation (short): <q>You just gotta believe!</q> &lt;q&gt;</li>
135+
<li>quotation within a quotation (short): <q>Yo dawg, I heard you like quotes so I put <q>this quote</q> within this quote.</q> &lt;q&gt;</li>
136+
<li>strikethough: <s>Lance Armstrong remains steroid-free.</s> &lt;s&gt;</li>
137+
<li>sample text: <samp>Error</samp> &lt;samp&gt;</li>
138+
<li>small: <small>Hydrogen</small> &lt;small&gt;</li>
139+
<li>small within small: <small>Hydrogen <small>Hydrogen</small></small> &lt;small&gt;</li>
140+
<li>strong: <strong>The Hammer</strong> &lt;strong&gt;</li>
141+
<li>subscript: <sub>Lower</sub> 0<sub>1<sub>2<sub>3</sub></sub></sub> &lt;sub&gt;</li>
142+
<li>superscript: I need a good <sup>superman</sup> joke to go here. 0<sup>1<sup>2<sup>3</sup></sup></sup> &lt;sup&gt;</li>
143+
<li>time: <time datetime="1985-12-09 19:00">Dec 9</time> &lt;time&gt;</li>
144+
<li>underline: Never underline <u>anything</u>. &lt;u&gt;</li>
145+
<li>variable: <var>cat</var> + <var>dog</var> = <var>catdog</var> &lt;var&gt;</li>
146+
</ul>
147+
<hr>
148+
149+
</body>
150+
</html>

external/normalize.css/LICENSE.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) Nicolas Gallagher and Jonathan Neal
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of
4+
this software and associated documentation files (the "Software"), to deal in
5+
the Software without restriction, including without limitation the rights to
6+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7+
of the Software, and to permit persons to whom the Software is furnished to do
8+
so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

0 commit comments

Comments
 (0)