diff --git a/extension/scss/common.scss b/extension/scss/common.scss index 2a693e5aed..6dcb09585e 100644 --- a/extension/scss/common.scss +++ b/extension/scss/common.scss @@ -50,7 +50,6 @@ html.anytypeWebclipper-popup { --color-ice: #2aa7ee; --color-teal: #0fc8ba; --color-lime: #5dd400; - --color-green: #57c600; /* Font */ diff --git a/src/img/theme/dark/icon/menu/action/block/text/quote0.svg b/src/img/theme/dark/icon/menu/action/block/text/quote0.svg index 918e70a340..d3965d81ab 100644 --- a/src/img/theme/dark/icon/menu/action/block/text/quote0.svg +++ b/src/img/theme/dark/icon/menu/action/block/text/quote0.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/src/img/theme/dark/icon/menu/action/block/text/quote1.svg b/src/img/theme/dark/icon/menu/action/block/text/quote1.svg index 75272bbe46..16fe75cfe6 100644 --- a/src/img/theme/dark/icon/menu/action/block/text/quote1.svg +++ b/src/img/theme/dark/icon/menu/action/block/text/quote1.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/src/img/theme/dark/icon/menu/syncStatus/loading.svg b/src/img/theme/dark/icon/menu/syncStatus/loading.svg index cdcee32d87..999689bb66 100644 --- a/src/img/theme/dark/icon/menu/syncStatus/loading.svg +++ b/src/img/theme/dark/icon/menu/syncStatus/loading.svg @@ -1,10 +1,10 @@ - - - - - - - - + + + + + + + + diff --git a/src/img/theme/dark/icon/object/preview/hl.svg b/src/img/theme/dark/icon/object/preview/hl.svg index 4bfd24a752..ba689eef50 100644 --- a/src/img/theme/dark/icon/object/preview/hl.svg +++ b/src/img/theme/dark/icon/object/preview/hl.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/src/img/theme/dark/icon/widget/button/all.svg b/src/img/theme/dark/icon/widget/button/all.svg index 903feda36c..329c4accd2 100644 --- a/src/img/theme/dark/icon/widget/button/all.svg +++ b/src/img/theme/dark/icon/widget/button/all.svg @@ -1,4 +1,4 @@ - - + + diff --git a/src/img/theme/dark/icon/widget/button/bin.svg b/src/img/theme/dark/icon/widget/button/bin.svg index a21a9946e0..8209394ed8 100644 --- a/src/img/theme/dark/icon/widget/button/bin.svg +++ b/src/img/theme/dark/icon/widget/button/bin.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/src/img/theme/dark/icon/widget/button/chat.svg b/src/img/theme/dark/icon/widget/button/chat.svg index edec41900f..58567d1a78 100644 --- a/src/img/theme/dark/icon/widget/button/chat.svg +++ b/src/img/theme/dark/icon/widget/button/chat.svg @@ -1,3 +1,3 @@ - + diff --git a/src/img/theme/dark/icon/widget/button/member.svg b/src/img/theme/dark/icon/widget/button/member.svg index 65065548e9..adb1f56280 100644 --- a/src/img/theme/dark/icon/widget/button/member.svg +++ b/src/img/theme/dark/icon/widget/button/member.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/src/img/theme/dark/icon/widget/button/store.svg b/src/img/theme/dark/icon/widget/button/store.svg index 428659f6be..ce16392793 100644 --- a/src/img/theme/dark/icon/widget/button/store.svg +++ b/src/img/theme/dark/icon/widget/button/store.svg @@ -1,7 +1,7 @@ - - - - - + + + + + diff --git a/src/json/theme.ts b/src/json/theme.ts index 8ba2b6ae9b..86c6d3ae02 100644 --- a/src/json/theme.ts +++ b/src/json/theme.ts @@ -2,6 +2,7 @@ export default { iconSpace: { text: '#fff', bg: { + grey: '#949494', yellow: '#ecd91b', orange: '#ffb522', red: '#f55522', @@ -10,11 +11,10 @@ export default { blue: '#3e58eb', ice: '#2aa7ee', teal: '#0fc8ba', - green: '#57c600', - grey: '#949494', + lime: '#5dd400', }, - list: [ 'grey', 'yellow', 'orange', 'red', 'pink', 'purple', 'blue', 'ice', 'teal', 'lime', 'green' ], + list: [ 'grey', 'yellow', 'orange', 'red', 'pink', 'purple', 'blue', 'ice', 'teal', 'lime' ], }, /* ----------------------------------------------------------- */ @@ -32,7 +32,6 @@ export default { ice: '#2aa7ee', teal: '#0fc8ba', lime: '#5dd400', - green: '#57c600', }, graph: { @@ -65,7 +64,7 @@ export default { dark: { color: { - default: '#ebebeb', + default: '#f8f8f8', yellow: '#ecd91b', orange: '#ffb522', red: '#f55522', @@ -75,7 +74,6 @@ export default { ice: '#2aa7ee', teal: '#0fc8ba', lime: '#5dd400', - green: '#57c600', }, graph: { diff --git a/src/scss/_vars.scss b/src/scss/_vars.scss index 3a0de35f4a..8fd9018e44 100644 --- a/src/scss/_vars.scss +++ b/src/scss/_vars.scss @@ -16,9 +16,9 @@ --color-shape-secondary-inversion: #292929; --color-shape-tertiary: #f2f2f2; - --color-shape-highlight-dark: rgba(79, 79, 79, 0.16); - --color-shape-highlight-medium: rgba(79, 79, 79, 0.08); - --color-shape-highlight-light: rgba(79, 79, 79, 0.04); + --color-shape-highlight-dark: rgba(0, 0, 0, 0.11); + --color-shape-highlight-medium: rgba(0, 0, 0, 0.05); + --color-shape-highlight-light: rgba(0, 0, 0, 0.03); --color-shape-highlight-add: rgba(93,212,0,0.2); --color-shape-highlight-change: rgba(42,167,238,0.2); @@ -29,7 +29,7 @@ --color-control-accent: #252525; --color-control-active: #b6b6b6; --color-control-active-inversion: #737373; - --color-control-inactive: #ebebeb; + --color-control-inactive: #dcdcdc; --color-control-bg: #fff; /* Background */ @@ -44,8 +44,8 @@ --color-system-accent-100: #ffb522; --color-system-accent-50: #ffd15b; --color-system-accent-25: #ffee94; - --color-system-selection: rgba(24, 163, 241, 0.15); - --color-system-drop-zone: rgba(255, 187, 44, 0.25); + --color-system-selection: rgba(42, 167, 238, 0.10); + --color-system-drop-zone: rgba(255, 181, 34, 0.25); /* Color */ @@ -58,7 +58,6 @@ --color-ice: #2aa7ee; --color-teal: #0fc8ba; --color-lime: #5dd400; - --color-green: #57c600; /* Font */ diff --git a/src/scss/form/phrase.scss b/src/scss/form/phrase.scss index b721c4eb39..ec48e961b0 100644 --- a/src/scss/form/phrase.scss +++ b/src/scss/form/phrase.scss @@ -21,7 +21,6 @@ .bg-blue { background: var(--color-blue) !important; } .bg-ice { background: var(--color-ice) !important; } .bg-lime { background: var(--color-lime) !important; } - .bg-green { background: var(--color-green) !important; } .placeholder { color: var(--color-text-tertiary); top: 0; display: flex; flex-direction: row; align-items: center; justify-content: center; } #entry { diff --git a/src/scss/popup/membership.scss b/src/scss/popup/membership.scss index 2ee0b5c227..4800608127 100644 --- a/src/scss/popup/membership.scss +++ b/src/scss/popup/membership.scss @@ -48,7 +48,7 @@ .statusBar { @include text-small; min-height: 18px; margin: 0px 0px 2px; color: var(--color-text-secondary); } .statusBar.error { color: var(--color-red); } - .statusBar.ok { color: var(--color-green); } + .statusBar.ok { color: var(--color-lime); } .priceWrapper { margin-bottom: 14px; } .priceWrapper { @@ -157,7 +157,7 @@ .statusBar { @include text-small; min-height: 18px; margin: 0px 0px 4px; color: var(--color-text-secondary); } .statusBar.error { color: var(--color-red); } - .statusBar.ok { color: var(--color-green); } + .statusBar.ok { color: var(--color-lime); } .button { width: 100%; } } diff --git a/src/scss/theme/dark/common.scss b/src/scss/theme/dark/common.scss index ed0e6f008b..b5681ac10b 100644 --- a/src/scss/theme/dark/common.scss +++ b/src/scss/theme/dark/common.scss @@ -5,7 +5,7 @@ $themePath: '~img/theme/dark'; html.themeDark { /* Text */ - --color-text-primary: #ebebeb; + --color-text-primary: #f8f8f8; --color-text-secondary: #9a9a9a; --color-text-tertiary: #656565; --color-text-inversion: #171717; @@ -31,14 +31,13 @@ html.themeDark { --color-bg-primary: #171717; --color-bg-secondary: #191919; - --color-bg-tertiary: #464646; --color-bg-loader: rgba(0,0,0,0.7); /* System */ --color-system-accent-125: #ffc83c; --color-system-accent-50: #9f6b00; - --color-system-accent-25: #f09c0e; + --color-system-accent-25: #694500; --color-system-selection: rgba(24, 163, 241, 0.15); /* Common */ @@ -68,7 +67,7 @@ html.themeDark { .isMultiSelect.tagColor-red { color: var(--color-red) !important; background: #74321e !important; } .isMultiSelect.tagColor-pink { color: var(--color-pink) !important; background: #712055 !important; } .isMultiSelect.tagColor-purple { color: var(--color-purple) !important; background: #542663 !important; } - .isMultiSelect.tagColor-blue { color: var(--color-blue) !important; background: #2b3368 !important; } + .isMultiSelect.tagColor-blue { color: var(--color-blue) !important; background: #20295c !important; } .isMultiSelect.tagColor-ice { color: var(--color-ice) !important; background: #19465f !important; } .isMultiSelect.tagColor-teal { color: var(--color-teal) !important; background: #16534e !important; } .isMultiSelect.tagColor-lime { color: var(--color-lime) !important; background: #36551d !important; } diff --git a/src/scss/theme/dark/popup.scss b/src/scss/theme/dark/popup.scss index c3f30ce78c..877279e5ae 100644 --- a/src/scss/theme/dark/popup.scss +++ b/src/scss/theme/dark/popup.scss @@ -13,7 +13,6 @@ .popup.popupSettings, .popup.popupSettingsOnboarding { .mainSides { - > .side.left { background: var(--color-bg-secondary); } > .side.left { .item { .icon.logout { background-image: url('#{$themePath}/icon/popup/settings/logout.svg'); }