Merge pull request #429 from megax/patch6

GTK 3.20 :: gnome-terminal scrollbar rewirte
pull/432/head
Khurshid Alam 2016-05-11 19:22:05 +05:30
commit 62839b2a97
2 changed files with 37 additions and 47 deletions

View File

@ -108,6 +108,10 @@ $backdrop_borders_color: mix($bg_color, $borders_color, .9);
$backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, .35); $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, .35);
$backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, .5); $backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, .5);
$backdrop_osd_base: $osd_base;
$backdrop_osd_bg: $osd_bg;
$backdrop_osd_fg: mix($osd_fg, $backdrop_osd_base, .5);
$backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%); $backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%);
$backdrop_scrollbar_slider_color: mix($backdrop_fg_color, $backdrop_bg_color, .4); $backdrop_scrollbar_slider_color: mix($backdrop_fg_color, $backdrop_bg_color, .4);

View File

@ -5,53 +5,39 @@
@include exports("gnome-terminal") { @include exports("gnome-terminal") {
//noinspection ScssLintInspection,ScssLintInspection //noinspection ScssLintInspection,ScssLintInspection
VteTerminal { VteTerminal {
background-color: $osd_base; background-color: $osd_base;
color: $osd_fg; color: $osd_fg;
} }
TerminalWindow {
.scrollbars-junction { terminal-window {
background-color: $osd_base; junction, scrollbar trough {
} background-color: $osd_base;
scrollbar { border-color: border_normal($osd_base);
trough {
background-color: $osd_base; &:backdrop {
} background-color: shade($backdrop_osd_bg, .9);
button { border-color: border_normal(shade($backdrop_osd_bg, .9));
color: shade($osd_base, 0.6); }
&:active { }
color: shade($osd_base, 0.6);
&:hover { scrollbar.vertical {
color: shade($osd_base, 0.6); slider {
} background-color: mix($osd_base, $osd_fg, .2);
}
} &:hover { background-color: mix($osd_base, $osd_fg, .3); }
& slider {
border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.21); &:hover:active { background-color: $selected_bg_color; }
background-color: mix($osd_base, $osd_fg, 0.21);
&:hover { &:backdrop { background-color: mix($backdrop_osd_fg, $backdrop_osd_bg, .4); }
border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.31);
background-color: mix($osd_base, $osd_fg, 0.31); &:disabled { background-color: transparent; }
} }
&.vertical { }
&:hover {
border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.31); /*GtkNotebook.notebook {
background-color: mix($osd_base, $osd_fg, 0.31); border-right-width: 0;
} border-bottom-width: 0;
&:active { border-left-width: 0;
border-color: shade($selected_bg_color, 0.9); }*/
background-color: $selected_bg_color;
}
}
&:active {
border-color: shade($selected_bg_color, 0.9);
background-color: $selected_bg_color;
}
}
}
GtkNotebook.notebook {
border-right-width: 0;
border-bottom-width: 0;
border-left-width: 0;
}
} }
} }