History

Refactor CSS

Thibaut committed 11 years ago

Commit bec7ebb1 parent b29d6ca18 files · +25 −117Browse files

Unified · Split

18 files
  1. assets/stylesheets/application-dark.css.scss +1 −7
  2. assets/stylesheets/application.css.scss +1 −7
  3. assets/stylesheets/pages/_base.scss +12 −8
  4. assets/stylesheets/pages/_chai.scss +1 −9
  5. assets/stylesheets/pages/_coffeescript.scss +1 −6
  6. assets/stylesheets/pages/_cordova.scss +0 −10
  7. assets/stylesheets/pages/_express.scss +1 −5
  8. assets/stylesheets/pages/_go.scss +2 −4
  9. assets/stylesheets/pages/_grunt.scss +0 −8
  10. assets/stylesheets/pages/_less.scss +0 −8
  11. assets/stylesheets/pages/_lua.scss +1 −6
  12. assets/stylesheets/pages/_marionette.scss +0 −8
  13. assets/stylesheets/pages/_markdown.scss +0 −7
  14. assets/stylesheets/pages/_maxcdn.scss +1 −7
  15. assets/stylesheets/pages/_mongoose.scss +0 −8
  16. assets/stylesheets/pages/_requirejs.scss +1 −6
  17. lib/docs/filters/less/clean_html.rb +1 −1
  18. lib/docs/filters/less/entries.rb +2 −2
