Skip to content

Commit

Permalink
Fixed budgie bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinceliuice
vinceliuice committed Apr 5, 2018
1 parent 223123c commit a35af8d
Show file tree
Hide file tree
Showing 14 changed files with 304 additions and 231 deletions.
27 changes: 14 additions & 13 deletions src/_sass/gtk/apps/_budgie.scss
View file
Expand Up @@ -94,7 +94,7 @@
// FIXME: workspace has unnecessary/unknown margin
.workspace-switcher {
.workspace-layout {
border: 0 solid $inverse_divider_color;
border: 0 solid $titlebar_divider_color;

.top &,
.bottom & {
Expand All @@ -109,7 +109,7 @@

.workspace-item,
.workspace-add-button {
border: 0 solid $inverse_divider_color;
border: 0 solid $titlebar_divider_color;

.top &,
.bottom & {
Expand All @@ -125,7 +125,7 @@
.workspace-item {
transition: $shorter_transition;

&.current-workspace { background-color: $inverse_divider_color; }
&.current-workspace { background-color: $titlebar_divider_color; }
}

.workspace-add-button {
Expand Down Expand Up @@ -274,28 +274,29 @@ popover.background.places-menu {
.budgie-panel {
transition: background-color $longer_duration $deceleration_curve;
background-color: $solid_panel_bg_color;
color: $inverse_secondary_fg_color;
color: $titlebar_secondary_fg_color;
font-weight: 500;

&.transparent { background-color: $panel_bg_color; }

button {
@extend %flat_button;
@extend %button_selected.flat;
// @extend %button_selected.flat;

min-height: 16px;
min-width: 16px;
padding: 0;
border-radius: 0;

&:checked { background-color: $inverse_divider_color; }
color: $titlebar_secondary_fg_color;
&:hover { color: $titlebar_fg_color; }
&:checked { background-color: $titlebar_divider_color; color: $titlebar_fg_color; }
}

&.horizontal button { padding: 0 4px; }

&.vertical button { padding: 4px 0; }

separator { background-color: $inverse_track_color; }
separator { background-color: $titlebar_track_color; }

// used to indicate unread notifications
.alert { color: $destructive_color; }
Expand All @@ -322,11 +323,11 @@ popover.background.places-menu {

// for indicator colors
&:not(:checked) {
color: $inverse_hint_fg_color;
color: $titlebar_hint_fg_color;

&:hover, &:active { color: $inverse_secondary_fg_color; }
&:hover, &:active { color: $titlebar_secondary_fg_color; }

&:disabled { color: $inverse_track_color; }
&:disabled { color: $titlebar_disabled_secondary_fg_color; }
}
}

Expand All @@ -342,14 +343,14 @@ popover.background.places-menu {
.#{$pos} & {
& {
border-image: radial-gradient(circle closest-corner at #{$b_pos},
currentColor 0%,
$accent_color 0%,
transparent 0%)
0 0 0 0 / 0 0 0 0;
}

&:checked {
border-image: radial-gradient(circle closest-corner at #{$b_pos},
currentColor 100%,
$accent_color 100%,
transparent 0%)
#{$b_wid};
}
Expand Down
4 changes: 2 additions & 2 deletions src/_sass/gtk/apps/_gnome.scss
View file
Expand Up @@ -10,7 +10,7 @@
.nautilus-window notebook,
.nautilus-window notebook > stack {
background-color: $base_color;
border-bottom-right-radius: $windows_radius + 2px;
border-radius: 0 0 $windows_radius $windows_radius;
background-image: -gtk-scaled(url("assets/background-img-bottom#{$asset_suffix}.png"),
url("assets/background-img-bottom#{$asset_suffix}@2.png"));
background-repeat: no-repeat;
Expand Down Expand Up @@ -205,7 +205,7 @@ filechooser,
&.csd.background, placessidebar list { background-color: transparent; }
&.csd.background, placessidebar {
background-color: transparentize($lighter_bg_color, 0.03);
border-radius: 0 0 ($windows_radius + 2px) $windows_radius; // It also has an effect on nautilus notebook stacks background
border-radius: 0 0 $windows_radius $windows_radius; // It also has an effect on nautilus notebook stacks background
}

&.maximized placessidebar { border-radius: 0; }
Expand Down
36 changes: 21 additions & 15 deletions src/gtk/gtk-compact-square.css
View file
Expand Up @@ -694,29 +694,29 @@ button:disabled {
color: rgba(255, 255, 255, 0.3);
}

row:selected button.sidebar-button, infobar.info button.flat, infobar.question button.flat, infobar.warning button.flat, infobar.error button.flat, .budgie-panel button, .raven stackswitcher.linked > button, .raven-mpris button.image-button, row:selected
row:selected button.sidebar-button, infobar.info button.flat, infobar.question button.flat, infobar.warning button.flat, infobar.error button.flat, .raven stackswitcher.linked > button, .raven-mpris button.image-button, row:selected
button.flat {
color: rgba(255, 255, 255, 0.7);
}

row:selected button.sidebar-button:hover, infobar.info button.flat:hover, infobar.question button.flat:hover, infobar.warning button.flat:hover, infobar.error button.flat:hover, .budgie-panel button:hover, .raven stackswitcher.linked > button:hover, .raven-mpris button.image-button:hover, row:selected button.sidebar-button:active, infobar.info button.flat:active, infobar.question button.flat:active, infobar.warning button.flat:active, infobar.error button.flat:active, .budgie-panel button:active, .raven stackswitcher.linked > button:active, .raven-mpris button.image-button:active, row:selected
row:selected button.sidebar-button:hover, infobar.info button.flat:hover, infobar.question button.flat:hover, infobar.warning button.flat:hover, infobar.error button.flat:hover, .raven stackswitcher.linked > button:hover, .raven-mpris button.image-button:hover, row:selected button.sidebar-button:active, infobar.info button.flat:active, infobar.question button.flat:active, infobar.warning button.flat:active, infobar.error button.flat:active, .raven stackswitcher.linked > button:active, .raven-mpris button.image-button:active, row:selected
button.flat:hover, row:selected
button.flat:active {
color: #FFFFFF;
}

row:selected button.sidebar-button:disabled, infobar.info button.flat:disabled, infobar.question button.flat:disabled, infobar.warning button.flat:disabled, infobar.error button.flat:disabled, .budgie-panel button:disabled, .raven stackswitcher.linked > button:disabled, .raven-mpris button.image-button:disabled, row:selected
row:selected button.sidebar-button:disabled, infobar.info button.flat:disabled, infobar.question button.flat:disabled, infobar.warning button.flat:disabled, infobar.error button.flat:disabled, .raven stackswitcher.linked > button:disabled, .raven-mpris button.image-button:disabled, row:selected
button.flat:disabled {
color: rgba(255, 255, 255, 0.3);
}

row:selected button.sidebar-button:checked, infobar.info button.flat:checked, infobar.question button.flat:checked, infobar.warning button.flat:checked, infobar.error button.flat:checked, .budgie-panel button:checked, .raven stackswitcher.linked > button:checked, .raven-mpris button.image-button:checked, row:selected
row:selected button.sidebar-button:checked, infobar.info button.flat:checked, infobar.question button.flat:checked, infobar.warning button.flat:checked, infobar.error button.flat:checked, .raven stackswitcher.linked > button:checked, .raven-mpris button.image-button:checked, row:selected
button.flat:checked {
background-color: rgba(255, 255, 255, 0.3);
color: #FFFFFF;
}

row:selected button.sidebar-button:checked:disabled, infobar.info button.flat:checked:disabled, infobar.question button.flat:checked:disabled, infobar.warning button.flat:checked:disabled, infobar.error button.flat:checked:disabled, .budgie-panel button:checked:disabled, .raven stackswitcher.linked > button:checked:disabled, .raven-mpris button.image-button:checked:disabled, row:selected
row:selected button.sidebar-button:checked:disabled, infobar.info button.flat:checked:disabled, infobar.question button.flat:checked:disabled, infobar.warning button.flat:checked:disabled, infobar.error button.flat:checked:disabled, .raven stackswitcher.linked > button:checked:disabled, .raven-mpris button.image-button:checked:disabled, row:selected
button.flat:checked:disabled {
background-color: rgba(255, 255, 255, 0.12);
color: rgba(255, 255, 255, 0.5);
Expand Down Expand Up @@ -4450,7 +4450,7 @@ button.emoji-section:last-child {
.nautilus-window notebook,
.nautilus-window notebook > stack {
background-color: #fcfcfc;
border-bottom-right-radius: 10px;
border-radius: 0 0 8px 8px;
background-image: -gtk-scaled(url("assets/background-img-bottom.png"), url("assets/background-img-bottom@2.png"));
background-repeat: no-repeat;
background-position: top right;
Expand Down Expand Up @@ -4620,7 +4620,7 @@ filechooser.csd.background, filechooser placessidebar,
.nautilus-window.csd.background,
.nautilus-window placessidebar {
background-color: rgba(250, 250, 250, 0.97);
border-radius: 0 0 10px 8px;
border-radius: 0 0 8px 8px;
}

filechooser.maximized placessidebar,
Expand Down Expand Up @@ -6521,10 +6521,16 @@ popover.background.places-menu row {
min-width: 16px;
padding: 0;
border-radius: 0;
color: rgba(255, 255, 255, 0.7);
}

.budgie-panel button:hover {
color: #FFFFFF;
}

.budgie-panel button:checked {
background-color: rgba(255, 255, 255, 0.12);
color: #FFFFFF;
}

.budgie-panel.horizontal button {
Expand Down Expand Up @@ -6568,39 +6574,39 @@ popover.background.places-menu row {
}

.top .budgie-panel #tasklist-button, .budgie-panel .top #tasklist-button, .top .budgie-panel button.flat.launcher, .budgie-panel .top button.flat.launcher {
border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
border-image: radial-gradient(circle closest-corner at center calc(1px), #FFAC00 0%, transparent 0%) 0 0 0 0/0 0 0 0;
}

.top .budgie-panel #tasklist-button:checked, .budgie-panel .top #tasklist-button:checked, .top .budgie-panel button.flat.launcher:checked, .budgie-panel .top button.flat.launcher:checked, .top .budgie-panel .unpinned button.flat.launcher, .budgie-panel .unpinned .top button.flat.launcher,
.top .budgie-panel .pinned button.flat.launcher.running, .budgie-panel .pinned .top button.flat.launcher.running {
border-image: radial-gradient(circle closest-corner at center calc(1px), currentColor 100%, transparent 0%) 2 0 0 0/2px 0 0 0;
border-image: radial-gradient(circle closest-corner at center calc(1px), #FFAC00 100%, transparent 0%) 2 0 0 0/2px 0 0 0;
}

.bottom .budgie-panel #tasklist-button, .budgie-panel .bottom #tasklist-button, .bottom .budgie-panel button.flat.launcher, .budgie-panel .bottom button.flat.launcher {
border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #FFAC00 0%, transparent 0%) 0 0 0 0/0 0 0 0;
}

.bottom .budgie-panel #tasklist-button:checked, .budgie-panel .bottom #tasklist-button:checked, .bottom .budgie-panel button.flat.launcher:checked, .budgie-panel .bottom button.flat.launcher:checked, .bottom .budgie-panel .unpinned button.flat.launcher, .budgie-panel .unpinned .bottom button.flat.launcher,
.bottom .budgie-panel .pinned button.flat.launcher.running, .budgie-panel .pinned .bottom button.flat.launcher.running {
border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), currentColor 100%, transparent 0%) 0 0 2 0/0 0 2px 0;
border-image: radial-gradient(circle closest-corner at center calc(100% - 1px), #FFAC00 100%, transparent 0%) 0 0 2 0/0 0 2px 0;
}

.left .budgie-panel #tasklist-button, .budgie-panel .left #tasklist-button, .left .budgie-panel button.flat.launcher, .budgie-panel .left button.flat.launcher {
border-image: radial-gradient(circle closest-corner at calc(1px) center, currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
border-image: radial-gradient(circle closest-corner at calc(1px) center, #FFAC00 0%, transparent 0%) 0 0 0 0/0 0 0 0;
}

.left .budgie-panel #tasklist-button:checked, .budgie-panel .left #tasklist-button:checked, .left .budgie-panel button.flat.launcher:checked, .budgie-panel .left button.flat.launcher:checked, .left .budgie-panel .unpinned button.flat.launcher, .budgie-panel .unpinned .left button.flat.launcher,
.left .budgie-panel .pinned button.flat.launcher.running, .budgie-panel .pinned .left button.flat.launcher.running {
border-image: radial-gradient(circle closest-corner at calc(1px) center, currentColor 100%, transparent 0%) 0 0 0 2/0 0 0 2px;
border-image: radial-gradient(circle closest-corner at calc(1px) center, #FFAC00 100%, transparent 0%) 0 0 0 2/0 0 0 2px;
}

.right .budgie-panel #tasklist-button, .budgie-panel .right #tasklist-button, .right .budgie-panel button.flat.launcher, .budgie-panel .right button.flat.launcher {
border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 0%, transparent 0%) 0 0 0 0/0 0 0 0;
border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #FFAC00 0%, transparent 0%) 0 0 0 0/0 0 0 0;
}

.right .budgie-panel #tasklist-button:checked, .budgie-panel .right #tasklist-button:checked, .right .budgie-panel button.flat.launcher:checked, .budgie-panel .right button.flat.launcher:checked, .right .budgie-panel .unpinned button.flat.launcher, .budgie-panel .unpinned .right button.flat.launcher,
.right .budgie-panel .pinned button.flat.launcher.running, .budgie-panel .pinned .right button.flat.launcher.running {
border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, currentColor 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
border-image: radial-gradient(circle closest-corner at calc(100% - 1px) center, #FFAC00 100%, transparent 0%) 0 2 0 0/0 2px 0 0;
}

frame.raven-frame > border {
Expand Down

0 comments on commit a35af8d

Please sign in to comment.