Refactor CSS

Thibaut committed 11 years ago

Commit dc6e2391 parent 314f2006 files · +30 −14Browse files

Unified · Split

6 files

assets/stylesheets/application-dark.css.scss +2 −2
assets/stylesheets/application.css.scss +2 −2
assets/stylesheets/components/_content.scss +1 −1
assets/stylesheets/pages/_base.scss +21 −0
assets/stylesheets/pages/_lodash.scss +0 −8
assets/stylesheets/pages/_sinon.scss +4 −1

assets/stylesheets/application-dark.css.scss+2−2

@@ -28,7 +28,8 @@ · 27 unmodified lines
28	28	'components/prism',
29	29	'components/mobile';
30	30
31		−@import 'pages/angular',
	31	+@import 'pages/base',
	32	+ 'pages/angular',
32	33	'pages/bower',
33	34	'pages/c',
34	35	'pages/chai',
@@ -46,7 +47,6 @@ · 11 unmodified lines
46	47	'pages/grunt',
47	48	'pages/laravel',
48	49	'pages/less',
49		− 'pages/lodash',
50	50	'pages/lua',
51	51	'pages/marionette',
52	52	'pages/markdown',

assets/stylesheets/application.css.scss+2−2

@@ -28,7 +28,8 @@ · 27 unmodified lines
28	28	'components/prism',
29	29	'components/mobile';
30	30
31		−@import 'pages/angular',
	31	+@import 'pages/base',
	32	+ 'pages/angular',
32	33	'pages/bower',
33	34	'pages/c',
34	35	'pages/chai',
@@ -46,7 +47,6 @@ · 11 unmodified lines
46	47	'pages/grunt',
47	48	'pages/laravel',
48	49	'pages/less',
49		− 'pages/lodash',
50	50	'pages/lua',
51	51	'pages/marionette',
52	52	'pages/markdown',

assets/stylesheets/components/_content.scss+1−1

@@ -208,7 +208,7 @@ · 207 unmodified lines
208	208	padding: .625rem 1rem;
209	209	@extend %box;
210	210
211		− + ._lined-heading { margin-top: 0; }
	211	+ + h1 { margin-top: 0; }
212	212	}
213	213
214	214	._toc-title {

assets/stylesheets/pages/_base.scss+21−0

@@ -0,0 +1,21 @@
	1	+%simple {
	2	+ padding-left: 1rem;
	3	+
	4	+ h1, h2, h3 {
	5	+ position: relative;
	6	+ left: -1rem;
	7	+ }
	8	+ h2 { @extend %block-heading; }
	9	+ h3 { @extend %block-label, %label-blue; }
	10	+ h4 { font-size: inherit; }
	11	+
	12	+ ._mobile & {
	13	+ padding-left: 0;
	14	+
	15	+ h1, h2, h3 { left: 0; }
	16	+ }
	17	+
	18	+ code { @extend %label; }
	19	+}
	20	+
	21	+._lodash { @extend %simple; }

assets/stylesheets/pages/_lodash.scss+0−8

@@ -1,8 +0,0 @@
1		−._lodash {
2		− padding-left: 1rem;
3		−
4		− h1, h2 { margin-left: -1rem; }
5		− h2 { @extend %block-heading; }
6		− h3 { @extend %block-label, %label-blue; }
7		− h4 { font-size: inherit; }
8		−}

assets/stylesheets/pages/_sinon.scss+4−1

@@ -1,7 +1,10 @@
1	1	._sinon {
2	2	padding-left: 1rem;
3	3
4		− > h1, > h2, > h3 { margin-left: -1rem; }
	4	+ > h1, > h2, > h3 {
	5	+ position: relative;
	6	+ left: -1rem;
	7	+ }
5	8	> h2 { @extend %block-heading; }
6	9	> h3 { @extend %block-label, %label-blue; }
7	10