Web-Projects/blog-static
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extract margin variables and mixins into separate file.

Browse Source
This commit is contained in:
Danila Fedorin 2020-06-24 14:21:56 -07:00
parent 3f0df8ae0d
commit 871a745702
3 changed files with 56 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
themes/vanilla/assets/scss/margin.scss Normal file
View File

@ -0,0 +1,38 @@
@import "variables.scss";
@import "mixins.scss";
$margin-width: 30rem;
$margin-offset: 1.5rem;
@mixin below-two-margins {
@media screen and
(max-width: $container-width +
2 * ($margin-width + 2 * $margin-offset)) {
@content;
}
}
@mixin below-one-margin {
@media screen and
(max-width: $container-width +
($margin-width + 3 * $margin-offset)) {
@content;
}
}
@mixin margin-content {
display: block;
position: absolute;
width: $margin-width;
box-sizing: border-box;
}
@mixin margin-content-left {
left: 0;
margin-left: -($margin-width + $margin-offset);
}
@mixin margin-content-right {
right: 0;
margin-right: -($margin-width + $margin-offset);
}

49
themes/vanilla/assets/scss/sidenotes.scss
View File

@ -1,28 +1,12 @@
@import "variables.scss"; @import "variables.scss";
@import "mixins.scss"; @import "mixins.scss";
@import "margin.scss";
$sidenote-accommodate-shrink: 10rem;
$sidenote-width: 30rem; $sidenote-width: 30rem;
$sidenote-offset: 1.5rem; $sidenote-offset: 1.5rem;
$sidenote-padding: 1rem; $sidenote-padding: 1rem;
$sidenote-highlight-border-width: .2rem; $sidenote-highlight-border-width: .2rem;
@mixin below-two-sidenotes {
@media screen and
(max-width: $container-width +
2 * ($sidenote-width + 2 * $sidenote-offset)) {
@content;
}
}
@mixin below-one-sidenote {
@media screen and
(max-width: $container-width +
($sidenote-width + 3 * $sidenote-offset)) {
@content;
}
}
.sidenote { .sidenote {
&:hover { &:hover {
.sidenote-label { .sidenote-label {
@ -48,25 +32,19 @@ $sidenote-highlight-border-width: .2rem;
} }
.sidenote-content { .sidenote-content {
display: block; @include margin-content;
position: absolute; @include bordered-block;
width: $sidenote-width;
margin-top: -1.5rem; margin-top: -1.5rem;
padding: $sidenote-padding;
text-align: left;
&.sidenote-right { &.sidenote-right {
right: 0; @include margin-content-right;
margin-right: -($sidenote-width + $sidenote-offset);
} }
&.sidenote-left { &.sidenote-left {
left: 0; @include margin-content-left;
margin-left: -($sidenote-width + $sidenote-offset);
} }
@include bordered-block;
padding: $sidenote-padding;
box-sizing: border-box;
text-align: left;
} }
.sidenote-delimiter { .sidenote-delimiter {
@ -85,18 +63,14 @@ $sidenote-highlight-border-width: .2rem;
} }
} }
@include below-two-sidenotes { @include below-two-margins {
.sidenote-content.sidenote-left { .sidenote-content.sidenote-left {
@include hidden-sidenote; @include hidden-sidenote;
margin-left: 0rem; margin-left: 0rem;
} }
.container {
left: -$sidenote-width/2
}
} }
@include below-one-sidenote { @include below-one-margin {
.post-content { .post-content {
max-width: 100%; max-width: 100%;
} }
@ -105,9 +79,4 @@ $sidenote-highlight-border-width: .2rem;
@include hidden-sidenote; @include hidden-sidenote;
margin-right: 0rem; margin-right: 0rem;
} }
.container {
position: initial;
} }
}

9
themes/vanilla/assets/scss/style.scss
View File

@ -1,5 +1,6 @@
@import "variables.scss"; @import "variables.scss";
@import "mixins.scss"; @import "mixins.scss";
@import "margin.scss";
body { body {
font-family: $font-body; font-family: $font-body;
@ -55,6 +56,14 @@ div.highlight table pre {
@include below-container-width { @include below-container-width {
padding: 0rem 1rem 0rem 1rem; padding: 0rem 1rem 0rem 1rem;
} }
@include below-two-margins {
left: -$margin-width/2;
}
@include below-one-margin {
position: initial;
}
} }
.button, input[type="submit"] { .button, input[type="submit"] {