Merge branch 'master' into gh-pages

Conflicts: javascripts/vendor/custom.modernizr.js javascripts/vendor/zepto.js mockup.html stylesheets/normalize.css
2026-07-13 01:00:28 +08:00 · 2016-02-01 17:05:29 +08:00
parent 33f4401065 5cb9ead162
commit 77d7814cf3
17 changed files with 343 additions and 2569 deletions
@@ -162,6 +162,9 @@ body {
        li.shift9 {
          margin-left: 270px;
        }
+        ul.shift {
+         margin-bottom: 0px;
+        }
      }
    }
    #main > .children {