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
3535 'pages/chai',
3636 'pages/clojure',
3737 'pages/coffeescript',
38− 'pages/cordova',
3938 'pages/d3',
4039 'pages/ember',
4140 'pages/express',
41+ 'pages/git',
4242 'pages/go',
4343 'pages/haskell',
4444 'pages/jquery',
4545 'pages/knockout',
46− 'pages/git',
47− 'pages/grunt',
4846 'pages/laravel',
49− 'pages/less',
5047 'pages/lua',
51− 'pages/marionette',
52− 'pages/markdown',
5348 'pages/maxcdn',
5449 'pages/mdn',
5550 'pages/meteor',
5651 'pages/modernizr',
5752 'pages/moment',
58− 'pages/mongoose',
5953 'pages/nginx',
6054 'pages/node',
6155 'pages/php',
assets/stylesheets/application.css.scss+1−7
@@ -35,27 +35,21 @@ · 34 unmodified lines
3535 'pages/chai',
3636 'pages/clojure',
3737 'pages/coffeescript',
38− 'pages/cordova',
3938 'pages/d3',
4039 'pages/ember',
4140 'pages/express',
41+ 'pages/git',
4242 'pages/go',
4343 'pages/haskell',
4444 'pages/jquery',
4545 'pages/knockout',
46− 'pages/git',
47− 'pages/grunt',
4846 'pages/laravel',
49− 'pages/less',
5047 'pages/lua',
51− 'pages/marionette',
52− 'pages/markdown',
5348 'pages/maxcdn',
5449 'pages/mdn',
5550 'pages/meteor',
5651 'pages/modernizr',
5752 'pages/moment',
58− 'pages/mongoose',
5953 'pages/nginx',
6054 'pages/node',
6155 'pages/php',
assets/stylesheets/pages/_base.scss+12−8
@@ -1,10 +1,7 @@
11 %simple {
22 padding-left: 1rem;
33
4− h1, h2, h3 {
5− position: relative;
6− left: -1rem;
7− }
4+ h1, h2, h3 { margin-left: -1rem; }
85 h2 { @extend %block-heading; }
96 h3 { @extend %block-label, %label-blue; }
107 h4 { font-size: inherit; }
@@ -12,14 +9,21 @@ · 1 unmodified line
129 ._mobile & {
1310 padding-left: 0;
1411
15− h1, h2, h3 { left: 0; }
12+ h1, h2, h3 { margin-left: 0; }
1613 }
1714
18− code { @extend %label; }
15+ p > code, li > code { @extend %label; }
16+ blockquote { @extend %note; }
1917 }
2018
19+._cordova,
20+._grunt,
21+._less,
2122 ._lodash,
22−._sinon,
23−._mocha {
23+._marionette,
24+._markdown,
25+._mocha,
26+._mongoose,
27+._sinon {
2428 @extend %simple;
2529 }
assets/stylesheets/pages/_chai.scss+1−9
@@ -1,13 +1,5 @@
11 ._chai {
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−
9− code { @extend %label; }
10− blockquote { @extend %note; }
2+ @extend %simple;
113
124 li.tag span { margin-right: 5px; }
135 }
assets/stylesheets/pages/_coffeescript.scss+1−6
@@ -1,10 +1,5 @@
11 ._coffeescript {
2− padding-left: 1rem;
3−
4− > h1, > h2 { margin-left: -1rem; }
5− > h2 { @extend %block-heading; }
6−
7− code { @extend %label; }
2+ @extend %simple;
83
94 // CoffeeScript / JavaScript code blocks
105 > .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 @@
11 ._express {
2− padding-left: 1rem;
2+ @extend %simple;
33
4− h1, h2, h3 { margin-left: -1rem; }
5− h2 { @extend %block-heading; }
6− h3 { @extend %block-label, %label-blue; }
7− p > code { @extend %label; }
84 .doc-box { @extend %note; }
95 .doc-warn { @extend %note-red; }
106 }
assets/stylesheets/pages/_go.scss+2−4
@@ -1,7 +1,5 @@
11 ._go {
2− padding-left: 1rem;
2+ @extend %simple;
33
4− h1, h2, #short-nav, table.dir { margin-left: -1rem; }
5− h2 { @extend %block-heading; }
6− h3 { @extend %block-label, %label-blue; }
4+ #short-nav, table.dir { margin-left: -1rem; }
75 }
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 @@
11 ._lua {
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; }
2+ @extend %simple;
83
94 .apii { float: right; }
105 }
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 @@
11 ._maxcdn {
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− p > code { @extend %label; }
2+ @extend %simple;
93
104 .url {
115 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 @@
11 ._requirejs {
2− padding-left: 1rem;
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; }
2+ @extend %simple;
83
94 ul.index ul { margin: .5em 0; }
105 }
lib/docs/filters/less/clean_html.rb+1−1
@@ -22,7 +22,7 @@ module Docs · 21 unmodified lines
2222 end
2323
2424 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 }
2626 end
2727
2828 css('pre').each do |node|
lib/docs/filters/less/entries.rb+2−2
@@ -23,7 +23,7 @@ module Docs · 22 unmodified lines
2323 end
2424
2525 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
2727 end
2828
2929 entries.concat [
@@ -52,7 +52,7 @@ module Docs · 22 unmodified lines
5252 if node.name == 'h2'
5353 type = node.content
5454 type.sub! %r{(.+) Functions}, 'Functions: \1'
55− elsif node.name == 'h4'
55+ elsif node.name == 'h3'
5656 entries << [node.content, node['id'], type]
5757 end
5858 end