diff --git a/gtk-3.0/assets/checkbox-checked-dark.svg b/gtk-3.0/assets/checkbox-checked-dark.svg new file mode 100644 index 0000000..2aaeaa6 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg b/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg new file mode 100644 index 0000000..c3219e2 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.svg b/gtk-3.0/assets/checkbox-checked-insensitive.svg new file mode 100644 index 0000000..4dbe967 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-checked.svg b/gtk-3.0/assets/checkbox-checked.svg new file mode 100644 index 0000000..0a5e5a5 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed-dark.svg b/gtk-3.0/assets/checkbox-mixed-dark.svg new file mode 100644 index 0000000..5765056 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg new file mode 100644 index 0000000..27e0ef1 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.svg b/gtk-3.0/assets/checkbox-mixed-insensitive.svg new file mode 100644 index 0000000..d408465 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed.svg b/gtk-3.0/assets/checkbox-mixed.svg new file mode 100644 index 0000000..414f2f2 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked-dark.svg b/gtk-3.0/assets/checkbox-unchecked-dark.svg new file mode 100644 index 0000000..36eeb4d --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg new file mode 100644 index 0000000..3488e66 --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive.svg b/gtk-3.0/assets/checkbox-unchecked-insensitive.svg new file mode 100644 index 0000000..f90aa4c --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked-insensitive.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked.svg b/gtk-3.0/assets/checkbox-unchecked.svg new file mode 100644 index 0000000..06176e3 --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/grid-selection-checked-dark.svg b/gtk-3.0/assets/grid-selection-checked-dark.svg new file mode 100644 index 0000000..c1d5486 --- /dev/null +++ b/gtk-3.0/assets/grid-selection-checked-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/grid-selection-checked.svg b/gtk-3.0/assets/grid-selection-checked.svg new file mode 100644 index 0000000..a660356 --- /dev/null +++ b/gtk-3.0/assets/grid-selection-checked.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/grid-selection-unchecked-dark.svg b/gtk-3.0/assets/grid-selection-unchecked-dark.svg new file mode 100644 index 0000000..f925043 --- /dev/null +++ b/gtk-3.0/assets/grid-selection-unchecked-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/grid-selection-unchecked.svg b/gtk-3.0/assets/grid-selection-unchecked.svg new file mode 100644 index 0000000..689da2d --- /dev/null +++ b/gtk-3.0/assets/grid-selection-unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg b/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg new file mode 100644 index 0000000..8ab7153 --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg new file mode 100644 index 0000000..f570a1c --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-checked.svg b/gtk-3.0/assets/menuitem-checkbox-checked.svg new file mode 100644 index 0000000..6fbfb3e --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-checked.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg new file mode 100644 index 0000000..d150f8f --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg new file mode 100644 index 0000000..fd8b0d4 --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg new file mode 100644 index 0000000..d150f8f --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/gtk-3.0/assets/menuitem-checkbox-mixed.svg new file mode 100644 index 0000000..a82b2c0 --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/gtk-3.0/assets/menuitem-radio-checked-hover.svg b/gtk-3.0/assets/menuitem-radio-checked-hover.svg new file mode 100644 index 0000000..afb9db2 --- /dev/null +++ b/gtk-3.0/assets/menuitem-radio-checked-hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg new file mode 100644 index 0000000..0bc947f --- /dev/null +++ b/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-radio-checked.svg b/gtk-3.0/assets/menuitem-radio-checked.svg new file mode 100644 index 0000000..61f0626 --- /dev/null +++ b/gtk-3.0/assets/menuitem-radio-checked.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/pane-handle-vertical.svg b/gtk-3.0/assets/pane-handle-vertical.svg new file mode 100644 index 0000000..8a983c7 --- /dev/null +++ b/gtk-3.0/assets/pane-handle-vertical.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/pane-handle.svg b/gtk-3.0/assets/pane-handle.svg new file mode 100644 index 0000000..7bd3be0 --- /dev/null +++ b/gtk-3.0/assets/pane-handle.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed-dark.svg b/gtk-3.0/assets/radio-mixed-dark.svg new file mode 100644 index 0000000..b6b0d76 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.svg b/gtk-3.0/assets/radio-mixed-insensitive-dark.svg new file mode 100644 index 0000000..6b93fc4 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed-insensitive.svg b/gtk-3.0/assets/radio-mixed-insensitive.svg new file mode 100644 index 0000000..9fa3659 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed.svg b/gtk-3.0/assets/radio-mixed.svg new file mode 100644 index 0000000..a85a7ac --- /dev/null +++ b/gtk-3.0/assets/radio-mixed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-selected-dark.svg b/gtk-3.0/assets/radio-selected-dark.svg new file mode 100644 index 0000000..28da8de --- /dev/null +++ b/gtk-3.0/assets/radio-selected-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-selected-insensitive-dark.svg b/gtk-3.0/assets/radio-selected-insensitive-dark.svg new file mode 100644 index 0000000..f5cfbe0 --- /dev/null +++ b/gtk-3.0/assets/radio-selected-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-selected-insensitive.svg b/gtk-3.0/assets/radio-selected-insensitive.svg new file mode 100644 index 0000000..e782ba6 --- /dev/null +++ b/gtk-3.0/assets/radio-selected-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-selected.svg b/gtk-3.0/assets/radio-selected.svg new file mode 100644 index 0000000..91cafc1 --- /dev/null +++ b/gtk-3.0/assets/radio-selected.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-unselected-dark.svg b/gtk-3.0/assets/radio-unselected-dark.svg new file mode 100644 index 0000000..214ed94 --- /dev/null +++ b/gtk-3.0/assets/radio-unselected-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/radio-unselected-insensitive-dark.svg b/gtk-3.0/assets/radio-unselected-insensitive-dark.svg new file mode 100644 index 0000000..0fdfaf4 --- /dev/null +++ b/gtk-3.0/assets/radio-unselected-insensitive-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/radio-unselected-insensitive.svg b/gtk-3.0/assets/radio-unselected-insensitive.svg new file mode 100644 index 0000000..a0f2168 --- /dev/null +++ b/gtk-3.0/assets/radio-unselected-insensitive.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/radio-unselected.svg b/gtk-3.0/assets/radio-unselected.svg new file mode 100644 index 0000000..2f05a0d --- /dev/null +++ b/gtk-3.0/assets/radio-unselected.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index 22f93ef..709de5b 100644 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -76,6 +76,7 @@ @import url("gtk-widgets.css"); @import url("gtk-widgets-assets.css"); +@import url("gtk-widgets-assets-dark.css"); @import url("apps/gnome-applications.css"); @import url("apps/granite-widgets.css"); @import url("apps/unity.css"); diff --git a/gtk-3.0/gtk-widgets-assets-dark.css b/gtk-3.0/gtk-widgets-assets-dark.css new file mode 100644 index 0000000..f50f176 --- /dev/null +++ b/gtk-3.0/gtk-widgets-assets-dark.css @@ -0,0 +1,94 @@ +/******************* +* check and radio * +*******************/ +/* draw regular check and radio items using our assets */ +.check, +.check:focus, +.check row:selected, +.check row:selected:focus { + -gtk-icon-source: url("assets/checkbox-unchecked-dark.svg"); +} + +.check:insensitive, +.check row:selected:insensitive, +.check row:selected:focus:insensitive { + -gtk-icon-source: url("assets/checkbox-unchecked-insensitive-dark.svg"); +} + +.check:active, +.check:checked, +.check row:selected:active, +.check row:selected:focus:active { + -gtk-icon-source: url("assets/checkbox-checked-dark.svg"); +} + +.check:active:insensitive, +.check row:selected:active:insensitive, +.check row:selected:focus:active:insensitive { + -gtk-icon-source: url("assets/checkbox-checked-insensitive-dark.svg"); +} + +.check:inconsistent, +.check row:selected:inconsistent, +.check row:selected:focus:inconsistent { + -gtk-icon-source: url("assets/checkbox-mixed-dark.svg"); +} + +.check:inconsistent:insensitive, +.check row:selected:inconsistent:insensitive, +.check row:selected:focus:inconsistent:insensitive { + -gtk-icon-source: url("assets/checkbox-mixed-insensitive-dark.svg"); +} + +.radio, +.radio row:selected, +.radio row:selected:focus { + -gtk-icon-source: url("assets/radio-unselected-dark.svg"); +} + +.radio:insensitive, +.radio row:selected:insensitive, +.radio row:selected:focus:insensitive { + -gtk-icon-source: url("assets/radio-unselected-insensitive-dark.svg"); +} + +.radio:active, +.radio:checked, +.radio row:selected:active, +.radio row:selected:focus:active { + -gtk-icon-source: url("assets/radio-selected-dark.svg"); +} + +.radio:active:insensitive, +.radio row:selected:active:insensitive, +.radio row:selected:focus:active:insensitive { + -gtk-icon-source: url("assets/radio-selected-insensitive-dark.svg"); +} + +.radio:inconsistent, +.radio row:selected:inconsistent, +.radio row:selected:focus:inconsistent { + -gtk-icon-source: url("assets/radio-mixed-dark.svg"); +} + +.radio:inconsistent:insensitive, +.radio row:selected:inconsistent:insensitive, +.radio row:selected:focus:inconsistent:insensitive { + -gtk-icon-source: url("assets/radio-mixed-insensitive-dark.svg"); +} + +.menuitem.check { + -gtk-icon-source: none; +} + +.menuitem.radio { + -gtk-icon-source: none; +} + +GtkIconView.content-view.cell.check { + -gtk-icon-source: url("assets/grid-selection-unchecked-dark.svg"); +} + +GtkIconView.content-view.cell.check:active { + -gtk-icon-source: url("assets/grid-selection-checked-dark.svg"); +} diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css index 6f878e1..d7413ea 100644 --- a/gtk-3.0/gtk-widgets-assets.css +++ b/gtk-3.0/gtk-widgets-assets.css @@ -1,339 +1,135 @@ /******************* * check and radio * *******************/ +/* draw regular check and radio items using our assets */ .check, +.check:focus, .check row:selected, .check row:selected:focus { - background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-unchecked.svg"); } .check:insensitive, .check row:selected:insensitive, .check row:selected:focus:insensitive { - background-image: linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.svg"); } .check:active, +.check:checked, .check row:selected:active, .check row:selected:focus:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_bg_color 30%, @theme_selected_bg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_bg_color 37%, @theme_selected_bg_color 62%, transparent 62%, transparent), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-checked.svg"); } .check:active:insensitive, .check row:selected:active:insensitive, .check row:selected:focus:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, shade(@theme_base_color, 0.6) 30%, shade(@theme_base_color, 0.6) 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, shade(@theme_base_color, 0.6) 37%, shade(@theme_base_color, 0.6) 62%, transparent 62%, transparent), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-checked-insensitive.svg"); } .check:inconsistent, .check row:selected:inconsistent, .check row:selected:focus:inconsistent { - background-image: linear-gradient(to bottom, @theme_selected_bg_color, @theme_selected_bg_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 50% 12%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-mixed.svg"); } .check:inconsistent:insensitive, .check row:selected:inconsistent:insensitive, .check row:selected:focus:inconsistent:insensitive { - background-image: linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 50% 12%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-mixed-insensitive.svg"); } .radio, .radio row:selected, .radio row:selected:focus { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center; - background-size: 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-unselected.svg"); } .radio:insensitive, .radio row:selected:insensitive, .radio row:selected:focus:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center; - background-size: 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-unselected-insensitive.svg"); } .radio:active, +.radio:checked, .radio row:selected:active, .radio row:selected:focus:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 40% 40%, 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-selected.svg"); } .radio:active:insensitive, .radio row:selected:active:insensitive, .radio row:selected:focus:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 40% 40%, 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-selected-insensitive.svg"); } .radio:inconsistent, .radio row:selected:inconsistent, .radio row:selected:focus:inconsistent { - background-image: linear-gradient(to bottom, @theme_selected_bg_color, @theme_selected_bg_color), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 50% 12%, 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-mixed.svg"); } .radio:inconsistent:insensitive, .radio row:selected:inconsistent:insensitive, .radio row:selected:focus:inconsistent:insensitive { - background-image: linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); + -gtk-icon-source: url("assets/radio-mixed-insensitive.svg"); +} - background-position: center center, center center, center center; - background-size: 50% 12%, 90% 90%, 100% 100%; - background-repeat: no-repeat; +.menuitem.check { + -gtk-icon-source: none; } .menuitem.check:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_bg_color 30%, @theme_selected_bg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_bg_color 37%, @theme_selected_bg_color 62%, transparent 62%, transparent); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/menuitem-checkbox-checked.svg"); } .menuitem.check:active:hover { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_fg_color 30%, @theme_selected_fg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_fg_color 37%, @theme_selected_fg_color 62%, transparent 62%, transparent); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/menuitem-checkbox-checked-hover.svg"); } .menuitem.check:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, mix(@menu_fg_color, @menu_bg_color, 0.5) 30%, mix(@menu_fg_color, @menu_bg_color, 0.5) 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, mix(@menu_fg_color, @menu_bg_color, 0.5) 37%, mix(@menu_fg_color, @menu_bg_color, 0.5) 62%, transparent 62%, transparent); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%; - background-repeat: no-repeat; -} - -.menuitem.radio:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)); - background-position: center center; - background-size: 40% 40%; - background-repeat: no-repeat; -} - -.menuitem.radio:active:hover { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)); - background-position: center center; - background-size: 40% 40%; - background-repeat: no-repeat; -} - -.menuitem.radio:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)); - background-position: center center; - background-size: 40% 40%; - background-repeat: no-repeat; -} - -.menuitem.check:inconsistent, -.menuitem.radio:inconsistent { - background-image: linear-gradient(to bottom, @theme_selected_bg_color, @theme_selected_bg_color); - - background-position: center center; - background-size: 50% 12%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/menuitem-checkbox-checked-insensitive.svg"); } .menuitem.check:inconsistent:hover, .menuitem.radio:inconsistent:hover { - background-image: linear-gradient(to bottom, @theme_selected_fg_color, @theme_selected_fg_color); + -gtk-icon-source: url("assets/menuitem-checkbox-mixed-hover.svg"); +} - background-position: center center; - background-size: 50% 12%; - background-repeat: no-repeat; +.menuitem.check:inconsistent, +.menuitem.radio:inconsistent { + -gtk-icon-source: url("assets/menuitem-checkbox-mixed.svg"); } .menuitem.check:inconsistent:insensitive, .menuitem.radio:inconsistent:insensitive { - background-image: linear-gradient(to bottom, mix(@menu_fg_color, @menu_bg_color, 0.5), mix(@menu_fg_color, @menu_bg_color, 0.5)); + -gtk-icon-source: url("assets/menuitem-checkbox-mixed-insensitive.svg"); +} - background-position: center center; - background-size: 50% 12%; - background-repeat: no-repeat; +.menuitem.radio { + -gtk-icon-source: none; +} + +.menuitem.radio:active { + -gtk-icon-source: url("assets/menuitem-radio-checked.svg"); +} + +.menuitem.radio:active:hover { + -gtk-icon-source: url("assets/menuitem-radio-checked-hover.svg"); +} + +.menuitem.radio:active:insensitive { + -gtk-icon-source: url("assets/menuitem-radio-checked-insensitive.svg"); } GtkIconView.content-view.cell.check { - background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/grid-selection-unchecked.svg"); } GtkIconView.content-view.cell.check:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_bg_color 30%, @theme_selected_bg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_bg_color 37%, @theme_selected_bg_color 62%, transparent 62%, transparent), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/grid-selection-checked.svg"); } /****************** diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 0bcc19a..ed35097 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -170,6 +170,10 @@ GtkGrid:insensitive { .primary-toolbar .button:active, .toolbar .button:active, .header-bar .button:active, +.button:checked, +.primary-toolbar .button:checked, +.toolbar .button:checked, +.header-bar .button:checked, .notebook.header { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -185,10 +189,14 @@ GtkGrid:insensitive { } /* disable inset shadow */ -.button:active *:insensitive, -.primary-toolbar .button:active *:insensitive, -.toolbar .button:active *:insensitive, -.header-bar .button:active *:insensitive, +.button:active:insensitive, +.primary-toolbar .button:active:insensitive, +.toolbar .button:active:insensitive, +.header-bar .button:active:insensitive, +.button:checked:insensitive, +.primary-toolbar .button:checked:insensitive, +.toolbar .button:checked:insensitive, +.header-bar .button:checked:insensitive, .entry:insensitive { box-shadow: none; } @@ -233,20 +241,24 @@ GtkAssistant .sidebar { background-image: none; } -.button:active { +.button:active, +.button:checked { border-color: shade(@theme_bg_color, 0.8); background-color: shade(@theme_bg_color, 0.95); background-image: none; } -.button:active:hover { +.button:active:hover, +.button:checked:hover { border-color: shade(@theme_bg_color, 0.7); } .button:focus, .button:hover:focus, .button:active:focus, -.button:active:hover:focus { +.button:active:hover:focus, +.button:checked:focus, +.button:checked:hover:focus { border-color: shade(@theme_bg_color, 0.7); } @@ -256,7 +268,8 @@ GtkAssistant .sidebar { background-image: none; } -.button:active *:insensitive { +.button:active:insensitive, +.button:checked:insensitive { border-color: shade(@theme_bg_color, 0.75); background-color: shade(@theme_bg_color, 0.80); background-image: none; @@ -274,16 +287,25 @@ GtkAssistant .sidebar { background-color: @theme_selected_bg_color; } -.button.default:active { +.button.default:active, +.button.default:checked { border-color: shade(@theme_selected_bg_color, 0.8); background-color: shade(@theme_selected_bg_color, 0.95); } -.button.default:active:hover { +.button.default:active:hover, +.button.default:checked:hover { border-color: shade(@theme_selected_bg_color, 0.7); background-color: shade(@theme_selected_bg_color, 0.97); } +.button.flat, +.button.flat:insensitive { + border-color: transparent; + background-color: transparent; + background-image: none; +} + /**************** * cell and row * ****************/ @@ -312,42 +334,22 @@ row:selected:focus { color: @theme_selected_fg_color; } -/******************* - * check and radio * - *******************/ -.check, -.radio, -.check:insensitive, -.radio:insensitive { - border-style: none; - background-color: transparent; -} - -GtkCheckButton:hover, -GtkCheckButton:active:hover, -GtkCheckButton:selected, -GtkCheckButton:selected:focus { - background-color: transparent; -} - -GtkCheckButton { - outline-offset: 0; - padding: 3px; -} - /***************** * column-header * *****************/ column-header .button, -column-header .button:active { +column-header .button:active, +column-header .button:checked { border-width: 0 1px 1px 0; border-radius: 0; } column-header .button, column-header .button:active, +column-header .button:checked, column-header .button:focus, -column-header .button:active:focus { +column-header .button:active:focus, +column-header .button:checked:focus { border-color: shade(@theme_base_color, 0.9); border-bottom-color: shade(@theme_base_color, 0.8); background-color: shade(@theme_base_color, 0.97); @@ -356,8 +358,10 @@ column-header .button:active:focus { column-header .button:hover, column-header .button:active:hover, +column-header .button:checked:hover, column-header .button:hover:focus, -column-header .button:active:hover:focus { +column-header .button:active:hover:focus, +column-header .button:checked:hover:focus { border-color: shade(@theme_base_color, 0.9); border-bottom-color: shade(@theme_base_color, 0.8); background-color: shade(@theme_base_color, 0.99); @@ -483,10 +487,12 @@ GtkComboBox.combobox-entry .entry:insensitive { .primary-toolbar GtkComboBox.combobox-entry .button, .primary-toolbar GtkComboBox.combobox-entry .button:hover, .primary-toolbar GtkComboBox.combobox-entry .button:active, +.primary-toolbar GtkComboBox.combobox-entry .button:checked, .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:hover, GtkComboBox.combobox-entry .button:active, +GtkComboBox.combobox-entry .button:checked, GtkComboBox.combobox-entry .button:insensitive { border-width: 1px 1px 1px 1px; border-bottom-left-radius: 0; @@ -559,19 +565,25 @@ GtkExpander { * list boxes * **************/ .list { - background-color: shade(@theme_bg_color, 0.97); - color: @theme_fg_color; + background-image: none; + background-color: transparent; } .list-row { + border: none; + border-radius: 0; padding: 3px; + background-image: none; + background-color: transparent; } .list-row:hover { + background-image: none; background-color: shade(@theme_bg_color, 1.02); } .list-row:selected { + background-image: none; background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } @@ -587,12 +599,7 @@ GtkExpander { /********* * frame * *********/ -.frame { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; -} +.frame { border: none; } /******************* * scrolled window * @@ -668,12 +675,14 @@ GtkInfoBar { background-color: shade(@info_bg_color, 1.10); } -.info .button:active { +.info .button:active, +.info .button:checked { border-color: shade(@info_bg_color, 0.6); background-color: shade(@info_bg_color, 0.95); } -.info .button:active:hover { +.info .button:active:hover, +.info .button:active:checked { border-top-color: shade(@info_bg_color, 0.85); border-right-color: shade(@info_bg_color, 0.78); border-left-color: shade(@info_bg_color, 0.78); @@ -719,12 +728,14 @@ GtkInfoBar { background-color: shade(@warning_bg_color, 1.10); } -.warning .button:active { +.warning .button:active, +.warning .button:checked { border-color: shade(@warning_bg_color, 0.6); background-color: shade(@warning_bg_color, 0.95); } -.warning .button:active:hover { +.warning .button:active:hover, +.warning .button:checked:hover { border-top-color: shade(@warning_bg_color, 0.85); border-right-color: shade(@warning_bg_color, 0.78); border-left-color: shade(@warning_bg_color, 0.78); @@ -770,12 +781,14 @@ GtkInfoBar { background-color: shade(@question_bg_color, 1.10); } -.question .button:active { +.question .button:active, +.question .button:checked { border-color: shade(@question_bg_color, 0.6); background-color: shade(@question_bg_color, 0.95); } -.question .button:active:hover { +.question .button:active:hover, +.question .button:checked:hover { border-top-color: shade(@question_bg_color, 0.85); border-right-color: shade(@question_bg_color, 0.78); border-left-color: shade(@question_bg_color, 0.78); @@ -821,12 +834,14 @@ GtkInfoBar { background-color: shade(@error_bg_color, 1.10); } -.error .button:active { +.error .button:active, +.error .button:checked { border-color: shade(@error_bg_color, 0.6); background-color: shade(@error_bg_color, 0.95); } -.error .button:active:hover { +.error .button:active:hover, +.error .button:checked:hover { border-top-color: shade(@error_bg_color, 0.85); border-right-color: shade(@error_bg_color, 0.78); border-left-color: shade(@error_bg_color, 0.78); @@ -968,7 +983,9 @@ GtkComboBox .menu { .menu.button:hover, .menu.button:active, -.menu.button:active *:insensitive, +.menu.button:checked, +.menu.button:active:insensitive, +.menu.button:checked:insensitive, .menu.button:insensitive, .menu.button { border-width: 0; @@ -1131,11 +1148,17 @@ GtkPopover { border-width: 1px; border-style: solid; background-clip: border-box; + background-image: none; background-color: @menu_bg_color; color: @menu_fg_color; box-shadow: 0 2px 3px alpha(black, 0.5); } +GtkPopover.background { + background-image: none; + background-color: @menu_bg_color; +} + GtkPopover:backdrop { box-shadow: none; } @@ -1147,9 +1170,38 @@ GtkPopover.osd { GtkPopover > .list, GtkPopover > .view, GtkPopover > .toolbar { + background-image: none; background-color: transparent; } +GtkPopover .list-row { + color: @menu_fg_color; +} + +GtkPopover .list-row:hover { + background-image: none; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + +GtkPopover .frame { + border: 1px solid mix(@menu_bg_color, @menu_fg_color, 0.12); + border-radius: 2px; +} + +GtkPopover .entry { + border-color: mix(@menu_bg_color, @menu_fg_color, 0.12); + background-color: @menu_bg_color; + background-image: none; + color: @menu_fg_color; +} + +GtkPopover .entry:hover, +GtkPopover .entry:focus, +GtkPopover .entry:active { + border-color: mix(@menu_bg_color, @menu_fg_color, 0.21); +} + GtkPopover.osd > .toolbar .button { border-radius: 0; border-width: 0; @@ -1171,21 +1223,22 @@ GtkPopover .separator { .menuitem.button, .menuitem.button:active, +.menuitem.button:checked, .menuitem.button:insensitive, -.menuitem.button:active:insensitive { +.menuitem.button:active:insensitive, +.menuitem.button:checked:insensitive { background-color: transparent; background-image: none; - border-color: transparent; - border-style: none; + border: none; box-shadow: none; color: @menu_fg_color; } .menuitem.button:active:hover, +.menuitem.button:checked:hover, .menuitem.button:hover, .menuitem.button:selected { - border-width: 0; - border-color: transparent; + border: none; background-color: @theme_selected_bg_color; background-image: none; color: @theme_selected_fg_color; @@ -1195,9 +1248,15 @@ GtkModelButton.button { color: @menu_fg_color; } + +GtkModelButton.button:focus, +GtkModelButton.button:active:focus, +GtkModelButton.button:checked:focus, GtkModelButton.button:active, -GtkModelButton.button:insensitive, +GtkModelButton.button:checked, +GtkModelButton.button:insensitive:insensitive, GtkModelButton.button:active:insensitive, +GtkModelButton.button:checked:insensitive, GtkModelButton.button { background-color: transparent; background-image: none; @@ -1213,7 +1272,11 @@ GtkModelButton.button:insensitive:backdrop, GtkModelButton.button:active:insensitive:backdrop, GtkModelButton.button:active:backdrop, GtkModelButton.button:active:hover:backdrop, -GtkModelButton.button:active:selected:backdrop { +GtkModelButton.button:active:selected:backdrop, +GtkModelButton.button:checked:insensitive:backdrop, +GtkModelButton.button:checked:backdrop, +GtkModelButton.button:checked:hover:backdrop, +GtkModelButton.button:checked:selected:backdrop { text-shadow: none; icon-shadow: none; color: @theme_selected_fg_color; @@ -1226,6 +1289,7 @@ GtkModelButton.button:active:selected:backdrop { } GtkModelButton.button:active:hover, +GtkModelButton.button:checked:hover, GtkModelButton.button:hover, GtkModelButton.button:selected { background-image: none; @@ -1396,6 +1460,7 @@ GtkModelButton.button:selected { /* close button styling */ .notebook tab .button, .notebook tab .button:active, +.notebook tab .button:checked, .notebook tab .button:hover { padding: 1px; border-width: 1px; @@ -1413,7 +1478,9 @@ GtkModelButton.button:selected { } .notebook tab .button:active, -.notebook tab .button:active:hover { +.notebook tab .button:checked, +.notebook tab .button:active:hover, +.notebook tab .button:checked:hover { border-color: shade(@theme_base_color, 0.7); background-color: shade(@theme_base_color, 0.95); } @@ -1665,7 +1732,9 @@ GtkLevelBar.vertical { .scrollbar.button, .scrollbar.button:active, -.scrollbar.button:active:hover { +.scrollbar.button:checked, +.scrollbar.button:active:hover, +.scrollbar.button:checked:hover { border-width: 0; border-radius: 0; background-color: transparent; @@ -1720,7 +1789,9 @@ OsScrollbar:insensitive { /************* * separator * *************/ +.sidebar.separator, .sidebar.view.separator, +.sidebar .view.separator, .view.separator, .separator { border-width: 1px; @@ -1871,6 +1942,7 @@ GtkComboBox .separator { } .spinbutton .button:active, +.spinbutton .button:checked, .spinbutton .button:hover { color: @theme_fg_color; } @@ -1905,20 +1977,24 @@ GtkComboBox .separator { background-image: none; } -.spinbutton.vertical .button:active { +.spinbutton.vertical .button:active, +.spinbutton.vertical .button:checked { border-color: shade(@theme_bg_color, 0.8); background-color: shade(@theme_bg_color, 0.95); background-image: none; } -.spinbutton.vertical .button:active:hover { +.spinbutton.vertical .button:active:hover, +.spinbutton.vertical .button:checked:hover { border-color: shade(@theme_bg_color, 0.7); } .spinbutton.vertical .button:focus, .spinbutton.vertical .button:hover:focus, .spinbutton.vertical .button:active:focus, -.spinbutton.vertical .button:active:hover:focus { +.spinbutton.vertical .button:active:hover:focus, +.spinbutton.vertical .button:checked:focus, +.spinbutton.vertical .button:checked:hover:focus { border-color: shade(@theme_bg_color, 0.7); } @@ -1953,71 +2029,25 @@ GtkComboBox .separator { /*********** * spinner * ***********/ -@keyframes spinner { - 00.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); } - - 10.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.90)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)); } - - 20.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.90)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)); } - - 30.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); } - - 40.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.50)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)); } - - 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(transparent), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.30)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)); } - - 60.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.10)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); } - - 70.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.10)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)); } - - 80.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.30)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(transparent), to(transparent)); } - - 90.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.50)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)); } - - 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); } +@keyframes spin { + to { -gtk-icon-transform: rotate(1turn); } } .spinner { - background-color: transparent; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); + background-image: none; + background-color: blue; + opacity: 0; - background-position: 0% 70%, 33% 70%, 70% 70%; - background-size: 30% 30%; - background-repeat: no-repeat; + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); } .spinner:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); - - animation: spinner 1s infinite linear; + opacity: 1; + animation: spin 1s linear infinite; } +.spinner:active:insensitive { opacity: 0.5; } + .menu.spinner, .menu .spinner, .menu .spinner:hover, @@ -2235,20 +2265,24 @@ GtkColorButton.button { background-image: none; } -.header-bar .button:active { +.header-bar .button:active, +.header-bar .button:checked { border-color: shade(@titlebar_bg_color, 0.8); background-color: shade(@titlebar_bg_color, 0.95); background-image: none; } -.header-bar .button:active:hover { +.header-bar .button:active:hover, +.header-bar .button:checked:hover { border-color: shade(@titlebar_bg_color, 0.7); } .header-bar .button:focus, .header-bar .button:hover:focus, .header-bar .button:active:focus, -.header-bar .button:active:hover:focus { +.header-bar .button:checked:focus, +.header-bar .button:active:hover:focus +.header-bar .button:checked:hover:focus { border-color: shade(@titlebar_bg_color, 0.7); } @@ -2258,7 +2292,8 @@ GtkColorButton.button { background-image: none; } -.header-bar .button:active *:insensitive { +.header-bar .button:active:insensitive, +.header-bar .button:checked:insensitive { border-color: shade(@titlebar_bg_color, 0.75); background-color: shade(@titlebar_bg_color, 0.80); background-image: none; @@ -2334,6 +2369,23 @@ GtkColorButton.button { color: @toolbar_fg_color; } +.primary-toolbar GtkComboBox.flat, +.primary-toolbar .button.flat, +.primary-toolbar GtkComboBox.flat, +.primary-toolbar .button.flat, +.toolbar GtkComboBox.flat, +.toolbar .button.flat, +.primary-toolbar GtkComboBox.flat:insensitive, +.primary-toolbar .button.flat:insensitive, +.primary-toolbar GtkComboBox.flat:insensitive, +.primary-toolbar .button.flat:insensitive, +.toolbar GtkComboBox.flat:insensitive, +.toolbar .button.flat:insensitive { + border-color: transparent; + background-color: transparent; + background-image: none; +} + .primary-toolbar .raised .button, .primary-toolbar .raised.button, .toolbar GtkComboBox, @@ -2352,14 +2404,18 @@ GtkColorButton.button { } .primary-toolbar .button:active, -.toolbar .button:active { +.toolbar .button:active, +.primary-toolbar .button:checked, +.toolbar .button:checked { border-color: shade(@toolbar_bg_color, 0.8); background-color: shade(@toolbar_bg_color, 0.95); background-image: none; } .primary-toolbar .button:active:hover, -.toolbar .button:active:hover { +.toolbar .button:active:hover, +.primary-toolbar .button:checked:hover, +.toolbar .button:checked:hover { border-color: shade(@toolbar_bg_color, 0.7); } @@ -2367,10 +2423,14 @@ GtkColorButton.button { .primary-toolbar .button:hover:focus, .primary-toolbar .button:active:focus, .primary-toolbar .button:active:hover:focus, +.primary-toolbar .button:checked:focus, +.primary-toolbar .button:checked:hover:focus, .toolbar .button:focus, .toolbar .button:hover:focus, .toolbar .button:active:focus, -.toolbar .button:active:hover:focus { +.toolbar .button:active:hover:focus, +.toolbar .button:checked:focus, +.toolbar .button:checked:hover:focus { border-color: shade(@toolbar_bg_color, 0.7); } @@ -2381,8 +2441,10 @@ GtkColorButton.button { background-image: none; } -.primary-toolbar .button:active *:insensitive, -.toolbar .button:active *:insensitive { +.primary-toolbar .button:active:insensitive, +.toolbar .button:active:insensitive, +.primary-toolbar .button:checked:insensitive, +.toolbar .button:checked:insensitive { border-color: shade(@toolbar_bg_color, 0.75); background-color: shade(@toolbar_bg_color, 0.80); background-image: none; @@ -2436,20 +2498,24 @@ GtkColorButton.button { background-image: none; } -.inline-toolbar.toolbar .button:active { +.inline-toolbar.toolbar .button:active, +.inline-toolbar.toolbar .button:checked { border-color: shade(@theme_bg_color, 0.8); background-color: shade(@theme_bg_color, 0.95); background-image: none; } -.inline-toolbar.toolbar .button:active:hover { +.inline-toolbar.toolbar .button:active:hover, +.inline-toolbar.toolbar .button:checked:hover { border-color: shade(@theme_bg_color, 0.7); } .inline-toolbar.toolbar .button:focus, .inline-toolbar.toolbar .button:hover:focus, .inline-toolbar.toolbar .button:active:focus, -.inline-toolbar.toolbar .button:active:hover:focus { +.inline-toolbar.toolbar .button:active:hover:focus, +.inline-toolbar.toolbar .button:checked:focus, +.inline-toolbar.toolbar .button:checked:hover:focus { border-color: shade(@theme_bg_color, 0.7); } @@ -2460,8 +2526,10 @@ GtkColorButton.button { background-image: none; } -.inline-toolbar.toolbar .button:active *:insensitive -.inline-toolbar.toolbar GtkToolButton .button:active *:insensitive { +.inline-toolbar.toolbar .button:active:insensitive +.inline-toolbar.toolbar GtkToolButton .button:active:insensitive, +.inline-toolbar.toolbar .button:checked:insensitive +.inline-toolbar.toolbar GtkToolButton .button:checked:insensitive { border-color: shade(@theme_bg_color, 0.75); background-color: shade(@theme_bg_color, 0.80); background-image: none; @@ -2481,7 +2549,11 @@ GtkColorButton.button { .linked .button:active, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar GtkToolButton .button:active, -.inline-toolbar.toolbar GtkToolButton > .button:active { +.inline-toolbar.toolbar GtkToolButton > .button:active, +.linked .button:checked, +.inline-toolbar.toolbar .button:checked, +.inline-toolbar.toolbar GtkToolButton .button:checked, +.inline-toolbar.toolbar GtkToolButton > .button:checked { box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2500,20 +2572,26 @@ GtkColorButton.button { .linked .button:only-child, .linked .button:insensitive:last-child, .linked .button:insensitive:only-child, -.linked .button:active *:insensitive:last-child, -.linked .button:active *:insensitive:only-child, +.linked .button:active:insensitive:last-child, +.linked .button:active:insensitive:only-child, +.linked .button:checked:insensitive:last-child, +.linked .button:checked:insensitive:only-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:insensitive:last-child, .inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar .button:active *:insensitive:last-child, -.inline-toolbar.toolbar .button:active *:insensitive:only-child, +.inline-toolbar.toolbar .button:active:insensitive:last-child, +.inline-toolbar.toolbar .button:active:insensitive:only-child, +.inline-toolbar.toolbar .button:checked:insensitive:last-child, +.inline-toolbar.toolbar .button:checked:insensitive:only-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button, .inline-toolbar.toolbar GtkToolButton:only-child > .button, .inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, .inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive { +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:insensitive, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked:insensitive { box-shadow: none; } @@ -2523,7 +2601,13 @@ GtkColorButton.button { .inline-toolbar.toolbar .button:active:last-child, .inline-toolbar.toolbar .button:active:only-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button:active, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active { +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active, +.linked .button:checked:last-child, +.linked .button:checked:only-child, +.inline-toolbar.toolbar .button:checked:last-child, +.inline-toolbar.toolbar .button:checked:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2534,12 +2618,16 @@ GtkColorButton.button { .linked .button, .linked .button:active, .linked .button:active:hover, +.linked .button:checked, +.linked .button:checked:hover, .linked .button:insensitive, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, +.inline-toolbar.toolbar .button:checked, .inline-toolbar.toolbar .button:insensitive, .inline-toolbar.toolbar GtkToolButton .button, .inline-toolbar.toolbar GtkToolButton .button:active, +.inline-toolbar.toolbar GtkToolButton .button:checked, .inline-toolbar.toolbar GtkToolButton .button:insensitive { border-width: 1px; border-radius: 0; @@ -2552,12 +2640,16 @@ GtkColorButton.button { .linked .button:first-child, .linked .button:active:first-child, .linked .button:active:hover:first-child, +.linked .button:checked:first-child, +.linked .button:checked:hover:first-child, .linked .button:insensitive:first-child, .inline-toolbar.toolbar .button:first-child, .inline-toolbar.toolbar .button:active:first-child, +.inline-toolbar.toolbar .button:checked:first-child, .inline-toolbar.toolbar .button:insensitive:first-child, .inline-toolbar.toolbar GtkToolButton:first-child .button, .inline-toolbar.toolbar GtkToolButton:first-child .button:active, +.inline-toolbar.toolbar GtkToolButton:first-child .button:checked, .inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive { border-width: 1px; border-radius: 2px; @@ -2571,12 +2663,16 @@ GtkColorButton.button { .linked .button:last-child, .linked .button:active:last-child, .linked .button:active:hover:last-child, +.linked .button:checked:last-child, +.linked .button:checked:hover:last-child, .linked .button:insensitive:last-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:active:last-child, +.inline-toolbar.toolbar .button:checked:last-child, .inline-toolbar.toolbar .button:insensitive:last-child, .inline-toolbar.toolbar GtkToolButton:last-child .button, .inline-toolbar.toolbar GtkToolButton:last-child .button:active, +.inline-toolbar.toolbar GtkToolButton:last-child .button:checked, .inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive { border-width: 1px; border-radius: 2px; @@ -2590,12 +2686,16 @@ GtkColorButton.button { .linked .button:only-child, .linked .button:active:only-child, .linked .button:active:hover:only-child, +.linked .button:checked:only-child, +.linked .button:checked:hover:only-child, .linked .button:insensitive:only-child, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:active:only-child, +.inline-toolbar.toolbar .button:checked:only-child, .inline-toolbar.toolbar .button:insensitive:only-child, .inline-toolbar.toolbar GtkToolButton:only-child .button, .inline-toolbar.toolbar GtkToolButton:only-child .button:active, +.inline-toolbar.toolbar GtkToolButton:only-child .button:checked, .inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive { border-width: 1px; border-radius: 2px; @@ -2610,7 +2710,10 @@ GtkColorButton.button { .linked.vertical .button:active, .inline-toolbar.toolbar.vertical .button:active, -.inline-toolbar.toolbar.vertical GtkToolButton > .button:active { +.inline-toolbar.toolbar.vertical GtkToolButton > .button:activeactive, +.linked.vertical .button:checked, +.inline-toolbar.toolbar.vertical .button:checked, +.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked { box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2628,20 +2731,26 @@ GtkColorButton.button { .linked.vertical .button:only-child, .linked.vertical .button:insensitive:last-child, .linked.vertical .button:insensitive:only-child, -.linked.vertical .button:active *:insensitive:last-child, -.linked.vertical .button:active *:insensitive:only-child, +.linked.vertical .button:active:insensitive:last-child, +.linked.vertical .button:active:insensitive:only-child, +.linked.vertical .button:checked:insensitive:last-child, +.linked.vertical .button:checked:insensitive:only-child, .inline-toolbar.toolbar.vertical .button:last-child, .inline-toolbar.toolbar.vertical .button:only-child, .inline-toolbar.toolbar.vertical .button:insensitive:last-child, .inline-toolbar.toolbar.vertical .button:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:active:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:active:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:checked:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:checked:insensitive:only-child, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive { +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked:insensitive { box-shadow: none; } @@ -2651,7 +2760,19 @@ GtkColorButton.button { .inline-toolbar.toolbar.vertical .button:active:last-child, .inline-toolbar.toolbar.vertical .button:active:only-child, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active { +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active, +.linked.vertical .button:active:last-child, +.linked.vertical .button:active:only-child, +.inline-toolbar.toolbar.vertical .button:active:last-child, +.inline-toolbar.toolbar.vertical .button:active:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active, +.linked.vertical .button:checked:last-child, +.linked.vertical .button:checked:only-child, +.inline-toolbar.toolbar.vertical .button:checked:last-child, +.inline-toolbar.toolbar.vertical .button:checked:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2662,6 +2783,8 @@ GtkColorButton.button { .linked.vertical .button, .linked.vertical .button:active, .linked.vertical .button:active:hover, +.linked.vertical .button:checked, +.linked.vertical .button:checked:hover, .linked.vertical .button:insensitive { border-width: 1px; border-radius: 0; @@ -2674,6 +2797,8 @@ GtkColorButton.button { .linked.vertical .button:first-child, .linked.vertical .button:active:first-child, .linked.vertical .button:active:hover:first-child, +.linked.vertical .button:checked:first-child, +.linked.vertical .button:checked:hover:first-child, .linked.vertical .button:insensitive:first-child { border-width: 1px; border-radius: 2px; @@ -2687,6 +2812,8 @@ GtkColorButton.button { .linked.vertical .button:last-child, .linked.vertical .button:active:last-child, .linked.vertical .button:active:hover:last-child, +.linked.vertical .button:checked:last-child, +.linked.vertical .button:checked:hover:last-child, .linked.vertical .button:insensitive:last-child { border-width: 1px; border-radius: 2px; @@ -2700,6 +2827,8 @@ GtkColorButton.button { .linked.vertical .button:only-child, .linked.vertical .button:active:only-child, .linked.vertical .button:active:hover:only-child, +.linked.vertical .button:checked:only-child, +.linked.vertical .button:checked:hover:only-child, .linked.vertical .button:insensitive:only-child { border-width: 1px; border-radius: 2px; @@ -2718,7 +2847,11 @@ GtkColorButton.button { .primary-toolbar .raised.linked .button:active, .toolbar .button.raised.linked:active, .toolbar .raised.linked .button:active, -.toolbar .linked .button:active { +.toolbar .linked .button:active, +.primary-toolbar .raised.linked .button:checked, +.toolbar .button.raised.linked:checked, +.toolbar .raised.linked .button:checked, +.toolbar .linked .button:checked { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2738,32 +2871,42 @@ GtkColorButton.button { .primary-toolbar .button.raised.linked:only-child, .primary-toolbar .button:insensitive.raised.linked:last-child, .primary-toolbar .button:insensitive.raised.linked:only-child, -.primary-toolbar .button:active *:insensitive.raised.linked:last-child, -.primary-toolbar .button:active *:insensitive.raised.linked:only-child, +.primary-toolbar .button:active:insensitive.raised.linked:last-child, +.primary-toolbar .button:active:insensitive.raised.linked:only-child, +.primary-toolbar .button:checked:insensitive.raised.linked:last-child, +.primary-toolbar .button:checked:insensitive.raised.linked:only-child, .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:insensitive:last-child, .primary-toolbar .raised.linked .button:insensitive:only-child, -.primary-toolbar .raised.linked .button:active *:insensitive:last-child, -.primary-toolbar .raised.linked .button:active *:insensitive:only-child, +.primary-toolbar .raised.linked .button:active:insensitive:last-child, +.primary-toolbar .raised.linked .button:active:insensitive:only-child, +.primary-toolbar .raised.linked .button:checked:insensitive:last-child, +.primary-toolbar .raised.linked .button:checked:insensitive:only-child, .toolbar .button.raised.linked:last-child, .toolbar .button.raised.linked:only-child, .toolbar .button:insensitive.raised.linked:last-child, .toolbar .button:insensitive.raised.linked:only-child, -.toolbar .button:active *:insensitive.raised.linked:last-child, -.toolbar .button:active *:insensitive.raised.linked:only-child, +.toolbar .button:active:insensitive.raised.linked:last-child, +.toolbar .button:active:insensitive.raised.linked:only-child, +.toolbar .button:checked:insensitive.raised.linked:last-child, +.toolbar .button:checked:insensitive.raised.linked:only-child, .toolbar .raised.linked .button:last-child, .toolbar .raised.linked .button:only-child, .toolbar .raised.linked .button:insensitive:last-child, .toolbar .raised.linked .button:insensitive:only-child, -.toolbar .raised.linked .button:active *:insensitive:last-child, -.toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .raised.linked .button:active:insensitive:last-child, +.toolbar .raised.linked .button:active:insensitive:only-child, +.toolbar .raised.linked .button:checked:insensitive:last-child, +.toolbar .raised.linked .button:checked:insensitive:only-child, .toolbar .linked .button:last-child, .toolbar .linked .button:only-child, .toolbar .linked .button:insensitive:last-child, .toolbar .linked .button:insensitive:only-child, -.toolbar .linked .button:active *:insensitive:last-child, -.toolbar .linked .button:active *:insensitive:only-child { +.toolbar .linked .button:active:insensitive:last-child, +.toolbar .linked .button:active:insensitive:only-child +.toolbar .linked .button:checked:insensitive:last-child, +.toolbar .linked .button:checked:insensitive:only-child { box-shadow: none; } @@ -2777,7 +2920,17 @@ GtkColorButton.button { .toolbar .raised.linked .button:active:last-child, .toolbar .raised.linked .button:active:only-child, .toolbar .linked .button:active:last-child, -.toolbar .linked .button:active:only-child { +.toolbar .linked .button:active:only-child, +.primary-toolbar .button:checked.raised.linked:last-child, +.primary-toolbar .button:checked.raised.linked:only-child, +.primary-toolbar .raised.linked .button:checked:last-child, +.primary-toolbar .raised.linked .button:checked:only-child, +.toolbar .button:checked.raised.linked:last-child, +.toolbar .button:checked.raised.linked:only-child, +.toolbar .raised.linked .button:checked:last-child, +.toolbar .raised.linked .button:checked:only-child, +.toolbar .linked .button:checked:last-child, +.toolbar .linked .button:checked:only-child { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2786,18 +2939,23 @@ GtkColorButton.button { /* middle button */ .primary-toolbar .button.raised.linked, .primary-toolbar .button.raised.linked:active, +.primary-toolbar .button.raised.linked:checked, .primary-toolbar .button.raised.linked:insensitive, .primary-toolbar .raised.linked .button, .primary-toolbar .raised.linked .button:active, +.primary-toolbar .raised.linked .button:checked, .primary-toolbar .raised.linked .button:insensitive, .toolbar .button.raised.linked, .toolbar .button.raised.linked:active, +.toolbar .button.raised.linked:checked, .toolbar .button.raised.linked:insensitive, .toolbar .raised.linked .button, .toolbar .raised.linked .button:active, +.toolbar .raised.linked .button:checked, .toolbar .raised.linked .button:insensitive, .toolbar .linked .button, .toolbar .linked .button:active, +.toolbar .linked .button:checked, .toolbar .linked .button:insensitive { border-width: 1px; border-radius: 0; @@ -2808,18 +2966,23 @@ GtkColorButton.button { /* leftmost button */ .primary-toolbar .button.raised.linked:first-child, .primary-toolbar .button.raised.linked:active:first-child, +.primary-toolbar .button.raised.linked:checked:first-child, .primary-toolbar .button.raised.linked:insensitive:first-child, .primary-toolbar .raised.linked .button:first-child, .primary-toolbar .raised.linked .button:active:first-child, +.primary-toolbar .raised.linked .button:checked:first-child, .primary-toolbar .raised.linked .button:insensitive:first-child, .toolbar .button.raised.linked:first-child, .toolbar .button.raised.linked:active:first-child, +.toolbar .button.raised.linked:checked:first-child, .toolbar .button.raised.linked:insensitive:first-child, .toolbar .raised.linked .button:first-child, .toolbar .raised.linked .button:active:first-child, +.toolbar .raised.linked .button:checked:first-child, .toolbar .raised.linked .button:insensitive:first-child, .toolbar .linked .button:first-child, -.toolbar .linked .button:active:first-child { +.toolbar .linked .button:active:first-child, +.toolbar .linked .button:checked:first-child { border-width: 1px; border-radius: 2px; border-right-width: 0; @@ -2830,18 +2993,23 @@ GtkColorButton.button { /* rightmost button */ .primary-toolbar .button.raised.linked:last-child, .primary-toolbar .button.raised.linked:active:last-child, +.primary-toolbar .button.raised.linked:checked:last-child, .primary-toolbar .button.raised.linked:insensitive:last-child, .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:active:last-child, +.primary-toolbar .raised.linked .button:checked:last-child, .primary-toolbar .raised.linked .button:insensitive:last-child, .toolbar .button.raised.linked:last-child, .toolbar .button.raised.linked:active:last-child, +.toolbar .button.raised.linked:checked:last-child, .toolbar .button.raised.linked:insensitive:last-child, .toolbar .raised.linked .button:last-child, .toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:checked:last-child, .toolbar .raised.linked .button:insensitive:last-child, .toolbar .linked .button:last-child, .toolbar .linked .button:active:last-child, +.toolbar .linked .button:checked:last-child, .toolbar .linked .button:insensitive:last-child { border-width: 1px; border-radius: 2px; @@ -2853,18 +3021,23 @@ GtkColorButton.button { /* linked single button */ .primary-toolbar .button.raised.linked:only-child, .primary-toolbar .button.raised.linked:active:only-child, +.primary-toolbar .button.raised.linked:checked:only-child, .primary-toolbar .button.raised.linked:insensitive:only-child, .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:active:only-child, +.primary-toolbar .raised.linked .button:checked:only-child, .primary-toolbar .raised.linked .button:insensitive:only-child, .toolbar .button.raised.linked:only-child, .toolbar .button.raised.linked:active:only-child, +.toolbar .button.raised.linked:checked:only-child, .toolbar .button.raised.linked:insensitive:only-child, .toolbar .raised.linked .button:only-child, .toolbar .raised.linked .button:active:only-child, +.toolbar .raised.linked .button:checked:only-child, .toolbar .raised.linked .button:insensitive:only-child, .toolbar .linked .button:only-child, .toolbar .linked .button:active:only-child, +.toolbar .linked .button:checked:only-child, .toolbar .linked .button:insensitive:only-child { border-width: 1px; border-radius: 2px; @@ -2879,7 +3052,10 @@ GtkColorButton.button { .header-bar .button.raised.linked:active, .header-bar .raised.linked .button:active, -.header-bar .linked .button:active { +.header-bar .button.raised.linked:checked, +.header-bar .raised.linked .button:checked, +.header-bar .linked .button:active, +.header-bar .linked .button:checked { box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2897,20 +3073,26 @@ GtkColorButton.button { .header-bar .button.raised.linked:only-child, .header-bar .button:insensitive.raised.linked:last-child, .header-bar .button:insensitive.raised.linked:only-child, -.header-bar .button:active *:insensitive.raised.linked:last-child, -.header-bar .button:active *:insensitive.raised.linked:only-child, +.header-bar .button:active:insensitive.raised.linked:last-child, +.header-bar .button:active:insensitive.raised.linked:only-child, +.header-bar .button:checked:insensitive.raised.linked:last-child, +.header-bar .button:checked:insensitive.raised.linked:only-child, .header-bar .raised.linked .button:last-child, .header-bar .raised.linked .button:only-child, .header-bar .raised.linked .button:insensitive:last-child, .header-bar .raised.linked .button:insensitive:only-child, -.header-bar .raised.linked .button:active *:insensitive:last-child, -.header-bar .raised.linked .button:active *:insensitive:only-child, +.header-bar .raised.linked .button:active:insensitive:last-child, +.header-bar .raised.linked .button:active:insensitive:only-child, +.header-bar .raised.linked .button:checked:insensitive:last-child, +.header-bar .raised.linked .button:checked:insensitive:only-child, .header-bar .linked .button:last-child, .header-bar .linked .button:only-child, .header-bar .linked .button:insensitive:last-child, .header-bar .linked .button:insensitive:only-child, -.header-bar .linked .button:active *:insensitive:last-child, -.header-bar .linked .button:active *:insensitive:only-child { +.header-bar .linked .button:active:insensitive:last-child, +.header-bar .linked .button:active:insensitive:only-child, +.header-bar .linked .button:checked:insensitive:last-child, +.header-bar .linked .button:checked:insensitive:only-child { box-shadow: none; } @@ -2920,7 +3102,13 @@ GtkColorButton.button { .header-bar .raised.linked .button:active:last-child, .header-bar .raised.linked .button:active:only-child, .header-bar .linked .button:active:last-child, -.header-bar .linked .button:active:only-child { +.header-bar .linked .button:active:only-child, +.header-bar .button:checked.raised.linked:last-child, +.header-bar .button:checked.raised.linked:only-child, +.header-bar .raised.linked .button:checked:last-child, +.header-bar .raised.linked .button:checked:only-child, +.header-bar .linked .button:checked:last-child, +.header-bar .linked .button:checked:only-child { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2929,12 +3117,15 @@ GtkColorButton.button { /* middle button */ .header-bar .button.raised.linked, .header-bar .button.raised.linked:active, +.header-bar .button.raised.linked:checked, .header-bar .button.raised.linked:insensitive, .header-bar .raised.linked .button, .header-bar .raised.linked .button:active, +.header-bar .raised.linked .button:checked, .header-bar .raised.linked .button:insensitive, .header-bar .linked .button, .header-bar .linked .button:active, +.header-bar .linked .button:checked, .header-bar .linked .button:insensitive { border-width: 1px; border-radius: 0; @@ -2962,12 +3153,15 @@ GtkColorButton.button { /* rightmost button */ .header-bar .button.raised.linked:last-child, .header-bar .button.raised.linked:active:last-child, +.header-bar .button.raised.linked:checked:last-child, .header-bar .button.raised.linked:insensitive:last-child, .header-bar .raised.linked .button:last-child, .header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:checked:last-child, .header-bar .raised.linked .button:insensitive:last-child, .header-bar .linked .button:last-child, .header-bar .linked .button:active:last-child, +.header-bar .linked .button:checked:last-child, .header-bar .linked .button:insensitive:last-child { border-width: 1px; border-radius: 2px; @@ -2979,12 +3173,15 @@ GtkColorButton.button { /* linked single button */ .header-bar .button.raised.linked:only-child, .header-bar .button.raised.linked:active:only-child, +.header-bar .button.raised.linked:checked:only-child, .header-bar .button.raised.linked:insensitive:only-child, .header-bar .raised.linked .button:only-child, .header-bar .raised.linked .button:active:only-child, +.header-bar .raised.linked .button:checked:only-child, .header-bar .raised.linked .button:insensitive:only-child, .header-bar .linked .button:only-child, .header-bar .linked .button:active:only-child, +.header-bar .linked .button:checked:only-child, .header-bar .linked .button:insensitive:only-child { border-width: 1px; border-radius: 2px; @@ -3199,7 +3396,10 @@ GtkOverlay.osd { .osd.button:active, .osd .button:active, -.osd GtkMenuButton.button:active { +.osd GtkMenuButton.button:active, +.osd.button:checked, +.osd .button:checked, +.osd GtkMenuButton.button:checked { border-color: shade(@osd_bg, 0.8); background-color: shade(@osd_bg, 0.95); background-image: none; @@ -3207,7 +3407,10 @@ GtkOverlay.osd { .osd.button:active:hover, .osd .button:active:hover, -.osd GtkMenuButton.button:active:hover { +.osd GtkMenuButton.button:active:hover, +.osd.button:checked:hover, +.osd .button:checked:hover, +.osd GtkMenuButton.button:checked:hover { border-color: shade(@osd_bg, 0.7); } @@ -3218,8 +3421,10 @@ GtkOverlay.osd { background-image: none; } -.osd.button:active *:insensitive, -.osd .button:active *:insensitive { +.osd.button:active:insensitive, +.osd .button:active:insensitive, +.osd.button:checked:insensitive, +.osd .button:checked:insensitive { background-color: shade(@osd_bg, 0.80); background-image: none; } @@ -3254,20 +3459,24 @@ GtkOverlay.osd { background-image: none; } -.osd.toolbar .button:active { +.osd.toolbar .button:active, +.osd.toolbar .button:checked { border-color: shade(@osd_bg, 0.8); background-color: shade(@osd_bg, 0.95); background-image: none; } -.osd.toolbar .button:active:hover { +.osd.toolbar .button:active:hover, +.osd.toolbar .button:checked:hover { border-color: shade(@osd_bg, 0.7); } .osd.toolbar .button:focus, .osd.toolbar .button:hover:focus, .osd.toolbar .button:active:focus, -.osd.toolbar .button:active:hover:focus { +.osd.toolbar .button:active:hover:focus, +.osd.toolbar .button:checked:focus, +.osd.toolbar .button:checked:hover:focus { border-color: shade(@osd_bg, 0.7); } @@ -3277,7 +3486,8 @@ GtkOverlay.osd { background-image: none; } -.osd.toolbar .button:active *:insensitive { +.osd.toolbar .button:active:insensitive, +.osd.toolbar .button:checked:insensitive { border-color: shade(@osd_bg, 0.75); background-color: shade(@osd_bg, 0.80); background-image: none; @@ -3453,7 +3663,8 @@ GtkProgressBar.osd.progressbar { background-image: none; } -.destructive-action.button:active { +.destructive-action.button:active, +.destructive-action.button:checked { border-color: shade(@error_color, 0.8); background-color: shade(@error_color, 0.87); background-image: none; @@ -3482,13 +3693,15 @@ GtkProgressBar.osd.progressbar { background-image: none; } -.suggested-action.button:active { +.suggested-action.button:active, +.suggested-action.button:checked { border-color: shade(@theme_selected_bg_color, 0.9); background-color: shade(@theme_selected_bg_color, 1.05); background-image: none; } -.suggested-action.button:hover:active { +.suggested-action.button:hover:active, +.suggested-action.button:hover:checked { border-color: shade(@theme_selected_bg_color, 0.8); } @@ -3536,7 +3749,10 @@ GtkProgressBar.osd.progressbar { .selection-mode.header-bar .button:active, .selection-mode.toolbar .button:active, -.selection-mode.toolbar GtkToolButton .button:active { +.selection-mode.toolbar GtkToolButton .button:active, +.selection-mode.header-bar .button:checked, +.selection-mode.toolbar .button:checked, +.selection-mode.toolbar GtkToolButton .button:checked { border-color: shade(@theme_selected_bg_color, 0.9); background-color: shade(@theme_selected_bg_color, 1.55); background-image: none; @@ -3571,7 +3787,10 @@ GtkProgressBar.osd.progressbar { .selection-mode.header-bar .suggested-action.button:active, .selection-mode.toolbar .suggested-action.button:active, -.selection-mode.toolbar GtkToolButton.suggested-action:active { +.selection-mode.toolbar GtkToolButton.suggested-action:active, +.selection-mode.header-bar .suggested-action.button:checked, +.selection-mode.toolbar .suggested-action.button:checked, +.selection-mode.toolbar GtkToolButton.suggested-action:checked { border-color: shade(@theme_selected_bg_color, 0.9); background-color: shade(@theme_selected_bg_color, 1.05); background-image: none; @@ -3579,7 +3798,10 @@ GtkProgressBar.osd.progressbar { .selection-mode.header-bar .suggested-action.button:hover:active, .selection-mode.toolbar .suggested-action.button:hover:active, -.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active { +.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active, +.selection-mode.header-bar .suggested-action.button:hover:checked, +.selection-mode.toolbar .suggested-action.button:hover:checked, +.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked { border-color: shade(@theme_selected_bg_color, 0.8); } @@ -3605,7 +3827,9 @@ GtkProgressBar.osd.progressbar { } .selection-mode.header-bar .selection-menu.button:active, -.selection-mode.toolbar .selection-menu.button:active { +.selection-mode.toolbar .selection-menu.button:active, +.selection-mode.header-bar .selection-menu.button:checked, +.selection-mode.toolbar .selection-menu.button:checked { color: shade(@theme_selected_bg_color, 0.8); box-shadow: none; } @@ -3680,7 +3904,9 @@ GtkBubbleWindow .toolbar { } .titlebar .titlebutton:active, -.titlebar .titlebutton:active:hover { +.titlebar .titlebutton:active:hover, +.titlebar .titlebutton:checked, +.titlebar .titlebutton:checked:hover { background: none; color: shade(@theme_selected_bg_color, 0.9); box-shadow: none; diff --git a/gtk-3.0/thumbnail.png b/gtk-3.0/thumbnail.png new file mode 100644 index 0000000..4f51185 Binary files /dev/null and b/gtk-3.0/thumbnail.png differ diff --git a/metacity-1/thumbnail.png b/metacity-1/thumbnail.png new file mode 100644 index 0000000..e656d16 Binary files /dev/null and b/metacity-1/thumbnail.png differ