assets/stylesheets/application-dark.css.scss+1−7
@@ -35,27 +35,21 @@ · 34 unmodified lines
35 'pages/chai',35 'pages/chai',
36 'pages/clojure',36 'pages/clojure',
37 'pages/coffeescript',37 'pages/coffeescript',
38 'pages/cordova',
39 'pages/d3',38 'pages/d3',
40 'pages/ember',39 'pages/ember',
41 'pages/express',40 'pages/express',
41 'pages/git',
42 'pages/go',42 'pages/go',
43 'pages/haskell',43 'pages/haskell',
44 'pages/jquery',44 'pages/jquery',
45 'pages/knockout',45 'pages/knockout',
46 'pages/git',
47 'pages/grunt',
48 'pages/laravel',46 'pages/laravel',
49 'pages/less',
50 'pages/lua',47 'pages/lua',
51 'pages/marionette',
52 'pages/markdown',
53 'pages/maxcdn',48 'pages/maxcdn',
54 'pages/mdn',49 'pages/mdn',
55 'pages/meteor',50 'pages/meteor',
56 'pages/modernizr',51 'pages/modernizr',
57 'pages/moment',52 'pages/moment',
58 'pages/mongoose',
59 'pages/nginx',53 'pages/nginx',
60 'pages/node',54 'pages/node',
61 'pages/php',55 'pages/php',
assets/stylesheets/application.css.scss+1−7
@@ -35,27 +35,21 @@ · 34 unmodified lines
35 'pages/chai',35 'pages/chai',
36 'pages/clojure',36 'pages/clojure',
37 'pages/coffeescript',37 'pages/coffeescript',
38 'pages/cordova',
39 'pages/d3',38 'pages/d3',
40 'pages/ember',39 'pages/ember',
41 'pages/express',40 'pages/express',
41 'pages/git',
42 'pages/go',42 'pages/go',
43 'pages/haskell',43 'pages/haskell',
44 'pages/jquery',44 'pages/jquery',
45 'pages/knockout',45 'pages/knockout',
46 'pages/git',
47 'pages/grunt',
48 'pages/laravel',46 'pages/laravel',
49 'pages/less',
50 'pages/lua',47 'pages/lua',
51 'pages/marionette',
52 'pages/markdown',
53 'pages/maxcdn',48 'pages/maxcdn',
54 'pages/mdn',49 'pages/mdn',
55 'pages/meteor',50 'pages/meteor',
56 'pages/modernizr',51 'pages/modernizr',
57 'pages/moment',52 'pages/moment',
58 'pages/mongoose',
59 'pages/nginx',53 'pages/nginx',
60 'pages/node',54 'pages/node',
61 'pages/php',55 'pages/php',
assets/stylesheets/pages/_base.scss+12−8
@@ -1,10 +1,7 @@
1%simple {1%simple {
2 padding-left: 1rem;2 padding-left: 1rem;
3 3
4 h1, h2, h3 {4 h1, h2, h3 { margin-left: -1rem; }
5 position: relative;
6 left: -1rem;
7 }
8 h2 { @extend %block-heading; }5 h2 { @extend %block-heading; }
9 h3 { @extend %block-label, %label-blue; }6 h3 { @extend %block-label, %label-blue; }
10 h4 { font-size: inherit; }7 h4 { font-size: inherit; }
@@ -12,14 +9,21 @@ · 1 unmodified line
12 ._mobile & {9 ._mobile & {
13 padding-left: 0;10 padding-left: 0;
14 11
15 h1, h2, h3 { left: 0; }12 h1, h2, h3 { margin-left: 0; }
16 }13 }
17 14
18 code { @extend %label; }15 p > code, li > code { @extend %label; }
16 blockquote { @extend %note; }
19}17}
20 18
19._cordova,
20._grunt,
21._less,
21._lodash,22._lodash,
22._sinon,23._marionette,
23._mocha {24._markdown,
25._mocha,
26._mongoose,
27._sinon {
24 @extend %simple;28 @extend %simple;
25}29}
assets/stylesheets/pages/_chai.scss+1−9
@@ -1,13 +1,5 @@
1._chai {1._chai {
2 padding-left: 1rem;2 @extend %simple;
3
4 > h1, > h2, h3 { margin-left: -1rem; }
5 > h2 { @extend %block-heading; }
6 h3 { @extend %block-label, %label-blue; }
7 h4 { font-size: 1em; }
8
9 code { @extend %label; }
10 blockquote { @extend %note; }
11 3
12 li.tag span { margin-right: 5px; }4 li.tag span { margin-right: 5px; }
13}5}
assets/stylesheets/pages/_coffeescript.scss+1−6
@@ -1,10 +1,5 @@
1._coffeescript {1._coffeescript {
2 padding-left: 1rem;2 @extend %simple;
3
4 > h1, > h2 { margin-left: -1rem; }
5 > h2 { @extend %block-heading; }
6
7 code { @extend %label; }
8 3
9 // CoffeeScript / JavaScript code blocks4 // CoffeeScript / JavaScript code blocks
10 > .code {5 > .code {
assets/stylesheets/pages/_cordova.scss+0−10
@@ -1,10 +0,0 @@
1._cordova {
2 padding-left: 1rem;
3
4 > h1, > h2 { margin-left: -1rem; }
5 > h2 { @extend %block-heading; }
6 > h3 { font-size: 1rem; }
7
8 code { @extend %label; }
9 blockquote { @extend %note; }
10}
assets/stylesheets/pages/_express.scss+1−5
@@ -1,10 +1,6 @@
1._express {1._express {
2 padding-left: 1rem;2 @extend %simple;
3 3
4 h1, h2, h3 { margin-left: -1rem; }
5 h2 { @extend %block-heading; }
6 h3 { @extend %block-label, %label-blue; }
7 p > code { @extend %label; }
8 .doc-box { @extend %note; }4 .doc-box { @extend %note; }
9 .doc-warn { @extend %note-red; }5 .doc-warn { @extend %note-red; }
10}6}
assets/stylesheets/pages/_go.scss+2−4
@@ -1,7 +1,5 @@
1._go {1._go {
2 padding-left: 1rem;2 @extend %simple;
3 3
4 h1, h2, #short-nav, table.dir { margin-left: -1rem; }4 #short-nav, table.dir { margin-left: -1rem; }
5 h2 { @extend %block-heading; }
6 h3 { @extend %block-label, %label-blue; }
7}5}
assets/stylesheets/pages/_grunt.scss+0−8
@@ -1,8 +0,0 @@
1._grunt {
2 padding-left: 1rem;
3
4 h1, h2, h3 { margin-left: -1rem; }
5 h2 { @extend %block-heading; }
6 h3 { @extend %block-label, %label-blue; }
7 p > code { @extend %label; }
8}
assets/stylesheets/pages/_less.scss+0−8
@@ -1,8 +0,0 @@
1._less {
2 padding-left: 1rem;
3
4 > h1, > h2, h3, h4 { margin-left: -1rem; }
5 > h2 { @extend %block-heading; }
6 h3, h4 { @extend %block-label, %label-blue; }
7 code { @extend %label; }
8}
assets/stylesheets/pages/_lua.scss+1−6
@@ -1,10 +1,5 @@
1._lua {1._lua {
2 padding-left: 1rem;2 @extend %simple;
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 3
9 .apii { float: right; }4 .apii { float: right; }
10}5}
assets/stylesheets/pages/_marionette.scss+0−8
@@ -1,8 +0,0 @@
1._marionette {
2 padding-left: 1rem;
3
4 > h1, > h2 { margin-left: -1rem; }
5 > h2 { @extend %block-heading; }
6 > h3 { @extend %block-label, %label-blue; }
7 blockquote { @extend %note; }
8}
assets/stylesheets/pages/_markdown.scss+0−7
@@ -1,7 +0,0 @@
1._markdown {
2 padding-left: 1rem;
3
4 h1, h2, h3, h1 + ul { margin-left: -1rem; }
5 h2 { @extend %block-heading; }
6 h3 { @extend %block-label, %label-blue; }
7}
assets/stylesheets/pages/_maxcdn.scss+1−7
@@ -1,11 +1,5 @@
1._maxcdn {1._maxcdn {
2 padding-left: 1rem;2 @extend %simple;
3
4 h1, h2, h3 { margin-left: -1rem; }
5 h2 { @extend %block-heading; }
6 h3 { @extend %block-label, %label-blue; }
7 h4 { font-size: 1em; }
8 p > code { @extend %label; }
9 3
10 .url {4 .url {
11 padding: .5rem;5 padding: .5rem;
assets/stylesheets/pages/_mongoose.scss+0−8
@@ -1,8 +0,0 @@
1._mongoose {
2 padding-left: 1rem;
3
4 > h1, > h2, > h3 { margin-left: -1rem; }
5 > h2 { @extend %block-heading; }
6 > h3 { @extend %block-label, %label-blue; }
7 h4 { font-size: 1em; }
8}
assets/stylesheets/pages/_requirejs.scss+1−6
@@ -1,10 +1,5 @@
1._requirejs {1._requirejs {
2 padding-left: 1rem;2 @extend %simple;
3
4 h1, h2, h3, ul.index { margin-left: -1rem; }
5 h2 { @extend %block-heading; }
6 h3 { @extend %block-label, %label-blue; }
7 h4 { font-size: 1em; }
8 3
9 ul.index ul { margin: .5em 0; }4 ul.index ul { margin: .5em 0; }
10}5}
lib/docs/filters/less/clean_html.rb+1−1
@@ -22,7 +22,7 @@ module Docs · 21 unmodified lines
22 end22 end
23 23
24 css('h1, h2, h3, h4').each do |node|24 css('h1, h2, h3, h4').each do |node|
25 node.name = node.name.sub(/\d/) { |i| i.to_i + 1 }25 node.name = node.name.sub(/\d/) { |i| [i.to_i + 1, 3].min }
26 end26 end
27 27
28 css('pre').each do |node|28 css('pre').each do |node|
lib/docs/filters/less/entries.rb+2−2
@@ -23,7 +23,7 @@ module Docs · 22 unmodified lines
23 end23 end
24 24
25 css('h3[id^="import-options-"]').each do |node|25 css('h3[id^="import-options-"]').each do |node|
26 entries << ["@import #{node.content}", node['id']]26 entries << ["@import #{node.content}", node['id']] unless node.content =~ /example/i
27 end27 end
28 28
29 entries.concat [29 entries.concat [
@@ -52,7 +52,7 @@ module Docs · 22 unmodified lines
52 if node.name == 'h2'52 if node.name == 'h2'
53 type = node.content53 type = node.content
54 type.sub! %r{(.+) Functions}, 'Functions: \1'54 type.sub! %r{(.+) Functions}, 'Functions: \1'
55 elsif node.name == 'h4'55 elsif node.name == 'h3'
56 entries << [node.content, node['id'], type]56 entries << [node.content, node['id'], type]
57 end57 end
58 end58 end