Skip to content

Commit ae4dc07

Browse files
aarongustafsonaarongustafson
committed
Got rid of Brekup
1 parent 2acfbdd commit ae4dc07

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3724
-3803
lines changed

‎src/_includes/layouts/base.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
<link href="/favicon.png" rel="icon">
1919
<link rel="manifest" href="/manifest.json">
2020

21-
<link rel="stylesheet" href="/c/default{% if site.minify %}.min{% endif %}.css" media="all">
22-
<link rel="preload" href="/c/advanced{% if site.minify %}.min{% endif %}.css" as="style" media="only screen" onload="this.onload=null;this.rel='stylesheet'">
21+
<link rel="preload" href="/c/advanced{% if site.minify %}.min{% endif %}.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
2322
<noscript>
24-
<link rel="stylesheet" href="/c/advanced{% if site.minify %}.min{% endif %}.css" media="only screen">
23+
<link rel="stylesheet" href="/c/advanced{% if site.minify %}.min{% endif %}.css">
2524
</noscript>
2625
<script>{% include "partials/global/dark-mode.js" %}</script>
2726
<script>{% include "partials/global/banner.js" %}</script>

‎src/_styles/advanced.scss

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,8 @@
44

55
@charset "UTF-8";
66

7-
@import "vendors/_vendors";
8-
9-
// Breakup Configuration
10-
// https://github.com/BPScott/breakup
11-
$breakup-included-blocks: ("tiny" "small" "medium" "full");
12-
13-
@import "helpers/_helpers";
14-
@import "base/_base";
15-
@import "layout/_layout";
16-
@import "components/_components";
17-
@import "pages/_pages";
7+
@use "vendors/_vendors";
8+
@use "base/_base";
9+
@use "layout/_layout";
10+
@use "components/_components";
11+
@use "pages/_pages";

‎src/_styles/base/__base.scss

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
\*------------------------------------*/
55

66
// Body element (global fonts & such)
7-
@import "body";
7+
@use "body";
88

99
// Flow-level semantics
10-
@import "headings";
11-
@import "blocks";
12-
@import "lists";
10+
@use "headings";
11+
@use "blocks";
12+
@use "lists";
1313

1414
// Text-level semantics
15-
@import "links";
16-
@import "text";
15+
@use "links";
16+
@use "text";
1717

1818
// Specifics
19-
@import "code";
20-
@import "media";
21-
@import "tables";
22-
@import "forms";
23-
@import "dialog";
19+
@use "code";
20+
@use "media";
21+
@use "tables";
22+
@use "forms";
23+
@use "dialog";
2424

2525
// Animations
26-
@import "animations";
26+
@use "animations";
2727

2828
// Scrollbars
29-
@import "scrollbars";
29+
@use "scrollbars";

‎src/_styles/base/_blocks.scss

