Skip to content

Commit

Permalink
Fixed cinnamon issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinceliuice
vinceliuice committed Apr 21, 2019
1 parent 6ec251c commit e08e4dd
Show file tree
Hide file tree
Showing 26 changed files with 91 additions and 88 deletions.
9 changes: 0 additions & 9 deletions install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,6 @@ usage() {
printf " %-25s%s\n" "-na, --noapple VARIANT" "Specify gnome-shell to not display apple logo (Default: Display apple logo)"
printf " %-25s%s\n" "-g, --gdm" "Install GDM theme"
printf " %-25s%s\n" "-h, --help" "Show this help"
printf "\n%s\n" "INSTALLATION EXAMPLES:"
printf "%s\n" "Install all theme variants into ~/.themes"
printf " %s\n" "$0 --dest ~/.themes"
printf "%s\n" "Install all theme variants into ~/.themes including GDM theme"
printf " %s\n" "$0 --dest ~/.themes --gdm"
printf "%s\n" "Install standard theme variant only"
printf " %s\n" "$0 --color standard --flat standard"
printf "%s\n" "Install specific theme variants with different name into ~/.themes"
printf " %s\n" "$0 --dest ~/.themes --name MyTheme --color light dark --flat compact"
}

install() {
Expand Down
6 changes: 5 additions & 1 deletion src/cinnamon/cinnamon-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
font-weight: bold;
spacing: 1em;
padding: 20px;
margin: 32px;
min-width: 64px;
min-height: 64px;
color: #dadada;
Expand All @@ -1529,6 +1528,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
color: #315bef;
}

.osd-window .level-bar {
border-radius: 2px;
background-color: #315bef;
}

.window-list-box {
spacing: 0;
}
Expand Down
6 changes: 5 additions & 1 deletion src/cinnamon/cinnamon-light.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
font-weight: bold;
spacing: 1em;
padding: 20px;
margin: 32px;
min-width: 64px;
min-height: 64px;
color: #363636;
Expand All @@ -1512,6 +1511,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
color: #315bef;
}

.osd-window .level-bar {
border-radius: 2px;
background-color: #315bef;
}

.window-list-box {
spacing: 0;
}
Expand Down
8 changes: 6 additions & 2 deletions src/cinnamon/sass/_common.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,6 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%)
font-weight: bold;
spacing: 1em;
padding: 20px;
margin: 32px;
min-width: 64px;
min-height: 64px;

Expand All @@ -1287,7 +1286,7 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%)
border-radius: 5px;
background-color: $panel_bg;

.osd-monitor-label { font-size: 3em; }
.osd-monitor-label { font-size: 3em; }

.level {
padding: 0;
Expand All @@ -1296,6 +1295,11 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%)
border-radius: 2px;
color: $selected_bg_color;
}

.level-bar {
border-radius: 2px;
background-color: $selected_bg_color;
}
}

//
Expand Down
4 changes: 2 additions & 2 deletions src/gnome-shell/gnome-shell-dark-solid.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2803,7 +2803,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog-user-list-item {
border-radius: 8px;
padding: 4px 4px 0;
padding: 6px;
color: rgba(255, 255, 255, 0.7);
}

Expand All @@ -2827,7 +2827,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog-user-list-item .login-dialog-timed-login-indicator {
height: 2px;
margin: 2px 0 0 0;
margin: 6px 0 0 0;
background-color: rgba(255, 255, 255, 0.85);
}

Expand Down
4 changes: 2 additions & 2 deletions src/gnome-shell/gnome-shell-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2803,7 +2803,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog-user-list-item {
border-radius: 8px;
padding: 4px 4px 0;
padding: 6px;
color: rgba(255, 255, 255, 0.7);
}

Expand All @@ -2827,7 +2827,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog-user-list-item .login-dialog-timed-login-indicator {
height: 2px;
margin: 2px 0 0 0;
margin: 6px 0 0 0;
background-color: rgba(255, 255, 255, 0.85);
}

Expand Down
4 changes: 2 additions & 2 deletions src/gnome-shell/gnome-shell-light-solid.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2803,7 +2803,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog-user-list-item {
border-radius: 8px;
padding: 4px 4px 0;
padding: 6px;
color: rgba(255, 255, 255, 0.7);
}

Expand All @@ -2827,7 +2827,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog-user-list-item .login-dialog-timed-login-indicator {
height: 2px;
margin: 2px 0 0 0;
margin: 6px 0 0 0;
background-color: rgba(255, 255, 255, 0.85);
}

Expand Down
4 changes: 2 additions & 2 deletions src/gnome-shell/gnome-shell-light.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2803,7 +2803,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog-user-list-item {
border-radius: 8px;
padding: 4px 4px 0;
padding: 6px;
color: rgba(255, 255, 255, 0.7);
}

Expand All @@ -2827,7 +2827,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.login-dialog-user-list-item .login-dialog-timed-login-indicator {
height: 2px;
margin: 2px 0 0 0;
margin: 6px 0 0 0;
background-color: rgba(255, 255, 255, 0.85);
}

