Skip to content

Commit

Permalink
chore: 5.0.0 modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
ert78gb committed Oct 21, 2023
1 parent 88c8013 commit 2970857
Show file tree
Hide file tree
Showing 10 changed files with 107 additions and 132 deletions.
24 changes: 9 additions & 15 deletions packages/uhk-web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/uhk-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"angular-notifier": "11.0.0",
"angular-resize-event": "3.1.1",
"angular-split": "13.1.0",
"bootstrap": "5.3.2",
"bootstrap": "5.0.0",
"colord": "2.9.3",
"dragula": "3.7.3",
"jasmine-core": "4.4.0",
Expand Down
1 change: 1 addition & 0 deletions packages/uhk-web/src/styles-dark.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import '@fontsource/jetbrains-mono';
@import './styles/themes/dark-bs-variables';
@import './styles/variables';
@import './styles/themes/dark';
@import './styles/main';
1 change: 1 addition & 0 deletions packages/uhk-web/src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import '@fontsource/jetbrains-mono';
@import './styles/themes/light-bs-variables';
@import './styles/variables';
@import './styles/themes/light';
@import './styles/main';
68 changes: 30 additions & 38 deletions packages/uhk-web/src/styles/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,44 +1,36 @@
/*!
* Bootstrap v4.5.3 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Bootstrap v5.0.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
*/

@import '~bootstrap/scss/functions';
@import '~bootstrap/scss/variables';
@import '~bootstrap/scss/mixins';
@import '~bootstrap/scss/root';
@import '~bootstrap/scss/reboot';
@import '~bootstrap/scss/type';
@import '~bootstrap/scss/images';
@import '~bootstrap/scss/code';
@import '~bootstrap/scss/grid';
@import 'bootstrap/scss/root';
@import 'bootstrap/scss/reboot';
@import 'bootstrap/scss/type';
@import 'bootstrap/scss/images';
@import 'bootstrap/scss/grid';
//@import '~bootstrap/scss/tables';
@import '~bootstrap/scss/forms';
@import '~bootstrap/scss/buttons';
@import '~bootstrap/scss/transitions';
@import '~bootstrap/scss/dropdown';
@import '~bootstrap/scss/button-group';
@import '~bootstrap/scss/input-group';
@import 'bootstrap/scss/forms';
@import 'bootstrap/scss/buttons';
@import 'bootstrap/scss/transitions';
@import 'bootstrap/scss/dropdown';
@import 'bootstrap/scss/button-group';
//@import '~bootstrap/scss/custom-forms';
@import '~bootstrap/scss/nav';
@import '~bootstrap/scss/navbar';
//@import '~bootstrap/scss/card';
//@import '~bootstrap/scss/breadcrumb';
//@import '~bootstrap/scss/pagination';
@import '~bootstrap/scss/badge';
//@import '~bootstrap/scss/jumbotron';
@import '~bootstrap/scss/alert';
@import '~bootstrap/scss/progress';
//@import '~bootstrap/scss/media';
@import '~bootstrap/scss/list-group';
@import '~bootstrap/scss/close';
@import '~bootstrap/scss/toasts';
@import '~bootstrap/scss/modal';
@import '~bootstrap/scss/tooltip';
@import '~bootstrap/scss/popover';
@import 'bootstrap/scss/nav';
@import 'bootstrap/scss/navbar';
//@import 'bootstrap/scss/card';
//@import 'bootstrap/scss/breadcrumb';
//@import 'bootstrap/scss/pagination';
@import 'bootstrap/scss/badge';
@import 'bootstrap/scss/alert';
@import 'bootstrap/scss/progress';
@import 'bootstrap/scss/list-group';
@import 'bootstrap/scss/close';
@import 'bootstrap/scss/toasts';
@import 'bootstrap/scss/modal';
@import 'bootstrap/scss/tooltip';
@import 'bootstrap/scss/popover';
//@import '~bootstrap/scss/carousel';
@import '~bootstrap/scss/spinners';
@import '~bootstrap/scss/utilities';
//@import '~bootstrap/scss/print';
@import 'bootstrap/scss/spinners';
//@import 'bootstrap/scss/utilities';
1 change: 1 addition & 0 deletions packages/uhk-web/src/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ $second-side-menu-width: 250px;

@import 'bootstrap/scss/functions';
@import 'bootstrap/scss/variables';
@import 'bootstrap/scss/mixins';
8 changes: 8 additions & 0 deletions packages/uhk-web/src/styles/themes/_dark-bs-variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
$primary: #3ec9e8;
$secondary: #999;
$success: #5cb85c;
$info: #5bc0de;
$warning: #f0ad4e;
$danger: #d9534f;
$light: #444;
$dark: #212529;
64 changes: 24 additions & 40 deletions packages/uhk-web/src/styles/themes/_dark.scss
Original file line number Diff line number Diff line change
@@ -1,50 +1,34 @@
// Dark theme
$dark-theme: true;

$light: #444;
$dark: #212529;
$theme-colors: map-merge(
$theme-colors,
(
'primary': #3ec9e8,
'secondary': #999,
'success': #5cb85c,
'info': #5bc0de,
'warning': #f0ad4e,
'danger': #d9534f,
'light': $light,
'dark': $dark
)
);

$color-bg: #111;
$color-bg-light: #222;
$color-text: #bbb;
$color-text-highlight: #ddd;
$color-copy-icon: #6a737d;
$color-popover-bg-light: tint-color($color-bg-light, 5%);
$color-popover-border: tint-color($color-bg-light, 10%);
$color-popover-bg-light: lighten($color-bg-light, 5%);
$color-popover-border: lighten($color-bg-light, 10%);

