From c06905cb22161c40f9fc3a81a7aec6d4b85652e5 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Thu, 18 Feb 2021 10:27:23 +0800 Subject: [PATCH] update --- install.sh | 2 -- src/main/gnome-shell/gdm3-dark.css | 3 +-- src/main/gnome-shell/gdm3-light.css | 3 +-- src/main/gnome-shell/gnome-shell-dark-solid.css | 3 +-- src/main/gnome-shell/gnome-shell-dark.css | 3 +-- src/main/gnome-shell/gnome-shell-light-solid.css | 3 +-- src/main/gnome-shell/gnome-shell-light.css | 3 +-- src/main/gtk-2.0/common/main.rc | 3 +++ src/main/gtk-3.0/gtk-dark-solid.css | 9 ++------- src/main/gtk-3.0/gtk-dark.css | 9 ++------- src/main/gtk-3.0/gtk-light-solid.css | 9 ++------- src/main/gtk-3.0/gtk-light.css | 9 ++------- src/sass/gnome-shell/widgets/_calendar.scss | 4 ++-- src/sass/gtk/_budgie.scss | 6 +----- 14 files changed, 20 insertions(+), 49 deletions(-) diff --git a/install.sh b/install.sh index d594200..94a430a 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,5 @@ #! /usr/bin/env bash -set -ueo pipefail set -o physical -#set -x REPO_DIR=$(cd $(dirname $0) && pwd) SRC_DIR=${REPO_DIR}/src diff --git a/src/main/gnome-shell/gdm3-dark.css b/src/main/gnome-shell/gdm3-dark.css index e749b09..26ef4f9 100644 --- a/src/main/gnome-shell/gdm3-dark.css +++ b/src/main/gnome-shell/gdm3-dark.css @@ -354,7 +354,7 @@ stage { } .calendar-today { - font-weight: bold !important; + font-weight: bold; color: rgba(255, 255, 255, 0.85); background-color: #0860F2; border: none; @@ -418,7 +418,6 @@ stage { font-weight: bold; } -/* Events */ .events-button .events-box { spacing: 6px; } diff --git a/src/main/gnome-shell/gdm3-light.css b/src/main/gnome-shell/gdm3-light.css index e8e38e8..679dd30 100644 --- a/src/main/gnome-shell/gdm3-light.css +++ b/src/main/gnome-shell/gdm3-light.css @@ -354,7 +354,7 @@ stage { } .calendar-today { - font-weight: bold !important; + font-weight: bold; color: rgba(255, 255, 255, 0.85); background-color: #0860F2; border: none; @@ -418,7 +418,6 @@ stage { font-weight: bold; } -/* Events */ .events-button .events-box { spacing: 6px; } diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css index 5d3499f..1d38bed 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid.css @@ -449,7 +449,7 @@ stage { } .calendar-today { - font-weight: bold !important; + font-weight: bold; color: rgba(255, 255, 255, 0.85); background-color: #0860F2; border: none; @@ -513,7 +513,6 @@ stage { font-weight: bold; } -/* Events */ .events-button .events-box { spacing: 6px; } diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index adbf13d..80b11b3 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -449,7 +449,7 @@ stage { } .calendar-today { - font-weight: bold !important; + font-weight: bold; color: rgba(255, 255, 255, 0.85); background-color: #0860F2; border: none; @@ -513,7 +513,6 @@ stage { font-weight: bold; } -/* Events */ .events-button .events-box { spacing: 6px; } diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index 6e67c3c..7a8f399 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -449,7 +449,7 @@ stage { } .calendar-today { - font-weight: bold !important; + font-weight: bold; color: rgba(255, 255, 255, 0.85); background-color: #0860F2; border: none; @@ -513,7 +513,6 @@ stage { font-weight: bold; } -/* Events */ .events-button .events-box { spacing: 6px; } diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index 243a133..307213d 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -449,7 +449,7 @@ stage { } .calendar-today { - font-weight: bold !important; + font-weight: bold; color: rgba(255, 255, 255, 0.85); background-color: #0860F2; border: none; @@ -513,7 +513,6 @@ stage { font-weight: bold; } -/* Events */ .events-button .events-box { spacing: 6px; } diff --git a/src/main/gtk-2.0/common/main.rc b/src/main/gtk-2.0/common/main.rc index 2a59cc1..4d04c36 100644 --- a/src/main/gtk-2.0/common/main.rc +++ b/src/main/gtk-2.0/common/main.rc @@ -5,6 +5,9 @@ style "default" { # Style Properties + GtkWindow::resize-grip-height = 4 + GtkWindow::resize-grip-width = 4 + GtkWidget::focus-line-width = 1 GtkMenuBar::window-dragging = 1 GtkToolbar::window-dragging = 1 diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css index dbc765f..138f067 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.css +++ b/src/main/gtk-3.0/gtk-dark-solid.css @@ -10027,17 +10027,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { .budgie-run-dialog, .budgie-session-dialog, .budgie-polkit-dialog { - border-radius: 12px; background-color: #333333; border: 1px solid #4d4d4d; } -.background.budgie-run-dialog, .background.budgie-session-dialog, -.background.budgie-polkit-dialog { - border-radius: 12px; -} - -.budgie-run-dialog decoration, .budgie-session-dialog decoration, +.budgie-run-dialog, .budgie-session-dialog, +.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration, .budgie-polkit-dialog decoration { border-radius: 12px; } diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index 0d9741a..5b78bd5 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -10023,17 +10023,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { .budgie-run-dialog, .budgie-session-dialog, .budgie-polkit-dialog { - border-radius: 12px; background-color: #333333; border: 1px solid rgba(77, 77, 77, 0.95); } -.background.budgie-run-dialog, .background.budgie-session-dialog, -.background.budgie-polkit-dialog { - border-radius: 12px; -} - -.budgie-run-dialog decoration, .budgie-session-dialog decoration, +.budgie-run-dialog, .budgie-session-dialog, +.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration, .budgie-polkit-dialog decoration { border-radius: 12px; } diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css index 28cc74e..4e1a9fc 100644 --- a/src/main/gtk-3.0/gtk-light-solid.css +++ b/src/main/gtk-3.0/gtk-light-solid.css @@ -10065,16 +10065,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { .budgie-run-dialog, .budgie-session-dialog, .budgie-polkit-dialog { - border-radius: 12px; background-color: #f5f5f5; } -.background.budgie-run-dialog, .background.budgie-session-dialog, -.background.budgie-polkit-dialog { - border-radius: 12px; -} - -.budgie-run-dialog decoration, .budgie-session-dialog decoration, +.budgie-run-dialog, .budgie-session-dialog, +.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration, .budgie-polkit-dialog decoration { border-radius: 12px; } diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index e6a0d83..da53a4d 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -10061,16 +10061,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow { .budgie-run-dialog, .budgie-session-dialog, .budgie-polkit-dialog { - border-radius: 12px; background-color: #f5f5f5; } -.background.budgie-run-dialog, .background.budgie-session-dialog, -.background.budgie-polkit-dialog { - border-radius: 12px; -} - -.budgie-run-dialog decoration, .budgie-session-dialog decoration, +.budgie-run-dialog, .budgie-session-dialog, +.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration, .budgie-polkit-dialog decoration { border-radius: 12px; } diff --git a/src/sass/gnome-shell/widgets/_calendar.scss b/src/sass/gnome-shell/widgets/_calendar.scss index 4d4fa59..1948b6a 100644 --- a/src/sass/gnome-shell/widgets/_calendar.scss +++ b/src/sass/gnome-shell/widgets/_calendar.scss @@ -152,7 +152,7 @@ } .calendar-today { - font-weight: bold !important; + font-weight: bold; color: $light_alt_fg_color; background-color: $primary_color; border: none; @@ -217,7 +217,7 @@ font-weight: bold; } -/* Events */ +// Events .events-button { .events-box { spacing: 6px; diff --git a/src/sass/gtk/_budgie.scss b/src/sass/gtk/_budgie.scss index 5fc040c..9b002a9 100644 --- a/src/sass/gtk/_budgie.scss +++ b/src/sass/gtk/_budgie.scss @@ -140,8 +140,6 @@ $raven_padding: 8px; &:disabled { color: $disabled_fg_color; } } - - treeview.view.sidebar, scrolledwindow.sidebar:not(.categories) { //AppMenu (Elementary) // min-height: 36px; @@ -1173,12 +1171,10 @@ window.budgie-switcher-window { } %budgie_dialog { - border-radius: $wm_radius; background-color: $bg_color; @if $variant == 'dark' { border: 1px solid lighten($menu_bg, 10%); } - &.background {border-radius: $wm_radius; } - decoration { border-radius: $wm_radius; } + &, &.background, decoration { border-radius: $wm_radius; } } // Session Dialog