minimal-mistakes-jekyll 4.6.0 → 4.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (144) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +26 -0
  3. data/LICENSE.txt +59 -21
  4. data/README.md +217 -160
  5. data/_data/navigation.yml +11 -11
  6. data/_data/ui-text.yml +931 -888
  7. data/_includes/analytics-providers/custom.html +2 -2
  8. data/_includes/analytics-providers/google-universal.html +9 -9
  9. data/_includes/analytics-providers/google.html +10 -10
  10. data/_includes/analytics.html +11 -11
  11. data/_includes/archive-single.html +37 -37
  12. data/_includes/author-profile-custom-links.html +6 -6
  13. data/_includes/author-profile.html +249 -249
  14. data/_includes/base_path +4 -4
  15. data/_includes/breadcrumbs.html +39 -39
  16. data/_includes/browser-upgrade.html +2 -2
  17. data/_includes/category-list.html +25 -25
  18. data/_includes/comment.html +22 -22
  19. data/_includes/comments-providers/custom.html +2 -2
  20. data/_includes/comments-providers/discourse.html +13 -13
  21. data/_includes/comments-providers/facebook.html +7 -7
  22. data/_includes/comments-providers/google-plus.html +1 -1
  23. data/_includes/comments-providers/scripts.html +17 -15
  24. data/_includes/comments-providers/staticman.html +41 -41
  25. data/_includes/comments-providers/staticman_v2.html +42 -0
  26. data/_includes/comments.html +168 -96
  27. data/_includes/feature_row +49 -49
  28. data/_includes/figure +12 -12
  29. data/_includes/footer.html +25 -25
  30. data/_includes/footer/custom.html +2 -2
  31. data/_includes/gallery +46 -46
  32. data/_includes/group-by-array +46 -46
  33. data/_includes/head.html +42 -42
  34. data/_includes/head/custom.html +4 -4
  35. data/_includes/masthead.html +23 -20
  36. data/_includes/nav_list +46 -46
  37. data/_includes/page__hero_video.html +4 -4
  38. data/_includes/page__taxonomy.html +6 -6
  39. data/_includes/paginator.html +69 -69
  40. data/_includes/post_pagination.html +13 -13
  41. data/_includes/read-time.html +14 -14
  42. data/_includes/scripts.html +15 -15
  43. data/_includes/seo.html +162 -147
  44. data/_includes/sidebar.html +22 -22
  45. data/_includes/social-share.html +13 -13
  46. data/_includes/tag-list.html +25 -25
  47. data/_includes/toc +6 -6
  48. data/_includes/toc.html +75 -0
  49. data/_includes/video +11 -11
  50. data/_layouts/archive-taxonomy.html +14 -14
  51. data/_layouts/archive.html +25 -25
  52. data/_layouts/compress.html +10 -10
  53. data/_layouts/default.html +1 -1
  54. data/_layouts/home.html +11 -11
  55. data/_layouts/single.html +92 -84
  56. data/_layouts/splash.html +21 -21
  57. data/_sass/minimal-mistakes.scss +1 -1
  58. data/_sass/minimal-mistakes/_animations.scss +20 -20
  59. data/_sass/minimal-mistakes/_archive.scss +317 -317
  60. data/_sass/minimal-mistakes/_base.scss +315 -315
  61. data/_sass/minimal-mistakes/_buttons.scss +97 -97
  62. data/_sass/minimal-mistakes/_footer.scss +82 -82
  63. data/_sass/minimal-mistakes/_forms.scss +399 -389
  64. data/_sass/minimal-mistakes/_masthead.scss +82 -82
  65. data/_sass/minimal-mistakes/_mixins.scss +91 -91
  66. data/_sass/minimal-mistakes/_navigation.scss +552 -552
  67. data/_sass/minimal-mistakes/_notices.scss +99 -99
  68. data/_sass/minimal-mistakes/_page.scss +430 -430
  69. data/_sass/minimal-mistakes/_reset.scss +186 -186
  70. data/_sass/minimal-mistakes/_sidebar.scss +262 -262
  71. data/_sass/minimal-mistakes/_syntax.scss +286 -146
  72. data/_sass/minimal-mistakes/_tables.scss +36 -36
  73. data/_sass/minimal-mistakes/_utilities.scss +519 -519
  74. data/_sass/minimal-mistakes/_variables.scss +137 -137
  75. data/_sass/minimal-mistakes/skins/_air.scss +22 -22
  76. data/_sass/minimal-mistakes/skins/_aqua.scss +30 -0
  77. data/_sass/minimal-mistakes/skins/_contrast.scss +33 -33
  78. data/_sass/minimal-mistakes/skins/_dark.scss +23 -23
  79. data/_sass/minimal-mistakes/skins/_default.scss +5 -5
  80. data/_sass/minimal-mistakes/skins/_dirt.scss +14 -14
  81. data/_sass/minimal-mistakes/skins/_mint.scss +22 -22
  82. data/_sass/minimal-mistakes/skins/_neon.scss +35 -0
  83. data/_sass/minimal-mistakes/skins/_plum.scss +42 -0
  84. data/_sass/minimal-mistakes/skins/_sunrise.scss +25 -25
  85. data/_sass/minimal-mistakes/vendor/breakpoint/_breakpoint.scss +114 -114
  86. data/_sass/minimal-mistakes/vendor/breakpoint/_context.scss +94 -94
  87. data/_sass/minimal-mistakes/vendor/breakpoint/_helpers.scss +151 -151
  88. data/_sass/minimal-mistakes/vendor/breakpoint/_legacy-settings.scss +49 -49
  89. data/_sass/minimal-mistakes/vendor/breakpoint/_no-query.scss +15 -15
  90. data/_sass/minimal-mistakes/vendor/breakpoint/_parsers.scss +215 -215
  91. data/_sass/minimal-mistakes/vendor/breakpoint/_respond-to.scss +82 -82
  92. data/_sass/minimal-mistakes/vendor/breakpoint/_settings.scss +70 -70
  93. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/_double.scss +33 -33
  94. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/_query.scss +82 -82
  95. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/_resolution.scss +31 -31
  96. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/_single.scss +26 -26
  97. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/_triple.scss +36 -36
  98. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/double/_default-pair.scss +21 -21
  99. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/double/_default.scss +22 -22
  100. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/double/_double-string.scss +21 -21
  101. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/resolution/_resolution.scss +60 -60
  102. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/single/_default.scss +13 -13
  103. data/_sass/minimal-mistakes/vendor/breakpoint/parsers/triple/_default.scss +18 -18
  104. data/_sass/minimal-mistakes/vendor/font-awesome/_animated.scss +34 -34
  105. data/_sass/minimal-mistakes/vendor/font-awesome/_bordered-pulled.scss +25 -25
  106. data/_sass/minimal-mistakes/vendor/font-awesome/_core.scss +12 -12
  107. data/_sass/minimal-mistakes/vendor/font-awesome/_fixed-width.scss +6 -6
  108. data/_sass/minimal-mistakes/vendor/font-awesome/_font-awesome.scss +18 -18
  109. data/_sass/minimal-mistakes/vendor/font-awesome/_icons.scss +789 -789
  110. data/_sass/minimal-mistakes/vendor/font-awesome/_larger.scss +13 -13
  111. data/_sass/minimal-mistakes/vendor/font-awesome/_list.scss +19 -19
  112. data/_sass/minimal-mistakes/vendor/font-awesome/_mixins.scss +60 -60
  113. data/_sass/minimal-mistakes/vendor/font-awesome/_path.scss +15 -15
  114. data/_sass/minimal-mistakes/vendor/font-awesome/_rotated-flipped.scss +20 -20
  115. data/_sass/minimal-mistakes/vendor/font-awesome/_screen-reader.scss +5 -5
  116. data/_sass/minimal-mistakes/vendor/font-awesome/_stacked.scss +20 -20
  117. data/_sass/minimal-mistakes/vendor/font-awesome/_variables.scss +800 -800
  118. data/_sass/minimal-mistakes/vendor/magnific-popup/_magnific-popup.scss +649 -649
  119. data/_sass/minimal-mistakes/vendor/magnific-popup/_settings.scss +45 -45
  120. data/_sass/minimal-mistakes/vendor/susy/_susy-prefix.scss +13 -13
  121. data/_sass/minimal-mistakes/vendor/susy/_susy.scss +5 -5
  122. data/_sass/minimal-mistakes/vendor/susy/plugins/_svg-grid.scss +5 -5
  123. data/_sass/minimal-mistakes/vendor/susy/plugins/svg-grid/_prefix.scss +7 -7
  124. data/_sass/minimal-mistakes/vendor/susy/plugins/svg-grid/_svg-api.scss +114 -114
  125. data/_sass/minimal-mistakes/vendor/susy/plugins/svg-grid/_svg-grid-math.scss +67 -67
  126. data/_sass/minimal-mistakes/vendor/susy/plugins/svg-grid/_svg-settings.scss +14 -14
  127. data/_sass/minimal-mistakes/vendor/susy/plugins/svg-grid/_svg-unprefix.scss +18 -18
  128. data/_sass/minimal-mistakes/vendor/susy/plugins/svg-grid/_svg-utilities.scss +133 -133
  129. data/_sass/minimal-mistakes/vendor/susy/susy/_api.scss +318 -318
  130. data/_sass/minimal-mistakes/vendor/susy/susy/_normalize.scss +261 -261
  131. data/_sass/minimal-mistakes/vendor/susy/susy/_parse.scss +163 -163
  132. data/_sass/minimal-mistakes/vendor/susy/susy/_settings.scss +329 -329
  133. data/_sass/minimal-mistakes/vendor/susy/susy/_su-math.scss +441 -441
  134. data/_sass/minimal-mistakes/vendor/susy/susy/_su-validate.scss +213 -213
  135. data/_sass/minimal-mistakes/vendor/susy/susy/_syntax-helpers.scss +191 -191
  136. data/_sass/minimal-mistakes/vendor/susy/susy/_unprefix.scss +56 -56
  137. data/_sass/minimal-mistakes/vendor/susy/susy/_utilities.scss +167 -167
  138. data/assets/css/main.scss +7 -7
  139. data/assets/fonts/fontawesome-webfont.svg +2671 -2671
  140. data/assets/js/_main.js +72 -72
  141. data/assets/js/main.min.js +1 -1
  142. data/assets/js/plugins/jquery.fitvids.js +81 -81
  143. data/assets/js/plugins/jquery.greedy-navigation.js +77 -77
  144. metadata +8 -3