$btn-default-bg: #444;
$btn-default-border: #666;

$icon-hover: theme-color('primary');
$icon-hover-delete: theme-color('danger');
$icon-hover: $primary;
$icon-hover-delete: $danger;
$tooltip-arrow-color: #ccc;
$tooltip-border-color: #ccc;

// Bootstrap variables
$body-bg: $color-bg;
$body-color: $color-text;
$link-color: theme-color('primary');
$link-color: $primary;
$link-hover-color: shade-color($link-color, 15%);
$list-group-bg: $color-bg-light;
$list-group-border-color: #666;
$input-bg: #222;
$input-color: $color-text;
$input-focus-bg: #111;
$input-btn-focus-color: rgba(theme-color('primary'), 0.25);
$color-select-active-bg: shade-color(theme-color('primary'), 40%);
$input-btn-focus-color: rgba($primary, 0.25);
$color-select-active-bg: shade-color($primary, 40%);
$color-select-active-text: $white;
$color-select-hover-bg: #3ec9e8;
$color-select-hover-text: #333;
Expand All @@ -60,7 +44,7 @@ $dropdown-color: $color-text;
$dropdown-bg: $input-bg;
$dropdown-link-color: $color-text;
$dropdown-link-hover-color: #333;
$dropdown-link-hover-bg: #{theme-color('primary')};
$dropdown-link-hover-bg: #{$primary};
$tooltip-color: $color-text;
$tooltip-bg: $color-bg;
$tooltip-arrow-color: $color-bg;
Expand All @@ -71,7 +55,7 @@ $popover-arrow-color: $color-bg-light;
$popover-arrow-outer-color: $color-popover-border;
$popover-body-color: $color-popover-bg-light;
$popover-border-color: $color-popover-border;
$component-active-bg: theme-color('primary') !default;
$component-active-bg: $primary !default;
$input-focus-border-color: tint-color($component-active-bg, 25%) !default;

:root,
Expand All @@ -94,21 +78,21 @@ $input-focus-border-color: tint-color($component-active-bg, 25%) !default;
--color-keyboard-border: #888;
--color-keyboard-key-bg: #f7f7f7;
--color-keyboard-key-hover: #494949;
--color-keyboard-key-active: #{theme-color('primary')};
--color-keyboard-key-active: #{$primary};

--color-input-bg: #{$input-bg};
--color-input-text: #{$input-color};
--color-input-border: #{theme-color('secondary')};
--color-input-border: #{$secondary};

--color-btn-secondary-border: #{theme-color('secondary')};
--color-btn-secondary-border: #{$secondary};

--color-icon-hover: #{theme-color('primary')};
--color-icon-hover: #{$primary};
--color-icon-hover-delete: #{$icon-hover-delete};
--color-icon-capture-keystroke: #{theme-color('danger')};
--color-icon-capture-keystroke: #{$danger};

--color-slider-base-bg: #555;
--color-slider-handle-bg: #888;
--color-slider-connect-bg: #{theme-color('primary')};
--color-slider-connect-bg: #{$primary};

--color-popover-bg: #{$color-bg-light};
--color-popover-bg-light: #{$color-popover-bg-light};
Expand All @@ -117,11 +101,11 @@ $input-focus-border-color: tint-color($component-active-bg, 25%) !default;
--color-popover-label-disabled: #959595;
--color-keymap-tab-background: #{$color-bg};
--color-keypress-tab-setting-label-disabled: #999;
--color-keypress-tab-disabled-info-text: #{theme-color('primary')};
--color-keypress-tab-disabled-info-text: #{$primary};

--color-progress-bar-bg: #{shade-color(theme-color('primary'), 40%)};
--color-progress-bar-progress: #{shade-color(theme-color('primary'), 20%)};
--color-progress-bar-progress-rgb-colors: #{tint-color(theme-color('success'), 10%)};
--color-progress-bar-bg: #{shade-color($primary, 40%)};
--color-progress-bar-progress: #{shade-color($primary, 20%)};
--color-progress-bar-progress-rgb-colors: #{tint-color($success, 10%)};
--color-progress-bar-text: #{$color-text};

--color-macro-bg: #333;
Expand All @@ -137,21 +121,21 @@ $input-focus-border-color: tint-color($component-active-bg, 25%) !default;
--color-xterm-bg: #000;
// uses as the textarea border color too
--color-xterm-border: #666;
--color-xterm-text: #{color('white')};
--color-xterm-text: #{$white};
--color-xterm-text-error: red;

--color-update-available-bg: #{theme-color('info')};
--color-update-available-bg: #{$info};
--color-update-available-text: #{$color-text-highlight};

--color-firmware-upgrade-panel-bg: #f39c12;
--color-firmware-upgrade-panel-text: #fff;

--color-highlight-arrow: #{theme-color('primary')};
--color-highlight-arrow: #{$primary};

--color-layers-button-disabled: #{shade-color(theme-color('secondary'), 40)};
--color-layers-button-disabled: #{shade-color($secondary, 40)};
--color-layers-button-active-disabled: #7c7c7c;

--color-out-of-space-warning-bg: #{theme-color('warning')};
--color-out-of-space-warning-bg: #{$warning};
--color-out-of-space-warning-text: #000;

--color-smart-macro-split-glutter: #000;
Expand Down
8 changes: 8 additions & 0 deletions packages/uhk-web/src/styles/themes/_light-bs-variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
$primary: #337ab7;
$secondary: #6d6d6d;
$success: #5cb85c;
$info: #5bc0de;
$warning: #f0ad4e;
$danger: #d9534f;
$light: #fff;
$dark: #212529;
Loading

0 comments on commit 2970857

Please sign in to comment.