Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions apps/studio/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export default Vue.extend({
'isTrial': 'isTrial',
'isUltimate': 'isUltimate',
'themeValue': 'settings/themeValue',
'accentColor': 'settings/accentColor',
}),
editorFontSize() {
return this.$store.state.settings?.settings?.editorFontSize?.value || 14
Expand All @@ -137,6 +138,16 @@ export default Vue.extend({
themeValue() {
document.body.className = `theme-${this.themeValue}`
this.trigger(AppEvent.changedTheme, this.themeValue)
if (this.accentColor) {
document.body.style.setProperty('--theme-primary', this.accentColor)
}
},
accentColor(val) {
if (val) {
document.body.style.setProperty('--theme-primary', val)
} else {
document.body.style.removeProperty('--theme-primary')
}
},
status(curr, prev) {
this.$store.dispatch('updateWindowTitle')
Expand Down Expand Up @@ -174,6 +185,9 @@ export default Vue.extend({
if (this.themeValue) {
document.body.className = `theme-${this.themeValue}`
}
if (this.accentColor) {
document.body.style.setProperty('--theme-primary', this.accentColor)
}

if (this.url) {
try {
Expand Down
19 changes: 9 additions & 10 deletions apps/studio/src/assets/styles/app/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ x-buttons > x-button[menu].btn {

.btn-brand {
color: #181818;
background: $theme-primary;
background: var(--theme-primary);
&:hover, &:focus {
background: $theme-primary;
background: var(--theme-primary);
color: #000;
}
}
Expand Down Expand Up @@ -311,14 +311,15 @@ label {
}
}

input, select, textarea, .bk-form-input {
input:not([type=checkbox]):not([type=radio]), select, textarea, .bk-form-input {
font-family: $font-family;
font-size: $base-font-size;
@include form-control;
&:focus {
border-color: $input-highlight;
}
}

.input-group {
position: relative;
display: flex;
Expand Down Expand Up @@ -429,8 +430,7 @@ input[type="checkbox"] {
&:active,
&:checked,
&:checked:active {
background: $theme-base;
color: $theme-bg;
background: var(--theme-primary);
box-shadow: none;
outline: none;
}
Expand Down Expand Up @@ -465,12 +465,11 @@ input[type="radio"] {
border: 0;
margin-top: -1px;
margin-right: $gutter-h;
border-radius: 5px;
border-radius: 50%;
transition: background 0.2s ease-in-out;
cursor: pointer;
&:checked{
background: color.adjust($theme-primary, $lightness: -10%);
color: rgba(black, 0.87);
&:checked {
background: var(--theme-primary);
box-shadow: none;
}
}
Expand Down Expand Up @@ -567,7 +566,7 @@ input[type=file] {
}
.item-icon {
font-size: 12px;
color: color.adjust($theme-primary, $lightness: -15%);
color: var(--theme-primary);
&.schema-icon {
color: $text-lighter;
}
Expand Down
4 changes: 2 additions & 2 deletions apps/studio/src/assets/styles/app/connection-interface.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
.pitch {
text-align: center;
a {
color: $theme-primary;
color: var(--theme-primary);
&:hover {
text-decoration: underline;
}
Expand Down Expand Up @@ -181,7 +181,7 @@
}
&.enabled {
i {
color: $theme-primary;
color: var(--theme-primary);
}
}
x-switch {
Expand Down
2 changes: 1 addition & 1 deletion apps/studio/src/assets/styles/app/export-modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.dialog-c-link {
margin-left: $gutter-w;
font-size: 0.8rem;
color:$theme-primary;
color: var(--theme-primary);
text-decoration: underline;
&:hover {

Expand Down
6 changes: 3 additions & 3 deletions apps/studio/src/assets/styles/app/sidebar/sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
&.active {
background: rgba($theme-base, 0.1);
.material-icons {
color: $theme-primary;
color: var(--theme-primary);
}
}

Expand Down Expand Up @@ -261,7 +261,7 @@
border-radius: $list-heading-height;
background: $border-color;
&.active {
color: $theme-primary;
color: var(--theme-primary);
}
}
.actions {
Expand Down Expand Up @@ -432,7 +432,7 @@
&.pinned {
display: inline-flex;
i.bk-pin {
color: $theme-primary;
color: var(--theme-primary);
}
i.material-icons {
display:none;
Expand Down
4 changes: 2 additions & 2 deletions apps/studio/src/assets/styles/app/tabs/table-properties.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ $cell-success: $row-add;
box-shadow: inset 0 -2px rgba($theme-base, 0.2);
}
&.active {
color: $theme-primary;
box-shadow: inset 0 -2px $theme-primary;
color: var(--theme-primary);
box-shadow: inset 0 -2px var(--theme-primary);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/studio/src/assets/styles/app/tabs/tabletable.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
&:hover {
span.material-icons {
color: $theme-primary
color: var(--theme-primary)
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions apps/studio/src/assets/styles/app/vendor/tabulator.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ $columnResizeGuideColor: color.mix($query-editor-bg, $theme-base, 80%);
}
&.row-moved {
.tabulator-cell {
background: rgba($theme-primary, 0.08) !important;
background: color-mix(in srgb, var(--theme-primary) 8%, transparent) !important;
}
}
}
Expand Down Expand Up @@ -537,7 +537,7 @@ $columnResizeGuideColor: color.mix($query-editor-bg, $theme-base, 80%);
content: 'vpn_key';
font-family: 'Material Icons';
font-size: $font-size;
color: $theme-primary;
color: var(--theme-primary);
padding-left: $foreign-key-width - $font-size;
display: inline-flex;
align-items: center;
Expand Down Expand Up @@ -810,11 +810,11 @@ $columnResizeGuideColor: color.mix($query-editor-bg, $theme-base, 80%);

.tabulator .tabulator-tableholder .tabulator-range-overlay {
.tabulator-range, .tabulator-range-cell-active {
border-color: color.adjust($theme-primary, $lightness: -20%);
border-color: var(--theme-primary);
border-width: 1px;
}
.tabulator-range.tabulator-range-active::after {
background-color: color.adjust($theme-primary, $lightness: -20%);
background-color: var(--theme-primary);
}
.tabulator-range.copied {
border-style: dashed;
Expand Down
2 changes: 1 addition & 1 deletion apps/studio/src/assets/styles/themes/light/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ x-buttons {
}
}
.item-icon {
color: color.adjust($theme-primary, $lightness: -6%);
color: var(--theme-primary);
}

// Editor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ x-buttons {
}
}
.item-icon {
color: $theme-primary;
color: var(--theme-primary);
}

// Editor
Expand Down
1 change: 0 additions & 1 deletion apps/studio/src/components/settings/AzureVaultSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<div class="form-group">
<label class="checkbox-group" for="vaultEnabled">
<input
class="form-control"
id="vaultEnabled"
type="checkbox"
v-model="form.enabled"
Expand Down
Loading