Merge pull request #457 from verdigado/task/fix-styles

Minor cleanup of styles, remove verdigado specific font
verdigado · Dec 22, 2023 · e538297 · e538297
2 parents b421c21 + 0b496fb
commit e538297
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 48 deletions.
diff --git a/assets/css/editor-style.css b/assets/css/editor-style.css
@@ -23,11 +23,6 @@
     font-style: normal;
     font-display: swap; }
 
-@font-face {
-    font-family: Sarabun;
-    src: url("../fonts/sarabun-v12-latin-regular.woff") format("woff");
-    font-display: swap; }
-
 body {
     font-family: "PTSans";
     font-size: 1.1875rem;
@@ -117,14 +112,40 @@ h1,h2,h3,h4 {
     font-family: "GrueneType";
 }
 @media (min-width: 768px) {
-    h1, .h1, .h1, .has-huge-font-size {
+    h1,
+    .h1,
+    .has-huge-font-size {
         font-size: 45px;
         line-height: 1.3em;
     }
-        h2, .h2, .h2, .has-large-font-size {
+
+    h2,
+    .h2,
+    .has-large-font-size {
         font-size: 31px;
         line-height: 1.3em;
     }
+
+    h3,
+    .h3,
+    .has-medium-font-size {
+        font-size: 27px;
+    }
+
+    h4,
+    .h4 {
+        font-size: 27px;
+    }
+
+    h5,
+    .h5 {
+        font-size: 25px;
+    }
+
+    h6,
+    .h6 {
+        font-size: 22px;
+    }
 }
 
 /* Main column width */

diff --git a/assets/fonts/sarabun-v12-latin-regular.woff b/assets/fonts/sarabun-v12-latin-regular.woff
diff --git a/sass/_fonts.scss b/sass/_fonts.scss
@@ -54,12 +54,6 @@
     font-display: block;
 }
 
-@font-face {
-    font-family: Sarabun;
-    src: url("assets/fonts/sarabun-v12-latin-regular.woff") format("woff");
-    font-display: swap;
-}
-
 .forkawesome {
     font-family: ForkAwesome !important;
     -webkit-font-smoothing: antialiased;

diff --git a/sass/_themes.scss b/sass/_themes.scss
@@ -1,7 +1,6 @@
 $themes: (
     default: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans"),
-    contrast: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans"),
-    verdigado: ("headingFont": "Sarabun", "headingFontBold": "Sarabun", "standardFont": "PTSans")
+    contrast: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans")
 );
 
 @mixin themed() {

diff --git a/sass/_widgets.scss b/sass/_widgets.scss
@@ -62,6 +62,30 @@
         input[type="submit"] {
             display: none;
         }
+
+        .wp-block-search__button-outside {
+
+            label {
+
+                &.wp-block-search__label {
+
+                    @include themed() {
+                        font-family: t("standardFont");
+                    }
+
+                    font-weight: 700;
+                    font-size: 1.3rem;
+                    color: $white;
+                    letter-spacing: 0.3px;
+
+                }
+
+                &::after {
+                    content: "";
+                }
+            }
+        }
+
     }
 
     &_categories {
@@ -143,33 +167,3 @@
         }
     }
 }
-
-.widget {
-
-    &_search {
-
-        .wp-block-search__button-outside {
-
-            label {
-
-                &.wp-block-search__label {
-
-                    @include themed() {
-                        font-family: t("standardFont");
-                    }
-
-                    font-weight: 700;
-                    font-size: 1.3rem;
-                    color: $white;
-                    letter-spacing: 0.3px;
-
-                }
-
-                &::after {
-                    content: "";
-                }
-            }
-        }
-    }
-
-}
diff --git a/sass/wp-blocks/button.scss b/sass/wp-blocks/button.scss
@@ -1,6 +1,6 @@
 .wp-block-button__link {
     background-color: $primary;
-    color: $white !important;
+    color: $white;
     text-transform: uppercase;
     font-size: 1rem;
     border-radius: 3px;
@@ -10,7 +10,11 @@
     }
 
     &:hover {
-        background-color: $secondary !important;
-        color: $white !important;
+        background-color: $secondary;
+    }
+
+    &:hover,
+    &:visited {
+        color: $white;
     }
 }