eudaimon
/
Oldiewaita
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fixed classes, and some other libadwaita adjustments

This commit is contained in:
Eudaimon 2024-04-10 12:51:17 +02:00
parent d9e2e1a1a6
commit cf96ce45bb
9 changed files with 279 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
gtk-3.0/gtk.css
View File

File diff suppressed because one or more lines are too long

132
gtk-4.0/gtk.css
View File

File diff suppressed because one or more lines are too long

28
source/common/common_common.scss
View File

@ -57,11 +57,31 @@ $popover_radius: $window_radius;
}
}
entry, label {
&.error, &.error > text {
color: mix($error_color, $fg_color, 50%);
&:disabled { color: mix($error_color,$insensitive_fg_color,50%); }
}
&.warning, &.warning > text {
color: mix($warning_color, $fg_color, 50%);
&:disabled { color: mix($warning_color,$insensitive_fg_color,50%); }
}
&.success, &.success > text {
color: mix($success_color, $fg_color, 50%);
&:disabled { color: mix($success_color,$insensitive_fg_color,50%); }
}
&.accent, &.accent > text {
color: $selected_bg_color;
&:disabled { color: mix($selected_bg_color,$insensitive_fg_color,50%); }
}
}
%draggable {
background-image: radial-gradient(circle closest-side, currentColor, currentColor 90%, transparent);
background-size: (2 * $border_width) (2 * $border_width);
background-repeat: no-repeat;
background-position: center;
background-image: radial-gradient(circle, gtkalpha(currentColor, 0.4) 15%, gtkalpha(currentColor, 0) 20%);
background-size: 0.3em 0.3em;
background-repeat: repeat;
background-clip: padding-box;
}
%disabled_pattern {

17
source/common/notebook.scss
View File

@ -182,10 +182,7 @@ notebook, notebook.frame {
color: $fg_color;
background-color: mix($base_color, $text_color,95%);
&.reorderable-page {
//border-color: transparentize($borders_color, 0.7);
//background-color: transparentize($bg_color, 0.8);
}
}
@ -292,8 +289,16 @@ notebook, notebook.frame {
// outside because of libadwaita:
tab.reorderable-page, tabbox tab {
background-image: radial-gradient(circle closest-side at 0.4em 0.4em, currentColor, currentColor 30%, gtkalpha(currentColor, 0) 33%);
//on :dir(rtl), how to tell it to be from the right? Not sure gtk css allows that :/
@extend %draggable;
&:disabled { @extend %disabled_pattern;}
& label {
border-radius: 9999px;
padding: 0 0.5em;
background-color: $base_color;
}
&:checked label {
background-color: mix($bg_color, $base_color, 50%);
}
}
//other libadwaita things:

7
source/common/paned.scss
View File

@ -5,16 +5,11 @@ paned {
-gtk-icon-source: none; // defeats the ugly default handle decoration.
border-width: $border_width; //for some reason, it's drawn twice as wide (only in GTK3!)
border-style: solid;
background-image: radial-gradient(circle closest-side, $fg_color 0%, $fg_color 75%, transparentize($fg_color, 1) 100%);
background-clip: padding-box;
//background-size: 2*$border_width 2*$border_width + 2px;
background-repeat: no-repeat;
background-position: center;
box-shadow: none;
margin: 0;
padding: 0;
@include relief($bg_color);
@extend %draggable;
&:selected { @include relief($selected_bg_color); } // FIXME is this needed?
&:hover {
background-color: mix($bg_color, $fg_color, 90%)

80
source/gtk3/_common.scss
View File

@ -178,23 +178,7 @@ label {
// selection { @extend %selected_items_backdrop; }
//}
&.error {
color: mix($error_color, $fg_color, 50%);
&:disabled { color: mix($error_color,$insensitive_fg_color, 50%); }
}
&.warning {
color: mix($warning_color, $fg_color, 50%);
&:disabled { color: mix($warning_color,$insensitive_fg_color, 50%); }
}
&.success {
color: mix($success_color, $fg_color, 50%);
&:disabled { color: mix($success_color,$insensitive_fg_color, 50%); }
}
&.accent {
color: mix($selected_bg_color, $fg_color, 50%);
&:disabled { color: mix($selected_bg_color,$insensitive_fg_color,50%); }
}
//entry and label with classes (.accent, .error, .warning, .success) moved to common_common.scss
}
@ -398,23 +382,7 @@ entry {
// linked entries: all suppressed
&.error {
color: mix($error_color, $fg_color, 50%);
&:disabled { color: mix($error_color,$insensitive_fg_color,50%); }
}
&.warning {
color: mix($warning_color, $fg_color, 50%);
&:disabled { color: mix($warning_color,$insensitive_fg_color,50%); }
}
&.success {
color: mix($success_color, $fg_color, 50%);
&:disabled { color: mix($success_color,$insensitive_fg_color,50%); }
}
&.accent {
color: mix($selected_bg_color, $fg_color, 50%);
&:disabled { color: mix($selected_bg_color,$insensitive_fg_color,50%); }
}
//entry and label with classes (.accent, .error, .warning, .success) moved to common_common.scss
}
treeview entry {
@ -899,28 +867,10 @@ button {
padding: $_circ_btn_pad; /* circles instead of ellipses */
label { padding: 0; }
// the followind code is needed since we use a darker bottom border on buttons, which looks pretty
// bad with a 100% border radius (see https://bugzilla.gnome.org/show_bug.cgi?id=771205 for details),
// so on relevant states we an additional background-image with a gradient clipped on the border-box,
// so setting a transparent border would reveal it.
$_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%);
&:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled) {//:not(:backdrop) {
@include button(normal);//, $backimage: $_border_bg);
//border-color: transparent;
}
&:hover:not(.osd):not(:checked):not(:active):not(:disabled) { //:not(:backdrop) {
@include button(hover);//, $backimage: $_border_bg);
//border-color: transparent;
}
//background-origin: padding-box, border-box;
//background-clip: padding-box, border-box;
}
&.pill {
border-radius: 9999px;
-gtk-outline-radius: 9999px;
}
}
@ -1098,9 +1048,9 @@ modelbutton.flat,
&:not(:hover):not(:active):not(:checked):not(:disabled) {@extend %undecorated_button;}
&:hover { background-color: $popover_hover_color; }
//&:hover { background-color: $popover_hover_color; }
&:selected { @extend %selected_items; }
&:hover, &:selected { @extend %selected_items; }
//&:backdrop,
//&:backdrop:hover { @extend %undecorated_button; }
@ -1423,7 +1373,7 @@ combobox {
%toolbar {
-GtkWidget-window-dragging: true;
padding: 4px;
$border-radius: $window_radius;
border-radius: $window_radius;
border-width: $border_width;
border-style: solid;
color: $fg_color;
@ -1527,6 +1477,18 @@ headerbar {
transition: none; //$backdrop_transition;
}
window.devel & {
background-image: linear-gradient(45deg,
gtkalpha(currentColor, 0.1) 25%,
gtkalpha(currentColor, 0.0) 25%,
gtkalpha(currentColor, 0.0) 50%,
gtkalpha(currentColor, 0.1) 50%,
gtkalpha(currentColor, 0.1) 75%,
gtkalpha(currentColor, 0.0) 75% );
background-size: 5em 5em;
background-repeat: repeat;
background-position: center;
}
.title {
padding-left: 12px;

76
source/gtk3/gtk-new.css
View File

File diff suppressed because one or more lines are too long

87
source/gtk4/_common.scss
View File

@ -171,23 +171,7 @@ label {
> selection { @extend %selected_items_disabled; }
}
&.error {
color: mix($error_color, $fg_color, 50%);
&:disabled { color: mix($error_color,$insensitive_fg_color,50%); }
}
&.warning {
color: mix($warning_color, $fg_color, 50%);
&:disabled { color: mix($warning_color,$insensitive_fg_color,50%); }
}
&.success {
color: mix($success_color, $fg_color, 50%);
&:disabled { color: mix($success_color,$insensitive_fg_color,50%); }
}
&.accent {
color: mix($selected_bg_color, $fg_color, 50%);
&:disabled { color: mix($selected_bg_color,$insensitive_fg_color,50%); }
}
//entry and label with classes (.accent, .error, .warning, .success) moved to common_common.scss
}
.dim-label {
@ -410,24 +394,8 @@ entry {
// linked entries: all suppressed
//entry and label with classes (.accent, .error, .warning, .success) moved to common_common.scss
&.error {
color: mix($error_color, $fg_color, 50%);
&:disabled { color: mix($error_color,$insensitive_fg_color,50%); }
}
&.warning {
color: mix($warning_color, $fg_color, 50%);
&:disabled { color: mix($warning_color,$insensitive_fg_color,50%); }
}
&.success {
color: mix($success_color, $fg_color, 50%);
&:disabled { color: mix($success_color,$insensitive_fg_color,50%); }
}
&.accent {
color: mix($selected_bg_color, $fg_color, 50%);
&:disabled { color: mix($selected_bg_color,$insensitive_fg_color,50%); }
}
.linked & {
margin: 0; //for libadwaita
}
@ -485,7 +453,7 @@ $_dot_color: $warning_color; //if($variant=='light', $selected_bg_color, lighten
%button,
button {
@at-root %button_basic, & {
@at-root %button_basic, &, &.opaque, &.card {
min-height: $button_min_height;
min-width: $button_min_width;
@ -493,6 +461,7 @@ button {
border: $border_width solid;
border-radius: $button_radius;
transition: $button_transition;
font-weight: normal;
@include button(normal);
@ -834,6 +803,9 @@ button {
label { padding: 0; }
}
&.pill {
border-radius: 9999px;
}
}
%needs_attention {
@ -1380,7 +1352,7 @@ combobox {
%toolbar {
padding: 4px;
border-spacing: 4px;
$border-radius: $window_radius;
border-radius: $window_radius;
border-width: $border_width;
border-style: solid;
color: $fg_color;
@ -1533,6 +1505,19 @@ headerbar { //.top-bar is for Nautilus. This is not included in '../common/deskt
transition: none;//$backdrop_transition;
}
window.devel & {
background-image: linear-gradient(45deg,
gtkalpha(currentColor, 0.1) 25%,
gtkalpha(currentColor, 0.0) 25%,
gtkalpha(currentColor, 0.0) 50%,
gtkalpha(currentColor, 0.1) 50%,
gtkalpha(currentColor, 0.1) 75%,
gtkalpha(currentColor, 0.0) 75% );
background-size: 5em 5em;
background-repeat: repeat;
background-position: center;
}
.title {
padding-left: 12px;
@ -2289,7 +2274,9 @@ check,
radio,{
min-height: 14px;
min-width: 14px;
border: 1px solid;
border: $border_width solid;
box-shadow: none; //against libadwaita
-gtk-icon-source: none;
&, &.view, .view & {
@ -3869,8 +3856,12 @@ menubutton {
border-style: solid;
@include relief($card_bg_color);
box-shadow: none;
&.activatable, &.button {
@extend %button_basic;
}
}
tabbox {
//background-color: $bg_color;
& > tabboxchild {
@ -3913,16 +3904,18 @@ tabbox {
}
splitbutton {
@extend %button_basic;
border-radius: 0px;
padding: 1px; //$border_width;
@include button(normal);
&:disabled {
@include button(insensitive);}
& > separator {border: none;}
& button, menubutton, arrow {margin: 0; padding: 0; min-width: 1.7em; min-height: 1.5em;}
headerbar &, .topbar & {
@extend %header_button;
&, &.text-button, &.image-button, &.flat {
@extend %button_basic;
border-radius: 0px;
padding: 1px; //$border_width;
@include button(normal);
&:disabled {
@include button(insensitive);}
& > separator {border: none;}
& button, menubutton, arrow {margin: 0; padding: 0; min-width: 1.7em; min-height: 1.5em;}
headerbar &, .topbar & {
@extend %header_button;
}
}
}

132
source/gtk4/gtk-new.css
View File

File diff suppressed because one or more lines are too long