fixed some menu bugs

This commit is contained in:
Sam Hewitt 2016-05-24 21:16:43 -04:00
parent f3066b216e
commit f3a5096b5b
6 changed files with 542 additions and 548 deletions

View File

@ -23,11 +23,11 @@ $purple: #673ab7;
$borders_color: if($variant == 'light', darken($bg_color,20%), darken($bg_color,10%));
$borders_edge: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.9));
$selected_fg_color: #ffffff;
$selected_bg_color: if($variant == 'light', $blue, lighten($blue,10%));
$selected_bg_color: if($variant == 'light', darken($blue,5%), $blue);
$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 10%), $borders_color);
$link_color: blue;
$link_visited_color:transparentize($link_color,0.5);
$top_highlight: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.7));
$top_highlight: if($variant == 'light', transparentize(white, 0.8), transparentize(white, 0.9));
$bottom_highlight: if($variant == 'light', transparentize(white, 0.7), transparentize(white, 0.9));
$dark_fill: mix($borders_color, $bg_color, 35%);
$menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20%));

View File

@ -3,63 +3,66 @@
**********/
$budgie_panel_bg_color: if($variant == 'light', $bg_color, #263238);
$budgie_panel_fg_color: if($variant == 'light', $fg_color, #cfd8dc);;
$budgie_panel_fg_color: if($variant == 'light', $fg_color, #fff);
$pos_list: ((top, bottom),(bottom,top),(left,right),(right,left));
@function gtkalpha($c,$a) {
@return unquote("alpha(#{$c},#{$a})");
}
$pos_list: ((top, bottom),(bottom,top),(left,right),(right,left));
$asset_suffix: if($variant == 'default', '', '-hc');
%app_indicators {
%underscores {
&:hover { background-color: transparentize(black, 0.9); }
&:active, &:checked { background-color: transparentize(black, 0.8); }
&:hover {
background-color: transparentize(black, 0.9);
}
@each $pos, $b_pos in $pos_list {
&:active,
&:checked {
// background-color: transparentize(black, 0.8);
}
@each $pos, $alt_pos in $pos_list {
.#{$pos} & {
border-#{$b_pos}: 2px solid transparentize($budgie_panel_bg_color, 1.0);
border-#{$pos}: 2px solid transparentize($budgie_panel_bg_color, 1.0);
@at-root {
.#{$pos} .budgie-panel .unpinned .launcher,
.#{$pos} .budgie-panel .pinned .launcher.running { border-#{$pos}: 2px solid transparentize($selected_bg_color, 0.5); }
.#{$pos} .budgie-panel .pinned .launcher.running {
border-#{$pos}: 2px solid transparentize($budgie_panel_fg_color, 0.8);
}
}
&:hover {
border-#{$b_pos}: 2px solid transparentize(black, 0.9);
border-#{$pos}: 2px solid transparentize($selected_bg_color, 0.5);
border-#{$pos}: 3px solid transparentize($budgie_panel_fg_color, 0.5);
}
&:active, &:checked {
border-#{$b_pos}: 2px solid transparentize(black, 0.8);
border-#{$pos}: 2px solid $selected_bg_color;
&:active,
&:checked {
border-#{$pos}: 3px solid $budgie_panel_fg_color;
}
}
}
}
// Positional Styles
@each $pos, $b_pos in $pos_list {
@each $pos, $alt_pos in $pos_list {
// Panel borders
.#{$pos} .budgie-panel {
border-#{$b_pos}: 1px solid transparentize(black,0.8);
border-#{$alt_pos}: 1px solid transparentize(black,0.8);
box-shadow:inset 0 1px 0 0 transparentize(white,0.9);
}
// Raven borders
.#{$pos} .raven-frame {
border-#{$b_pos}: 1px solid transparentize(black, 0.2);
border-#{$alt_pos}: 1px solid transparentize(black, 0.2);
box-shadow:inset 0 0 0 1px transparentize(white, 0.7);
}
// Shadows
.#{$pos} .shadow-block {
background-color: transparent;
background-image: linear-gradient(to $b_pos,
background-image: linear-gradient(to $alt_pos,
$shadow_color,
transparent,
transparent);
@ -79,6 +82,7 @@ $asset_suffix: if($variant == 'default', '', '-hc');
// Budgie Menu
.budgie-menu {
GtkSearchEntry.entry:not(:selected) {
border: none;
box-shadow: none;
@ -136,7 +140,7 @@ $asset_suffix: if($variant == 'default', '', '-hc');
background-clip: padding-box;
border: none;
@extend %underscores;
@extend %app_indicators;
}
}
}
@ -155,11 +159,19 @@ $asset_suffix: if($variant == 'default', '', '-hc');
.unpinned {
.launcher,
.launcher.running {
@extend %underscores;
@extend %app_indicators;
padding: 2px 6px;
}
}
}
// Panel borders
.bottom .budgie-panel {
border: none;
box-shadow:none;
background:none;
}
// Raven
.raven {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -25,17 +25,10 @@
}
}
%menu,
.content-view .menu,
.menu,
.popup {
%menu {
padding: 4px 0px;
background-color: $menu_color;
border: 1px solid $borders_color;
border-radius: 4px;
box-shadow: 0 2px 4px 0 transparentize(black,0.9), inset 0 1px 0 0 $top_highlight;
.csd & {border: none;}
&:backdrop { background-color: $backdrop_menu_color; }
@ -72,8 +65,13 @@
margin-right: 10px;
}
}
}
// separator
&.separator {
color: transparentize(black, 0.8);
}
}
// overflow arrows
> .arrow {
@include button(undecorated);
@ -106,13 +104,29 @@
}
}
.menuitem {
.accelerator { color: gtkalpha(currentColor,0.55); }
&.accelerator { color: gtkalpha(currentColor,0.55);}
.check,
.radio {
&.check,
&.radio {
padding:4px;
&:dir(ltr) { margin-right: 7px; }
&:dir(ltr) { margin-right: 7px;}
&:dir(rtl) { margin-left: 7px; }
}
}
}
.menu {
@extend %menu;
box-shadow: inset 0 1px 0 0 $top_highlight;
.csd & {border: none;}
}
.content-view .menu,
.popup,
.context-menu {
@extend %menu;
box-shadow: 0 2px 4px 0 transparentize(black,0.9), inset 0 1px 0 0 $top_highlight;
}

View File

@ -15,7 +15,7 @@ GtkSwitch {
color: transparent;
background-color: transparentize(black,0.9);
box-shadow: inset 0 0 0 1px transparentize(black,0.9), 0px 1px $bottom_highlight;
box-shadow: if($variant == 'light', (inset 0 0 0 1px transparentize(black,0.9), 0px 1px $bottom_highlight), (inset 0 0 0 1px transparentize(black,0.75), 0px 1px $bottom_highlight));
&:insensitive {
background-color: $insensitive_base_color;