kramdown 1.17.0 → 2.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of kramdown might be problematic. Click here for more details.

Files changed (196) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTERS +4 -2
  3. data/VERSION +1 -1
  4. data/bin/kramdown +13 -14
  5. data/lib/kramdown.rb +2 -2
  6. data/lib/kramdown/converter.rb +6 -7
  7. data/lib/kramdown/converter/base.rb +18 -29
  8. data/lib/kramdown/converter/hash_ast.rb +4 -4
  9. data/lib/kramdown/converter/html.rb +82 -67
  10. data/lib/kramdown/converter/kramdown.rb +83 -78
  11. data/lib/kramdown/converter/latex.rb +53 -47
  12. data/lib/kramdown/converter/man.rb +22 -25
  13. data/lib/kramdown/converter/math_engine/mathjax.rb +10 -10
  14. data/lib/kramdown/converter/remove_html_tags.rb +2 -2
  15. data/lib/kramdown/converter/syntax_highlighter.rb +2 -2
  16. data/lib/kramdown/converter/syntax_highlighter/minted.rb +2 -2
  17. data/lib/kramdown/converter/syntax_highlighter/rouge.rb +5 -5
  18. data/lib/kramdown/converter/toc.rb +5 -5
  19. data/lib/kramdown/document.rb +9 -11
  20. data/lib/kramdown/element.rb +11 -9
  21. data/lib/kramdown/error.rb +2 -2
  22. data/lib/kramdown/options.rb +258 -384
  23. data/lib/kramdown/parser.rb +2 -3
  24. data/lib/kramdown/parser/base.rb +7 -6
  25. data/lib/kramdown/parser/html.rb +103 -95
  26. data/lib/kramdown/parser/kramdown.rb +32 -36
  27. data/lib/kramdown/parser/kramdown/abbreviation.rb +13 -10
  28. data/lib/kramdown/parser/kramdown/autolink.rb +3 -3
  29. data/lib/kramdown/parser/kramdown/blank_line.rb +2 -2
  30. data/lib/kramdown/parser/kramdown/block_boundary.rb +2 -2
  31. data/lib/kramdown/parser/kramdown/blockquote.rb +4 -5
  32. data/lib/kramdown/parser/kramdown/codeblock.rb +4 -5
  33. data/lib/kramdown/parser/kramdown/codespan.rb +5 -5
  34. data/lib/kramdown/parser/kramdown/emphasis.rb +6 -6
  35. data/lib/kramdown/parser/kramdown/eob.rb +2 -2
  36. data/lib/kramdown/parser/kramdown/escaped_chars.rb +2 -2
  37. data/lib/kramdown/parser/kramdown/extensions.rb +31 -26
  38. data/lib/kramdown/parser/kramdown/footnote.rb +7 -6
  39. data/lib/kramdown/parser/kramdown/header.rb +6 -6
  40. data/lib/kramdown/parser/kramdown/horizontal_rule.rb +3 -3
  41. data/lib/kramdown/parser/kramdown/html.rb +31 -26
  42. data/lib/kramdown/parser/kramdown/html_entity.rb +6 -5
  43. data/lib/kramdown/parser/kramdown/line_break.rb +3 -3
  44. data/lib/kramdown/parser/kramdown/link.rb +13 -11
  45. data/lib/kramdown/parser/kramdown/list.rb +38 -40
  46. data/lib/kramdown/parser/kramdown/math.rb +4 -5
  47. data/lib/kramdown/parser/kramdown/paragraph.rb +5 -5
  48. data/lib/kramdown/parser/kramdown/smart_quotes.rb +23 -23
  49. data/lib/kramdown/parser/kramdown/table.rb +18 -17
  50. data/lib/kramdown/parser/kramdown/typographic_symbol.rb +8 -8
  51. data/lib/kramdown/parser/markdown.rb +9 -8
  52. data/lib/kramdown/utils.rb +5 -6
  53. data/lib/kramdown/utils/configurable.rb +7 -6
  54. data/lib/kramdown/utils/entities.rb +286 -289
  55. data/lib/kramdown/utils/html.rb +10 -12
  56. data/lib/kramdown/utils/lru_cache.rb +3 -2
  57. data/lib/kramdown/utils/string_scanner.rb +2 -3
  58. data/lib/kramdown/utils/unidecoder.rb +8 -6
  59. data/lib/kramdown/version.rb +3 -3
  60. data/man/man1/kramdown.1 +3 -107
  61. data/test/run_tests.rb +6 -6
  62. data/test/test_files.rb +122 -298
  63. data/test/test_location.rb +8 -30
  64. data/test/test_string_scanner_kramdown.rb +6 -9
  65. data/test/testcases/block/06_codeblock/highlighting-opts.html +6 -6
  66. data/test/testcases/block/06_codeblock/highlighting.html +5 -6
  67. data/test/testcases/block/06_codeblock/with_lang_in_fenced_block.options +1 -1
  68. data/test/testcases/block/07_horizontal_rule/error.html +2 -2
  69. data/test/testcases/block/09_html/html5_attributes.html +2 -0
  70. data/test/testcases/block/09_html/html5_attributes.text +2 -0
  71. data/test/testcases/block/09_html/html_to_native/typography.html +1 -1
  72. data/test/testcases/block/09_html/simple.html +1 -1
  73. data/test/testcases/block/12_extension/options3.html +7 -6
  74. data/test/testcases/block/12_extension/options3.text +2 -2
  75. data/test/testcases/span/01_link/inline.html +1 -1
  76. data/test/testcases/span/01_link/reference.html +3 -3
  77. data/test/testcases/span/03_codespan/highlighting.html +1 -1
  78. data/test/testcases/span/text_substitutions/entities_as_char.html +1 -1
  79. metadata +5 -234
  80. data/Rakefile +0 -341
  81. data/benchmark/benchmark.rb +0 -43
  82. data/benchmark/benchmark.sh +0 -74
  83. data/benchmark/generate_data.rb +0 -119
  84. data/benchmark/mdbasics.text +0 -306
  85. data/benchmark/mdsyntax.text +0 -888
  86. data/benchmark/testing.sh +0 -12
  87. data/benchmark/timing.sh +0 -10
  88. data/doc/_design.scss +0 -441
  89. data/doc/bg.png +0 -0
  90. data/doc/default.scss +0 -217
  91. data/doc/default.template +0 -62
  92. data/doc/documentation.page +0 -84
  93. data/doc/documentation.template +0 -36
  94. data/doc/index.page +0 -113
  95. data/doc/installation.page +0 -88
  96. data/doc/links.markdown +0 -6
  97. data/doc/metainfo +0 -13
  98. data/doc/news.feed +0 -9
  99. data/doc/news.page +0 -29
  100. data/doc/options.page +0 -49
  101. data/doc/quickref.page +0 -603
  102. data/doc/sidebar.template +0 -22
  103. data/doc/sitemap.sitemap +0 -5
  104. data/doc/syntax.page +0 -1799
  105. data/doc/tests.page +0 -104
  106. data/doc/virtual +0 -14
  107. data/lib/kramdown/converter/math_engine/itex2mml.rb +0 -39
  108. data/lib/kramdown/converter/math_engine/katex.rb +0 -35
  109. data/lib/kramdown/converter/math_engine/mathjaxnode.rb +0 -56
  110. data/lib/kramdown/converter/math_engine/ritex.rb +0 -38
  111. data/lib/kramdown/converter/math_engine/sskatex.rb +0 -97
  112. data/lib/kramdown/converter/pdf.rb +0 -625
  113. data/lib/kramdown/converter/syntax_highlighter/coderay.rb +0 -81
  114. data/lib/kramdown/parser/gfm.rb +0 -188
  115. data/lib/kramdown/utils/ordered_hash.rb +0 -18
  116. data/setup.rb +0 -1585
  117. data/test/testcases/block/07_horizontal_rule/error.html.19 +0 -7
  118. data/test/testcases/block/09_html/html_to_native/typography.html.19 +0 -1
  119. data/test/testcases/block/09_html/simple.html.19 +0 -60
  120. data/test/testcases/block/15_math/itex2mml.html +0 -1
  121. data/test/testcases/block/15_math/itex2mml.options +0 -1
  122. data/test/testcases/block/15_math/itex2mml.text +0 -1
  123. data/test/testcases/block/15_math/katex.html.19 +0 -2
  124. data/test/testcases/block/15_math/katex.options +0 -1
  125. data/test/testcases/block/15_math/katex.text +0 -2
  126. data/test/testcases/block/15_math/mathjaxnode.html.19 +0 -27
  127. data/test/testcases/block/15_math/mathjaxnode.options +0 -1
  128. data/test/testcases/block/15_math/mathjaxnode.text +0 -1
  129. data/test/testcases/block/15_math/mathjaxnode_notexhints.html.19 +0 -23
  130. data/test/testcases/block/15_math/mathjaxnode_notexhints.options +0 -3
  131. data/test/testcases/block/15_math/mathjaxnode_notexhints.text +0 -1
  132. data/test/testcases/block/15_math/mathjaxnode_semantics.html.19 +0 -32
  133. data/test/testcases/block/15_math/mathjaxnode_semantics.options +0 -3
  134. data/test/testcases/block/15_math/mathjaxnode_semantics.text +0 -1
  135. data/test/testcases/block/15_math/ritex.html +0 -1
  136. data/test/testcases/block/15_math/ritex.options +0 -1
  137. data/test/testcases/block/15_math/ritex.text +0 -1
  138. data/test/testcases/block/15_math/sskatex.html.19 +0 -2
  139. data/test/testcases/block/15_math/sskatex.options +0 -1
  140. data/test/testcases/block/15_math/sskatex.text +0 -2
  141. data/test/testcases/span/01_link/inline.html.19 +0 -46
  142. data/test/testcases/span/01_link/reference.html.19 +0 -37
  143. data/test/testcases/span/math/itex2mml.html +0 -1
  144. data/test/testcases/span/math/itex2mml.options +0 -1
  145. data/test/testcases/span/math/itex2mml.text +0 -1
  146. data/test/testcases/span/math/katex.html.19 +0 -1
  147. data/test/testcases/span/math/katex.options +0 -1
  148. data/test/testcases/span/math/katex.text +0 -1
  149. data/test/testcases/span/math/mathjaxnode.html.19 +0 -27
  150. data/test/testcases/span/math/mathjaxnode.options +0 -1
  151. data/test/testcases/span/math/mathjaxnode.text +0 -1
  152. data/test/testcases/span/math/ritex.html +0 -1
  153. data/test/testcases/span/math/ritex.options +0 -1
  154. data/test/testcases/span/math/ritex.text +0 -1
  155. data/test/testcases/span/math/sskatex.html.19 +0 -1
  156. data/test/testcases/span/math/sskatex.options +0 -1
  157. data/test/testcases/span/math/sskatex.text +0 -1
  158. data/test/testcases/span/text_substitutions/entities_as_char.html.19 +0 -1
  159. data/test/testcases_gfm/atx_header.html +0 -3
  160. data/test/testcases_gfm/atx_header.text +0 -3
  161. data/test/testcases_gfm/backticks_disable_highlighting.html +0 -2
  162. data/test/testcases_gfm/backticks_disable_highlighting.options +0 -1
  163. data/test/testcases_gfm/backticks_disable_highlighting.text +0 -3
  164. data/test/testcases_gfm/backticks_syntax.html +0 -20
  165. data/test/testcases_gfm/backticks_syntax.text +0 -19
  166. data/test/testcases_gfm/codeblock_fenced.html +0 -20
  167. data/test/testcases_gfm/codeblock_fenced.options +0 -1
  168. data/test/testcases_gfm/codeblock_fenced.text +0 -21
  169. data/test/testcases_gfm/hard_line_breaks.html +0 -3
  170. data/test/testcases_gfm/hard_line_breaks.text +0 -3
  171. data/test/testcases_gfm/hard_line_breaks_off.html +0 -2
  172. data/test/testcases_gfm/hard_line_breaks_off.options +0 -1
  173. data/test/testcases_gfm/hard_line_breaks_off.text +0 -2
  174. data/test/testcases_gfm/header_ids.html +0 -27
  175. data/test/testcases_gfm/header_ids.html.19 +0 -27
  176. data/test/testcases_gfm/header_ids.options +0 -1
  177. data/test/testcases_gfm/header_ids.text +0 -27
  178. data/test/testcases_gfm/header_ids_with_prefix.html +0 -3
  179. data/test/testcases_gfm/header_ids_with_prefix.options +0 -2
  180. data/test/testcases_gfm/header_ids_with_prefix.text +0 -3
  181. data/test/testcases_gfm/no_typographic.html +0 -3
  182. data/test/testcases_gfm/no_typographic.html.19 +0 -3
  183. data/test/testcases_gfm/no_typographic.options +0 -1
  184. data/test/testcases_gfm/no_typographic.text +0 -3
  185. data/test/testcases_gfm/paragraph_end-disabled.html +0 -31
  186. data/test/testcases_gfm/paragraph_end-disabled.options +0 -1
  187. data/test/testcases_gfm/paragraph_end-disabled.text +0 -27
  188. data/test/testcases_gfm/paragraph_end.html +0 -38
  189. data/test/testcases_gfm/paragraph_end.text +0 -27
  190. data/test/testcases_gfm/strikethrough.html +0 -27
  191. data/test/testcases_gfm/strikethrough.html.19 +0 -27
  192. data/test/testcases_gfm/strikethrough.text +0 -27
  193. data/test/testcases_gfm/task_list.html +0 -40
  194. data/test/testcases_gfm/task_list.text +0 -26
  195. data/test/testcases_gfm/two_para_hard_line_breaks.html +0 -4
  196. data/test/testcases_gfm/two_para_hard_line_breaks.text +0 -4
