Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Bootstrap 5 #1378

Merged
merged 47 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
9a2d007
feat: Use Bootstrap 5; remove Bootstrap 4
jsit Jun 18, 2023
3639f09
feat: Add link decoration override global var
jsit Jun 18, 2023
a77d226
fix: Change sr-only to visually-hidden
jsit Jun 18, 2023
8eb6c13
fix: Fix missing toggle button classes
jsit Jun 18, 2023
0f6114a
fix: Use darker green to pass 3:1 contrast and allow foreground color…
jsit Jun 18, 2023
97b36cd
fix: Replace all mr- and ml- classes with me- (end) and ms- (start) c…
jsit Jun 18, 2023
293bc28
fix: Replace all pr- and pl- classes with pe- (end) and ps- (start) c…
jsit Jun 18, 2023
a6386cc
fix: Replace custom-select with form-select d-inline-block
jsit Jun 18, 2023
75faa5d
fix: Change max-width to Bootstrap 4's max-width
jsit Jun 18, 2023
c8c4bb0
fix: Fix badge colors
jsit Jun 18, 2023
1272a53
fix: Replace deprecated btn-block class with d-block
jsit Jun 18, 2023
8e075c7
fix: Temporary fix for missing btn-block styles
jsit Jun 18, 2023
c88bcd3
fix: Fix margin-left auto and margin-right auto
jsit Jun 18, 2023
754e078
fix: Fix default border color
jsit Jun 18, 2023
2ddd784
fix: Fix some button widths
jsit Jun 18, 2023
ed60841
fix: Fix form row margins
jsit Jun 18, 2023
fff0128
fix: Remove theme color maps; no longer necessary in Bootstrap 5
jsit Jun 18, 2023
747b7fe
fix: Remove unused gray
jsit Jun 18, 2023
4bd7bba
Merge remote-tracking branch 'origin/main' into feat/bootstrap-5
jsit Jun 19, 2023
3a355e6
test commit
jsit Jun 19, 2023
6466783
Merge remote-tracking branch 'origin/main' into feat/bootstrap-5
jsit Jun 19, 2023
6a78b7a
Merge branch 'main' into feat/bootstrap-5
jsit Jun 19, 2023
05619d9
fix: Fix deprecated input-group-append usage
jsit Jun 19, 2023
ce4d6cf
fix: Add missing col-form-label classes
jsit Jun 19, 2023
720ae60
fix: Fix some column widths
jsit Jun 19, 2023
7ef06c4
fix: Fix language dropdown style regression
jsit Jun 19, 2023
8fc4f3e
Merge remote-tracking branch 'origin/main' into feat/bootstrap-5
jsit Jun 19, 2023
6d5359d
fix: Fix toast background color
jsit Jun 19, 2023
1776da4
fix: Fix missing colors in red themes
jsit Jun 19, 2023
f8b45d0
fix: Fix default radio button appearance for toggles
jsit Jun 19, 2023
2a4c566
fix: Fix missing margin in search form
jsit Jun 19, 2023
6dfddf8
fix: Fix search form widths
jsit Jun 19, 2023
35be578
Merge branch 'main' into feat/bootstrap-5
jsit Jun 19, 2023
8ff8e0c
fix: Fix rate limit form columns
jsit Jun 19, 2023
a0adced
Merge branch 'main' into feat/bootstrap-5
SleeplessOne1917 Jun 20, 2023
b9a3a38
Merge remote-tracking branch 'origin/main' into feat/bootstrap-5
jsit Jun 20, 2023
d4a1598
fix: Fix search filters layout
jsit Jun 20, 2023
cb1d377
fix: Fix weird table background issue; re-compile from main updates
jsit Jun 20, 2023
43541e8
fix: Fix modlog filter layout
jsit Jun 20, 2023
b3b06f0
fix: Fix some horizontal margins
jsit Jun 20, 2023
31210ee
fix: Fix incorrect usage of input-group
jsit Jun 20, 2023
5ff6354
chore: Empty commit to re-trigger Woodpecker job
jsit Jun 20, 2023
99f1dc6
fix: Fix incorrect Bootstrap 5 padding class
jsit Jun 20, 2023
57500c9
fix: Tighten up the home filter bars for the hell of it
jsit Jun 20, 2023
19a20e3
fix: Fix home filter bar gap
jsit Jun 20, 2023
05a0855
Merge branch 'main' into feat/bootstrap-5
dessalines Jun 20, 2023
beb0056
Merge branch 'main' into feat/bootstrap-5
dessalines Jun 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@
"@types/toastify-js": "^1.11.1",
"@typescript-eslint/eslint-plugin": "^5.59.5",
"@typescript-eslint/parser": "^5.59.5",
"bootstrap-v4": "npm:bootstrap@^4.6.2",
"eslint": "^8.40.0",
"eslint-plugin-inferno": "^7.32.2",
"eslint-plugin-jsx-a11y": "^6.7.1",
Expand Down
10 changes: 9 additions & 1 deletion src/assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
margin-top: -10px;
}

