diff --git a/gtk-3.0/apps/_budgie.scss b/gtk-3.0/apps/_budgie.scss index ca05374..808a0e5 100755 --- a/gtk-3.0/apps/_budgie.scss +++ b/gtk-3.0/apps/_budgie.scss @@ -9,7 +9,7 @@ $mpris_overlay_bg: transparentize(if($variant=='light',$base_color, darken($bg_c $mpris_overlay_border: $top_highlight; $panel_bg: transparentize( darken($_sidebar_color,10%),0.05); $panel_color: $headerbar_fg_color; // text color for raven and popovers -$panel_secondary_color: #98abb2; // text color for dark panel +$panel_secondary_color: lighten($headerbar_fg_color, 70%); // text color for dark panel $panel_border: transparentize($borders_color, 0.08); $panel_shadow: transparentize(black, 0.7); $raven_bg: transparentize($headerbar_color, 0.08); @@ -178,16 +178,16 @@ $pos_list: ((top, bottom),(bottom,top),(left,right),(right,left)); // Menu Button button.budgie-menu-launcher { padding: 0 2px; - color: $headerbar_fg_color; + color: $panel_secondary_color; box-shadow: none; background-color: transparent; - &:hover { color: $headerbar_fg_color; } - &:active, &:checked { color: $headerbar_fg_color; } + &:hover { color: $panel_secondary_color; } + &:active, &:checked { color: $panel_secondary_color; } &:backdrop { - color: $headerbar_fg_color; + color: $panel_secondary_color; background-color: transparent; - &:hover { color: $headerbar_fg_color; } + &:hover { color: $panel_secondary_color; } &:active, &:checked { color: $selected_bg_color; box-shadow: none; @@ -252,10 +252,10 @@ button.budgie-menu-launcher { button.raven-trigger { padding-left: 2px; padding-right: 2px; - color: $headerbar_fg_color; + color: $panel_secondary_color; box-shadow: none; &:hover { - color: $headerbar_fg_color; + color: $panel_secondary_color; background-color: transparent; } &:active, &:checked { @@ -264,9 +264,9 @@ button.raven-trigger { color: $selected_bg_color; } &:backdrop { - color: $headerbar_fg_color; + color: $panel_secondary_color; &:hover { - color: $headerbar_fg_color; + color: $panel_secondary_color; } &:active, &:checked { box-shadow: none; @@ -401,12 +401,12 @@ button.raven-trigger { } label { - color: $red; + color: $panel_secondary_color; font-weight: 700; } &.transparent { - background-color: transparent; + background-color: transparentize($panel_bg, 0.75); .top & { border-bottom-color: transparent; diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index 04cb502..33306d6 100755 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -4821,18 +4821,18 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec button.budgie-menu-launcher { padding: 0 2px; - color: #C3C7D1; + color: white; box-shadow: none; background-color: transparent; } button.budgie-menu-launcher:hover { - color: #C3C7D1; } + color: white; } button.budgie-menu-launcher:active, button.budgie-menu-launcher:checked { - color: #C3C7D1; } + color: white; } button.budgie-menu-launcher:backdrop { - color: #C3C7D1; + color: white; background-color: transparent; } button.budgie-menu-launcher:backdrop:hover { - color: #C3C7D1; } + color: white; } button.budgie-menu-launcher:backdrop:active, button.budgie-menu-launcher:backdrop:checked { color: #00D3A7; box-shadow: none; @@ -4883,19 +4883,19 @@ button.budgie-menu-launcher { button.raven-trigger { padding-left: 2px; padding-right: 2px; - color: #C3C7D1; + color: white; box-shadow: none; } button.raven-trigger:hover { - color: #C3C7D1; + color: white; background-color: transparent; } button.raven-trigger:active, button.raven-trigger:checked { box-shadow: none; background-color: transparent; color: #00D3A7; } button.raven-trigger:backdrop { - color: #C3C7D1; } + color: white; } button.raven-trigger:backdrop:hover { - color: #C3C7D1; } + color: white; } button.raven-trigger:backdrop:active, button.raven-trigger:backdrop:checked { box-shadow: none; color: #00D3A7; @@ -4972,7 +4972,7 @@ button.raven-trigger { box-shadow: inset 0px 1px 1px alpha(@theme_fg_color, 0.04);; } .budgie-panel { - color: #98abb2; + color: white; background-color: rgba(3, 3, 5, 0.95); background-image: none; box-shadow: none; @@ -4981,7 +4981,7 @@ button.raven-trigger { .budgie-panel .alert { color: #ed254e; } .budgie-panel:backdrop { - color: #98abb2; + color: white; background-color: rgba(3, 3, 5, 0.95); } .budgie-panel button { border-top-width: 0; @@ -4990,7 +4990,7 @@ button.raven-trigger { .budgie-panel button.flat { background: transparent; border: none; - color: #98abb2; } + color: white; } .budgie-panel button.flat:hover, .budgie-panel button.flat:active, .budgie-panel button.flat:checked { background: transparent; color: #00D3A7; } @@ -4999,10 +4999,10 @@ button.raven-trigger { padding: 0; margin: 0; } .budgie-panel label { - color: #ed254e; + color: white; font-weight: 700; } .budgie-panel.transparent { - background-color: transparent; } + background-color: rgba(3, 3, 5, 0.2); } .top .budgie-panel.transparent { border-bottom-color: transparent; } .bottom .budgie-panel.transparent { @@ -5017,7 +5017,7 @@ button.raven-trigger { background-color: rgba(195, 199, 209, 0.15); } .budgie-panel .end-region label { font-weight: 700; - color: #98abb2; } + color: white; } .budgie-panel #tasklist-button, .budgie-panel #tasklist-button:backdrop { diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 68af9a0..0accc3d 100755 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -4846,18 +4846,18 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec button.budgie-menu-launcher { padding: 0 2px; - color: #31363D; + color: #e7e9ec; box-shadow: none; background-color: transparent; } button.budgie-menu-launcher:hover { - color: #31363D; } + color: #e7e9ec; } button.budgie-menu-launcher:active, button.budgie-menu-launcher:checked { - color: #31363D; } + color: #e7e9ec; } button.budgie-menu-launcher:backdrop { - color: #31363D; + color: #e7e9ec; background-color: transparent; } button.budgie-menu-launcher:backdrop:hover { - color: #31363D; } + color: #e7e9ec; } button.budgie-menu-launcher:backdrop:active, button.budgie-menu-launcher:backdrop:checked { color: #00D3A7; box-shadow: none; @@ -4908,19 +4908,19 @@ button.budgie-menu-launcher { button.raven-trigger { padding-left: 2px; padding-right: 2px; - color: #31363D; + color: #e7e9ec; box-shadow: none; } button.raven-trigger:hover { - color: #31363D; + color: #e7e9ec; background-color: transparent; } button.raven-trigger:active, button.raven-trigger:checked { box-shadow: none; background-color: transparent; color: #00D3A7; } button.raven-trigger:backdrop { - color: #31363D; } + color: #e7e9ec; } button.raven-trigger:backdrop:hover { - color: #31363D; } + color: #e7e9ec; } button.raven-trigger:backdrop:active, button.raven-trigger:backdrop:checked { box-shadow: none; color: #00D3A7; @@ -4997,7 +4997,7 @@ button.raven-trigger { box-shadow: inset 0px 1px 1px alpha(@theme_fg_color, 0.04);; } .budgie-panel { - color: #98abb2; + color: #e7e9ec; background-color: rgba(15, 20, 25, 0.95); background-image: none; box-shadow: none; @@ -5006,7 +5006,7 @@ button.raven-trigger { .budgie-panel .alert { color: #ed254e; } .budgie-panel:backdrop { - color: #98abb2; + color: #e7e9ec; background-color: rgba(15, 20, 25, 0.95); } .budgie-panel button { border-top-width: 0; @@ -5015,7 +5015,7 @@ button.raven-trigger { .budgie-panel button.flat { background: transparent; border: none; - color: #98abb2; } + color: #e7e9ec; } .budgie-panel button.flat:hover, .budgie-panel button.flat:active, .budgie-panel button.flat:checked { background: transparent; color: #00D3A7; } @@ -5024,10 +5024,10 @@ button.raven-trigger { padding: 0; margin: 0; } .budgie-panel label { - color: #ed254e; + color: #e7e9ec; font-weight: 700; } .budgie-panel.transparent { - background-color: transparent; } + background-color: rgba(15, 20, 25, 0.2); } .top .budgie-panel.transparent { border-bottom-color: transparent; } .bottom .budgie-panel.transparent { @@ -5042,7 +5042,7 @@ button.raven-trigger { background-color: rgba(49, 54, 61, 0.15); } .budgie-panel .end-region label { font-weight: 700; - color: #98abb2; } + color: #e7e9ec; } .budgie-panel #tasklist-button, .budgie-panel #tasklist-button:backdrop { diff --git a/package-lock.json b/package-lock.json index 1a27840..c692b78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,9 +10,9 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "ajv": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz", - "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", + "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3184,9 +3184,7 @@ "nan": { "version": "2.14.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", - "dev": true, - "optional": true + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" }, "nanomatch": { "version": "1.2.13", @@ -3261,13 +3259,6 @@ "sass-graph": "^2.2.4", "stdout-stream": "^1.4.0", "true-case-path": "^1.0.2" - }, - "dependencies": { - "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" - } } }, "nopt": {