@@ -1,12 +0,0 @@
1
- #!/bin/bash
2
-
3
- source ~/.profile
4
-
5
- COMMAND="$@"
6
- if [[ -z "$COMMAND" ]]; then COMMAND="rake test"; fi
7
-
8
- for VERSION in `rvm list strings | sort`; do
9
- rvm $VERSION
10
- echo $(ruby -v)
11
- RUBYOPT=-rubygems $COMMAND
12
- done
@@ -1,10 +0,0 @@
1
- #!/bin/bash
2
-
3
- source ~/.bashrc
4
-
5
- for VERSION in `rvm list strings | sort`; do
6
- rvm $VERSION
7
- echo $(ruby -v)
8
- ruby -Ilib bin/kramdown < benchmark/mdsyntax.text 2>/dev/null >/dev/null
9
- time ruby -Ilib bin/kramdown < benchmark/mdsyntax.text 2>/dev/null >/dev/null
10
- done
@@ -1,441 +0,0 @@
1
- /* Based on the Less Framework 4
2
- http://lessframework.com
3
- by Joni Korpi
4
- License: http://opensource.org/licenses/mit-license.php */
5
-
6
-
7
- /***** Variables for easy customization *****/
8
-
9
- /* the baseline height in px */
10
- $baseline-height: 24;
11
-
12
- /* The overlay color for the background image */
13
- $bg-grad-color: rgba(255,255,128,0.1);
14
-
15
- /* The font size of the logo in px */
16
- $logo-size: 36;
17
-
18
- /* Color settings */
19
- $link-color: #1666A3;
20
-
21
-
22
-
23
- /* Resets
24
- ------ */
25
-
26
- html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6,
27
- p, blockquote, pre, a, abbr, address, cite, code, del, dfn, em,
28
- img, ins, kbd, q, samp, small, strong, sub, sup, var, b, i, hr,
29
- dl, dt, dd, ol, ul, li, fieldset, form, label, legend,
30
- table, caption, tbody, tfoot, thead, tr, th, td,
31
- article, aside, canvas, details, figure, figcaption, hgroup,
32
- menu, footer, header, nav, section, summary, time, mark, audio, video {
33
- margin: 0;
34
- padding: 0;
35
- border: 0;
36
- }
37
-
38
- article, aside, canvas, figure, figure img, figcaption, hgroup,
39
- footer, header, nav, section, audio, video {
40
- display: block;
41
- }
42
-
43
- a img {border: 0;}
44
-
45
-
46
-
47
- /* Typography presets
48
- ------------------ */
49
-
50
- .gigantic {
51
- font-size: 59px;
52
- line-height: 72px;
53
- }
54
-
55
- .huge {
56
- font-size: 36px;
57
- line-height: 48px;
58
- }
59
-
60
- .large {
61
- font-size: 23px;
62
- line-height: 24px;
63
- }
64
-
65
- .bigger {
66
- font-size: 18px;
67
- line-height: 24px;
68
- }
69
-
70
- .big {
71
- font-size: 14px;
72
- line-height: 24px;
73
- }
74
-
75
- body {
76
- font: 14px/24px 'Palatino Linotype', 'Book Antiqua', Palatino, serif;
77
- }
78
-
79
- .small, small {
80
- font-size: 12px;
81
- line-height: 24px;
82
- }
83
-
84
- *:target::after {
85
- content: " ☜";
86
- }
87
-
88
-
89
- /* Typographics grid overlay */
90
-
91
- .grid{
92
- background-image: -moz-linear-gradient(top, rgba(0,0,0,0) 95%, rgba(0,0,0,0.3) 100%); /* FF3.6+ */
93
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(95%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,0.3))); /* Chrome,Safari4+ */
94
- background-image: -webkit-linear-gradient(top, rgba(0,0,0,0) 95%,rgba(0,0,0,0.3) 100%); /* Chrome10+,Safari5.1+ */
95
- background-image: -o-linear-gradient(top, rgba(0,0,0,0) 95%, rgba(0,0,0,0.3) 100%); /* Opera11.10+ */
96
- background-image: -ms-linear-gradient(top, rgba(0,0,0,0) 95%,rgba(0,0,0,0.3) 100%); /* IE10+ */
97
- background-image: linear-gradient(top, rgba(0,0,0,0.3) 95%,rgba(0,0,0,0.3) 100%); /* W3C */
98
-
99
- -webkit-background-size: 100% #{$baseline-height}px;
100
- -o-background-size: 100% #{$baseline-height}px;
101
- background-size: 100% #{$baseline-height}px;
102
- }
103
-
104
-
105
- /* Basic mixins */
106
-
107
- @mixin background {
108
- background-image: -moz-linear-gradient($bg-grad-color, $bg-grad-color), url('bg.png');
109
- background-image: -webkit-linear-gradient($bg-grad-color, $bg-grad-color), url('bg.png');
110
- background-image: -o-linear-gradient($bg-grad-color, $bg-grad-color), url('bg.png');
111
- background-image: -ms-linear-gradient($bg-grad-color, $bg-grad-color), url('bg.png');
112
- background-image: linear-gradient($bg-grad-color, $bg-grad-color), url('bg.png');
113
- }
114
-
115
- @mixin typography($size: big) {
116
- h3, h4, h5, h6, p, ul, ol, dl, pre, blockquote, table {
117
- margin-top: 24px;
118
- margin-bottom: 24px;
119
- }
120
-
121
- @if $size == big {
122
- h1 { @extend .huge }
123
- h2 { @extend .large }
124
- h3 { @extend .bigger }
125
- h4,h5,h6 { @extend .big }
126
- } @else {
127
- h1 { @extend .large }
128
- h2 { @extend .bigger }
129
- h3,h4,h5,h6 { @extend .big }
130
- }
131
-
132
- h1, h2, h3, h4, h5, h6 {
133
- font-weight: normal;
134
- padding-left: 48px;
135
- margin-left: -48px;
136
- margin-top: 36px;
137
- margin-bottom: -12px;
138
- }
139
-
140
- ul, ol, dd {
141
- padding-left: 24px;
142
- }
143
-
144
- ul ul, ul ol, ol ul, ol ol {
145
- margin-top: 0;
146
- margin-bottom: 0;
147
- }
148
-
149
- pre {
150
- padding-left: 12px;
151
- padding-right: 12px;
152
- border: 1px solid #ccc;
153
- font-family: "Bitstream Vera Sans Mono", Consolas, monospace;
154
- }
155
-
156
- dt {
157
- font-weight: bold;
158
- }
159
-
160
- a {
161
- color: $link-color;
162
- text-decoration: underline;
163
- }
164
-
165
- a:hover, a:link {
166
- color: scale-color($link-color, $lightness: -50%);
167
- }
168
- }
169
-
170
- /* Default Layout: 992px.
171
- Gutters: 24px.
172
- Outer margins: 48px.
173
- Leftover space for scrollbars @1024px: 32px.
174
- -------------------------------------------------------------------------------
175
- cols 1 2 3 4 5 6 7 8 9 10
176
- px 68 160 252 344 436 528 620 712 804 896 */
177
-
178
- body {
179
- width: 992px;
180
- margin: 0 auto 48px;
181
- color: rgb(60,60,60);
182
- -webkit-text-size-adjust: 100%; /* Stops Mobile Safari from auto-adjusting font-sizes */
183
- @include background;
184
- }
185
-
186
- body > header {
187
- position: relative;
188
- padding: 12px;
189
- font-family: Verdana;
190
- color: #eee;
191
- -moz-box-shadow: 0 0 24px rgba(0,0,0,0.6);
192
- -webkit-box-shadow: 0 0 24px rgba(0,0,0,0.6);
193
- box-shadow: 0 0 24px rgba(0,0,0,0.6);
194
- z-index: 1;
195
- }
196
-
197
- #logo {
198
- font-size: #{$logo-size}px;
199
- line-height: #{$baseline-height * (floor($logo-size / $baseline-height) + 1)}px;
200
- margin: 12px;
201
- text-shadow: 0px 2px 5px rgba(0, 0, 0, 0.5);
202
-
203
- a {
204
- color: #eee;
205
- text-decoration: none;
206
-
207
- &:hover {
208
- color: #fff;
209
- }
210
- }
211
-
212
- }
213
-
214
- #slogan {
215
- font-size: 100%;
216
- margin: 12px;
217
- text-shadow: 0px 2px 5px rgba(0, 0, 0, 0.5);
218
- }
219
-
220
- nav {
221
- position: absolute;
222
- bottom: 0px;
223
- right: 0px;
224
- background-color: rgba(255,255,255,0.1);
225
-
226
- li {
227
- display: inline-block;
228
- }
229
-
230
- ul {
231
- margin: 0;
232
- padding: 0;
233
- }
234
-
235
- a, span {
236
- display: block;
237
- padding: 12px;
238
- color: #ccc;
239
- text-decoration: none;
240
- }
241
-
242
- span {
243
- background-color: rgba(255,255,255,0.3);
244
- }
245
-
246
- a:hover {
247
- background-color: rgba(255,255,255,0.3);
248
- }
249
-
250
- }
251
-
252
- #wrapper {
253
- clear: both;
254
- position: relative;
255
- background-color: white;
256
- -moz-box-shadow: 0 0 24px rgba(0,0,0,0.6);
257
- -webkit-box-shadow: 0 0 24px rgba(0,0,0,0.6);
258
- box-shadow: 0 0 24px rgba(0,0,0,0.6);
259
- }
260
-
261
- aside {
262
- float: right;
263
- right: 0;
264
- background-color: white;
265
- width: 252px;
266
- padding: 24px;
267
-
268
- @include typography(small);
269
-
270
- h1, h2, h3, h4, h5, h6 {
271
- padding-left: 48px;
272
- margin-left: -48px;
273
- }
274
- }
275
-
276
-
277
- aside.banner {
278
- @include background;
279
- position: relative;
280
- width: inherit;
281
- margin: 0;
282
- float: none;
283
- padding: 24px;
284
- border: 10px solid rgba(255,255,255,0.1);
285
- color: #ccc;
286
- font-size: 36px;
287
- line-height: 48px;
288
-
289
- a {
290
- color: #ccc;
291
- text-decoration: underline;
292
- }
293
-
294
- a:hover {
295
- background-color: rgba(255,255,255,0.3);
296
- }
297
-
298
- p {
299
- margin: 0;
300
- }
301
-
302
- p + p {
303
- margin-top: 24px;
304
- }
305
- }
306
-
307
- #content {
308
- width: 620px;
309
- padding: 24px 48px;
310
-
311
- @include typography(big);
312
- }
313
-
314
- footer {
315
- background-color: rgba(255,255,255,0.1);
316
- min-height: 24px;
317
- color: #eee;
318
- }
319
-
320
-
321
- /* Tablet Layout: 768px.
322
- Gutters: 24px.
323
- Outer margins: 28px.
324
- Inherits styles from: Default Layout.
325
- -----------------------------------------------------------------
326
- cols 1 2 3 4 5 6 7 8
327
- px 68 160 252 344 436 528 620 712 */
328
-
329
- @media only screen and (min-width: 768px) and (max-width: 1005px) {
330
-
331
- body {
332
- width: 716px;
333
- }
334
-
335
- body > header {
336
- padding: 0;
337
- }
338
-
339
- aside {
340
- position: static;
341
- float: right;
342
- }
343
-
344
- nav {
345
- position: relative;
346
- margin-top: 12px;
347
- }
348
- }
349
-
350
-
351
-
352
- /* Mobile Layout: 320px.
353
- Gutters: 24px.
354
- Outer margins: 34px.
355
- Inherits styles from: Default Layout.
356
- ---------------------------------------------
357
- cols 1 2 3
358
- px 68 160 252 */
359
-
360
- @media only screen and (max-width: 767px) {
361
-
362
- body {
363
- width: 320px;
364
- }
365
-
366
- body > header {
367
- padding: 0;
368
- }
369
-
370
- nav {
371
- position: relative;
372
- margin-top: 12px;
373
- }
374
-
375
- aside {
376
- position: relative;
377
- }
378
-
379
- #content, aside {
380
- width: 296px;
381
- padding: 24px 12px;
382
- }
383
-
384
- #content {
385
- h1, h2, h3, h4, h5, h6 {
386
- padding-left: 12px;
387
- margin-left: -12px;
388
- }
389
- }
390
-
391
- }
392
-
393
-
394
-
395
- /* Wide Mobile Layout: 480px.
396
- Gutters: 24px.
397
- Outer margins: 22px.
398
- Inherits styles from: Default Layout, Mobile Layout.
399
- ------------------------------------------------------------
400
- cols 1 2 3 4 5
401
- px 68 160 252 344 436 */
402
-
403
- @media only screen and (min-width: 480px) and (max-width: 767px) {
404
-
405
- body {
406
- width: 90%;
407
- }
408
-
409
- aside {
410
- position: relative;
411
- }
412
-
413
- #content, aside {
414
- width: inherit;
415
- padding: 24px 48px;
416
- }
417
-
418
- #content {
419
- h1, h2, h3, h4, h5, h6 {
420
- padding-left: 48px;
421
- margin-left: -48px;
422
- }
423
- }
424
-
425
- }
426
-
427
-
428
- /* Retina media query.
429
- Overrides styles for devices with a
430
- device-pixel-ratio of 2+, such as iPhone 4.
431
- ----------------------------------------------- */
432
-
433
- @media
434
- only screen and (-webkit-min-device-pixel-ratio: 2),
435
- only screen and (min-device-pixel-ratio: 2) {
436
-
437
- body {
438
-
439
- }
440
-
441
- }