Skip to content

Commit

Permalink
Fixed bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
vinceliuice committed Apr 7, 2018
1 parent 4b903d2 commit fc24570
Show file tree
Hide file tree
Showing 10 changed files with 822 additions and 187 deletions.
109 changes: 91 additions & 18 deletions src/gtk-3.0/gtk-compact-dark-solid.css

Large diffs are not rendered by default.

109 changes: 91 additions & 18 deletions src/gtk-3.0/gtk-compact-dark.css

Large diffs are not rendered by default.

121 changes: 97 additions & 24 deletions src/gtk-3.0/gtk-compact-light-solid.css

Large diffs are not rendered by default.

121 changes: 97 additions & 24 deletions src/gtk-3.0/gtk-compact-light.css

Large diffs are not rendered by default.

109 changes: 91 additions & 18 deletions src/gtk-3.0/gtk-dark-solid.css

Large diffs are not rendered by default.

109 changes: 91 additions & 18 deletions src/gtk-3.0/gtk-dark.css

Large diffs are not rendered by default.

121 changes: 97 additions & 24 deletions src/gtk-3.0/gtk-light-solid.css

Large diffs are not rendered by default.

121 changes: 97 additions & 24 deletions src/gtk-3.0/gtk-light.css

Large diffs are not rendered by default.

88 changes: 70 additions & 18 deletions src/gtk-3.0/sass/_budgie.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
// Container for both the "panel" area and the shadow. Wise to keep
// this transparent..

$raven_base_color: #242424;
$raven_bg_color: #333333;
$raven_fg_color: #dedede;
$raven_button_bg_color: #545454;

%budgiebutton.flat {
@include button(flat-normal);
&:hover { @include button(flat-hover); }
Expand All @@ -15,6 +20,37 @@
&:disabled { @include button(flat-insensitive); }
}

%raven.flat {
border: none;
background-color: transparent;
color: $raven_fg_color;
box-shadow: none;

&:hover {
color: darken($raven_fg_color, 10%);
background-color: rgba(white, 0.15);
border-color: rgba(white, 0.15);
}
&:checked {
background-image: none;
color: $selected_fg_color;
background-color: rgba(white, 0.35);
text-shadow: none;
-gtk-icon-shadow: none;
}
&:active {
background-image: none;
color: $selected_fg_color;
background-color: rgba(white, 0.25);
text-shadow: none;
-gtk-icon-shadow: none;
}
&:disabled {
label, & { color: transparentize($raven_fg_color, 0.55); }
background-color: transparent;
}
}

.budgie-container { background-color: transparent; }

.budgie-settings-window buttonbox.inline-toolbar {
Expand Down Expand Up @@ -107,7 +143,7 @@
// FIXME: workspace has unnecessary/unknown margin
.workspace-switcher {
.workspace-layout {
border: 0 solid rgba(white, 0.12);
border: 0 solid $borders_color;

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

.workspace-item,
.workspace-add-button {
border: 0 solid rgba(white, 0.12);
border: 0 solid $borders_color;

.top &,
.bottom & {
Expand All @@ -138,7 +174,7 @@
.workspace-item {
transition: $transition_2;

&.current-workspace { background-color: rgba(white, 0.12); }
&.current-workspace { background-color: $borders_color; }
}

.workspace-add-button {
Expand Down Expand Up @@ -306,12 +342,12 @@ popover.background.places-menu {
min-width: 16px;
padding: 0;
border-radius: 0;
color: $header_fg;
border-top-width: 0;
border-bottom-width: 0;
border: none;

&:checked { background-color: rgba($header_fg, 0.12); }
color: $header_fg;
&:active { background-color: rgba($header_fg, 0.15); color: rgba($header_fg, 0.75); }
&:checked { background-color: rgba($header_fg, 0.12); color: $header_fg; }
}

&.horizontal button { padding: 0 4px; }
Expand Down Expand Up @@ -372,6 +408,8 @@ popover.background.places-menu {

&:disabled { color: rgba($fg_color, 0.5); }
}
&:active { background-color: rgba($fg_color, 0.20); }
&:checked { background-color: rgba($fg_color, 0.15); }
}

.unpinned button.flat.launcher,
Expand All @@ -386,14 +424,14 @@ popover.background.places-menu {
.#{$pos} & {
& {
border-image: radial-gradient(circle closest-corner at #{$b_pos},
currentColor 0%,
$selection_mode_bg 0%,
transparent 0%)
0 0 0 0 / 0 0 0 0;
}

&:checked {
border-image: radial-gradient(circle closest-corner at #{$b_pos},
currentColor 100%,
$selection_mode_bg 100%,
transparent 0%)
#{$b_wid};
}
Expand Down Expand Up @@ -425,7 +463,8 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left));

// Raven
.raven {
background-color: if($transparency == 'true', rgba($bg_color, 0.95), $bg_color);
background-color: if($transparency == 'true', rgba($raven_bg_color, 0.95), $raven_bg_color);
color: $raven_fg_color;

// for >=10.4
> box { margin-bottom: -10px; }
Expand All @@ -436,7 +475,9 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left));
// > stack > box:last-child > stack { margin-top: -6px; }

stackswitcher.linked > button {

background-color: $raven_button_bg_color;
color: $raven_fg_color;
border: none;
&:checked { }
}

Expand All @@ -448,9 +489,9 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left));
margin-top: -6px; // remove extra spaces, but not perfect :(

button {
@extend %budgiebutton.flat;
min-height: 28px;
min-width: 28px;
@extend %raven.flat;
min-height: 32px;
min-width: 32px;
margin: 0;
padding: 0;

Expand All @@ -462,8 +503,8 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left));

&.top {
padding: 2px 12px;
// background-color: rgba($bg_color, 0.95);
color: $fg_color;
// background-color: rgba($raven_bg_color, 0.95);
color: $raven_fg_color;

stackswitcher button {
margin: -6px 0;
Expand Down Expand Up @@ -499,14 +540,24 @@ $pos_list: ((top, bottom), (bottom, top), (left, right), (right, left));
border-style: solid none;
border-width: 1px;
border-color: $borders_color;
background-color: $base_color;
background-color: $raven_base_color;
color: $raven_fg_color;

&.middle {border-bottom-style: none; } // applet background between two headers

checkbutton, radiobutton { // this is for a nice focus on check and radios text
&.text-button {
&:hover { color: darken($raven_fg_color, 15%); }
&:disabled { color: transparentize($raven_fg_color, 0.55); }
}
}

&.middle { border-bottom-style: none; } // applet background between two headers
list { color: $raven_fg_color; background-color: $raven_base_color; }

// for <10.4
&.frame { border-style: solid none; }

> overlay > widget > image { color: gtkalpha(currentColor, 0.12); }
> overlay > widget > image { color: gtkalpha($raven_fg_color, 0.12); }

// for <10.4
grid > label:first-child { min-height: 26px; } // workaround to fix vertical-align
Expand Down Expand Up @@ -545,6 +596,7 @@ calendar.raven-calendar {
padding: 2px;
border-style: none;
background-color: transparent;
color: $raven_fg_color;

&:selected {
border-radius: 3px;
Expand Down
1 change: 0 additions & 1 deletion src/gtk-3.0/sass/_drawing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ $switch_animation: switch_ripple_effect 0.3s cubic-bezier(0, 0, 0.2, 1);
//
border: none;
background-color: transparent;

box-shadow: none;
}

Expand Down

0 comments on commit fc24570

Please sign in to comment.