Skip to content

Commit

Permalink
Merge remote-tracking branch 'lemmy/main' into fix/fix-toggle-radio-f…
Browse files Browse the repository at this point in the history
…ocus-1772

* lemmy/main: (25 commits)
  v0.18.1-rc.10
  Attempt to fix inability to logout from some instances (subdomains) (LemmyNet#1809)
  feat(theme): Vaporwave (LemmyNet#1682)
  fix: Revert smaller text size (LemmyNet#1795)
  Updated the regex for isAuthPath to reduce false positive hits (LemmyNet#1806)
  fix: Add focus border to markdown toolbar buttons
  fix: Add data-bs-theme attribute for user dark/light modes (LemmyNet#1782)
  v0.18.1-rc.9
  fix: Fix comment collapse and vote buttons not having focus style (LemmyNet#1789)
  Add missing modlog reasons (LemmyNet#1787)
  Fix search page breaking on initial load when logged in (LemmyNet#1781)
  feat: Add PR template (LemmyNet#1785)
  v0.18.1-rc.8
  Fix profile loading spinner
  fix: Break text on post titles so long words don't overflow
  fix: Move getRoleLabelPill to the only component that uses it
  fix: Remove unused hasBadges() function
  fix: Fix badge alignment and break out into component
  fix: Fix up filter row gaps and margins a little
  fix: Fix heading levels
  ...
  • Loading branch information
jsit committed Jul 4, 2023
2 parents acfbe99 + 4a0368b commit e5b5c08
Show file tree
Hide file tree
Showing 63 changed files with 24,857 additions and 700 deletions.
12 changes: 12 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## Description

<!-- Please describe exactly what this PR changes, including URLs and issue
numbers. If it fixes an issue, add "Fixes #XXXX" -->

## Screenshots

<!-- Please include before and after screenshots if applicable -->

### Before

### After
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lemmy-ui",
"version": "0.18.1-rc.7",
"version": "0.18.1-rc.10",
"description": "An isomorphic UI for lemmy",
"repository": "https://github.com/LemmyNet/lemmy-ui",
"license": "AGPL-3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/themes/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
$link-decoration: none;
$min-contrast-ratio: 3;
$font-size-base: 0.875rem;
$font-size-root: 93.75%;
27 changes: 27 additions & 0 deletions src/assets/css/themes/_variables.vaporwave-dark.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@import "./variables.vaporwave";

// Colors
$white: #fff;
$gray-200: #ebebeb;
$gray-600: #888;
$gray-700: #444;
$gray-800: #303030;
$gray-900: #222;

$light: $gray-700;

$body-bg: $gray-900;
$body-color: $gray-200;

$card-bg: $body-bg;
$navbar-dark-color: rgba($body-bg, 0.5);
$navbar-light-active-color: rgba($gray-200, 0.9);
$navbar-light-disabled-color: rgba($gray-200, 0.3);
$navbar-light-color: rgba($white, 0.5);
$nav-tabs-link-active-color: $purple;
$input-bg: $gray-600;
$input-color: $white;
$input-disabled-bg: $gray-800;
$input-border-color: $gray-800;
$mark-bg: $gray-600;
$pre-color: $gray-200;
13 changes: 13 additions & 0 deletions src/assets/css/themes/_variables.vaporwave-light.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@import "./variables.vaporwave";

// Colors
$gray-600: #6c757d;
$gray-700: #495057;
$gray-800: #343a40;
$gray-900: #212529;

$light: darken($gray-300, 1.5);

$body-bg: $gray-100;
$body-color: $gray-700;
$text-muted: $gray-500;
32 changes: 32 additions & 0 deletions src/assets/css/themes/_variables.vaporwave.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@import "./variables";

// Colors
$gray-100: #f8f9fa;
$gray-300: #dee2e6;
$gray-500: #adb5bd;

$blue: #01cdfe;
$indigo: #b967ff;
$purple: #b967ff;
$pink: rgb(255, 64, 186);
$red: rgb(255, 95, 110);
$orange: rgb(255, 167, 93);
$yellow: #fffb96;
$green: #05ffa1;
$teal: #01cdfe;
$cyan: #01cdfe;

$primary: $pink;
$secondary: $blue;

$enable-shadows: true;
$enable-gradients: true;
$enable-responsive-font-sizes: true;

$border-radius: 1rem;
$border-radius-lg: 1rem;
$font-family-monospace: Arial, "Noto Sans", sans-serif;
$yiq-text-light: $gray-300;
$text-muted: $gray-500;
$navbar-light-hover-color: rgba($primary, 0.7);
$font-family-sans-serif: "Lucida Console", Monaco, monospace;
Loading

0 comments on commit e5b5c08

Please sign in to comment.