This commit is contained in:
Vince
2021-05-12 14:01:57 +08:00
parent 19e1366a62
commit 45d5ba137c
260 changed files with 121 additions and 3135 deletions

View File

@@ -146,19 +146,20 @@ $menu_bd: if($variant == 'light', rgba(black, 0.05), r
@if $trans == 'true' { $menu_bg: if($variant == 'light', rgba($base_color, 0.95), rgba($bg_color, 0.95)); }
$dialog_bg_color: if($variant == 'light', $bg_color, $base_color);
$dialog_bg_color: if($variant == 'light', darken($bg_color, 5%), $base_color);
@if $trans=='true' { $dialog_bg_color: if($variant == 'light', rgba($bg_color, 0.95), rgba($base_color, 0.95)); }
$submenu_bg_color: if($variant == 'light', rgba(white, 1), rgba(white, 0.1));
@if $trans=='true' { $submenu_bg_color: if($variant == 'light', rgba(white, 0.75), rgba(white, 0.15)); }
// Panel colors
$panel_bg: if($variant == 'light', #f1f1f1, #2a2a2a);
$panel_fg: if($trans == 'true', white, $text_color);
@if $black == 'true' { $panel_fg: $text_color; }
$panel_top_color: if($variant == 'dark', #333333, #f5f5f5);
$panel_bottom_color: if($variant == 'dark', #2a2a2a, #e2e2e2);
$panel_border_color: if($variant == 'light', rgba(white, 0.22), rgba(black, 0.22));
$shell_panel: if($variant == 'light', rgba(white, $panel_opacity), rgba(black, $panel_opacity));
$shell_panel_bg: if($trans == 'true', $shell_panel, $panel_bg);
// Entry colors
$entry_bg: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05));

5
src/sass/_gtk-base.scss Normal file
View File

@@ -0,0 +1,5 @@
// Theme base options
$laptop: 'false';
$trans: 'true';
$black: 'false'; // panel font option
$theme: 'default';

View File

@@ -1,4 +1,5 @@
@import 'theme-options-temp';
@import 'gtk-base-temp';
$asset_suffix: if($variant == 'dark', '-dark', '');
$con_asset_suffix: if($variant=='dark', '', '-dark');
@@ -11,9 +12,9 @@ $font-family: "M+ 1c", Roboto, Cantarell, Sans-Serif;
$large-font-family: Roboto, "M+ 1c", Cantarell, Sans-Serif;
// font sizes
$root-font-size: if($laptop == 'false', 14px, 13px);
$subheading-size: if($laptop == 'false', 16px, 15px);
$base_font_size: 11;
$root-font-size: if($laptop == 'false', 15px, 13px);
$subheading-size: if($laptop == 'false', 17px, 15px);
$base_font_size: if($laptop == 'false', 11, 10);
// opacities
$higher_opacity: 0.9;

View File

@@ -1,9 +1,6 @@
/* Top Bar */
// a.k.a. the panel
@if $trans == 'true' { $panel_bg: if($variant == 'light', rgba(white, $panel_opacity), rgba(black, $panel_opacity)); }
$shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
#panel {
background-color: $shell_panel_bg;
font-weight: normal;

View File

@@ -19,7 +19,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
min-width: 12em;
color: $alt_fg_color;
padding: 0 0 !important;
font-weight: normal;
// font-weight: normal;
@include font(body-1);
.popup-menu-content {
@@ -28,7 +28,8 @@ $popop_menuitem_radius: $wm_radius - 4px;
box-shadow: 0 8px 16px 0 rgba(black, 0.25);
border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
margin: 4px 8px 4px 12px !important;
font-weight: normal;
// font-weight: normal;
@include font(body-1);
}
.popup-menu-item {
@@ -50,7 +51,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
border: none;
box-shadow: none;
color: $alt_fg_color;
background-color: if($variant == 'light', rgba(white, 0.75), rgba(white, 0.15));
background-color: $submenu_bg_color;
&.hover, &.selected {
color: $selected_fg_color;
@@ -79,7 +80,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
}
.popup-sub-menu {
background-color: if($variant == 'light', rgba(white, 0.75), rgba(white, 0.15));
background-color: $submenu_bg_color;
border-radius: 0 0 $popop_menuitem_radius $popop_menuitem_radius;
border: none;
box-shadow: none;

View File

@@ -2923,11 +2923,15 @@ $text_shadow: 0 0 1px rgba(0, 0, 0, 0.26),
&, &.marching-ants { transition: none; } // unset transitions
}
button.flat { @extend %panel_button; }
button.flat {
@extend %panel_button;
-gtk-icon-style: symbolic;
}
button {
font-weight: 700;
@extend %panel_button;
-gtk-icon-style: symbolic;
&#launcher-arrow { // launcher applet
// FIXME: quite weird pseudo-classe transitions, especially :hover
@@ -2958,7 +2962,10 @@ $text_shadow: 0 0 1px rgba(0, 0, 0, 0.26),
}
}
widget.tasklist > button.toggle { font-weight: 400; }
widget.tasklist > button.toggle {
font-weight: 400;
-gtk-icon-style: symbolic;
}
}
XfdesktopIconView.view {
@@ -3081,10 +3088,16 @@ window.thunar {
// FIXME: need to unset for weird allocation height
entry {
min-height: 22px;
min-height: if($variant == 'light', 22px, 24px);
}
}
> grid > toolbar > toolitem > widget > box > entry {
min-height: if($variant == 'light', 22px, 24px);
margin-left: $container_padding / 2; // Not use!
-gtk-icon-style: symbolic;
}
notebook {
// hide unneeded border
stack > scrolledwindow.frame.standard-view {
@@ -3096,6 +3109,12 @@ window.thunar {
// image height (it's quite weird).
header.top tab.reorderable-page > box > label { min-height: 0; }
}
> grid > paned > grid > notebook > .standard-view {
> .view {
border-radius: $bt_radius;
}
}
}
//

View File

@@ -2101,7 +2101,7 @@ menubar,
menu,
.menu {
// margin: 4px;
padding: 6px 0;
padding: 6px;
border-radius: $mn_radius;
background-color: opacify($menu_bg, 1);
border: 1px solid $solid_borders_color;
@@ -2127,9 +2127,9 @@ menu,
min-width: 40px;
padding: 3px 6px;
border-radius: $mn_radius - 3px;
margin: 0 6px;
text-shadow: none;
color: $fg_color;
-gtk-icon-style: symbolic;
&:hover {
transition: none;
@@ -2148,6 +2148,8 @@ menu,
-gtk-icon-shadow: none;
}
menuitem { -gtk-icon-style: symbolic; }
menuitem:hover {
arrow { color: $selected_fg_color; }
}