diff options
| -rwxr-xr-x | docker/dev/deploy.sh | 3 | ||||
| -rw-r--r-- | docker/prod/docker-compose.yml | 2 | ||||
| -rw-r--r-- | ui/assets/css/themes/_variables.vaporwave-light.scss | 3 | ||||
| -rw-r--r-- | ui/src/utils.ts | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/docker/dev/deploy.sh b/docker/dev/deploy.sh index a46b41c9..90094e21 100755 --- a/docker/dev/deploy.sh +++ b/docker/dev/deploy.sh @@ -6,12 +6,15 @@ new_tag="$1" git tag $new_tag # Setting the version on the front end +cd ../../ echo "export let version: string = '$(git describe --tags)';" > "ui/src/version.ts" git add "ui/src/version.ts" # Setting the version on the backend echo "pub const VERSION: &'static str = \"$(git describe --tags)\";" > "server/src/version.rs" git add "server/src/version.rs" +cd docker/dev + # Changing the docker-compose prod sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml git add ../prod/docker-compose.yml diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 2e5ee2b1..6d7ca1d1 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -11,7 +11,7 @@ services: - lemmy_db:/var/lib/postgresql/data restart: always lemmy: - image: dessalines/lemmy:v0.4.0.3 + image: dessalines/lemmy:v0.4.0.5 ports: - "127.0.0.1:8536:8536" environment: diff --git a/ui/assets/css/themes/_variables.vaporwave-light.scss b/ui/assets/css/themes/_variables.vaporwave-light.scss index 3d2527a0..9278b091 100644 --- a/ui/assets/css/themes/_variables.vaporwave-light.scss +++ b/ui/assets/css/themes/_variables.vaporwave-light.scss @@ -1,4 +1,3 @@ - $blue: #01cdfe; $indigo: #b967ff; $purple: #b967ff; @@ -23,4 +22,4 @@ $text-muted: $gray-500; $primary: $pink; $navbar-light-hover-color: rgba($primary, .7); $light: darken($gray-100,1.5); -$font-family-sans-serif: "Lucida Console", Monaco, monospace;
\ No newline at end of file +$font-family-sans-serif: "Lucida Console", Monaco, monospace; diff --git a/ui/src/utils.ts b/ui/src/utils.ts index b63f0cab..18144dde 100644 --- a/ui/src/utils.ts +++ b/ui/src/utils.ts @@ -287,6 +287,7 @@ export const themes = [ 'journal', 'sketchy', 'vaporwave', + 'vaporwave-dark', ]; export function setTheme(theme: string = 'darkly') { |