Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/JohnAlbin/normalize-scss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/sass
diff options
context:
space:
mode:
authorJohnAlbin <virtually.johnalbin@gmail.com>2016-10-24 08:48:19 +0300
committerJohnAlbin <virtually.johnalbin@gmail.com>2016-10-24 09:24:13 +0300
commit6dcf2941f392560414d0f7ebcc4df60b51976d5e (patch)
tree5578b3db0c2e8a0edaf6ddb301466294aeac13b8 /sass
parent86f93372c6ec845280c6a727ad6fb88458e280ac (diff)
Don't output vertical rhythm if only $indent-amount variable is set. #88
Diffstat (limited to 'sass')
-rw-r--r--sass/normalize/_normalize-mixin.scss10
1 files changed, 7 insertions, 3 deletions
diff --git a/sass/normalize/_normalize-mixin.scss b/sass/normalize/_normalize-mixin.scss
index 05561f5..33a381e 100644
--- a/sass/normalize/_normalize-mixin.scss
+++ b/sass/normalize/_normalize-mixin.scss
@@ -39,8 +39,7 @@
or $h3-font-size != 1.17 * $base-font-size
or $h4-font-size != 1 * $base-font-size
or $h5-font-size != 0.83 * $base-font-size
- or $h6-font-size != 0.67 * $base-font-size
- or $indent-amount != 40px {
+ or $h6-font-size != 0.67 * $base-font-size {
$normalize-vertical-rhythm: true !global;
}
@@ -201,7 +200,12 @@
*/
figure {
- @include normalize-margin(1 $indent-amount);
+ @if $normalize-vertical-rhythm {
+ @include normalize-margin(1 $indent-amount);
+ }
+ @else {
+ margin: 1em $indent-amount;
+ }
}
/**