Skip to content

Commit 80ca946

Browse files
ElbullazulElbullazul
committed
scale changes & upstream corrections
1 parent 7f2121c commit 80ca946

File tree

1 file changed

+104
-31
lines changed

1 file changed

+104
-31
lines changed

‎gtk-3.20/gtk-widgets.css‎

Lines changed: 104 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ image, image:disabled, label, label:disabled, box, box:disabled {
5454
label selection {
5555
background-color: @theme_selected_base_color;
5656
color: @theme_selected_text_color; }
57-
label.separator {
58-
color: @borders; }
59-
label.separator:backdrop {
60-
color: @unfocused_borders; }
6157
label.dim-label, label.separator, popover label.separator, popover.background label.separator, label:disabled {
6258
opacity: 0.55; }
6359

@@ -109,29 +105,40 @@ assistant .sidebar {
109105
color: @theme_fg_color;
110106
background-color: @theme_bg_color; }
111107

112-
button:link > label, button:visited > label, *:link, button:link, button:visited {
108+
button:link > label, button:visited > label,
109+
*:link,
110+
button:link,
111+
button:visited {
113112
color: @link_color; }
114-
button:link > label:visited, button:visited > label:visited, *:link:visited, button:visited {
113+
button:link > label:visited, button:visited > label:visited,
114+
*:link:visited,
115+
button:visited {
115116
color: mix(@link_color, @theme_fg_color, 0.2); }
116-
*:selected button:link > label:visited, *:selected button:visited > label:visited,
117-
*:selected *:link:visited,
118-
*:selected button:visited:link,
119-
*:selected button:visited {
120-
color: mix(@selected_fg_color, @selected_bg_color, 0.4); }
121-
button:link > label:hover, button:visited > label:hover, *:link:hover, button:hover:link, button:hover:visited {
117+
*:selected button:link > label:visited, *:selected button:visited > label:visited, *:selected
118+
*:link:visited, *:selected
119+
button:visited:link, *:selected
120+
button:visited {
121+
color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.4); }
122+
button:link > label:hover, button:visited > label:hover,
123+
*:link:hover,
124+
button:hover:link,
125+
button:hover:visited {
122126
color: shade(@link_color, 1.1); }
123-
*:selected button:link > label:hover, *:selected button:visited > label:hover,
124-
*:selected *:link:hover,
125-
*:selected button:hover:link,
126-
*:selected button:hover:visited {
127-
color: mix(@selected_fg_color, @selected_bg_color, 0.9); }
128-
button:link > label:active, button:visited > label:active, *:link:active, button:active:link, button:active:visited {
127+
*:selected button:link > label:hover, *:selected button:visited > label:hover, *:selected
128+
*:link:hover, *:selected
129+
button:hover:link, *:selected
130+
button:hover:visited {
131+
color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.9); }
132+
button:link > label:active, button:visited > label:active,
133+
*:link:active,
134+
button:active:link,
135+
button:active:visited {
129136
color: @link_color; }
130-
*:selected button:link > label:active, *:selected button:visited > label:active,
131-
*:selected *:link:active,
132-
*:selected button:active:link,
133-
*:selected button:active:visited {
134-
color: mix(@selected_fg_color, @selected_bg_color, 0.8); }
137+
*:selected button:link > label:active, *:selected button:visited > label:active, *:selected
138+
*:link:active, *:selected
139+
button:active:link, *:selected
140+
button:active:visited {
141+
color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.8); }
135142
button:link > label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, button:link > label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, button:link > label:backdrop, button:visited > label:backdrop,
136143
*:link:backdrop:backdrop:hover,
137144
button:backdrop:backdrop:hover:link,
@@ -142,15 +149,15 @@ button:link > label, button:visited > label, *:link, button:link, button:visited
142149
*:link:backdrop,
143150
button:backdrop:link,
144151
button:backdrop:visited {
145-
color: @selected_bg_color; }
152+
color: mix(@link_color, @theme_unfocused_selected_bg_color, 0.3); }
146153
button:link > label:selected, button:visited > label:selected, *:selected button:link > label, *:selected button:visited > label,
147154
*:link:selected,
148155
button:selected:link,
149-
button:selected:visited,
150-
*:selected *:link,
151-
*:selected button:link,
152-
*:selected button:visited {
153-
color: mix(@selected_fg_color, @selected_bg_color, 0.8); }
156+
button:selected:visited, *:selected
157+
*:link, *:selected
158+
button:link, *:selected
159+
button:visited {
160+
color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.8); }
154161