@@ -1,82 +1,82 @@
1
- ////////////////////////
2
- // Default the Breakpoints variable
3
- ////////////////////////
4
- $breakpoints: () !default;
5
- $BREAKPOINTS: () !default;
6
-
7
- ////////////////////////
8
- // Respond-to API Mixin
9
- ////////////////////////
10
- @mixin respond-to($context, $no-query: false) {
11
- @if length($breakpoints) > 0 and length($BREAKPOINTS) == 0 {
12
- @warn "In order to avoid variable namespace collisions, we have updated the way to add breakpoints for respond-to. Please change all instances of `$breakpoints: add-breakpoint()` to `@include add-breakpoint()`. The `add-breakpoint()` function will be deprecated in a future release.";
13
- $BREAKPOINTS: $breakpoints !global;
14
- $breakpoints: () !global;
15
- }
16
-
17
- @if type-of($BREAKPOINTS) != 'map' {
18
- // Just in case someone writes gibberish to the $breakpoints variable.
19
- @warn "Your breakpoints aren't a map! `respond-to` expects a map. Please check the value of $BREAKPOINTS variable.";
20
- @content;
21
- }
22
- @else if map-has-key($BREAKPOINTS, $context) {
23
- @include breakpoint(map-get($BREAKPOINTS, $context), $no-query) {
24
- @content;
25
- }
26
- }
27
- @else if not map-has-key($BREAKPOINTS, $context) {
28
- @warn "`#{$context}` isn't a defined breakpoint! Please add it using `$breakpoints: add-breakpoint(`#{$context}`, $value);`";
29
- @content;
30
- }
31
- @else {
32
- @warn "You haven't created any breakpoints yet! Make some already! `@include add-breakpoint($name, $bkpt)`";
33
- @content;
34
- }
35
- }
36
-
37
- //////////////////////////////
38
- // Add Breakpoint to Breakpoints
39
- // TODO: Remove function in next release
40
- //////////////////////////////
41
- @function add-breakpoint($name, $bkpt, $overwrite: false) {
42
- $output: ($name: $bkpt);
43
-
44
- @if length($breakpoints) == 0 {
45
- @return $output;
46
- }
47
- @else {
48
- @if map-has-key($breakpoints, $name) and $overwrite != true {
49
- @warn "You already have a breakpoint named `#{$name}`, please choose another breakpoint name, or pass in `$overwrite: true` to overwrite the previous breakpoint.";
50
- @return $breakpoints;
51
- }
52
- @else if not map-has-key($breakpoints, $name) or $overwrite == true {
53
- @return map-merge($breakpoints, $output);
54
- }
55
- }
56
- }
57
-
58
- @mixin add-breakpoint($name, $bkpt, $overwrite: false) {
59
- $output: ($name: $bkpt);
60
-
61
- @if length($BREAKPOINTS) == 0 {
62
- $BREAKPOINTS: $output !global;
63
- }
64
- @else {
65
- @if map-has-key($BREAKPOINTS, $name) and $overwrite != true {
66
- @warn "You already have a breakpoint named `#{$name}`, please choose another breakpoint name, or pass in `$overwrite: true` to overwrite the previous breakpoint.";
67
- $BREAKPOINTS: $BREAKPOINTS !global;
68
- }
69
- @else if not map-has-key($BREAKPOINTS, $name) or $overwrite == true {
70
- $BREAKPOINTS: map-merge($BREAKPOINTS, $output) !global;
71
- }
72
- }
73
- }
74
-
75
- @function get-breakpoint($name: false) {
76
- @if $name == false {
77
- @return $BREAKPOINTS;
78
- }
79
- @else {
80
- @return map-get($BREAKPOINTS, $name);
81
- }
82
- }
1
+ ////////////////////////
2
+ // Default the Breakpoints variable
3
+ ////////////////////////
4
+ $breakpoints: () !default;
5
+ $BREAKPOINTS: () !default;
6
+
7
+ ////////////////////////
8
+ // Respond-to API Mixin
9
+ ////////////////////////
10
+ @mixin respond-to($context, $no-query: false) {
11
+ @if length($breakpoints) > 0 and length($BREAKPOINTS) == 0 {
12
+ @warn "In order to avoid variable namespace collisions, we have updated the way to add breakpoints for respond-to. Please change all instances of `$breakpoints: add-breakpoint()` to `@include add-breakpoint()`. The `add-breakpoint()` function will be deprecated in a future release.";
13
+ $BREAKPOINTS: $breakpoints !global;
14
+ $breakpoints: () !global;
15
+ }
16
+
17
+ @if type-of($BREAKPOINTS) != 'map' {
18
+ // Just in case someone writes gibberish to the $breakpoints variable.
19
+ @warn "Your breakpoints aren't a map! `respond-to` expects a map. Please check the value of $BREAKPOINTS variable.";
20
+ @content;
21
+ }
22
+ @else if map-has-key($BREAKPOINTS, $context) {
23
+ @include breakpoint(map-get($BREAKPOINTS, $context), $no-query) {
24
+ @content;
25
+ }
26
+ }
27
+ @else if not map-has-key($BREAKPOINTS, $context) {
28
+ @warn "`#{$context}` isn't a defined breakpoint! Please add it using `$breakpoints: add-breakpoint(`#{$context}`, $value);`";
29
+ @content;
30
+ }
31
+ @else {
32
+ @warn "You haven't created any breakpoints yet! Make some already! `@include add-breakpoint($name, $bkpt)`";
33
+ @content;
34
+ }
35
+ }
36
+
37
+ //////////////////////////////
38
+ // Add Breakpoint to Breakpoints
39
+ // TODO: Remove function in next release
40
+ //////////////////////////////
41
+ @function add-breakpoint($name, $bkpt, $overwrite: false) {
42
+ $output: ($name: $bkpt);
43
+
44
+ @if length($breakpoints) == 0 {
45
+ @return $output;
46
+ }
47
+ @else {
48
+ @if map-has-key($breakpoints, $name) and $overwrite != true {
49
+ @warn "You already have a breakpoint named `#{$name}`, please choose another breakpoint name, or pass in `$overwrite: true` to overwrite the previous breakpoint.";
50
+ @return $breakpoints;
51
+ }
52
+ @else if not map-has-key($breakpoints, $name) or $overwrite == true {
53
+ @return map-merge($breakpoints, $output);
54
+ }
55
+ }
56
+ }
57
+
58
+ @mixin add-breakpoint($name, $bkpt, $overwrite: false) {
59
+ $output: ($name: $bkpt);
60
+
61
+ @if length($BREAKPOINTS) == 0 {
62
+ $BREAKPOINTS: $output !global;
63
+ }
64
+ @else {
65
+ @if map-has-key($BREAKPOINTS, $name) and $overwrite != true {
66
+ @warn "You already have a breakpoint named `#{$name}`, please choose another breakpoint name, or pass in `$overwrite: true` to overwrite the previous breakpoint.";
67
+ $BREAKPOINTS: $BREAKPOINTS !global;
68
+ }
69
+ @else if not map-has-key($BREAKPOINTS, $name) or $overwrite == true {
70
+ $BREAKPOINTS: map-merge($BREAKPOINTS, $output) !global;
71
+ }
72
+ }
73
+ }
74
+
75
+ @function get-breakpoint($name: false) {
76
+ @if $name == false {
77
+ @return $BREAKPOINTS;
78
+ }
79
+ @else {
80
+ @return map-get($BREAKPOINTS, $name);
81
+ }
82
+ }
@@ -1,71 +1,71 @@
1
- //////////////////////////////
2
- // Has Setting
3
- //////////////////////////////
4
- @function breakpoint-has($setting) {
5
- @if map-has-key($breakpoint, $setting) {
6
- @return true;
7
- }
8
- @else {
9
- @return false;
10
- }
11
- }
12
-
13
- //////////////////////////////
14
- // Get Settings
15
- //////////////////////////////
16
- @function breakpoint-get($setting) {
17
- @if breakpoint-has($setting) {
18
- @return map-get($breakpoint, $setting);
19
- }
20
- @else {
21
- @return map-get($Breakpoint-Settings, $setting);
22
- }
23
- }
24
-
25
- //////////////////////////////
26
- // Set Settings
27
- //////////////////////////////
28
- @function breakpoint-set($setting, $value) {
29
- @if (str-index($setting, '-') or str-index($setting, '_')) and str-index($setting, ' ') == null {
30
- @warn "Words in Breakpoint settings should be separated by spaces, not dashes or underscores. Please replace dashes and underscores between words with spaces. Settings will not work as expected until changed.";
31
- }
32
- $breakpoint: map-merge($breakpoint, ($setting: $value)) !global;
33
- @return true;
34
- }
35
-
36
- @mixin breakpoint-change($setting, $value) {
37
- $breakpoint-change: breakpoint-set($setting, $value);
38
- }
39
-
40
- @mixin breakpoint-set($setting, $value) {
41
- @include breakpoint-change($setting, $value);
42
- }
43
-
44
- @mixin bkpt-change($setting, $value) {
45
- @include breakpoint-change($setting, $value);
46
- }
47
- @mixin bkpt-set($setting, $value) {
48
- @include breakpoint-change($setting, $value);
49
- }
50
-
51
- //////////////////////////////
52
- // Remove Setting
53
- //////////////////////////////
54
- @function breakpoint-reset($settings...) {
55
- @if length($settings) == 1 {
56
- $settings: nth($settings, 1);
57
- }
58
-
59
- @each $setting in $settings {
60
- $breakpoint: map-remove($breakpoint, $setting) !global;
61
- }
62
- @return true;
63
- }
64
-
65
- @mixin breakpoint-reset($settings...) {
66
- $breakpoint-reset: breakpoint-reset($settings);
67
- }
68
-
69
- @mixin bkpt-reset($settings...) {
70
- $breakpoint-reset: breakpoint-reset($settings);
1
+ //////////////////////////////
2
+ // Has Setting
3
+ //////////////////////////////
4
+ @function breakpoint-has($setting) {
5
+ @if map-has-key($breakpoint, $setting) {
6
+ @return true;
7
+ }
8
+ @else {
9
+ @return false;
10
+ }
11
+ }
12
+
13
+ //////////////////////////////
14
+ // Get Settings
15
+ //////////////////////////////
16
+ @function breakpoint-get($setting) {
17
+ @if breakpoint-has($setting) {
18
+ @return map-get($breakpoint, $setting);
19
+ }
20
+ @else {
21
+ @return map-get($Breakpoint-Settings, $setting);
22
+ }
23
+ }
24
+
25
+ //////////////////////////////
26
+ // Set Settings
27
+ //////////////////////////////
28
+ @function breakpoint-set($setting, $value) {
29
+ @if (str-index($setting, '-') or str-index($setting, '_')) and str-index($setting, ' ') == null {
30
+ @warn "Words in Breakpoint settings should be separated by spaces, not dashes or underscores. Please replace dashes and underscores between words with spaces. Settings will not work as expected until changed.";
31
+ }
32
+ $breakpoint: map-merge($breakpoint, ($setting: $value)) !global;
33
+ @return true;
34
+ }
35
+
36
+ @mixin breakpoint-change($setting, $value) {
37
+ $breakpoint-change: breakpoint-set($setting, $value);
38
+ }
39
+
40
+ @mixin breakpoint-set($setting, $value) {
41
+ @include breakpoint-change($setting, $value);
42
+ }
43
+
44
+ @mixin bkpt-change($setting, $value) {
45
+ @include breakpoint-change($setting, $value);
46
+ }
47
+ @mixin bkpt-set($setting, $value) {
48
+ @include breakpoint-change($setting, $value);
49
+ }
50
+
51
+ //////////////////////////////
52
+ // Remove Setting
53
+ //////////////////////////////
54
+ @function breakpoint-reset($settings...) {
55
+ @if length($settings) == 1 {
56
+ $settings: nth($settings, 1);
57
+ }
58
+
59
+ @each $setting in $settings {
60
+ $breakpoint: map-remove($breakpoint, $setting) !global;
61
+ }
62
+ @return true;
63
+ }
64
+
65
+ @mixin breakpoint-reset($settings...) {
66
+ $breakpoint-reset: breakpoint-reset($settings);
67
+ }
68
+
69
+ @mixin bkpt-reset($settings...) {
70
+ $breakpoint-reset: breakpoint-reset($settings);
71
71
  }
@@ -1,33 +1,33 @@
1
- //////////////////////////////
2
- // Import Pieces
3
- //////////////////////////////
4
- @import "double/default-pair";
5
- @import "double/double-string";
6
- @import "double/default";
7
-
8
- @function breakpoint-parse-double($feature, $empty-media, $first) {
9
- $parsed: '';
10
- $leader: '';
11
- // If we're forcing
12
- @if not ($empty-media) or not ($first) {
13
- $leader: 'and ';
14
- }
15
-
16
- $first: nth($feature, 1);
17
- $second: nth($feature, 2);
18
-
19
- // If we've got two numbers, we know we need to use the default pair because there are no media queries that has a media feature that is a number
20
- @if type-of($first) == 'number' and type-of($second) == 'number' {
21
- $parsed: breakpoint-parse-default-pair($first, $second);
22
- }
23
- // If they are both strings, we send it through the string parser
24
- @else if type-of($first) == 'string' and type-of($second) == 'string' {
25
- $parsed: breakpoint-parse-double-string($first, $second);
26
- }
27
- // If it's a string/number pair, we parse it as a normal double
28
- @else {
29
- $parsed: breakpoint-parse-double-default($first, $second);
30
- }
31
-
32
- @return $leader + $parsed;
33
- }
1
+ //////////////////////////////
2
+ // Import Pieces
3
+ //////////////////////////////
4
+ @import "double/default-pair";
5
+ @import "double/double-string";
6
+ @import "double/default";
7
+
8
+ @function breakpoint-parse-double($feature, $empty-media, $first) {
9
+ $parsed: '';
10
+ $leader: '';
11
+ // If we're forcing
12
+ @if not ($empty-media) or not ($first) {
13
+ $leader: 'and ';
14
+ }
15
+
16
+ $first: nth($feature, 1);
17
+ $second: nth($feature, 2);
18
+
19
+ // If we've got two numbers, we know we need to use the default pair because there are no media queries that has a media feature that is a number
20
+ @if type-of($first) == 'number' and type-of($second) == 'number' {
21
+ $parsed: breakpoint-parse-default-pair($first, $second);
22
+ }
23
+ // If they are both strings, we send it through the string parser
24
+ @else if type-of($first) == 'string' and type-of($second) == 'string' {
25
+ $parsed: breakpoint-parse-double-string($first, $second);
26
+ }
27
+ // If it's a string/number pair, we parse it as a normal double
28
+ @else {
29
+ $parsed: breakpoint-parse-double-default($first, $second);
30
+ }
31
+
32
+ @return $leader + $parsed;
33
+ }
@@ -1,82 +1,82 @@
1
- @function breakpoint-parse-query($query) {
2
- // Parse features out of an individual query
3
- $feature-holder: ();
4
- $query-holder: ();
5
- $length: length($query);
6
-
7
- @if $length == 2 {
8
- // If we've got a string/number, number/string, check to see if it's a valid string/number pair or two singles
9
- @if (type-of(nth($query, 1)) == 'string' and type-of(nth($query, 2)) == 'number') or (type-of(nth($query, 1)) == 'number' and type-of(nth($query, 2)) == 'string') {
10
-
11
- $number: '';
12
- $value: '';
13
-
14
- @if type-of(nth($query, 1)) == 'string' {
15
- $number: nth($query, 2);
16
- $value: nth($query, 1);
17
- }
18
- @else {
19
- $number: nth($query, 1);
20
- $value: nth($query, 2);
21
- }
22
-
23
- // If the string value can be a single value, check to see if the number passed in is a valid input for said single value. Fortunately, all current single-value options only accept unitless numbers, so this check is easy.
24
- @if breakpoint-single-string($value) {
25
- @if unitless($number) {
26
- $feature-holder: append($value, $number, space);
27
- $query-holder: append($query-holder, $feature-holder, comma);
28
- @return $query-holder;
29
- }
30
- }
31
- // If the string is a media type, split the query
32
- @if breakpoint-is-media($value) {
33
- $query-holder: append($query-holder, nth($query, 1));
34
- $query-holder: append($query-holder, nth($query, 2));
35
- @return $query-holder;
36
- }
37
- // If it's not a single feature, we're just going to assume it's a proper string/value pair, and roll with it.
38
- @else {
39
- $feature-holder: append($value, $number, space);
40
- $query-holder: append($query-holder, $feature-holder, comma);
41
- @return $query-holder;
42
- }
43
-
44
- }
45
- // If they're both numbers, we assume it's a double and roll with that
46
- @else if (type-of(nth($query, 1)) == 'number' and type-of(nth($query, 2)) == 'number') {
47
- $feature-holder: append(nth($query, 1), nth($query, 2), space);
48
- $query-holder: append($query-holder, $feature-holder, comma);
49
- @return $query-holder;
50
- }
51
- // If they're both strings and neither are singles, we roll with that.
52
- @else if (type-of(nth($query, 1)) == 'string' and type-of(nth($query, 2)) == 'string') {
53
- @if not breakpoint-single-string(nth($query, 1)) and not breakpoint-single-string(nth($query, 2)) {
54
- $feature-holder: append(nth($query, 1), nth($query, 2), space);
55
- $query-holder: append($query-holder, $feature-holder, comma);
56
- @return $query-holder;
57
- }
58
- }
59
- }
60
- @else if $length == 3 {
61
- // If we've got three items and none is a list, we check to see
62
- @if type-of(nth($query, 1)) != 'list' and type-of(nth($query, 2)) != 'list' and type-of(nth($query, 3)) != 'list' {
63
- // If none of the items are single string values and none of the values are media values, we're good.
64
- @if (not breakpoint-single-string(nth($query, 1)) and not breakpoint-single-string(nth($query, 2)) and not breakpoint-single-string(nth($query, 3))) and ((not breakpoint-is-media(nth($query, 1)) and not breakpoint-is-media(nth($query, 2)) and not breakpoint-is-media(nth($query, 3)))) {
65
- $feature-holder: append(nth($query, 1), nth($query, 2), space);
66
- $feature-holder: append($feature-holder, nth($query, 3), space);
67
- $query-holder: append($query-holder, $feature-holder, comma);
68
- @return $query-holder;
69
- }
70
- // let's check to see if the first item is a media type
71
- @else if breakpoint-is-media(nth($query, 1)) {
72
- $query-holder: append($query-holder, nth($query, 1));
73
- $feature-holder: append(nth($query, 2), nth($query, 3), space);
74
- $query-holder: append($query-holder, $feature-holder);
75
- @return $query-holder;
76
- }
77
- }
78
- }
79
-
80
- // If it's a single item, or if it's not a special case double or triple, we can simply return the query.
81
- @return $query;
82
- }
1
+ @function breakpoint-parse-query($query) {
2
+ // Parse features out of an individual query
3
+ $feature-holder: ();
4
+ $query-holder: ();
5
+ $length: length($query);
6
+
7
+ @if $length == 2 {
8
+ // If we've got a string/number, number/string, check to see if it's a valid string/number pair or two singles
9
+ @if (type-of(nth($query, 1)) == 'string' and type-of(nth($query, 2)) == 'number') or (type-of(nth($query, 1)) == 'number' and type-of(nth($query, 2)) == 'string') {
10
+
11
+ $number: '';
12
+ $value: '';
13
+
14
+ @if type-of(nth($query, 1)) == 'string' {
15
+ $number: nth($query, 2);
16
+ $value: nth($query, 1);
17
+ }
18
+ @else {
19
+ $number: nth($query, 1);
20
+ $value: nth($query, 2);
21
+ }
22
+
23
+ // If the string value can be a single value, check to see if the number passed in is a valid input for said single value. Fortunately, all current single-value options only accept unitless numbers, so this check is easy.
24
+ @if breakpoint-single-string($value) {
25
+ @if unitless($number) {
26
+ $feature-holder: append($value, $number, space);
27
+ $query-holder: append($query-holder, $feature-holder, comma);
28
+ @return $query-holder;
29
+ }
30
+ }
31
+ // If the string is a media type, split the query
32
+ @if breakpoint-is-media($value) {
33
+ $query-holder: append($query-holder, nth($query, 1));
34
+ $query-holder: append($query-holder, nth($query, 2));
35
+ @return $query-holder;
36
+ }
37
+ // If it's not a single feature, we're just going to assume it's a proper string/value pair, and roll with it.
38
+ @else {
39
+ $feature-holder: append($value, $number, space);
40
+ $query-holder: append($query-holder, $feature-holder, comma);
41
+ @return $query-holder;
42
+ }
43
+
44
+ }
45
+ // If they're both numbers, we assume it's a double and roll with that
46
+ @else if (type-of(nth($query, 1)) == 'number' and type-of(nth($query, 2)) == 'number') {
47
+ $feature-holder: append(nth($query, 1), nth($query, 2), space);
48
+ $query-holder: append($query-holder, $feature-holder, comma);
49
+ @return $query-holder;
50
+ }
51
+ // If they're both strings and neither are singles, we roll with that.
52
+ @else if (type-of(nth($query, 1)) == 'string' and type-of(nth($query, 2)) == 'string') {
53
+ @if not breakpoint-single-string(nth($query, 1)) and not breakpoint-single-string(nth($query, 2)) {
54
+ $feature-holder: append(nth($query, 1), nth($query, 2), space);
55
+ $query-holder: append($query-holder, $feature-holder, comma);
56
+ @return $query-holder;
57
+ }
58
+ }
59
+ }
60
+ @else if $length == 3 {
61
+ // If we've got three items and none is a list, we check to see
62
+ @if type-of(nth($query, 1)) != 'list' and type-of(nth($query, 2)) != 'list' and type-of(nth($query, 3)) != 'list' {
63
+ // If none of the items are single string values and none of the values are media values, we're good.
64
+ @if (not breakpoint-single-string(nth($query, 1)) and not breakpoint-single-string(nth($query, 2)) and not breakpoint-single-string(nth($query, 3))) and ((not breakpoint-is-media(nth($query, 1)) and not breakpoint-is-media(nth($query, 2)) and not breakpoint-is-media(nth($query, 3)))) {
65
+ $feature-holder: append(nth($query, 1), nth($query, 2), space);
66
+ $feature-holder: append($feature-holder, nth($query, 3), space);
67
+ $query-holder: append($query-holder, $feature-holder, comma);
68
+ @return $query-holder;
69
+ }
70
+ // let's check to see if the first item is a media type
71
+ @else if breakpoint-is-media(nth($query, 1)) {
72
+ $query-holder: append($query-holder, nth($query, 1));
73
+ $feature-holder: append(nth($query, 2), nth($query, 3), space);
74
+ $query-holder: append($query-holder, $feature-holder);
75
+ @return $query-holder;
76
+ }
77
+ }
78
+ }
79
+
80
+ // If it's a single item, or if it's not a special case double or triple, we can simply return the query.
81
+ @return $query;
82
+ }