Many improvements and fixes
This commit is contained in:
parent
2acd4e6850
commit
76bbc427f6
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
/* Based on adw-gtk version 4.7 and 4.9 */
|
||||
|
||||
@define-color disabled_fg_color mix(@window_fg_color, @window_bg_color, 0.5);
|
||||
@define-color disabled_fg_color mix(mix(@window_fg_color, @window_bg_color, 0.5), @error_color, 0.15);
|
||||
|
||||
|
||||
.background { color: @window_fg_color; background-color: @window_bg_color; }
|
||||
|
|
@ -147,6 +147,10 @@ entry, .entry, spinbutton text {
|
|||
border-bottom-color: alpha(@view_fg_color, 0.5);
|
||||
}
|
||||
|
||||
.view entry, list entry, list spinbutton text {
|
||||
background-color: mix(@view_bg_color, @window_bg_color, 0.3);
|
||||
}
|
||||
|
||||
entry:active, .entry:active, text:active, entry:focus, text:focus, entry:focus-within, text:focus-within {
|
||||
border-bottom-color: @accent_color;
|
||||
}
|
||||
|
|
@ -162,11 +166,12 @@ spinbutton button {
|
|||
/* checks, radios */
|
||||
|
||||
check, radio {
|
||||
border: 1px solid alpha(currentColor, 0.6);
|
||||
min-width: 16px;
|
||||
min-height: 16px;
|
||||
border: 2px solid alpha(currentColor, 0.6);
|
||||
min-width: 1em;
|
||||
min-height: 1em;
|
||||
-gtk-icon-source: none;
|
||||
margin: 1px;
|
||||
margin: 0.2em 0.3em;
|
||||
background-clip: padding-box;
|
||||
}
|
||||
|
||||
check:hover, radio:hover {
|
||||
|
|
@ -180,6 +185,7 @@ check:hover:active, radio:hover:active {
|
|||
check:checked, radio:checked,
|
||||
check:checked:selected, radio:checked:selected
|
||||
{
|
||||
|
||||
background-color: @accent_fg_color;
|
||||
box-shadow: inset 0 0 0 3px @accent_bg_color;
|
||||
}
|
||||
|
|
@ -189,7 +195,7 @@ check:checked:disabled, radio:checked:disabled
|
|||
background-color: @disabled_fg_color;
|
||||
box-shadow: inset 0 0 0 3px @window_bg_color;
|
||||
}
|
||||
|
||||
/*
|
||||
check:indeterminate, check:indeterminate:disabled,
|
||||
radio:indeterminate, radio:indeterminate:disabled {
|
||||
box-shadow: inset 0 5px 0 3px currentColor;
|
||||
|
|
@ -198,7 +204,11 @@ check:indeterminate:checked, check:indeterminate:checked:disabled,
|
|||
radio:indeterminate:checked, radio:indeterminate:checked:disabled {
|
||||
background-color: @warning_color;
|
||||
}
|
||||
*/
|
||||
|
||||
check:indeterminate, radio:indeterminate {
|
||||
border-style: dashed;
|
||||
}
|
||||
|
||||
/* .destructive-action, .suggested-action */
|
||||
.destructive-action:not(:disabled), .destructive:not(:disabled) {
|
||||
|
|
@ -266,7 +276,7 @@ switch {
|
|||
border-radius: 9999px;
|
||||
}
|
||||
|
||||
switch:not(:disabled):not(checked) {
|
||||
switch {
|
||||
background-color: mix(@window_bg_color, @view_bg_color, 0.5);
|
||||
}
|
||||
|
||||
|
|
@ -295,6 +305,14 @@ scale slider {
|
|||
}
|
||||
/* progressbar and levelbar */
|
||||
|
||||
progressbar.horizontal, levebar.horizontal {
|
||||
min-height: 0.5em;
|
||||
}
|
||||
progressbar.vertical, levebar.vertical {
|
||||
min-width: 0.5em;
|
||||
}
|
||||
|
||||
|
||||
/* scrollbar */
|
||||
trough {
|
||||
background-color: alpha(@window_fg_color, 0.1);
|
||||
|
|
@ -302,10 +320,10 @@ trough {
|
|||
border-radius: 9999px;
|
||||
}
|
||||
|
||||
scale.vertical trough, progress.vertical trough, levelbar.vertical trough {
|
||||
scale.vertical > trough, progressbar.vertical > trough, levelbar.vertical > trough, progressbar.vertical > trough > progress{
|
||||
min-width: 0.5em;
|
||||
}
|
||||
scale.horizontal trough, progress.horizontal trough, levelbar.horizontal trough {
|
||||
scale.horizontal > trough, progressbar.horizontal > trough, levelbar.horizontal > trough, progressbar.horizontal > trough > progress {
|
||||
min-height: 0.5em;
|
||||
}
|
||||
|
||||
|
|
@ -321,18 +339,26 @@ block.filled.low {
|
|||
background-color: @warning_color;
|
||||
}
|
||||
|
||||
entry progress {
|
||||
background: none;
|
||||
box-shadow: inset 0 -0.1em 0 0 @accent_color, 0 0.1em 0 0 @accent_color;
|
||||
border-radius: 0;
|
||||
}
|
||||
/* entry progress in each gtk file because they conflict */
|
||||
|
||||
|
||||
|
||||
/* notebook, tabbar */
|
||||
/* see buttons too */
|
||||
|
||||
notebook {
|
||||
background-color: @window_bg_color;
|
||||
}
|
||||
|
||||
|
||||
tab, button.radio, stackswitcher > button, .circular, .pill {
|
||||
border-radius: 9999px;
|
||||
margin: 1px;
|
||||
}
|
||||
|
||||
stackswitcher > button {
|
||||
min-height: 1.6em;
|
||||
min-width: 1.6em;
|
||||
}
|
||||
|
||||
tab button {
|
||||
|
|
@ -344,8 +370,8 @@ tab button {
|
|||
/* headerbar, .titlebar, windowcontrols... window.devel headerbar > windowhandle */
|
||||
|
||||
.titlebar:not(headerbar), headerbar {
|
||||
padding: 0 6px;
|
||||
min-height: 46px;
|
||||
padding: 0.3em;
|
||||
min-height: 2em;
|
||||
border-width: 0 0 1px;
|
||||
border-style: solid;
|
||||
border-color: @headerbar_shade_color;
|
||||
|
|
@ -354,6 +380,10 @@ tab button {
|
|||
color: @headerbar_fg_color;
|
||||
}
|
||||
|
||||
.titlebar > button, .titlebar > entry, .titlebar > box {
|
||||
margin-top: 0.3em; margin-bottom: 0.3em;
|
||||
}
|
||||
|
||||
.titlebar:not(headerbar):backdrop, headerbar:backdrop { background: @headerbar_backdrop_color; }
|
||||
|
||||
.titlebar:not(headerbar) button:not(:disabled) {
|
||||
|
|
@ -364,7 +394,7 @@ tab button {
|
|||
|
||||
/* menus (popover.menu, modelbutton, menubar, menubar > item */
|
||||
menuitem, menubar > item, modelbutton {
|
||||
padding: 0.1em 0.5em;
|
||||
padding: 0.3em 0.5em;
|
||||
}
|
||||
|
||||
menuitem:hover, menubar > item:hover, modelbutton:hover {
|
||||
|
|
@ -373,13 +403,7 @@ menuitem:hover, menubar > item:hover, modelbutton:hover {
|
|||
}
|
||||
|
||||
|
||||
/********** Frames * */
|
||||
|
||||
frame, .frame { border: 1px solid alpha(currentColor,0.15); }
|
||||
|
||||
frame { border-radius: 12px; }
|
||||
|
||||
frame > label { margin: 4px; }
|
||||
|
||||
/* sidebars */
|
||||
|
||||
|
|
@ -443,6 +467,7 @@ paned > separator {
|
|||
separator {
|
||||
min-width: 1px;
|
||||
min-height: 1px;
|
||||
margin: 0.2em;
|
||||
}
|
||||
|
||||
/* .needs-attention */
|
||||
|
|
@ -522,13 +547,27 @@ stacksidebar row.needs-attention > label:dir(rtl), stackswitcher > button.needs-
|
|||
|
||||
|
||||
decoration, window.background.csd {
|
||||
box-shadow: 0 0.5em 1em 0 alpha(black, 0.5);
|
||||
box-shadow: 0 0.5em 1em 0 alpha(black, 0.5),
|
||||
0 0 0 1px @headerbar_fg_color;
|
||||
margin: 1em; /*for resizing */
|
||||
}
|
||||
decoration:backdrop, window.background.csd:backdrop {
|
||||
box-shadow: 0 0.5em 1em 0 alpha(black, 0.5),
|
||||
0 0 0 1px @headerbar_backdrop_color;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.background.csd, popover > contents, window.background.csd.popup {
|
||||
box-shadow: 0 0.25em 0.5em 0 alpha(black, 0.5);
|
||||
box-shadow: 0 0.25em 0.5em 0 alpha(black, 0.5),
|
||||
0 0 0 1px @headerbar_fg_color;
|
||||
/*background-clip: padding-box;*/
|
||||
}
|
||||
.background.csd, popover > contents, window.background.csd.popup {
|
||||
box-shadow: 0 0.25em 0.5em 0 alpha(black, 0.5),
|
||||
0 0 0 1px @headerbar_backdrop_color;
|
||||
}
|
||||
|
||||
|
||||
/* popovers defined in each gtk-3.0 or gtk-4.0 because they conflict each other */
|
||||
|
||||
|
|
@ -565,10 +604,14 @@ button.maximize:active, button.maximize:backdrop:active {
|
|||
|
||||
|
||||
windowcontrols button {
|
||||
margin: 0.2em;
|
||||
margin: 0 0.2em;
|
||||
}
|
||||
windowcontrols.end {margin-left: 1em;}
|
||||
windowcontrols.start {margin-right: 1em;}
|
||||
|
||||
|
||||
/* osd * .osd */
|
||||
|
||||
.osd {
|
||||
background-color: alpha(mix(@window_bg_color, @view_bg_color, 0.5), 0.3);
|
||||
border: 1px dashed alpha(@view_fg_color, 0.3);
|
||||
|
|
@ -577,9 +620,12 @@ margin: 0.2em;
|
|||
|
||||
/* frame */
|
||||
|
||||
.frame {
|
||||
border: 1px solid alpha(currentColor, 0.3);
|
||||
}
|
||||
frame, .frame { border: 1px solid alpha(currentColor,0.15); }
|
||||
|
||||
frame { border-radius: 0px; }
|
||||
|
||||
frame > label { margin: 4px; }
|
||||
|
||||
|
||||
/* .app-notification */
|
||||
|
||||
|
|
@ -589,11 +635,26 @@ margin: 0.2em;
|
|||
|
||||
/* cards */
|
||||
|
||||
card, .card {
|
||||
background-color: @card_bg_color;
|
||||
color: @card_fg_color;
|
||||
}
|
||||
|
||||
/* shortcut, shortcuts-section, shortcuts-search-results */
|
||||
|
||||
|
||||
|
||||
/* stacksidebar, navigation-sidebar */
|
||||
|
||||
/* spinner */
|
||||
/* spinner */ /* animation definition moved to each gtk file because of contradiction */
|
||||
|
||||
|
||||
spinner {
|
||||
-gtk-icon-source: -gtk-icontheme('process-working-symbolic');
|
||||
animation: spin-no-spin 0.5s alternate infinite;
|
||||
animation-timing-function: steps(5, start);
|
||||
}
|
||||
spinner:checked {animation: spin 1s linear infinite;}
|
||||
|
||||
/* tooltip */
|
||||
|
||||
|
|
|
|||
|
|
@ -28,3 +28,18 @@ popover, popover.background, .background.popup {
|
|||
background-color: @popover_bg_color;
|
||||
color: @popover_fg_color;
|
||||
}
|
||||
|
||||
|
||||
entry progress {
|
||||
background: none;
|
||||
box-shadow: inset 0 -0.1em 0 0 @accent_color, 0 0.1em 0 0 @accent_color;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
to { -gtk-icon-transform: rotate(1turn); }
|
||||
}
|
||||
@keyframes spin-no-spin {
|
||||
to { -gtk-icon-transform: rotate(0.25turn); }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
/* Based on adw-gtk version 4.7 and 4.9 */
|
||||
|
||||
|
||||
.normal-icons { -gtk-icon-size: 16px; }
|
||||
|
||||
.large-icons { -gtk-icon-size: 32px; }
|
||||
|
|
@ -27,3 +28,24 @@ border: 1px solid mix(@popover_bg_color, @popover_fg_color, 0.5);
|
|||
background-color: @popover_bg_color;
|
||||
color: @popover_fg_color;
|
||||
}
|
||||
|
||||
|
||||
entry > progress {
|
||||
margin-bottom: -0.5em;
|
||||
}
|
||||
entry trough > progress {
|
||||
background: none;
|
||||
box-shadow: inset 0 -0.1em 0 0 @accent_color, 0 0.1em 0 0 @accent_color;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
entry trough, entry > progress {
|
||||
background-color: unset;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
to { transform: rotate(1turn); }
|
||||
}
|
||||
@keyframes spin-no-spin {
|
||||
to { transform: rotate(0.25turn); }
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue