lesderid
/
paper-gtk-theme
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Paper/gtk-3.18/_colors.scss
View File

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

56
Paper/gtk-3.18/apps/_budgie.scss
View File

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

490
Paper/gtk-3.18/gtk-dark.css
View File

File diff suppressed because it is too large Load Diff

496
Paper/gtk-3.18/gtk.css
View File

File diff suppressed because it is too large Load Diff

42
Paper/gtk-3.18/widgets/_menus.scss
View File

@ -25,17 +25,10 @@
} }
} }
%menu, %menu {
.content-view .menu,
.menu,
.popup {
padding: 4px 0px; padding: 4px 0px;
background-color: $menu_color; background-color: $menu_color;
border: 1px solid $borders_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; } &:backdrop { background-color: $backdrop_menu_color; }
@ -72,8 +65,13 @@
margin-right: 10px; margin-right: 10px;
} }
} }
}
// separator
&.separator {
color: transparentize(black, 0.8);
}
}
// overflow arrows // overflow arrows
> .arrow { > .arrow {
@include button(undecorated); @include button(undecorated);
@ -106,13 +104,29 @@
} }
} }
.menuitem { .menuitem {
.accelerator { color: gtkalpha(currentColor,0.55); } &.accelerator { color: gtkalpha(currentColor,0.55);}
.check, &.check,
.radio { &.radio {
padding:4px;
&:dir(ltr) { margin-right: 7px; } &:dir(ltr) { margin-right: 7px;}
&:dir(rtl) { margin-left: 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;
}

2
Paper/gtk-3.18/widgets/_switches.scss
View File

@ -15,7 +15,7 @@ GtkSwitch {
color: transparent; color: transparent;
background-color: transparentize(black,0.9); 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 { &:insensitive {
background-color: $insensitive_base_color; background-color: $insensitive_base_color;