@@ -109,29 +109,40 @@ assistant .sidebar {
109109 color: @theme_fg_color ;
110110 background-color: @theme_bg_color ; }
111111
112- button : link > label , button : visited > label , * : link , button : link , button : visited {
112+ button : link > label , button : visited > label ,
113+ * : link ,
114+ button : link ,
115+ button : visited {
113116 color: @link_color ; }
114- button : link > label : visited , button : visited > label : visited , * : link : visited , button : visited {
117+ button : link > label : visited , button : visited > label : visited ,
118+ * : link : visited ,
119+ button : visited {
115120 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 {
121+ * : selected button : link > label : visited , * : selected button : visited > label : visited , * : selected
122+ * : link : visited , * : selected
123+ button : visited : link , * : selected
124+ button : visited {
125+ color : mix (@theme_selected_fg_color , @theme_selected_bg_color , 0.4 ); }
126+ button : link > label : hover , button : visited > label : hover ,
127+ * : link : hover ,
128+ button : hover : link ,
129+ button : hover : visited {
122130 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 {
131+ * : selected button : link > label : hover , * : selected button : visited > label : hover , * : selected
132+ * : link : hover , * : selected
133+ button : hover : link , * : selected
134+ button : hover : visited {
135+ color : mix (@theme_selected_fg_color , @theme_selected_bg_color , 0.9 ); }
136+ button : link > label : active , button : visited > label : active ,
137+ * : link : active ,
138+ button : active : link ,
139+ button : active : visited {
129140 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 ); }
141+ * : selected button : link > label : active , * : selected button : visited > label : active , * : selected
142+ * : link : active , * : selected
143+ button : active : link , * : selected
144+ button : active : visited {
145+ color : mix (@theme_selected_fg_color , @theme_selected_bg_color , 0.8 ); }
135146 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 ,
136147 * : link : backdrop : backdrop : hover ,
137148 button : backdrop : backdrop : hover : link ,
@@ -142,15 +153,15 @@ button:link > label, button:visited > label, *:link, button:link, button:visited
142153 * : link : backdrop ,
143154 button : backdrop : link ,
144155 button : backdrop : visited {
145- color: @selected_bg_color ; }
156+ color : mix ( @link_color , @theme_unfocused_selected_bg_color , 0.3 ) ; }
146157 button : link > label : selected , button : visited > label : selected , * : selected button : link > label , * : selected button : visited > label ,
147158 * : link : selected ,
148159 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 ); }
160+ button : selected : visited , * : selected
161+ * : link , * : selected
162+ button : link , * : selected
163+ button : visited {
164+ color : mix (@theme_selected_fg_color , @theme_selected_bg_color , 0.8 ); }
154165
155166button : link , button : visited {
156167 border-color : transparent;
@@ -169,7 +180,7 @@ button {
169180 border-width : 0 ;
170181 border-radius : 4px ;
171182 color: @theme_selected_bg_color ;
172- border-color: @theme_selected_bg_color ;
183+ border-color : transparent ;
173184 background-color : transparent;
174185 -gtk-outline-radius : 4px ; }
175186 button : active , button : checked {
@@ -182,15 +193,15 @@ button {
182193 background-color: @theme_unfocused_selected_bg_color ; }
183194 button : active : disabled , button : checked : disabled {
184195 color: @theme_disabled_fg_color ;
185- border-color : mix (@theme_selected_bg_color , @theme_disabled_bg_color , 0.85 );
196+ border-color : mix (transparent , @theme_disabled_bg_color , 0.85 );
186197 background-color : shade (@theme_disabled_bg_color , 0.9 ); }
187198 button : active : disabled : backdrop , button : checked : disabled : backdrop {
188199 color: @theme_unfocused_disabled_fg_color ;
189200 border-color: @unfocused_borders ;
190201 background-color : shade (@theme_unfocused_disabled_bg_color , 0.9 ); }
191202 button : disabled {
192203 color : mix (@theme_selected_bg_color , @theme_unfocused_disabled_fg_color , 0.5 );
193- border-color : mix (@theme_selected_bg_color , @theme_unfocused_disabled_fg_color , 0.5 ); }
204+ border-color : mix (transparent , @theme_unfocused_disabled_fg_color , 0.5 ); }
194205 button : disabled : backdrop {
195206 color: @theme_unfocused_disabled_fg_color ;
196207 border-color: @theme_unfocused_disabled_fg_color ; }
@@ -203,7 +214,7 @@ button.flat {
203214 color: @theme_selected_bg_color ;
204215 background-color : transparent; }
205216 button .flat : hover {
206- border-color: @theme_selected_bg_color ;
217+ border-color : transparent ;
207218 color: @theme_selected_bg_color ;
208219 background-color : transparent; }
209220 button .flat : active , button .flat : checked {
@@ -214,11 +225,11 @@ button.flat {
214225 background-color : shade (@theme_unfocused_selected_bg_color , 0.6 ); }
215226 button .flat : disabled {
216227 border-color : transparent;
217- color : alpha (@theme_selected_bg_color , 0.8 );
228+ color : alpha (transparent , 0.8 );
218229 background-color : transparent; }
219230 button .flat : disabled : backdrop {
220231 border-color : transparent;
221- color : alpha (@theme_selected_bg_color , 0.7 );
232+ color : alpha (transparent , 0.7 );
222233 background-color : transparent; }
223234 button .flat : backdrop {
224235 border-color : transparent;
@@ -1164,7 +1175,7 @@ treeview.view.trough {
11641175 background-color : alpha (@dark_shadow , 0.1 );
11651176 border-radius : 0 ;
11661177 border : none; }
1167- treeview .view infobar trough , treeview . view row : selected trough {
1178+ infobar treeview .view trough , row : selected treeview . view trough {
11681179 background-color : alpha (@dark_shadow , 0.1 ); }
11691180
11701181levelbar trough {
@@ -1432,11 +1443,9 @@ filechooser placessidebar.sidebar row, filechooser placessidebar.sidebar view ro
14321443 color: @sidebar_fg_color ;
14331444 background-color : mix (@sidebar_bg_color , @dark_shadow , 0.15 ); }
14341445
1435- .nautilus-window .csd .background ,
1436- .nautilus-window placessidebar list {
1446+ .nautilus-window .csd .background , .nautilus-window placessidebar list {
14371447 background-color: @sidebar_bg_color ; }
1438- .nautilus-window .csd .background : backdrop ,
1439- .nautilus-window placessidebar list : backdrop {
1448+ .nautilus-window .csd .background : backdrop , .nautilus-window placessidebar list : backdrop {
14401449 background-color: @theme_unfocused_bg_color ; }
14411450
14421451.nautilus-window placessidebar .sidebar row .sidebar-row {
@@ -1712,8 +1721,8 @@ headerbar, headerbar:not(.titlebar) {
17121721 border-width : 0 ;
17131722 border-radius : 4px ;
17141723 color: @headerbar_fg_color ;
1715- border-color: @headerbar_fg_color ;
1716- background-color : transparent ;
1724+ border-color: @borders ;
1725+ background-color : mix ( @theme_bg_color , @theme_fg_color , 0.1 ) ;
17171726 -gtk-outline-radius : 4px ; }
17181727 headerbar button : active , headerbar button : checked , headerbar : not (.titlebar ) button : active , headerbar : not (.titlebar ) button : checked {
17191728 color: @theme_selected_fg_color ;
@@ -1725,15 +1734,15 @@ headerbar, headerbar:not(.titlebar) {
17251734 background-color: @theme_unfocused_selected_bg_color ; }
17261735 headerbar button : active : disabled , headerbar button : checked : disabled , headerbar : not (.titlebar ) button : active : disabled , headerbar : not (.titlebar ) button : checked : disabled {
17271736 color: @theme_disabled_fg_color ;
1728- border-color : mix (@headerbar_fg_color , @theme_disabled_bg_color , 0.85 );
1737+ border-color : mix (@borders , @theme_disabled_bg_color , 0.85 );
17291738 background-color : shade (@theme_disabled_bg_color , 0.9 ); }
17301739 headerbar button : active : disabled : backdrop , headerbar button : checked : disabled : backdrop , headerbar : not (.titlebar ) button : active : disabled : backdrop , headerbar : not (.titlebar ) button : checked : disabled : backdrop {
17311740 color: @theme_unfocused_disabled_fg_color ;
17321741 border-color: @unfocused_borders ;
17331742 background-color : shade (@theme_unfocused_disabled_bg_color , 0.9 ); }
17341743 headerbar button : disabled , headerbar : not (.titlebar ) button : disabled {
17351744 color : mix (@headerbar_fg_color , @theme_unfocused_disabled_fg_color , 0.5 );
1736- border-color : mix (@headerbar_fg_color , @theme_unfocused_disabled_fg_color , 0.5 ); }
1745+ border-color : mix (@borders , @theme_unfocused_disabled_fg_color , 0.5 ); }
17371746 headerbar button : disabled : backdrop , headerbar : not (.titlebar ) button : disabled : backdrop {
17381747 color: @theme_unfocused_disabled_fg_color ;
17391748 border-color: @theme_unfocused_disabled_fg_color ; }
@@ -1760,7 +1769,7 @@ toolbar {
17601769 color: @toolbar_fg_color ;
17611770 background-color : transparent; }
17621771 toolbar button .flat : hover {
1763- border-color: @toolbar_fg_color ;
1772+ border-color : transparent ;
17641773 color: @toolbar_fg_color ;
17651774 background-color : transparent; }
17661775 toolbar button .flat : active , toolbar button .flat : checked {
@@ -1771,11 +1780,11 @@ toolbar {
17711780 background-color : shade (@theme_unfocused_selected_bg_color , 0.6 ); }
17721781 toolbar button .flat : disabled {
17731782 border-color : transparent;
1774- color : alpha (@toolbar_fg_color , 0.8 );
1783+ color : alpha (transparent , 0.8 );
17751784 background-color : transparent; }
17761785 toolbar button .flat : disabled : backdrop {
17771786 border-color : transparent;
1778- color : alpha (@toolbar_fg_color , 0.7 );
1787+ color : alpha (transparent , 0.7 );
17791788 background-color : transparent; }
17801789 toolbar button .flat : backdrop {
17811790 border-color : transparent;
@@ -1802,7 +1811,7 @@ toolbar {
18021811 border-width : 0 ;
18031812 border-radius : 4px ;
18041813 color: @toolbar_fg_color ;
1805- border-color: @toolbar_fg_color ;
1814+ border-color : transparent ;
18061815 background-color : transparent;
18071816 -gtk-outline-radius : 4px ; }
18081817 .primary-toolbar button : active , .primary-toolbar button : checked , .primary-toolbar .raised button : active , .primary-toolbar .raised button : checked {
@@ -1815,15 +1824,15 @@ toolbar {
18151824 background-color: @theme_unfocused_selected_bg_color ; }
18161825 .primary-toolbar button : active : disabled , .primary-toolbar button : checked : disabled , .primary-toolbar .raised button : active : disabled , .primary-toolbar .raised button : checked : disabled {
18171826 color: @theme_disabled_fg_color ;
1818- border-color : mix (@toolbar_fg_color , @theme_disabled_bg_color , 0.85 );
1827+ border-color : mix (transparent , @theme_disabled_bg_color , 0.85 );
18191828 background-color : shade (@theme_disabled_bg_color , 0.9 ); }
18201829 .primary-toolbar button : active : disabled : backdrop , .primary-toolbar button : checked : disabled : backdrop , .primary-toolbar .raised button : active : disabled : backdrop , .primary-toolbar .raised button : checked : disabled : backdrop {
18211830 color: @theme_unfocused_disabled_fg_color ;
18221831 border-color: @unfocused_borders ;
18231832 background-color : shade (@theme_unfocused_disabled_bg_color , 0.9 ); }
18241833 .primary-toolbar button : disabled , .primary-toolbar .raised button : disabled {
18251834 color : mix (@toolbar_fg_color , @theme_unfocused_disabled_fg_color , 0.5 );
1826- border-color : mix (@toolbar_fg_color , @theme_unfocused_disabled_fg_color , 0.5 ); }
1835+ border-color : mix (transparent , @theme_unfocused_disabled_fg_color , 0.5 ); }
18271836 .primary-toolbar button : disabled : backdrop , .primary-toolbar .raised button : disabled : backdrop {
18281837 color: @theme_unfocused_disabled_fg_color ;
18291838 border-color: @theme_unfocused_disabled_fg_color ; }
@@ -1848,7 +1857,7 @@ toolbar {
18481857 border-width : 0 ;
18491858 border-radius : 4px ;
18501859 color: @toolbar_fg_color ;
1851- border-color: @toolbar_fg_color ;
1860+ border-color : transparent ;
18521861 background-color : transparent;
18531862 -gtk-outline-radius : 4px ; }
18541863 .inline-toolbar toolbar button : active , .inline-toolbar toolbar button : checked {
@@ -1861,15 +1870,15 @@ toolbar {
18611870 background-color: @theme_unfocused_selected_bg_color ; }
18621871 .inline-toolbar toolbar button : active : disabled , .inline-toolbar toolbar button : checked : disabled {
18631872 color: @theme_disabled_fg_color ;
1864- border-color : mix (@toolbar_fg_color , @theme_disabled_bg_color , 0.85 );
1873+ border-color : mix (transparent , @theme_disabled_bg_color , 0.85 );
18651874 background-color : shade (@theme_disabled_bg_color , 0.9 ); }
18661875 .inline-toolbar toolbar button : active : disabled : backdrop , .inline-toolbar toolbar button : checked : disabled : backdrop {
18671876 color: @theme_unfocused_disabled_fg_color ;
18681877 border-color: @unfocused_borders ;
18691878 background-color : shade (@theme_unfocused_disabled_bg_color , 0.9 ); }
18701879 .inline-toolbar toolbar button : disabled {
18711880 color : mix (@toolbar_fg_color , @theme_unfocused_disabled_fg_color , 0.5 );
1872- border-color : mix (@toolbar_fg_color , @theme_unfocused_disabled_fg_color , 0.5 ); }
1881+ border-color : mix (transparent , @theme_unfocused_disabled_fg_color , 0.5 ); }
18731882 .inline-toolbar toolbar button : disabled : backdrop {
18741883 color: @theme_unfocused_disabled_fg_color ;
18751884 border-color: @theme_unfocused_disabled_fg_color ; }
@@ -2089,7 +2098,8 @@ treeview {
20892098 color: @theme_text_color ;
20902099 background-color: @theme_base_color ; }
20912100 .view : not (treeview ) {
2092- border-radius : 3px ; }
2101+ border-radius : 3px ;
2102+ -gtk-outline-radius : 3px ; }
20932103 .view : disabled {
20942104 color: @theme_disabled_fg_color ;
20952105 background-color: @theme_disabled_bg_color ; }
@@ -2445,7 +2455,8 @@ messagedialog {
24452455 messagedialog .csd .dialog-action-area button {
24462456 padding : 10px ;
24472457 border-radius : 0 ;
2448- border-bottom-style : none; }
2458+ border-bottom-style : none;
2459+ background-image : none; }
24492460 messagedialog .csd .dialog-action-area button : last-child {
24502461 border-right-width : 0 ;
24512462 border-radius : 0px ;
@@ -2668,7 +2679,7 @@ panel-toplevel.background na-tray-applet {
26682679 border-width : 0 ;
26692680 border-radius : 4px ;
26702681 color: @theme_fg_color ;
2671- border-color: @theme_fg_color ;
2682+ border-color : transparent ;
26722683 background-color : transparent;
26732684 -gtk-outline-radius : 4px ; }
26742685 # XfceNotifyWindow .osd button : active , # XfceNotifyWindow .osd button : checked {
@@ -2681,15 +2692,15 @@ panel-toplevel.background na-tray-applet {
26812692 background-color: @theme_unfocused_selected_bg_color ; }
26822693 # XfceNotifyWindow .osd button : active : disabled , # XfceNotifyWindow .osd button : checked : disabled {
26832694 color: @theme_disabled_fg_color ;
2684- border-color : mix (@theme_fg_color , @theme_disabled_bg_color , 0.85 );
2695+ border-color : mix (transparent , @theme_disabled_bg_color , 0.85 );
26852696 background-color : shade (@theme_disabled_bg_color , 0.9 ); }
26862697 # XfceNotifyWindow .osd button : active : disabled : backdrop , # XfceNotifyWindow .osd button : checked : disabled : backdrop {
26872698 color: @theme_unfocused_disabled_fg_color ;
26882699 border-color: @unfocused_borders ;
26892700 background-color : shade (@theme_unfocused_disabled_bg_color , 0.9 ); }
26902701 # XfceNotifyWindow .osd button : disabled {
26912702 color : mix (@theme_fg_color , @theme_unfocused_disabled_fg_color , 0.5 );
2692- border-color : mix (@theme_fg_color , @theme_unfocused_disabled_fg_color , 0.5 ); }
2703+ border-color : mix (transparent , @theme_unfocused_disabled_fg_color , 0.5 ); }
26932704 # XfceNotifyWindow .osd button : disabled : backdrop {
26942705 color: @theme_unfocused_disabled_fg_color ;
26952706 border-color: @theme_unfocused_disabled_fg_color ; }
0 commit comments