Pushing colour fix

AlexFlipnote · Apr 23, 2021 · 1690d6c · 1690d6c
1 parent a6024b2
commit 1690d6c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/scss/assets/_credits.scss b/scss/assets/_credits.scss
@@ -1,6 +1,6 @@
 // scss-lint:disable Comment
 /*!
- * Modesta v3.0.0 (https://modesta.alexflipnote.dev)
+ * Modesta v3.0.0.1 (https://modesta.alexflipnote.dev)
  * Made by AlexFlipnote (https://alexflipnote.dev)
  * Licensed under MIT (https://github.com/AlexFlipnote/Modesta/blob/master/LICENSE)
  */
diff --git a/scss/components/_themeColours.scss b/scss/components/_themeColours.scss
@@ -65,8 +65,6 @@ $themes-container: (
       color: $text;
     }
 
-    .btn { color: $text; }
-
     .fullscreen { background-color: $highlight; }
 
     .label {

diff --git a/scss/modesta.scss b/scss/modesta.scss
@@ -11,11 +11,11 @@
 
 // Everything else
 @import 'components/buttons';
-@import 'components/colour';
 @import 'components/grid';
 @import 'components/objects';
 @import 'components/emojis';
 @import 'components/markdown';
+@import 'components/colour';
 
 // Last items
 @import 'components/responsive';

diff --git a/tests/buttons-colours.html b/tests/buttons-colours.html
@@ -0,0 +1,26 @@
+<html>
+  <head>
+    <link href="../dist/modesta.css" type="text/css" rel="stylesheet">
+    <script src="assets/change_theme.js"></script>
+  </head>
+  <body class="dark-theme">
+
+    <style>
+      .buttons { flex-direction: column; }
+      .btn { background: red; }
+    </style>
+
+    <section class="buttons">
+      <a class="btn sun-flower-text">Button</a>
+      <a class="btn COLOUR no-dark-hover">Button no darken hover</a>
+      <br><br>
+      <a class="btn animation COLOUR">Button animation</a>
+      <a class="btn animation hover COLOUR">Button animation and hover</a>
+      <br><br>
+      <a class="btn hover COLOUR">Button hover</a>
+      <a class="btn hover-scale COLOUR">Button scale hover</a>
+      <a class="btn hover-scale-inset COLOUR">Button scale inset hover</a>
+    </section>
+
+  </body>
+</html>