Expand Down
4 changes: 2 additions & 2 deletions src/gnome-shell/sass/_common.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2185,15 +2185,15 @@ $slider_color: if($variant == 'light', $accent_color, white);
}
.login-dialog-user-list-item {
border-radius: $bt_radius;
padding: 4px 4px 0;
padding: 6px;
color: $inverse_secondary_fg_color;
&:ltr { padding-right: 1em; }
&:rtl { padding-left: 1em; }
&:hover { background-color: $inverse_divider_color; color: $inverse_fg_color; }
&:active { background-color: $inverse_track_color; color: $inverse_fg_color; }
.login-dialog-timed-login-indicator {
height: 2px;
margin: 2px 0 0 0;
margin: 6px 0 0 0;
background-color: $inverse_fg_color;
}
&:focus .login-dialog-timed-login-indicator { background-color: $inverse_fg_color; }
Expand Down
8 changes: 4 additions & 4 deletions src/gtk-3.0/gtk-compact-dark-alt.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6171,20 +6171,20 @@ stack.background {
background: none;
}

.background.csd scrolledwindow.view {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view {
background-color: #242424;
border-bottom-left-radius: 7px;
}

.background.csd scrolledwindow.view > viewport.frame > stack {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .background.csd .nemo-window .nemo-places-sidebar scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar .background.csd scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .background.csd .budgie-menu scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected), .budgie-menu .background.csd scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .budgie-menu window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
background-color: transparent;
}

Expand Down
8 changes: 4 additions & 4 deletions src/gtk-3.0/gtk-compact-dark-solid-alt.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6171,20 +6171,20 @@ stack.background {
background: none;
}

.background.csd scrolledwindow.view {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view {
background-color: #242424;
border-bottom-left-radius: 7px;
}

.background.csd scrolledwindow.view > viewport.frame > stack {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .background.csd .nemo-window .nemo-places-sidebar scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar .background.csd scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .background.csd .budgie-menu scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected), .budgie-menu .background.csd scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .budgie-menu window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
background-color: transparent;
}

Expand Down
8 changes: 4 additions & 4 deletions src/gtk-3.0/gtk-compact-dark-solid.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6171,20 +6171,20 @@ stack.background {
background: none;
}

.background.csd scrolledwindow.view {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view {
background-color: #242424;
border-bottom-left-radius: 7px;
}

.background.csd scrolledwindow.view > viewport.frame > stack {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .background.csd .nemo-window .nemo-places-sidebar scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar .background.csd scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .background.csd .budgie-menu scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected), .budgie-menu .background.csd scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .budgie-menu window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
background-color: transparent;
}

Expand Down
8 changes: 4 additions & 4 deletions src/gtk-3.0/gtk-compact-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6171,20 +6171,20 @@ stack.background {
background: none;
}

.background.csd scrolledwindow.view {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view {
background-color: #242424;
border-bottom-left-radius: 7px;
}

.background.csd scrolledwindow.view > viewport.frame > stack {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .background.csd .nemo-window .nemo-places-sidebar scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar .background.csd scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .background.csd .budgie-menu scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected), .budgie-menu .background.csd scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .budgie-menu window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
background-color: transparent;
}

Expand Down
8 changes: 4 additions & 4 deletions src/gtk-3.0/gtk-compact-light-alt.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6183,20 +6183,20 @@ stack.background {
background: none;
}

.background.csd scrolledwindow.view {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view {
background-color: #ffffff;
border-bottom-left-radius: 7px;
}

.background.csd scrolledwindow.view > viewport.frame > stack {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .background.csd .nemo-window .nemo-places-sidebar scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar .background.csd scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .background.csd .budgie-menu scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected), .budgie-menu .background.csd scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .budgie-menu window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
background-color: transparent;
}

Expand Down
8 changes: 4 additions & 4 deletions src/gtk-3.0/gtk-compact-light-solid-alt.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6183,20 +6183,20 @@ stack.background {
background: none;
}

.background.csd scrolledwindow.view {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view {
background-color: #ffffff;
border-bottom-left-radius: 7px;
}

.background.csd scrolledwindow.view > viewport.frame > stack {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .background.csd .nemo-window .nemo-places-sidebar scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar .background.csd scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .background.csd .budgie-menu scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected), .budgie-menu .background.csd scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .budgie-menu window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
background-color: transparent;
}

Expand Down
8 changes: 4 additions & 4 deletions src/gtk-3.0/gtk-compact-light-solid.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6183,20 +6183,20 @@ stack.background {
background: none;
}

.background.csd scrolledwindow.view {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view {
background-color: #ffffff;
border-bottom-left-radius: 7px;
}

.background.csd scrolledwindow.view > viewport.frame > stack {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list {
background-color: transparent;
}

.background.csd scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .background.csd .nemo-window .nemo-places-sidebar scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar .background.csd scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .background.csd .budgie-menu scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected), .budgie-menu .background.csd scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > row.activatable:not(:hover):not(:active):not(:selected), .nemo-window .nemo-places-sidebar window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > .places-treeview:not(:hover):not(:active):not(:selected), .budgie-menu window.background.csd > box.horizontal > box.vertical > scrolledwindow.view > viewport.frame > stack > list > button:not(:hover):not(:active):not(:selected) {
background-color: transparent;
}

Expand Down
Loading

0 comments on commit e08e4dd

Please sign in to comment.