.custom-select {
.form-select {
-moz-appearance: none;
}

Expand Down Expand Up @@ -266,6 +266,14 @@ hr {
-ms-transform: scale(1.2);
}

/**
* TODO: Fix this in markup rather than this overly specific selector:
* https://getbootstrap.com/docs/5.3/components/buttons/#block-buttons
*/
.btn.d-block + .btn.d-block {
margin-top: 0.5rem;
}

.mini-overlay {
position: absolute;
top: 0;
Expand Down
6 changes: 0 additions & 6 deletions src/assets/css/themes/_variables.darkly-red.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,4 @@ $primary: $blue;
$secondary: #444;
$light: $gray-800;

$theme-colors: (
"primary": $primary,
"secondary": $secondary,
"light": $light,
);

$link-color: $red;
32 changes: 3 additions & 29 deletions src/assets/css/themes/_variables.darkly.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "./variables";

// Colors
$white: #fff;
$gray-200: #ebebeb;
Expand All @@ -8,48 +10,21 @@ $gray-700: #444;
$gray-800: #303030;
$gray-900: #222;

// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$grays: (
"gray-200": $gray-200,
"gray-600": $gray-600,
"gray-700": $gray-700,
"gray-800": $gray-800,
"gray-900": $gray-900,
);

$blue: #375a7f;
$red: #e74c3c;
$yellow: #f39c12;
$green: #00bc8c;
$cyan: #3498db;

// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$colors: (
"blue": $blue,
"red": $red,
"yellow": $yellow,
"green": $green,
"cyan": $cyan,
);

$primary: $green;
$secondary: $gray-700;
$success: $green;
$dark: $gray-300;

// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$theme-colors: (
"primary": $primary,
"secondary": $secondary,
"dark": $dark,
);

$body-color: $gray-300;
$body-bg: $gray-900;
$link-color: $success;
$border-color: rgba($body-color, 0.25);
$mark-bg: #333;
$text-muted: $gray-600;
$yiq-contrasted-threshold: 175;
Expand Down Expand Up @@ -94,7 +69,6 @@ $input-group-addon-bg: $gray-700;

$hr-border-color: rgba($body-color, 0.25);

$table-accent-bg: $gray-800;
$table-border-color: $gray-700;

$custom-file-color: $gray-500;
Expand Down
5 changes: 0 additions & 5 deletions src/assets/css/themes/_variables.litely-red.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,3 @@

$secondary: #c80000;
$danger: darken($primary, 24%);

$theme-colors: (
"secondary": $secondary,
"danger": $danger,
);
36 changes: 4 additions & 32 deletions src/assets/css/themes/_variables.litely.scss
Original file line number Diff line number Diff line change
@@ -1,58 +1,30 @@
@import "./variables";

// Colors
$gray-100: #f8f9fa;
$gray-200: #e9ecef;
$gray-600: #6c757d;
$gray-700: #495057;
$gray-800: #343a40;
$gray-900: #212529;
$black: #222;

// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$grays: (
"gray-200": $gray-200,
"gray-600": $gray-600,
"gray-700": $gray-700,
"gray-800": $gray-800,
"gray-900": $gray-900,
);

$blue: #007bff;
$indigo: #6610f2;
$red: #d8486a;
$orange: #f1641e;
$green: #00c853;
$green: #00a846;
$cyan: #02bdc2;

// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$colors: (
"red": $red,
"orange": $orange,
"cyan": $cyan,
"green": $green,
);

$primary: $orange;
$secondary: $green;
$success: $indigo;
$info: $blue;
$danger: darken($primary, 25%);

// Writing these maps is necessary for Bootstrap theming:
// https://getbootstrap.com/docs/4.6/getting-started/introduction/
$theme-colors: (
"primary": $primary,
"secondary": $secondary,
"success": $success,
"info": $info,
"danger": $danger,
);

$body-color: $gray-700;
$body-bg: #fff;
$link-color: $primary;
$border-color: $gray-700;
$border-color: rgba($body-color, 0.25);
$mark-bg: rgb(255, 252, 239);
$headings-color: $gray-700;

Expand Down
6 changes: 6 additions & 0 deletions src/assets/css/themes/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$link-decoration: none;
$min-contrast-ratio: 3;

$container-max-widths: (
lg: 1140px,
);
Loading