Lines changed: 107 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,116 @@
1+
@use "../helpers/_helpers" as *;
2+
13
/*------------------------------------*\
24
Block-level Semantics
35
\*------------------------------------*/
4-
@include breakup-breakpoint( "global" ) {
5-
6-
* {
7-
margin-top: 0;
8-
margin-bottom: 0;
9-
10-
@supports (margin-block: 1em) {
11-
margin: unset;
12-
margin-block: 0;
13-
}
14-
}
15-
16-
* + * {
17-
@include rem( margin-top, $default-spacing );
6+
* {
7+
margin-top: 0;
8+
margin-bottom: 0;
9+
10+
@supports (margin-block: 1em) {
11+
margin: unset;
12+
margin-block: 0;
13+
}
14+
}
1815

19-
@supports (margin-block: 1em) {
20-
margin-top: unset;
21-
@include rem( margin-block-start, $default-spacing, false );
22-
}
23-
}
24-
25-
noscript {
26-
display: none;
27-
}
16+
* + * {
17+
@include rem( margin-top, $default-spacing );
2818

29-
p:empty {
30-
display: none;
31-
}
32-
33-
blockquote {
34-
35-
@include rem( font-size, $font-size-body );
36-
font-family: $font-stack-serif;
37-
font-style: italic;
38-
39-
hanging-punctuation: first;
40-
hyphens: none;
41-
42-
margin-left: auto;
43-
margin-right: auto;
44-
@include rem( padding, 0 $default-spacing );
45-
@include rem( max-width, 700 );
19+
@supports (margin-block: 1em) {
20+
margin-top: unset;
21+
@include rem( margin-block-start, $default-spacing, false );
22+
}
23+
}
4624

47-
@supports (margin-block: 1em) {
48-
@include unset( margin-left margin-right padding max-width );
49-
margin-inline: auto;
50-
padding-block: 0;
51-
@include rem( padding-inline, $default-spacing, false );
52-
@include rem( max-inline-size, 700, false );
53-
}
54-
55-
}
56-
57-
.blockquote__attribution {
58-
59-
font-family: $font-stack-sansserif;
60-
61-
margin: 0;
62-
@include rem( padding-left, 2 * $default-spacing );
25+
noscript {
26+
display: none;
27+
}
6328

64-
@supports (margin-block: 1em) {
65-
@include unset( margin padding-left );
66-
margin-block: 0;
67-
margin-inline: 0;
68-
@include rem( padding-inline-start, 2 * $default-spacing, false );
69-
}
70-
71-
cite {
72-
font-style: normal;
73-
}
74-
75-
}
76-
77-
p {
78-
font-weight: normal;
79-
/*hyphens: auto;*/
80-
line-height: $line-height-default;
81-
82-
.wf-active & {
83-
word-spacing: 2px;
84-
}
85-
}
86-
87-
[aria-hidden="true"] {
88-
display: none;
89-
}
90-
91-
hr {
92-
border: 0;
93-
border-top: 1px solid $color-rule;
94-
95-
height: 0;
96-
@include rem( margin, $default-spacing auto );
29+
p:empty {
30+
display: none;
31+
}
9732

98-
@supports (margin-block: 1em) {
99-
@include unset( border-top height margin );
100-
border-block-start: 1px solid $color-rule;
101-
block-size: 0;
102-
margin-inline: auto;
103-
@include rem( margin-block, $default-spacing, false );
104-
}
105-
}
106-
107-
section + section {
108-
@include rem( margin-top, $default-spacing * 2 );
33+
blockquote {
34+
35+
@include rem( font-size, $font-size-body );
36+
font-family: $font-stack-serif;
37+
font-style: italic;
38+
39+
hanging-punctuation: first;
40+
hyphens: none;
10941

110-
@supports (margin-block: 1em) {
111-
margin-top: unset;
112-
@include rem( margin-block-start, $default-spacing * 2, false );
113-
}
114-
}
115-
42+
margin-left: auto;
43+
margin-right: auto;
44+
@include rem( padding, 0 $default-spacing );
45+
@include rem( max-width, 700 );
46+
47+
@supports (margin-block: 1em) {
48+
@include unset( margin-left margin-right padding max-width );
49+
margin-inline: auto;
50+
padding-block: 0;
51+
@include rem( padding-inline, $default-spacing, false );
52+
@include rem( max-inline-size, 700, false );
53+
}
54+
55+
}
56+
57+
.blockquote__attribution {
58+
59+
font-family: $font-stack-sansserif;
60+
61+
margin: 0;
62+
@include rem( padding-left, 2 * $default-spacing );
63+
64+
@supports (margin-block: 1em) {
65+
@include unset( margin padding-left );
66+
margin-block: 0;
67+
margin-inline: 0;
68+
@include rem( padding-inline-start, 2 * $default-spacing, false );
69+
}
70+
71+
cite {
72+
font-style: normal;
73+
}
74+
75+
}
76+
77+
p {
78+
font-weight: normal;
79+
/*hyphens: auto;*/
80+
line-height: $line-height-default;
81+
82+
.wf-active & {
83+
word-spacing: 2px;
84+
}
85+
}
86+
87+
[aria-hidden="true"] {
88+
display: none;
89+
}
90+
91+
hr {
92+
border: 0;
93+
border-top: 1px solid $color-rule;
94+
95+
height: 0;
96+
@include rem( margin, $default-spacing auto );
97+
98+
@supports (margin-block: 1em) {
99+
@include unset( border-top height margin );
100+
border-block-start: 1px solid $color-rule;
101+
block-size: 0;
102+
margin-inline: auto;
103+
@include rem( margin-block, $default-spacing, false );
104+
}
105+
}
106+
107+
section + section {
108+
@include rem( margin-top, $default-spacing * 2 );
109+
110+
@supports (margin-block: 1em) {
111+
margin-top: unset;
112+
@include rem( margin-block-start, $default-spacing * 2, false );
113+
}
116114
}
117115

118116
dialog::backdrop {
@@ -123,7 +121,7 @@ dialog + .backdrop {
123121
background: rgba( $color-black, .4 );
124122
}
125123

126-
@include breakup-breakpoint( "medium" ) {
124+
@media screen and (min-width: #{$bp-medium-em}) {
127125
blockquote,
128126
dl {
129127
@include rem( padding, 0 $default-spacing );
@@ -136,7 +134,7 @@ dialog + .backdrop {
136134
}
137135
}
138136

139-
@include breakup-breakpoint( "full" ) {
137+
@media screen and (min-width: #{$bp-full-em}) {
140138
blockquote,
141139
dl {
142140
@include rem( padding, 0 ( 3 * $default-spacing ) );
@@ -149,7 +147,7 @@ dialog + .backdrop {
149147
}
150148
}
151149

152-
@include breakup-breakpoint( "print" ) {
150+
@media print {
153151
p, ol, ol, dl {
154152
hyphens: auto;
155153
orphans: 3;

0 commit comments

Comments
 (0)