155162
button:link, button:visited {
156163
border-color: transparent;
@@ -902,6 +909,11 @@ button.circular, button.circular-button {
902909
border-radius: 50%;
903910
-gtk-outline-radius: 50%; }
904911

912+
stackswitcher button.circular, stackswitcher button.text-button.circular {
913+
min-width: 32px;
914+
min-height: 32px;
915+
padding: 0; }
916+
905917
printdialog paper {
906918
border: 1px solid @borders;
907919
background: @light_shadow;
@@ -1380,6 +1392,16 @@ scale {
13801392
scale slider:backdrop {
13811393
color: @theme_unfocused_selected_fg_color;
13821394
background-image: url("assets/slider-horiz-insensitive.png"); }
1395+
scale.horizontal.marks-before slider {
1396+
background-image: url("assets/slider-horiz-top.png"); }
1397+
scale.horizontal.marks-before slider:hover {
1398+
background-image: url("assets/slider-horiz-top-hover.png"); }
1399+
scale.horizontal.marks-before slider:disabled {
1400+
background-image: url("assets/slider-horiz-top-insensitive.png"); }
1401+
scale.horizontal.marks-before slider:disabled:backdrop {
1402+
background-image: url("assets/slider-horiz-top-insensitive.png"); }
1403+
scale.horizontal.marks-before slider:backdrop {
1404+
background-image: url("assets/slider-horiz-top-insensitive.png"); }
13831405
scale.vertical slider {
13841406
min-height: 11px;
13851407
min-width: 19px;
@@ -1394,6 +1416,16 @@ scale {
13941416
background-image: url("assets/slider-vert-insensitive.png"); }
13951417
scale.vertical slider:backdrop {
13961418
background-image: url("assets/slider-vert-insensitive.png"); }
1419+
scale.vertical.marks-before {
1420+
background-image: url("assets/slider-vert-left.png"); }
1421+
scale.vertical.marks-before:hover {
1422+
background-image: url("assets/slider-vert-left-hover.png"); }
1423+
scale.vertical.marks-before:disabled {
1424+
background-image: url("assets/slider-vert-left-insensitive.png"); }
1425+
scale.vertical.marks-before:disabled:backdrop {
1426+
background-image: url("assets/slider-vert-left-insensitive.png"); }
1427+
scale.vertical.marks-before:backdrop {
1428+
background-image: url("assets/slider-vert-left-insensitive.png"); }
13971429
scale value {
13981430
color: alpha(currentColor, 0.35); }
13991431
scale marks {
@@ -1578,8 +1610,7 @@ filechooser placessidebar.sidebar row, filechooser placessidebar.sidebar view ro
15781610
color: @sidebar_fg_color;
15791611
background-color: mix(@sidebar_bg_color, @dark_shadow, 0.15); }
15801612

1581-
.nautilus-window.csd.background,
1582-
.nautilus-window placessidebar list {
1613+
.nautilus-window.csd.background, .nautilus-window placessidebar list {
15831614
background-color: @sidebar_bg_color; }
15841615

15851616
.nautilus-window placessidebar.sidebar row.sidebar-row {
@@ -1844,6 +1875,48 @@ headerbar, headerbar:not(.titlebar) {
18441875
padding-left: 12px;
18451876
padding-right: 12px;
18461877
color: alpha(currentColor, 0.7); }
1878+
headerbar button, headerbar:not(.titlebar) button {
1879+
padding: 3px;
1880+
border-style: solid;
1881+
border-width: 1px;
1882+
border-radius: 0px;
1883+
color: @theme_fg_color;
1884+
border-color: @borders;
1885+
background-color: @theme_bg_color; }
1886+
headerbar button:hover, headerbar:not(.titlebar) button:hover {
1887+
color: @theme_fg_color;
1888+
border-color: shade(@theme_selected_bg_color, 0.7);
1889+
background-color: shade(@theme_selected_bg_color, 1.02); }
1890+
headerbar button:active, headerbar button:checked, headerbar:not(.titlebar) button:active, headerbar:not(.titlebar) button:checked {
1891+
color: @theme_fg_color;
1892+
border-color: shade(@theme_selected_bg_color, 0.8);
1893+
background-color: shade(@theme_selected_bg_color, 0.95); }
1894+
headerbar button:active:backdrop, headerbar button:checked:backdrop, headerbar:not(.titlebar) button:active:backdrop, headerbar:not(.titlebar) button:checked:backdrop {
1895+
color: @theme_unfocused_fg_color;
1896+
border-color: shade(@theme_unfocused_bg_color, 0.85);
1897+
background-color: shade(@theme_unfocused_bg_color, 0.85); }
1898+
headerbar button:active:disabled, headerbar button:checked:disabled, headerbar:not(.titlebar) button:active:disabled, headerbar:not(.titlebar) button:checked:disabled {
1899+
color: mix(@theme_fg_color, @theme_unfocused_disabled_fg_color, 0.1);
1900+
border-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.6);
1901+
background-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.2); }
1902+
headerbar button:active:disabled:backdrop, headerbar button:checked:disabled:backdrop, headerbar:not(.titlebar) button:active:disabled:backdrop, headerbar:not(.titlebar) button:checked:disabled:backdrop {
1903+
color: @theme_unfocused_disabled_fg_color;
1904+
border-color: @unfocused_borders;
1905+
background-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.2); }
1906+
headerbar button:focus, headerbar button:hover:focus, headerbar button:active:focus, headerbar button:active:hover:focus, headerbar:not(.titlebar) button:focus, headerbar:not(.titlebar) button:hover:focus, headerbar:not(.titlebar) button:active:focus, headerbar:not(.titlebar) button:active:hover:focus {
1907+
border-color: shade(@theme_selected_bg_color, 0.7); }
1908+
headerbar button:disabled, headerbar:not(.titlebar) button:disabled {
1909+
color: mix(@theme_fg_color, @theme_unfocused_disabled_fg_color, 0.1);
1910+
border-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.6);
1911+
background-color: mix(@theme_bg_color, @theme_disabled_bg_color, 0.1); }
1912+
headerbar button:disabled:backdrop, headerbar:not(.titlebar) button:disabled:backdrop {
1913+
color: @theme_unfocused_disabled_fg_color;
1914+
border-color: @unfocused_borders;
1915+
background-color: @theme_unfocused_disabled_bg_color; }
1916+
headerbar button:backdrop, headerbar:not(.titlebar) button:backdrop {
1917+
border-color: @unfocused_borders;
1918+
color: @theme_unfocused_fg_color;
1919+
background-color: @theme_unfocused_bg_color; }
18471920
headerbar entry, headerbar:not(.titlebar) entry {
18481921
padding: 4px 8px; }
18491922

0 commit comments

Comments
 (0)