about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-08-15 10:25:07 -0500
committermultiple creatures <dev@multiple-creature.party>2019-08-15 10:25:07 -0500
commitc8a9f38bcd5a891968b34842c372b6cefa7f8f97 (patch)
treea9b29530e8a1772bf60a6ae76eec98ab84740e96 /app
parentb4b6f39c87e871eb64d6d2d8407962fda7c14dfb (diff)
initial fixes of tentacle colors
Diffstat (limited to 'app')
-rw-r--r--app/javascript/flavours/glitch/styles/tentacle/diff.scss12
-rw-r--r--app/javascript/flavours/glitch/styles/tentacle/variables.scss45
2 files changed, 44 insertions, 13 deletions
diff --git a/app/javascript/flavours/glitch/styles/tentacle/diff.scss b/app/javascript/flavours/glitch/styles/tentacle/diff.scss
index 883696b52..916cd434b 100644
--- a/app/javascript/flavours/glitch/styles/tentacle/diff.scss
+++ b/app/javascript/flavours/glitch/styles/tentacle/diff.scss
@@ -212,17 +212,19 @@
 		color: white;
 	}
 
-	.status__prepend
+	.status__prepend,
+  .notification__message
   {
 		margin-top: 0;
 		margin-bottom: 0;
 	}
-	.status__prepend span
+	.status__prepend span,
+  .notification__message span
   {
-		font-size: 0 !important;
-		color: transparent !important;
+		color: #332233 !important;
 	}
-	.status__prepend span a *
+	.status__prepend span a *,
+  .notification__message span a *
   {
 		color:#fff
 	}
diff --git a/app/javascript/flavours/glitch/styles/tentacle/variables.scss b/app/javascript/flavours/glitch/styles/tentacle/variables.scss
index d4a7ad691..0b0a41e84 100644
--- a/app/javascript/flavours/glitch/styles/tentacle/variables.scss
+++ b/app/javascript/flavours/glitch/styles/tentacle/variables.scss
@@ -1,16 +1,20 @@
 $classic-base-color: #956;
 $classic-primary-color: #302;
-$classic-secondary-color: #624;
-$classic-highlight-color: #845;
+$classic-secondary-color: $white; //624
+$classic-highlight-color: #845; //845
 
-$primary-text-color: #fac;
+$media-modal-media-max-width: 100%;
+$media-modal-media-max-height: 80%;
 
-$ui-base-color: $classic-base-color;
-$ui-primary-color: $classic-primary-color;
-$ui-secondary-color: $classic-secondary-color;
-$ui-highlight-color: $classic-highlight-color;
+$no-gap-breakpoint: 415px;
+
+$font-sans-serif: 'mastodon-font-sans-serif' !default;
+$font-display: 'mastodon-font-display' !default;
+$font-monospace: 'mastodon-font-monospace' !default;
 
-$simple-background-color: #000;
+$ui-avatar-border-size: 8%;
+
+$dismiss-overlay-width: 4rem;
 
 $error-column: #fac;
 
@@ -33,3 +37,28 @@ $status_actions_bg: #967;
 
 $cw_bg: #623;
 $cw_text: #956;
+
+$base-shadow-color: $black;
+$base-overlay-background: $black;
+$base-border-color: $white;
+
+$simple-background-color: $black;
+$valid-value-color: $success-green;
+$error-value-color: $error-red;
+
+$ui-base-color: $classic-base-color;                  // Darkest
+$ui-base-lighter-color: lighten($ui-base-color, 26%); // Lighter darkest
+$ui-primary-color: $classic-primary-color;            // Lighter
+$ui-secondary-color: $classic-secondary-color;        // Lightest
+$ui-highlight-color: $classic-highlight-color;
+
+$primary-text-color: #fac;
+$darker-text-color: $ui-primary-color;
+$dark-text-color: $ui-base-lighter-color;
+$secondary-text-color: $ui-secondary-color;
+$highlight-text-color: $ui-highlight-color;
+$action-button-color: $ui-base-lighter-color;
+
+$inverted-text-color: $ui-base-color;
+$lighter-text-color: $ui-base-lighter-color;
+$light-text-color: $ui-primary-color;