Updated _s defaults so they're not overriding bootstrap so much

Automattic · Nov 13, 2024 · 2eb0169 · 2eb0169
1 parent 372d5b3
commit 2eb0169
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 28 deletions.
diff --git a/src/scss/abstracts/variables/_colors.scss b/src/scss/abstracts/variables/_colors.scss
@@ -1,20 +1,20 @@
-$color__background-body: #fff;
-$color__background-screen: #f1f1f1;
-$color__background-hr: #ccc;
-$color__background-button: #e6e6e6;
+$color__background-body: $body-bg;
+$color__background-screen: $body-br;
+$color__background-hr: $primary;
+$color__background-button: $primary;
 $color__background-pre: #eee;
 $color__background-ins: #fff9c0;
 
-$color__text-screen: #21759b;
-$color__text-input: #666;
-$color__text-input-focus: #111;
-$color__link: #4169e1; //royalblue
-$color__link-visited: #800080; //purple
-$color__link-hover: #191970; //midnightblue
-$color__text-main: #404040;
+$color__text-screen: $body-color;
+$color__text-input: $body-color;
+$color__text-input-focus: $body-color;
+$color__link: $primary; //royalblue
+$color__link-visited: $primary; //purple
+$color__link-hover: $primary; //midnightblue
+$color__text-main: $body-color;
 
-$color__border-button: #ccc #ccc #bbb;
-$color__border-button-hover: #ccc #bbb #aaa;
-$color__border-button-focus: #aaa #bbb #bbb;
-$color__border-input: #ccc;
-$color__border-abbr: #666;
+$color__border-button: $primary;
+$color__border-button-hover: $primary;
+$color__border-button-focus: $primary;
+$color__border-input: $primary;
+$color__border-abbr: $primary;
diff --git a/src/scss/abstracts/variables/_typography.scss b/src/scss/abstracts/variables/_typography.scss
@@ -1,7 +1,7 @@
 // stylelint-disable value-keyword-case
-$font__main: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+$font__main: $font-family-sans-serif;
 // stylelint-enable value-keyword-case
 $font__code: monaco, consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
 $font__pre: "Courier 10 Pitch", courier, monospace;
-$font__line-height-body: 1.5;
+$font__line-height-body: $line-height-base;
 $font__line-height-pre: 1.6;
diff --git a/src/scss/base/elements/_buttons.scss b/src/scss/base/elements/_buttons.scss
@@ -6,7 +6,7 @@ input[type="submit"] {
 	border-color: $color__border-button;
 	border-radius: 3px;
 	background: $color__background-button;
-	color: rgba(0, 0, 0, 0.8);
+	color: $body-color;
 	line-height: 1;
 	padding: 0.6em 1em 0.4em;
 

diff --git a/src/scss/base/elements/_links.scss b/src/scss/base/elements/_links.scss
@@ -12,7 +12,7 @@ a {
 	}
 
 	&:focus {
-		outline: thin dotted;
+		outline: 0;
 	}
 
 	&:hover,

diff --git a/src/scss/base/typography/_copy.scss b/src/scss/base/typography/_copy.scss
@@ -1,5 +1,5 @@
 p {
-	margin-bottom: 1.5em;
+	margin-bottom: 0;
 }
 
 dfn,

diff --git a/src/scss/base/typography/_typography.scss b/src/scss/base/typography/_typography.scss
@@ -6,7 +6,7 @@ optgroup,
 textarea {
 	color: $color__text-main;
 	font-family: $font__main;
-	font-size: 1rem;
+	font-size: $font-size-base;
 	line-height: $font__line-height-body;
 }
 

diff --git a/src/scss/components/content/_posts-and-pages.scss b/src/scss/components/content/_posts-and-pages.scss
@@ -4,7 +4,7 @@
 
 .post,
 .page {
-	margin: 0 0 1.5em;
+	margin: 0;
 }
 
 .updated:not(.published) {
@@ -14,10 +14,10 @@
 .page-content,
 .entry-content,
 .entry-summary {
-	margin: 1.5em 0 0;
+	margin: 0;
 }
 
 .page-links {
 	clear: both;
-	margin: 0 0 1.5em;
+	margin: 0;
 }
diff --git a/src/scss/components/widgets/_widgets.scss b/src/scss/components/widgets/_widgets.scss
@@ -1,5 +1,5 @@
 .widget {
-	margin: 0 0 1.5em;
+	margin: 0;
 
 	// Make sure select elements fit in widgets.
 	select {

diff --git a/src/scss/style.scss b/src/scss/style.scss
@@ -67,8 +67,6 @@ $gray: #f5f5f5;
 $green: rgb(0, 174, 64);
 $orange: rgb(215, 86, 34);
 $red: rgb(232, 0, 50);
-$hybride: rgb(208, 48, 45);
-$cover-it: rgb(78, 54, 121);
 $yellow: rgb(255, 210, 0);
 $purple: rgb(193, 60, 128);
 $primary: $red;