Merge pull request #1001 from kmycode/kb-draft-18.0

Release: kb18.0

app/javascript/styles/full-dark/variables.scss

@@ -1,11 +1,14 @@
 $classic-base-color: #282c37; // Midnight Express
 $classic-secondary-color: #d9e1e8; // Pattens Blue
 
-// Variables for defaults in UI
+@use '../mastodon/variables' with (
-$simple-background-color: $classic-base-color !default;
+  // Variables for defaults in UI
+  $simple-background-color: $classic-base-color,
 
-// Tell UI to use selected colors
+  // Tell UI to use selected colors
-$ui-base-lighter-color: #969fbc !default; // Lighter darkest
+  $ui-base-lighter-color: #969fbc,
 
-// For texts on inverted backgrounds
+  // Lighter darkest
-$inverted-text-color: $classic-secondary-color !default;
+  // For texts on inverted backgrounds
+  $inverted-text-color: $classic-secondary-color
+);

docker-compose.yml

@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     build: .
-    image: kmyblue:18.0-dev
+    image: kmyblue:18.0
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     build:
       dockerfile: ./streaming/Dockerfile
       context: .
-    image: kmyblue-streaming:18.0-dev
+    image: kmyblue-streaming:18.0
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
 
   sidekiq:
     build: .
-    image: kmyblue:18.0-dev
+    image: kmyblue:18.0
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq

lib/mastodon/version.rb

@@ -18,8 +18,8 @@ module Mastodon
 
     def kmyblue_flag
       # 'LTS'
-      'dev'
+      # 'dev'
-      # nil
+      nil
     end
 
     def major