diff --git a/.themes/oomox-numix-gruvbox/assets/all-assets.svg b/.themes/oomox-gruvbox/assets/all-assets.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/assets/all-assets.svg rename to .themes/oomox-gruvbox/assets/all-assets.svg diff --git a/.themes/oomox-numix-gruvbox/assets/all-assets.txt b/.themes/oomox-gruvbox/assets/all-assets.txt similarity index 100% rename from .themes/oomox-numix-gruvbox/assets/all-assets.txt rename to .themes/oomox-gruvbox/assets/all-assets.txt diff --git a/.themes/oomox-numix-gruvbox/assets/change_dpi.sh b/.themes/oomox-gruvbox/assets/change_dpi.sh similarity index 100% rename from .themes/oomox-numix-gruvbox/assets/change_dpi.sh rename to .themes/oomox-gruvbox/assets/change_dpi.sh diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-checked-dark.svg b/.themes/oomox-gruvbox/assets/checkbox-checked-dark.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/checkbox-checked-dark.svg rename to .themes/oomox-gruvbox/assets/checkbox-checked-dark.svg index f89adcc9..c26be075 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-checked-dark.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-checked-dark.svg @@ -1,10 +1,10 @@ - - - - + + + + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-checked-insensitive-dark.svg b/.themes/oomox-gruvbox/assets/checkbox-checked-insensitive-dark.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/checkbox-checked-insensitive-dark.svg rename to .themes/oomox-gruvbox/assets/checkbox-checked-insensitive-dark.svg index 2fe23421..20d326aa 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-checked-insensitive-dark.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-checked-insensitive-dark.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-checked-insensitive.svg b/.themes/oomox-gruvbox/assets/checkbox-checked-insensitive.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/checkbox-checked-insensitive.svg rename to .themes/oomox-gruvbox/assets/checkbox-checked-insensitive.svg index 2fe23421..20d326aa 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-checked-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-checked-insensitive.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-checked.svg b/.themes/oomox-gruvbox/assets/checkbox-checked.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/checkbox-checked.svg rename to .themes/oomox-gruvbox/assets/checkbox-checked.svg index 4fa11fb9..206391a3 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-checked.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-checked.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-mixed-dark.svg b/.themes/oomox-gruvbox/assets/checkbox-mixed-dark.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/checkbox-mixed-dark.svg rename to .themes/oomox-gruvbox/assets/checkbox-mixed-dark.svg index 235a023f..62694bd8 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-mixed-dark.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-mixed-dark.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-mixed-insensitive-dark.svg b/.themes/oomox-gruvbox/assets/checkbox-mixed-insensitive-dark.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/checkbox-mixed-insensitive-dark.svg rename to .themes/oomox-gruvbox/assets/checkbox-mixed-insensitive-dark.svg index 89f1136d..644672ee 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-mixed-insensitive-dark.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-mixed-insensitive-dark.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-mixed-insensitive.svg b/.themes/oomox-gruvbox/assets/checkbox-mixed-insensitive.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/checkbox-mixed-insensitive.svg rename to .themes/oomox-gruvbox/assets/checkbox-mixed-insensitive.svg index 89f1136d..644672ee 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-mixed-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-mixed-insensitive.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-mixed.svg b/.themes/oomox-gruvbox/assets/checkbox-mixed.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/checkbox-mixed.svg rename to .themes/oomox-gruvbox/assets/checkbox-mixed.svg index 235a023f..62694bd8 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-mixed.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-mixed.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-unchecked-dark.svg b/.themes/oomox-gruvbox/assets/checkbox-unchecked-dark.svg similarity index 90% rename from .themes/oomox-numix-gruvbox/assets/checkbox-unchecked-dark.svg rename to .themes/oomox-gruvbox/assets/checkbox-unchecked-dark.svg index b9f2e915..9fd8461a 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-unchecked-dark.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-unchecked-dark.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-unchecked-insensitive-dark.svg b/.themes/oomox-gruvbox/assets/checkbox-unchecked-insensitive-dark.svg similarity index 93% rename from .themes/oomox-numix-gruvbox/assets/checkbox-unchecked-insensitive-dark.svg rename to .themes/oomox-gruvbox/assets/checkbox-unchecked-insensitive-dark.svg index d78dc7f5..61bd771e 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-unchecked-insensitive-dark.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-unchecked-insensitive-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-unchecked-insensitive.svg b/.themes/oomox-gruvbox/assets/checkbox-unchecked-insensitive.svg similarity index 93% rename from .themes/oomox-numix-gruvbox/assets/checkbox-unchecked-insensitive.svg rename to .themes/oomox-gruvbox/assets/checkbox-unchecked-insensitive.svg index d78dc7f5..61bd771e 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-unchecked-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-unchecked-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/checkbox-unchecked.svg b/.themes/oomox-gruvbox/assets/checkbox-unchecked.svg similarity index 90% rename from .themes/oomox-numix-gruvbox/assets/checkbox-unchecked.svg rename to .themes/oomox-gruvbox/assets/checkbox-unchecked.svg index b9f2e915..9fd8461a 100644 --- a/.themes/oomox-numix-gruvbox/assets/checkbox-unchecked.svg +++ b/.themes/oomox-gruvbox/assets/checkbox-unchecked.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/grid-selection-checked-dark.svg b/.themes/oomox-gruvbox/assets/grid-selection-checked-dark.svg similarity index 93% rename from .themes/oomox-numix-gruvbox/assets/grid-selection-checked-dark.svg rename to .themes/oomox-gruvbox/assets/grid-selection-checked-dark.svg index 70af1579..38afda13 100644 --- a/.themes/oomox-numix-gruvbox/assets/grid-selection-checked-dark.svg +++ b/.themes/oomox-gruvbox/assets/grid-selection-checked-dark.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/grid-selection-checked.svg b/.themes/oomox-gruvbox/assets/grid-selection-checked.svg similarity index 93% rename from .themes/oomox-numix-gruvbox/assets/grid-selection-checked.svg rename to .themes/oomox-gruvbox/assets/grid-selection-checked.svg index 70af1579..38afda13 100644 --- a/.themes/oomox-numix-gruvbox/assets/grid-selection-checked.svg +++ b/.themes/oomox-gruvbox/assets/grid-selection-checked.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/grid-selection-unchecked-dark.svg b/.themes/oomox-gruvbox/assets/grid-selection-unchecked-dark.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/grid-selection-unchecked-dark.svg rename to .themes/oomox-gruvbox/assets/grid-selection-unchecked-dark.svg index 402bd9e9..25426b49 100644 --- a/.themes/oomox-numix-gruvbox/assets/grid-selection-unchecked-dark.svg +++ b/.themes/oomox-gruvbox/assets/grid-selection-unchecked-dark.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/grid-selection-unchecked.svg b/.themes/oomox-gruvbox/assets/grid-selection-unchecked.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/grid-selection-unchecked.svg rename to .themes/oomox-gruvbox/assets/grid-selection-unchecked.svg index 402bd9e9..25426b49 100644 --- a/.themes/oomox-numix-gruvbox/assets/grid-selection-unchecked.svg +++ b/.themes/oomox-gruvbox/assets/grid-selection-unchecked.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-checked-hover.svg b/.themes/oomox-gruvbox/assets/menuitem-checkbox-checked-hover.svg similarity index 94% rename from .themes/oomox-numix-gruvbox/assets/menuitem-checkbox-checked-hover.svg rename to .themes/oomox-gruvbox/assets/menuitem-checkbox-checked-hover.svg index 46e63d2c..a1ffba4b 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-checked-hover.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-checkbox-checked-hover.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-checked-insensitive.svg b/.themes/oomox-gruvbox/assets/menuitem-checkbox-checked-insensitive.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/menuitem-checkbox-checked-insensitive.svg rename to .themes/oomox-gruvbox/assets/menuitem-checkbox-checked-insensitive.svg index 9b81a2e0..6cb7be4f 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-checked-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-checkbox-checked-insensitive.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-checked.svg b/.themes/oomox-gruvbox/assets/menuitem-checkbox-checked.svg similarity index 94% rename from .themes/oomox-numix-gruvbox/assets/menuitem-checkbox-checked.svg rename to .themes/oomox-gruvbox/assets/menuitem-checkbox-checked.svg index a1f3e2f4..bebd85da 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-checked.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-checkbox-checked.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed-hover.svg b/.themes/oomox-gruvbox/assets/menuitem-checkbox-mixed-hover.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed-hover.svg rename to .themes/oomox-gruvbox/assets/menuitem-checkbox-mixed-hover.svg index 503d9dd1..3c244300 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed-hover.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-checkbox-mixed-hover.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed-insensitive.svg b/.themes/oomox-gruvbox/assets/menuitem-checkbox-mixed-insensitive.svg similarity index 89% rename from .themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed-insensitive.svg rename to .themes/oomox-gruvbox/assets/menuitem-checkbox-mixed-insensitive.svg index 4c9ffacd..ae8dcc5d 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-checkbox-mixed-insensitive.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed-selected.svg b/.themes/oomox-gruvbox/assets/menuitem-checkbox-mixed-selected.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed-selected.svg rename to .themes/oomox-gruvbox/assets/menuitem-checkbox-mixed-selected.svg index c952e254..d0c9e4db 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed-selected.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-checkbox-mixed-selected.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed.svg b/.themes/oomox-gruvbox/assets/menuitem-checkbox-mixed.svg similarity index 89% rename from .themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed.svg rename to .themes/oomox-gruvbox/assets/menuitem-checkbox-mixed.svg index 503d9dd1..2e2b1b63 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-mixed.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-checkbox-mixed.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-unchecked.svg b/.themes/oomox-gruvbox/assets/menuitem-checkbox-unchecked.svg similarity index 93% rename from .themes/oomox-numix-gruvbox/assets/menuitem-checkbox-unchecked.svg rename to .themes/oomox-gruvbox/assets/menuitem-checkbox-unchecked.svg index 3ad57d06..d5a6b0c5 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-checkbox-unchecked.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-checkbox-unchecked.svg @@ -1,6 +1,6 @@ - + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-checked-hover.svg b/.themes/oomox-gruvbox/assets/menuitem-radio-checked-hover.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/menuitem-radio-checked-hover.svg rename to .themes/oomox-gruvbox/assets/menuitem-radio-checked-hover.svg index 86debc10..767bcc0c 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-checked-hover.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-radio-checked-hover.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-checked-insensitive.svg b/.themes/oomox-gruvbox/assets/menuitem-radio-checked-insensitive.svg similarity index 88% rename from .themes/oomox-numix-gruvbox/assets/menuitem-radio-checked-insensitive.svg rename to .themes/oomox-gruvbox/assets/menuitem-radio-checked-insensitive.svg index 4134ea0e..ef10e021 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-checked-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-radio-checked-insensitive.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-checked.svg b/.themes/oomox-gruvbox/assets/menuitem-radio-checked.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/menuitem-radio-checked.svg rename to .themes/oomox-gruvbox/assets/menuitem-radio-checked.svg index 65b2cc94..ceb12d90 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-checked.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-radio-checked.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed-hover.svg b/.themes/oomox-gruvbox/assets/menuitem-radio-mixed-hover.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed-hover.svg rename to .themes/oomox-gruvbox/assets/menuitem-radio-mixed-hover.svg index 46ea7c47..144db812 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed-hover.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-radio-mixed-hover.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed-insensitive.svg b/.themes/oomox-gruvbox/assets/menuitem-radio-mixed-insensitive.svg similarity index 87% rename from .themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed-insensitive.svg rename to .themes/oomox-gruvbox/assets/menuitem-radio-mixed-insensitive.svg index a43d6396..6eae53ac 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-radio-mixed-insensitive.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed-selected.svg b/.themes/oomox-gruvbox/assets/menuitem-radio-mixed-selected.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed-selected.svg rename to .themes/oomox-gruvbox/assets/menuitem-radio-mixed-selected.svg index a3a5f750..ef5eefc5 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed-selected.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-radio-mixed-selected.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed.svg b/.themes/oomox-gruvbox/assets/menuitem-radio-mixed.svg similarity index 87% rename from .themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed.svg rename to .themes/oomox-gruvbox/assets/menuitem-radio-mixed.svg index 46ea7c47..0c82e9c2 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-mixed.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-radio-mixed.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-unchecked.svg b/.themes/oomox-gruvbox/assets/menuitem-radio-unchecked.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/assets/menuitem-radio-unchecked.svg rename to .themes/oomox-gruvbox/assets/menuitem-radio-unchecked.svg index 7391d222..50485850 100644 --- a/.themes/oomox-numix-gruvbox/assets/menuitem-radio-unchecked.svg +++ b/.themes/oomox-gruvbox/assets/menuitem-radio-unchecked.svg @@ -1,6 +1,6 @@ - + diff --git a/.themes/oomox-numix-gruvbox/assets/pane-handle-vertical.svg b/.themes/oomox-gruvbox/assets/pane-handle-vertical.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/pane-handle-vertical.svg rename to .themes/oomox-gruvbox/assets/pane-handle-vertical.svg index c1dd3fcd..988738d2 100644 --- a/.themes/oomox-numix-gruvbox/assets/pane-handle-vertical.svg +++ b/.themes/oomox-gruvbox/assets/pane-handle-vertical.svg @@ -14,7 +14,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/.themes/oomox-numix-gruvbox/assets/pane-handle.png b/.themes/oomox-gruvbox/assets/pane-handle.png similarity index 100% rename from .themes/oomox-numix-gruvbox/assets/pane-handle.png rename to .themes/oomox-gruvbox/assets/pane-handle.png diff --git a/.themes/oomox-numix-gruvbox/assets/pane-handle.svg b/.themes/oomox-gruvbox/assets/pane-handle.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/pane-handle.svg rename to .themes/oomox-gruvbox/assets/pane-handle.svg index 6d8a18bc..d6a6a939 100644 --- a/.themes/oomox-numix-gruvbox/assets/pane-handle.svg +++ b/.themes/oomox-gruvbox/assets/pane-handle.svg @@ -14,7 +14,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/.themes/oomox-numix-gruvbox/assets/pane-handle@2.png b/.themes/oomox-gruvbox/assets/pane-handle@2.png similarity index 100% rename from .themes/oomox-numix-gruvbox/assets/pane-handle@2.png rename to .themes/oomox-gruvbox/assets/pane-handle@2.png diff --git a/.themes/oomox-numix-gruvbox/assets/radio-checked-dark.svg b/.themes/oomox-gruvbox/assets/radio-checked-dark.svg similarity index 90% rename from .themes/oomox-numix-gruvbox/assets/radio-checked-dark.svg rename to .themes/oomox-gruvbox/assets/radio-checked-dark.svg index cd5b49a2..3b785b6b 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-checked-dark.svg +++ b/.themes/oomox-gruvbox/assets/radio-checked-dark.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-checked-insensitive-dark.svg b/.themes/oomox-gruvbox/assets/radio-checked-insensitive-dark.svg similarity index 90% rename from .themes/oomox-numix-gruvbox/assets/radio-checked-insensitive-dark.svg rename to .themes/oomox-gruvbox/assets/radio-checked-insensitive-dark.svg index cb3f82e2..c5019089 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-checked-insensitive-dark.svg +++ b/.themes/oomox-gruvbox/assets/radio-checked-insensitive-dark.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-checked-insensitive.svg b/.themes/oomox-gruvbox/assets/radio-checked-insensitive.svg similarity index 90% rename from .themes/oomox-numix-gruvbox/assets/radio-checked-insensitive.svg rename to .themes/oomox-gruvbox/assets/radio-checked-insensitive.svg index cb3f82e2..c5019089 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-checked-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/radio-checked-insensitive.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-checked.svg b/.themes/oomox-gruvbox/assets/radio-checked.svg similarity index 90% rename from .themes/oomox-numix-gruvbox/assets/radio-checked.svg rename to .themes/oomox-gruvbox/assets/radio-checked.svg index cd5b49a2..3b785b6b 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-checked.svg +++ b/.themes/oomox-gruvbox/assets/radio-checked.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-mixed-dark.svg b/.themes/oomox-gruvbox/assets/radio-mixed-dark.svg similarity index 89% rename from .themes/oomox-numix-gruvbox/assets/radio-mixed-dark.svg rename to .themes/oomox-gruvbox/assets/radio-mixed-dark.svg index 6cfaf63d..4891f088 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-mixed-dark.svg +++ b/.themes/oomox-gruvbox/assets/radio-mixed-dark.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-mixed-insensitive-dark.svg b/.themes/oomox-gruvbox/assets/radio-mixed-insensitive-dark.svg similarity index 89% rename from .themes/oomox-numix-gruvbox/assets/radio-mixed-insensitive-dark.svg rename to .themes/oomox-gruvbox/assets/radio-mixed-insensitive-dark.svg index 9a445813..4d5ec1c6 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-mixed-insensitive-dark.svg +++ b/.themes/oomox-gruvbox/assets/radio-mixed-insensitive-dark.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-mixed-insensitive.svg b/.themes/oomox-gruvbox/assets/radio-mixed-insensitive.svg similarity index 89% rename from .themes/oomox-numix-gruvbox/assets/radio-mixed-insensitive.svg rename to .themes/oomox-gruvbox/assets/radio-mixed-insensitive.svg index 9a445813..4d5ec1c6 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-mixed-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/radio-mixed-insensitive.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-mixed.svg b/.themes/oomox-gruvbox/assets/radio-mixed.svg similarity index 89% rename from .themes/oomox-numix-gruvbox/assets/radio-mixed.svg rename to .themes/oomox-gruvbox/assets/radio-mixed.svg index 6cfaf63d..4891f088 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-mixed.svg +++ b/.themes/oomox-gruvbox/assets/radio-mixed.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-selected-insensitive.svg b/.themes/oomox-gruvbox/assets/radio-selected-insensitive.svg similarity index 90% rename from .themes/oomox-numix-gruvbox/assets/radio-selected-insensitive.svg rename to .themes/oomox-gruvbox/assets/radio-selected-insensitive.svg index cb3f82e2..c5019089 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-selected-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/radio-selected-insensitive.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-selected.svg b/.themes/oomox-gruvbox/assets/radio-selected.svg similarity index 90% rename from .themes/oomox-numix-gruvbox/assets/radio-selected.svg rename to .themes/oomox-gruvbox/assets/radio-selected.svg index cd5b49a2..3b785b6b 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-selected.svg +++ b/.themes/oomox-gruvbox/assets/radio-selected.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-unchecked-dark.svg b/.themes/oomox-gruvbox/assets/radio-unchecked-dark.svg similarity index 88% rename from .themes/oomox-numix-gruvbox/assets/radio-unchecked-dark.svg rename to .themes/oomox-gruvbox/assets/radio-unchecked-dark.svg index aaa3448e..2ae1b874 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-unchecked-dark.svg +++ b/.themes/oomox-gruvbox/assets/radio-unchecked-dark.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-unchecked-insensitive-dark.svg b/.themes/oomox-gruvbox/assets/radio-unchecked-insensitive-dark.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/radio-unchecked-insensitive-dark.svg rename to .themes/oomox-gruvbox/assets/radio-unchecked-insensitive-dark.svg index e3ba20f5..d5482397 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-unchecked-insensitive-dark.svg +++ b/.themes/oomox-gruvbox/assets/radio-unchecked-insensitive-dark.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-unchecked-insensitive.svg b/.themes/oomox-gruvbox/assets/radio-unchecked-insensitive.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/radio-unchecked-insensitive.svg rename to .themes/oomox-gruvbox/assets/radio-unchecked-insensitive.svg index e3ba20f5..d5482397 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-unchecked-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/radio-unchecked-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-unchecked.svg b/.themes/oomox-gruvbox/assets/radio-unchecked.svg similarity index 88% rename from .themes/oomox-numix-gruvbox/assets/radio-unchecked.svg rename to .themes/oomox-gruvbox/assets/radio-unchecked.svg index aaa3448e..2ae1b874 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-unchecked.svg +++ b/.themes/oomox-gruvbox/assets/radio-unchecked.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-unselected-dark.svg b/.themes/oomox-gruvbox/assets/radio-unselected-dark.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/assets/radio-unselected-dark.svg rename to .themes/oomox-gruvbox/assets/radio-unselected-dark.svg diff --git a/.themes/oomox-numix-gruvbox/assets/radio-unselected-insensitive-dark.svg b/.themes/oomox-gruvbox/assets/radio-unselected-insensitive-dark.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/assets/radio-unselected-insensitive-dark.svg rename to .themes/oomox-gruvbox/assets/radio-unselected-insensitive-dark.svg diff --git a/.themes/oomox-numix-gruvbox/assets/radio-unselected-insensitive.svg b/.themes/oomox-gruvbox/assets/radio-unselected-insensitive.svg similarity index 92% rename from .themes/oomox-numix-gruvbox/assets/radio-unselected-insensitive.svg rename to .themes/oomox-gruvbox/assets/radio-unselected-insensitive.svg index e3ba20f5..d5482397 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-unselected-insensitive.svg +++ b/.themes/oomox-gruvbox/assets/radio-unselected-insensitive.svg @@ -1,8 +1,8 @@ - - + + diff --git a/.themes/oomox-numix-gruvbox/assets/radio-unselected.svg b/.themes/oomox-gruvbox/assets/radio-unselected.svg similarity index 88% rename from .themes/oomox-numix-gruvbox/assets/radio-unselected.svg rename to .themes/oomox-gruvbox/assets/radio-unselected.svg index aaa3448e..2ae1b874 100644 --- a/.themes/oomox-numix-gruvbox/assets/radio-unselected.svg +++ b/.themes/oomox-gruvbox/assets/radio-unselected.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/.themes/oomox-numix-gruvbox/assets/sed.sh b/.themes/oomox-gruvbox/assets/sed.sh similarity index 55% rename from .themes/oomox-numix-gruvbox/assets/sed.sh rename to .themes/oomox-gruvbox/assets/sed.sh index 1967fb83..1b502fed 100755 --- a/.themes/oomox-numix-gruvbox/assets/sed.sh +++ b/.themes/oomox-gruvbox/assets/sed.sh @@ -1,9 +1,9 @@ #!/bin/sh sed -i \ - -e 's/#282828/rgb(0%,0%,0%)/g' \ + -e 's/#32302f/rgb(0%,0%,0%)/g' \ -e 's/#ebdbb2/rgb(100%,100%,100%)/g' \ - -e 's/#30302f/rgb(50%,0%,0%)/g' \ + -e 's/#282828/rgb(50%,0%,0%)/g' \ -e 's/#83a598/rgb(0%,50%,0%)/g' \ - -e 's/#30302f/rgb(50%,0%,50%)/g' \ + -e 's/#32302f/rgb(50%,0%,50%)/g' \ -e 's/#ebdbb2/rgb(0%,0%,50%)/g' \ $@ diff --git a/.themes/oomox-numix-gruvbox/assets/unsed.sh b/.themes/oomox-gruvbox/assets/unsed.sh similarity index 52% rename from .themes/oomox-numix-gruvbox/assets/unsed.sh rename to .themes/oomox-gruvbox/assets/unsed.sh index df9bea24..f54e1f52 100755 --- a/.themes/oomox-numix-gruvbox/assets/unsed.sh +++ b/.themes/oomox-gruvbox/assets/unsed.sh @@ -1,11 +1,11 @@ #!/bin/sh sed -i \ - -e 's/rgb(0%,0%,0%)/#282828/g' \ + -e 's/rgb(0%,0%,0%)/#32302f/g' \ -e 's/rgb(100%,100%,100%)/#ebdbb2/g' \ - -e 's/rgb(50%,0%,0%)/#30302f/g' \ + -e 's/rgb(50%,0%,0%)/#282828/g' \ -e 's/rgb(0%,50%,0%)/#83a598/g' \ -e 's/rgb(0%,50.196078%,0%)/#83a598/g' \ - -e 's/rgb(50%,0%,50%)/#30302f/g' \ - -e 's/rgb(50.196078%,0%,50.196078%)/#30302f/g' \ + -e 's/rgb(50%,0%,50%)/#32302f/g' \ + -e 's/rgb(50.196078%,0%,50.196078%)/#32302f/g' \ -e 's/rgb(0%,0%,50%)/#ebdbb2/g' \ $@ diff --git a/.themes/oomox-numix-gruvbox/gtk-2.0/gtkrc b/.themes/oomox-gruvbox/gtk-2.0/gtkrc similarity index 82% rename from .themes/oomox-numix-gruvbox/gtk-2.0/gtkrc rename to .themes/oomox-gruvbox/gtk-2.0/gtkrc index eeb1db14..323edf06 100644 --- a/.themes/oomox-numix-gruvbox/gtk-2.0/gtkrc +++ b/.themes/oomox-gruvbox/gtk-2.0/gtkrc @@ -1,24 +1,20 @@ # Oomox GTK Theme (Numix Fork) gtk-color-scheme = -"base_color:#30302f\nbg_color:#282828\ntooltip_bg_color:#282828\nselected_bg_color:#83a598\ntext_color:#ebdbb2\nfg_color:#ebdbb2\ntooltip_fg_color:#ebdbb2\nselected_fg_color:#ebdbb2\nmenubar_bg_color:#30302f\nmenubar_fg_color:#ebdbb2\ntoolbar_bg_color:#282828\ntoolbar_fg_color:#ebdbb2\nmenu_bg_color:#30302f\nmenu_fg_color:#ebdbb2\npanel_bg_color:#282828\npanel_fg_color:#ebdbb2\nlink_color:#83a598\nbtn_bg_color:#32302f\nbtn_fg_color:#ebdbb2\ntitlebar_bg_color:#30302f\ntitlebar_fg_color:#ebdbb2\nprimary_caret_color:#282828\nsecondary_caret_color:#282828\n" +"base_color:#32302f\nbg_color:#32302f\ntooltip_bg_color:#32302f\nselected_bg_color:#83a598\ntext_color:#ebdbb2\nfg_color:#ebdbb2\ntooltip_fg_color:#ebdbb2\nselected_fg_color:#ebdbb2\nmenubar_bg_color:#282828\nmenubar_fg_color:#d5c4a1\ntoolbar_bg_color:#32302f\ntoolbar_fg_color:#ebdbb2\nmenu_bg_color:#282828\nmenu_fg_color:#d5c4a1\npanel_bg_color:#32302f\npanel_fg_color:#ebdbb2\nlink_color:#9400af\nbtn_bg_color:#32302f\nbtn_fg_color:#ebdbb2\ntitlebar_bg_color:#282828\ntitlebar_fg_color:#d5c4a1\nprimary_caret_color:#282828\nsecondary_caret_color:#282828\n" # Default Style style "murrine-default" { GtkArrow::arrow-scaling= 0.6 - GtkWidget::cursor_color = @primary_caret_color - GtkWidget::secondary_cursor_color = @secondary_caret_color - GtkWidget::cursor_aspect_ratio = 0.04 - GtkButton::child-displacement-x = 0 GtkButton::child-displacement-y = 0 GtkButton::default-border = { 0, 0, 0, 0 } - GtkButtonBox::child-min-height = 26 + GtkButtonBox::child-min-height = 52 - GtkCheckButton::indicator-size = 16 + GtkCheckButton::indicator-size = 30 # The following line hints to gecko (and possibly other appliations) # that the entry should be drawn transparently on the canvas. @@ -26,31 +22,31 @@ style "murrine-default" { GtkEntry::honors-transparent-bg-hint = 1 GtkEntry::state-hint = 0 - GtkExpander::expander-size = 16 + GtkExpander::expander-size = 30 GtkImage::x-ayatana-indicator-dynamic = 1 - GtkMenu::horizontal-padding = 0 - GtkMenu::vertical-padding = 0 + GtkMenu::horizontal-padding = 2 + GtkMenu::vertical-padding = 2 - GtkMenuBar::internal-padding = 0 + GtkMenuBar::internal-padding = 1 GtkMenuBar::window-dragging = 1 GtkMenuItem::arrow-scaling= 0.5 GtkPaned::handle-size = 1 - GtkProgressBar::min-horizontal-bar-height = 12 - GtkProgressBar::min-vertical-bar-width = 12 + GtkProgressBar::min-horizontal-bar-height = 14 + GtkProgressBar::min-vertical-bar-width = 14 GtkRange::trough-border = 0 - GtkRange::slider-width = 12 - GtkRange::stepper-size = 12 + GtkRange::slider-width = 24 + GtkRange::stepper-size = 24 GtkRange::stepper_spacing = 0 GtkRange::trough-under-steppers = 1 - GtkScale::slider-length = 16 - GtkScale::slider-width = 16 + GtkScale::slider-length = 30 + GtkScale::slider-width = 30 GtkScale::trough-side-details = 1 GtkScrollbar::activate-slider = 1 @@ -58,8 +54,8 @@ style "murrine-default" { GtkScrollbar::has-forward-stepper = 0 GtkScrollbar::has-secondary-backward-stepper = 0 GtkScrollbar::has-secondary-forward-stepper = 0 - GtkScrollbar::min-slider-length = 80 - GtkScrollbar::slider-width = 12 + GtkScrollbar::min-slider-length = 160 + GtkScrollbar::slider-width = 24 GtkScrollbar::trough-border = 0 GtkScrolledWindow::scrollbar-spacing = 0 @@ -69,20 +65,20 @@ style "murrine-default" { GtkToolbar::internal-padding = 0 - GtkTreeView::expander-size = 11 + GtkTreeView::expander-size = 22 GtkTreeView::vertical-separator = 0 - GtkWidget::focus-line-width = 1 + GtkWidget::focus-line-width = 2 # The following line prevents the Firefox tabs # from jumping a few pixels when you create a new tab GtkWidget::focus-padding = 0 GtkWidget::wide-separators = 1 - GtkWidget::separator-width = 1 - GtkWidget::separator-height = 1 + GtkWidget::separator-width = 2 + GtkWidget::separator-height = 2 - GtkWindow::resize-grip-height = 0 - GtkWindow::resize-grip-width = 0 + GtkWindow::resize-grip-height = 2 + GtkWindow::resize-grip-width = 2 WnckTasklist::fade-overlay-rect = 0 @@ -96,8 +92,8 @@ style "murrine-default" { GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified - xthickness = 1 - ythickness = 1 + xthickness = 2 + ythickness = 2 fg[NORMAL] = @fg_color fg[PRELIGHT] = @fg_color @@ -131,7 +127,7 @@ style "murrine-default" { colorize_scrollbar = FALSE comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow contrast = 0.8 # overal contrast with borders - focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow + focusstyle = 3 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides glow_shade = 1.0 # amount of glow @@ -147,7 +143,7 @@ style "murrine-default" { menustyle = 0 # 0 = none, 1 = vertical striped progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient - roundness = 0 # roundness of widgets + roundness = 8# roundness of widgets scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles sliderstyle = 0 # 0 = none, 1 = handles stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles @@ -156,18 +152,18 @@ style "murrine-default" { } style "murrine-wide" { - xthickness = 2 - ythickness = 2 + xthickness = 6 + ythickness = 6 } style "murrine-wider" { - xthickness = 3 - ythickness = 3 + xthickness = 4 + ythickness = 8 } style "murrine-thin" { - xthickness = 0 - ythickness = 0 + xthickness = 1 + ythickness = 1 } # Notebook @@ -178,8 +174,8 @@ style "clearlooks-notebook-bg" { } style "clearlooks-notebook" = "clearlooks-notebook-bg" { - xthickness = 2 - ythickness = 2 + xthickness = 8 + ythickness = 4 engine "clearlooks" { radius = 0.1 @@ -190,14 +186,14 @@ style "clearlooks-notebook" = "clearlooks-notebook-bg" { style "murrine-button" = "murrine-wider" { bg[NORMAL] = @btn_bg_color - bg[PRELIGHT] = shade (1.10, @btn_bg_color) + bg[PRELIGHT] = shade (1.04, @btn_bg_color) bg[SELECTED] = shade (0.7, @btn_bg_color) bg[ACTIVE] = shade (0.95, @btn_bg_color) bg[INSENSITIVE] = shade (0.75, @btn_bg_color) engine "murrine" { - border_colors = { mix(0.2, @btn_fg_color, @btn_bg_color), mix(0.2, @btn_fg_color, @btn_bg_color) } - roundness = 0 + border_colors = { mix(0.4, @btn_fg_color, @btn_bg_color), mix(0.4, @btn_fg_color, @btn_bg_color) } + roundness = 8 } } @@ -218,7 +214,7 @@ style "murrine-scrollbar" { bg[ACTIVE] = @selected_bg_color engine "murrine" { - roundness = 0 + roundness = 8 contrast = 0.0 border_shades = { 0.9, 0.9 } trough_shades = { 0.97, 0.97 } @@ -235,15 +231,15 @@ style "murrine-overlay-scrollbar" { } style "murrine-scale" = "murrine-thin" { - bg[NORMAL] = @bg_color + bg[NORMAL] = @btn_bg_color bg[ACTIVE] = @bg_color bg[SELECTED] = @selected_bg_color - bg[INSENSITIVE] = shade (0.95, @bg_color) + bg[INSENSITIVE] = shade (0.95, @btn_bg_color) engine "murrine" { - roundness = 8 + roundness = 25 gradient_shades = { 1.08, 1.08, 1.08, 1.08 } - border_shades = { 1.0, 1.0 } + border_shades = { 0.5, 0.5 } trough_shades = { 1.08, 1.08 } trough_border_shades = { 0.8, 0.8 } } @@ -256,7 +252,7 @@ style "murrine-progressbar" = "murrine-thin" { fg[PRELIGHT] = @selected_fg_color engine "murrine" { - roundness = 2 + roundness = 8 border_shades = { 1.2, 1.2 } trough_border_shades = { 0.8, 0.8 } } @@ -294,8 +290,8 @@ style "murrine-frame-title" { } style "murrine-tooltips" { - xthickness = 5 - ythickness = 5 + xthickness = 10 + ythickness = 10 bg[NORMAL] = @tooltip_bg_color bg[SELECTED] = @tooltip_bg_color @@ -304,7 +300,7 @@ style "murrine-tooltips" { engine "murrine" { textstyle = 0 - roundness = 2 + roundness = 8 rgba = FALSE } } @@ -322,7 +318,7 @@ style "clearlooks-radiocheck" = "murrine-default" { text[PRELIGHT] = @selected_bg_color engine "clearlooks" { - radius = 4.0 + radius = 8.0 } } @@ -332,8 +328,9 @@ style "clearlooks-base-radiocheck" = "clearlooks-radiocheck" { style "murrine-entry" = "murrine-wider" { engine "murrine" { - border_shades = { 1.15, 1.15 } - roundness = 0 + #border_shades = { 1.15, 1.15 } + border_colors = { mix(0.4, @text_color, @base_color), mix(0.4, @text_color, @base_color) } + roundness = 8 } } @@ -559,21 +556,21 @@ style "xfdesktop-windowlist" { } style "xfdesktop-icon-view" { - XfdesktopIconView::label-alpha = 0 - XfdesktopIconView::selected-label-alpha = 60 - XfdesktopIconView::shadow-x-offset = 0 - XfdesktopIconView::shadow-y-offset = 1 - XfdesktopIconView::selected-shadow-x-offset = 0 - XfdesktopIconView::selected-shadow-y-offset = 1 - XfdesktopIconView::shadow-color = "#000000" - XfdesktopIconView::selected-shadow-color = "#000000" - XfdesktopIconView::shadow-blur-radius = 2 - XfdesktopIconView::cell-spacing = 2 - XfdesktopIconView::cell-padding = 6 - XfdesktopIconView::cell-text-width-proportion = 1.9 + XfdesktopIconView::label-alpha = 0 + XfdesktopIconView::selected-label-alpha = 60 + XfdesktopIconView::shadow-x-offset = 0 + XfdesktopIconView::shadow-y-offset = 1 + XfdesktopIconView::selected-shadow-x-offset = 0 + XfdesktopIconView::selected-shadow-y-offset = 1 + XfdesktopIconView::shadow-color = @fg_color + XfdesktopIconView::selected-shadow-color = @fg_color + XfdesktopIconView::shadow-blur-radius = 2 + XfdesktopIconView::cell-spacing = 2 + XfdesktopIconView::cell-padding = 6 + XfdesktopIconView::cell-text-width-proportion = 1.9 - fg[NORMAL] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color + fg[NORMAL] = @bg_color + fg[ACTIVE] = @bg_color } @@ -676,7 +673,7 @@ widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkV style "chromium-toolbar-button" { engine "murrine" { - roundness = 2 + roundness = 8 textstyle = 0 } } @@ -827,6 +824,81 @@ widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix" widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix" widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix" + + + +style "gimp-default-style" { +# Uncommenting this line allows to set a different (smaller) font for GIMP. +# +# font_name = "sans 8" +# Enabling the following line for some reason breaks toolbox resize +# increment calculation. You can enable it to get an even smaller GUI +# but need to restart GIMP after the theme change. +# +# GtkWidget::focus-padding = 0 + GtkOptionMenu::indicator-size = { 15, 25 } + GtkOptionMenu::indicator-spacing = { 10, 8, 4, 4 } + GtkPaned::handle-size = 5 + GimpDockWindow::default-height = 600 + GimpDock::font-scale = 1.0 + GimpMenuDock::minimal-width = 400 + GimpToolPalette::tool-icon-size = large-toolbar + GimpToolPalette::button-relief = none + GimpDockbook::tab-border = 0 + GimpDockbook::tab-icon-size = button + GimpColorNotebook::tab-border = 0 + GimpColorNotebook::tab-icon-size = button + GimpDeviceEditor::handle-size = 30 + GimpDockable::content-border = 1 + GimpEditor::content-spacing = 1 + GimpEditor::button-spacing = 1 + GimpEditor::button-icon-size = button + GimpDataEditor::minimal-height = 150 + GimpFrame::label-spacing = 5 + GtkDialog::content-area-border = 2 + GtkDialog::button-spacing = 20 + GtkDialog::action-area-border = 25 + GimpUnitComboBox::appears-as-list = 0 +} + +class "GtkWidget" style "gimp-default-style" +style "gimp-tool-dialog-style" = "gimp-default-style" +{ + GtkDialog::action-area-border = 6 +} +class "GimpToolDialog" style "gimp-tool-dialog-style" +style "gimp-grid-view-style" = "gimp-default-style" +{ + bg[NORMAL] = { 1.0, 1.0, 1.0 } +} +widget "*GimpContainerGridView*GtkViewport*" style "gimp-grid-view-style" +style "gimp-dockable-style" = "gimp-default-style" +{ + GimpFrame::label-bold = 0 + GtkButton::focus-line_width = 1 + GtkButton::focus-padding = 0 +} +widget "*GimpDockable.*" style "gimp-dockable-style" +style "gimp-display-style" = "gimp-default-style" +{ + GimpRuler::font-scale = 1.0 + GimpUnitComboBox::label-scale = 1.0 + GimpScaleComboBox::label-scale = 1.0 + GtkComboBox::arrow-size = 20 + GtkButton::inner-border = { 0, 0, 0, 0 } + GtkButton::focus-line-width = 0 + GtkButton::focus-padding = 0 +} +widget "*GimpDisplayShell.*" style "gimp-display-style" +style "gimp-overlay-style" = "gimp-display-style" +{ + GtkButton::focus-line_width = 2 +} +widget_class "**" style "gimp-overlay-style" + + + + # Performance Fixes style "performance-fix" { diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/assets b/.themes/oomox-gruvbox/gtk-3.0/assets similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.0/assets rename to .themes/oomox-gruvbox/gtk-3.0/assets diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/gtk-dark.css b/.themes/oomox-gruvbox/gtk-3.0/gtk-dark.css similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.0/gtk-dark.css rename to .themes/oomox-gruvbox/gtk-3.0/gtk-dark.css diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/gtk.css b/.themes/oomox-gruvbox/gtk-3.0/gtk.css similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.0/gtk.css rename to .themes/oomox-gruvbox/gtk-3.0/gtk.css diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/gtk.gresource.xml b/.themes/oomox-gruvbox/gtk-3.0/gtk.gresource.xml similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.0/gtk.gresource.xml rename to .themes/oomox-gruvbox/gtk-3.0/gtk.gresource.xml diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/thumbnail.png b/.themes/oomox-gruvbox/gtk-3.0/thumbnail.png similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.0/thumbnail.png rename to .themes/oomox-gruvbox/gtk-3.0/thumbnail.png diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/assets b/.themes/oomox-gruvbox/gtk-3.20/assets similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.20/assets rename to .themes/oomox-gruvbox/gtk-3.20/assets diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/dist/gtk-dark.css b/.themes/oomox-gruvbox/gtk-3.20/dist/gtk-dark.css similarity index 85% rename from .themes/oomox-numix-gruvbox/gtk-3.20/dist/gtk-dark.css rename to .themes/oomox-gruvbox/gtk-3.20/dist/gtk-dark.css index 57de8d6d..e3971f19 100644 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/dist/gtk-dark.css +++ b/.themes/oomox-gruvbox/gtk-3.20/dist/gtk-dark.css @@ -1,43 +1,43 @@ -/*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ -/*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ /*$dark_shadow: #000;*/ /*$light_shadow: #fff;*/ +/*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ +/*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ /*$button_border_strength: if(lightness($bg) > 50, 0, .1);*/ /*$button_shadow_strength: if(lightness($bg) > 50, 0, .1);*/ -/*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ -/*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ /*$dark_shadow: #000;*/ /*$light_shadow: #fff;*/ +/*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ +/*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ /*$button_border_strength: if(lightness($bg) > 50, 0, .1);*/ /*$button_shadow_strength: if(lightness($bg) > 50, 0, .1);*/ /* dark color scheme */ -@define-color dark_bg_color #30302f; -@define-color dark_fg_color #ebdbb2; +@define-color dark_bg_color #282828; +@define-color dark_fg_color #d5c4a1; /* colormap actually used by the theme, to be overridden in other css files */ @define-color theme_bg_color #ebdbb2; -@define-color theme_fg_color #282828; +@define-color theme_fg_color #32302f; @define-color theme_base_color #ebdbb2; -@define-color theme_text_color #30302f; +@define-color theme_text_color #32302f; @define-color theme_selected_bg_color #83a598; @define-color theme_selected_fg_color #ebdbb2; -@define-color theme_tooltip_bg_color #282828; +@define-color theme_tooltip_bg_color #32302f; @define-color theme_tooltip_fg_color #ebdbb2; /* shadow effects */ @define-color light_shadow #ebdcb4; -@define-color dark_shadow #080808; +@define-color dark_shadow #0a0a09; /* misc colors used by gtk+ */ -@define-color info_fg_color #fff; -@define-color info_bg_color #03a9f4; -@define-color warning_fg_color #fff; -@define-color warning_bg_color #ef6c00; -@define-color question_fg_color #fff; -@define-color question_bg_color #673ab7; -@define-color error_fg_color #fff; -@define-color error_bg_color #f44336; -@define-color link_color #3f51b5; -@define-color success_color #4caf50; -@define-color warning_color #ef6c00; -@define-color error_color #f44336; +@define-color info_fg_color #32302f; +@define-color info_bg_color #a327c0; +@define-color warning_fg_color #32302f; +@define-color warning_bg_color #ff7f42; +@define-color question_fg_color #32302f; +@define-color question_bg_color #a327c0; +@define-color error_fg_color #32302f; +@define-color error_bg_color #ff276a; +@define-color link_color #9400af; +@define-color success_color #c3a544; +@define-color warning_color #ff7f42; +@define-color error_color #ff276a; /* widget colors */ @define-color titlebar_bg_color @dark_bg_color; @define-color titlebar_fg_color @dark_fg_color; @@ -49,28 +49,28 @@ @define-color menu_fg_color @dark_fg_color; @define-color panel_bg_color @dark_bg_color; @define-color panel_fg_color @dark_fg_color; -@define-color borders #e1c98b; -@define-color unfocused_borders mix(#ebdbb2,#e1c98b,0.9); +@define-color borders mix(#ebdbb2,#32302f,0.1); +@define-color unfocused_borders mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); @define-color button_bg_color #ebdbb2; @define-color button_fg_color #32302f; -@define-color header_button_bg_color #30302f; -@define-color header_button_fg_color #ebdbb2; +@define-color header_button_bg_color #32302f; +@define-color header_button_fg_color #d5c4a1; @define-color insensitive_bg_color mix(#ebdbb2,#ebdbb2,0.6); -@define-color insensitive_fg_color mix(#282828,#ebdbb2,0.5); +@define-color insensitive_fg_color mix(#32302f,#ebdbb2,0.5); /* osd */ -@define-color osd_base #30302f; -@define-color osd_bg rgba(48, 48, 47, 0.8); -@define-color osd_fg #ebdbb2; -@define-color osd_insensitive_bg_color mix(#ebdbb2,rgba(48, 48, 47, 0.8),0.5); -@define-color osd_insensitive_fg_color mix(#ebdbb2,#30302f,0.6); -@define-color osd_borders_color rgba(41, 41, 40, 0.8); +@define-color osd_base #282828; +@define-color osd_bg rgba(40, 40, 40, 0.8); +@define-color osd_fg #d5c4a1; +@define-color osd_insensitive_bg_color mix(#d5c4a1,rgba(40, 40, 40, 0.8),0.5); +@define-color osd_insensitive_fg_color mix(#d5c4a1,#282828,0.6); +@define-color osd_borders_color rgba(34, 34, 34, 0.8); /* lightdm greeter colors */ -@define-color lightdm_bg_color #30302f; -@define-color lightdm_fg_color #ebdbb2; +@define-color lightdm_bg_color #282828; +@define-color lightdm_fg_color #d5c4a1; /* widget text/foreground color on backdrop windows */ -@define-color theme_unfocused_fg_color mix(#282828,#ebdbb2,0.5); +@define-color theme_unfocused_fg_color mix(#32302f,#ebdbb2,0.5); /* text color for entries, views and content in general on backdrop windows */ -@define-color theme_unfocused_text_color #30302f; +@define-color theme_unfocused_text_color #32302f; /* widget base background color on backdrop windows */ @define-color theme_unfocused_bg_color #ebdbb2; /* text widgets and the like base background color on backdrop windows */ @@ -82,15 +82,15 @@ /* insensitive color on backdrop windows*/ @define-color unfocused_insensitive_color #fbf7ef; /* window manager colors */ -@define-color wm_bg #30302f; -@define-color wm_border_focused #32302f; +@define-color wm_bg #282828; +@define-color wm_border_focused #282828; @define-color wm_border_unfocused #282828; -@define-color wm_title_focused mix(#ebdbb2,#30302f,0.1); -@define-color wm_title_unfocused mix(#ebdbb2,#30302f,0.4); -@define-color wm_icons_focused mix(#ebdbb2,#30302f,0.1); +@define-color wm_title_focused mix(#d5c4a1,#282828,0.1); +@define-color wm_title_unfocused mix(#d5c4a1,#282828,0.4); +@define-color wm_icons_focused mix(#d5c4a1,#282828,0.1); @define-color wm_icons_focused_prelight #83a598; @define-color wm_icons_focused_pressed #64897b; -@define-color wm_icons_unfocused mix(#ebdbb2,#30302f,0.4); +@define-color wm_icons_unfocused mix(#d5c4a1,#282828,0.4); @define-color wm_icons_unfocused_prelight #83a598; @define-color wm_icons_unfocused_pressed #64897b; /************** @@ -105,7 +105,7 @@ outline-style: dashed; outline-width: 1px; outline-offset: -1px; - -gtk-outline-radius: 0px; } + -gtk-outline-radius: 4px; } /************* ! Base states @@ -116,19 +116,19 @@ * { /* hyperlinks */ - -GtkIMHtml-hyperlink-color: #3f51b5; } + -GtkIMHtml-hyperlink-color: #9400af; } *:disabled, *:disabled:disabled { - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } *:disabled, *:disabled { -gtk-icon-effect: dim; } *:hover { -gtk-icon-effect: highlight; } *:link, *:visited { - color: #3f51b5; } + color: #9400af; } .background { background-color: #ebdbb2; - color: #282828; } + color: #32302f; } .background:backdrop { text-shadow: none; -gtk-icon-shadow: none; } @@ -137,52 +137,52 @@ .gtkstyle-fallback { background-color: rgba(235, 219, 178, 0.5); - color: #282828; } + color: #32302f; } .gtkstyle-fallback:hover { background-color: #f4ead3; - color: #282828; } + color: #32302f; } .gtkstyle-fallback:active { background-color: #e2cc91; - color: #282828; } + color: #32302f; } .gtkstyle-fallback:disabled { background-color: #ebdbb1; - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } image, image:disabled, label, label:disabled, box, box:disabled, grid, grid:disabled { background-color: transparent; } label.separator { - color: #282828; } + color: #32302f; } label.separator:backdrop { - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } label selection { background-color: #83a598; color: #ebdbb2; } label:disabled { - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } label:disabled:backdrop { color: #fbf7ef; } label:backdrop { - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } assistant .sidebar { background-color: #ebdbb2; - border-top: 1px solid #e1c98b; } + border-top: 1px solid mix(#ebdbb2,#32302f,0.1); } assistant .sidebar:backdrop { background-color: #ebdbb2; - border-color: mix(#ebdbb2,#e1c98b,0.9); } + border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); } assistant.csd .sidebar { border-top-style: none; } assistant .sidebar label { - padding: 3px 6px; } + padding: 0px 0px; } assistant .sidebar label.highlight { - background-color: mix(#282828,#ebdbb2,0.8); } + background-color: mix(#32302f,#ebdbb2,0.8); } /********* ! Buttons @@ -195,7 +195,7 @@ assistant .sidebar label.highlight { stacksidebar row.needs-attention > label { animation: needs_attention 150ms ease-in; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#83a598), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(255, 255, 255, 0.769231)), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#83a598), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(236, 220, 180, 0.769231)), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 2px; } @@ -210,12 +210,12 @@ button, headerbar button, .titlebar:not(headerbar) button, toolbar button, toolb #XfceNotifyWindow button, .osd button, .osd spinbutton:not(.vertical) button, #XfceNotifyWindow spinbutton:not(.vertical) button, .osd spinbutton.vertical button:first-child, #XfceNotifyWindow spinbutton.vertical button:first-child, .nemo-window toolbar button, .nemo-window .sidebar + separator + box .primary-toolbar button.flat, #login_window button, #shutdown_button button, #restart_button button { - min-height: 20px; - min-width: 20px; - padding: 3px 5px; + min-height: 14px; + min-width: 14px; + padding: 0px 2px; border-width: 1px; border-style: solid; - border-radius: 0px; + border-radius: 4px; transition: 150ms ease; outline-color: transparent; } @@ -262,7 +262,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { .linked > button:first-child, combobox box button:first-child, combobox box entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, headerbar .linked > button:first-child, .titlebar:not(headerbar) .linked > button:first-child, toolbar .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, popover.background .linked > button:first-child, .nemo-window toolbar toolitem stack widget button:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-left-style: solid; border-right-style: none; border-top-right-radius: 0; @@ -276,7 +276,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { .linked > button:last-child, combobox box button:last-child, combobox box entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, headerbar .linked > button:last-child, .titlebar:not(headerbar) .linked > button:last-child, toolbar .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, popover.background .linked > button:last-child, .nemo-window toolbar toolitem stack widget button:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-left-style: none; border-right-style: solid; border-top-left-radius: 0; @@ -295,7 +295,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { .inline-toolbar button:only-child, .linked > button:only-child, combobox box button:only-child, combobox box entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, headerbar .linked > button:only-child, .titlebar:not(headerbar) .linked > button:only-child, toolbar .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, popover.background .linked > button:only-child, .nemo-window toolbar toolitem stack widget button:only-child { - border-radius: 0px; } + border-radius: 4px; } .linked.vertical > button { border-width: 1px; @@ -305,7 +305,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { border-bottom-style: none; } .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-style: solid; border-bottom-style: none; border-bottom-left-radius: 0; @@ -315,7 +315,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { border-bottom-style: solid; } .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-style: none; border-bottom-style: solid; border-top-left-radius: 0; @@ -327,7 +327,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { border-width: 1px; border-style: solid; } .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo { - border-radius: 0px; } + border-radius: 4px; } infobar.info button.close, infobar.warning button.close, infobar.question button.close, infobar.error button.close, notebook > header > tabs > arrow { border: 1px solid transparent; @@ -336,7 +336,7 @@ infobar.info button.close, infobar.warning button.close, infobar.question button box-shadow: none; } infobar.info button.close:focus, infobar.warning button.close:focus, infobar.question button.close:focus, infobar.error button.close:focus, notebook > header > tabs > arrow:focus, infobar.info button.close:hover, infobar.warning button.close:hover, infobar.question button.close:hover, infobar.error button.close:hover, notebook > header > tabs > arrow:hover { border: 1px solid rgba(235, 219, 178, 0.3); - background-color: rgba(40, 40, 40, 0.2); + background-color: rgba(50, 48, 47, 0.2); background-image: none; box-shadow: none; } infobar.info button.close:active, infobar.warning button.close:active, infobar.question button.close:active, infobar.error button.close:active, notebook > header > tabs > arrow:active, infobar.info button.close:checked, infobar.warning button.close:checked, infobar.question button.close:checked, infobar.error button.close:checked, notebook > header > tabs > arrow:checked, infobar.info button.close:active:hover, infobar.warning button.close:active:hover, infobar.question button.close:active:hover, infobar.error button.close:active:hover, notebook > header > tabs > arrow:active:hover, infobar.info button.close:checked:hover, infobar.warning button.close:checked:hover, infobar.question button.close:checked:hover, infobar.error button.close:checked:hover, notebook > header > tabs > arrow:checked:hover { @@ -350,7 +350,7 @@ button { background-image: none; border-color: rgba(40, 38, 38, 0.32); color: #32302f; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } button:focus, button:hover { border-color: #527065; } button:active, button:active:hover, button:active:focus, button:active:hover:focus, button:checked, button:checked:hover, button:checked:focus, button:checked:hover:focus { @@ -370,7 +370,7 @@ button { background-image: none; border-color: rgba(40, 38, 38, 0.4); color: #32302f; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } button:hover:focus, button:hover:hover, button.flat:hover:focus, button.flat:hover:hover { border-color: #527065; } button:hover:active, button:hover:active:hover, button:hover:active:focus, button:hover:active:hover:focus, button:hover:checked, button:hover:checked:hover, button:hover:checked:focus, button:hover:checked:hover:focus, button.flat:hover:active, button.flat:hover:active:hover, button.flat:hover:active:focus, button.flat:hover:active:hover:focus, button.flat:hover:checked, button.flat:hover:checked:hover, button.flat:hover:checked:focus, button.flat:hover:checked:hover:focus { @@ -384,7 +384,7 @@ button { background-image: none; border-color: rgba(40, 38, 38, 0.4); color: #32302f; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } button:focus:focus, button:focus:hover, button.flat:focus:focus, button.flat:focus:hover { border-color: #527065; } button:focus:active, button:focus:active:hover, button:focus:active:focus, button:focus:active:hover:focus, button:focus:checked, button:focus:checked:hover, button:focus:checked:focus, button:focus:checked:hover:focus, button.flat:focus:active, button.flat:focus:active:hover, button.flat:focus:active:focus, button.flat:focus:active:hover:focus, button.flat:focus:checked, button.flat:focus:checked:hover, button.flat:focus:checked:focus, button.flat:focus:checked:hover:focus { @@ -397,7 +397,7 @@ button { background-color: #f4ead3; background-image: none; border-color: rgba(40, 38, 38, 0.4); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.38); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } button:focus:hover:focus, button:focus:hover:hover, button.flat:focus:hover:focus, button.flat:focus:hover:hover { border-color: #527065; } button:focus:hover:active, button:focus:hover:active:hover, button:focus:hover:active:focus, button:focus:hover:active:hover:focus, button:focus:hover:checked, button:focus:hover:checked:hover, button:focus:hover:checked:focus, button:focus:hover:checked:hover:focus, button.flat:focus:hover:active, button.flat:focus:hover:active:hover, button.flat:focus:hover:active:focus, button.flat:focus:hover:active:hover:focus, button.flat:focus:hover:checked, button.flat:focus:hover:checked:hover, button.flat:focus:hover:checked:focus, button.flat:focus:hover:checked:hover:focus { @@ -410,9 +410,9 @@ button { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); - border-color: rgba(40, 38, 38, 0.32); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } button:checked:focus, button:checked:hover, button:active:focus, button:active:hover, button.flat:checked:focus, button.flat:checked:hover, button.flat:active:focus, button.flat:active:hover { border-color: #527065; } button:checked:active, button:checked:active:hover, button:checked:active:focus, button:checked:active:hover:focus, button:checked:checked, button:checked:checked:hover, button:checked:checked:focus, button:checked:checked:hover:focus, button:active:active, button:active:active:hover, button:active:active:focus, button:active:active:hover:focus, button:active:checked, button:active:checked:hover, button:active:checked:focus, button:active:checked:hover:focus, button.flat:checked:active, button.flat:checked:active:hover, button.flat:checked:active:focus, button.flat:checked:active:hover:focus, button.flat:checked:checked, button.flat:checked:checked:hover, button.flat:checked:checked:focus, button.flat:checked:checked:hover:focus, button.flat:active:active, button.flat:active:active:hover, button.flat:active:active:focus, button.flat:active:active:hover:focus, button.flat:active:checked, button.flat:active:checked:hover, button.flat:active:checked:focus, button.flat:active:checked:hover:focus { @@ -447,11 +447,11 @@ button { color: rgba(235, 219, 178, 0.85); } .inline-toolbar button, .linked > button { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .inline-toolbar button:focus, .inline-toolbar button:hover, .linked > button:focus, .linked > button:hover { - box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .inline-toolbar button:active, .inline-toolbar button:active:hover, .inline-toolbar button:active:focus, .inline-toolbar button:active:hover:focus, .inline-toolbar button:checked, .inline-toolbar button:checked:hover, .inline-toolbar button:checked:focus, .inline-toolbar button:checked:hover:focus, .linked > button:active, .linked > button:active:hover, @@ -461,18 +461,18 @@ button { .linked > button:checked:hover, .linked > button:checked:focus, .linked > button:checked:hover:focus { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(8, 8, 8, 0.07), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(10, 10, 9, 0.07), inset 0 -1px rgba(10, 10, 9, 0.05); } .inline-toolbar button:disabled, .linked > button:disabled { box-shadow: inset -1px 0 #dabc70; } .inline-toolbar button:last-child, .inline-toolbar button:only-child, .linked > button:last-child, .linked > button:only-child { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .inline-toolbar button:last-child:hover, .inline-toolbar button:only-child:hover, .linked > button:last-child:hover, .linked > button:only-child:hover { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .inline-toolbar button:disabled:last-child, .inline-toolbar button:disabled:only-child, .inline-toolbar button:active:disabled:last-child, .inline-toolbar button:active:disabled:only-child, .inline-toolbar button:checked:disabled:last-child, .inline-toolbar button:checked:disabled:only-child, .linked > button:disabled:last-child, .linked > button:disabled:only-child, @@ -490,7 +490,7 @@ button { .linked > button:checked:last-child:focus, .linked > button:checked:last-child:hover, .linked > button:checked:last-child:hover:focus { - box-shadow: inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } .inline-toolbar button:active:only-child, .inline-toolbar button:active:only-child:focus, .inline-toolbar button:active:only-child:hover, .inline-toolbar button:active:only-child:hover:focus, .inline-toolbar button:checked:only-child, .inline-toolbar button:checked:only-child:focus, .inline-toolbar button:checked:only-child:hover, .inline-toolbar button:checked:only-child:hover:focus, .linked > button:active:only-child, .linked > button:active:only-child:focus, @@ -500,25 +500,25 @@ button { .linked > button:checked:only-child:focus, .linked > button:checked:only-child:hover, .linked > button:checked:only-child:hover:focus { - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.06), inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } .linked.vertical > button { - box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .linked.vertical > button:focus, .linked.vertical > button:hover { - box-shadow: inset 0 -1px #527065, 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: inset 0 -1px #527065, 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .linked.vertical > button:active, .linked.vertical > button:active:hover, .linked.vertical > button:active:focus, .linked.vertical > button:active:hover:focus, .linked.vertical > button:checked, .linked.vertical > button:checked:hover, .linked.vertical > button:checked:focus, .linked.vertical > button:checked:hover:focus { - box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 1px 0 rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.05); } + box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 1px 0 rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.05); } .linked.vertical > button:disabled { box-shadow: inset 0 -1px #dabc70; } .linked.vertical > button:last-child, .linked.vertical > button:only-child { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .linked.vertical > button:last-child:hover, .linked.vertical > button:only-child:hover { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .linked.vertical > button:disabled:last-child, .linked.vertical > button:disabled:only-child, .linked.vertical > button:active:disabled:last-child, .linked.vertical > button:active:disabled:only-child, .linked.vertical > button:checked:disabled:last-child, .linked.vertical > button:checked:disabled:only-child { box-shadow: none; } .linked.vertical > button:active:last-child, .linked.vertical > button:active:last-child:focus, .linked.vertical > button:active:last-child:hover, .linked.vertical > button:active:last-child:hover:focus, .linked.vertical > button:checked:last-child, .linked.vertical > button:checked:last-child:focus, .linked.vertical > button:checked:last-child:hover, .linked.vertical > button:checked:last-child:hover:focus { - box-shadow: inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } .linked.vertical > button:active:only-child, .linked.vertical > button:active:only-child:focus, .linked.vertical > button:active:only-child:hover, .linked.vertical > button:active:only-child:hover:focus, .linked.vertical > button:checked:only-child, .linked.vertical > button:checked:only-child:focus, .linked.vertical > button:checked:only-child:hover, .linked.vertical > button:checked:only-child:hover:focus { - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.06), inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } button.circular, button.nautilus-circular-button.image-button, button.circular-button { padding: 0; min-width: 28px; @@ -539,7 +539,7 @@ spinbutton button { spinbutton button:disabled { color: mix(#32302f,#ebdbb2,0.7); } spinbutton button:backdrop { - color: mix(#ebdbb2,mix(#282828,#ebdbb2,0.5),0.9); } + color: mix(#ebdbb2,mix(#32302f,#ebdbb2,0.5),0.9); } spinbutton button:backdrop:disabled { color: rgba(251, 247, 239, 0.8); } @@ -549,16 +549,16 @@ spinbutton:not(.vertical) { background-image: none; /*@include border($base_color);*/ padding: 0; - border-radius: 0px; - color: #30302f; - caret-color: #30302f; + border-radius: 4px; + color: #32302f; + caret-color: #32302f; /*&:focus, &:active { border-color: border_focus($borders_color); }*/ } spinbutton:not(.vertical):disabled { background-color: #e2cc91; background-image: none; - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } spinbutton:not(.vertical) entry { - border-radius: 0px 0 0 0px; + border-radius: 4px 0 0 4px; border-right-width: 0; box-shadow: none; } spinbutton:not(.vertical) button { @@ -572,31 +572,31 @@ spinbutton:not(.vertical) { background-color: shade($bg_color, 1.08); } - &:hover { + &:hover { @if (lightness($bg_color) > 50) { background-color: shade($bg_color, 1.11); - } + } } - */ } + */ } spinbutton:not(.vertical) button:dir(rtl) { border-style: none solid none none; } spinbutton:not(.vertical) button:active { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } + box-shadow: inset 0 2px 3px -1px rgba(20, 19, 19, 0.2); } spinbutton:not(.vertical) button:backdrop { - border-color: alpha(mix(#ebdbb2,#e1c98b,0.9),0.8); } + border-color: alpha(mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9),0.8); } spinbutton:not(.vertical) button:backdrop:disabled { border-style: none none none solid; } spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } spinbutton:not(.vertical) button:dir(rtl):first-child { - border-radius: 0px 0 0 0px; } + border-radius: 4px 0 0 4px; } spinbutton:not(.vertical) button:dir(ltr):last-child { - border-radius: 0 0px 0px 0; } + border-radius: 0 4px 4px 0; } spinbutton.vertical button, spinbutton.vertical entry { min-width: 0; - padding-left: 1px; - padding-right: 1px; } + padding-left: -2px; + padding-right: -2px; } spinbutton.vertical entry { border-radius: 0; @@ -604,20 +604,20 @@ spinbutton.vertical entry { border-bottom-width: 0; } spinbutton.vertical button.up { - border-style: solid solid none solid; - border-radius: 0px 0px 0 0; } + border-style: solid solid none; + border-radius: 4px 4px 0 0; } spinbutton.vertical button.down { - border-style: none solid solid solid; - border-radius: 0 0 0px 0px; } + border-style: none solid solid; + border-radius: 0 0 4px 4px; } /****************** ! ComboBoxes * *******************/ combobox button.combo { min-width: 0; - padding-left: 5px; - padding-right: 5px; } + padding-left: 2px; + padding-right: 2px; } combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); @@ -625,7 +625,7 @@ combobox arrow { min-width: 16px; } combobox box button, combobox box entry { - padding: 3px 5px; } + padding: 0px 2px; } /********* ! Entry * @@ -637,7 +637,7 @@ combobox box button, combobox box entry { border-left-width: 0; } .linked:not(.vertical) > entry:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-right-width: 0; border-bottom-right-radius: 0; border-top-right-radius: 0; } @@ -646,7 +646,7 @@ combobox box button, combobox box entry { border-right-width: 1px; } .linked:not(.vertical) > entry:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-left-width: 0; border-bottom-left-radius: 0; border-top-left-radius: 0; } @@ -656,7 +656,7 @@ combobox box button, combobox box entry { .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > entry:first-child:only-child { border-width: 1px; } .linked:not(.vertical) > entry:only-child { - border-radius: 0px; } + border-radius: 4px; } .linked.vertical > entry { border-width: 1px; @@ -665,7 +665,7 @@ combobox box button, combobox box entry { border-bottom-width: 0; } .linked.vertical > entry:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-width: 1px; border-bottom-width: 0; border-bottom-left-radius: 0; @@ -675,7 +675,7 @@ combobox box button, combobox box entry { border-bottom-width: 1px; } .linked.vertical > entry:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-width: 0; border-bottom-width: 1px; border-top-left-radius: 0; @@ -686,16 +686,15 @@ combobox box button, combobox box entry { .linked.vertical > entry:only-child, .linked.vertical > entry:first-child:only-child { border-width: 1px; } .linked.vertical > entry:only-child { - border-radius: 0px; } + border-radius: 4px; } entry, menuitem entry, popover.background entry, .osd entry, #XfceNotifyWindow entry, #login_window entry { border-width: 1px; border-style: solid; - border-radius: 0px; - border-color: #dabc70; + border-radius: 4px; transition: border 100ms ease-out; - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.1), inset 0 1px rgba(8, 8, 8, 0.12), inset -1px 0 rgba(8, 8, 8, 0.1), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.1), inset 0 1px rgba(10, 10, 9, 0.12), inset -1px 0 rgba(10, 10, 9, 0.1), inset 0 -1px rgba(10, 10, 9, 0.05); } entry:focus, popover.background entry:focus, #XfceNotifyWindow entry:focus, #login_window entry:focus, entry:hover, popover.background entry:hover, #XfceNotifyWindow entry:hover, #login_window entry:hover, entry:active, popover.background entry:active, @@ -709,108 +708,99 @@ entry, menuitem entry, popover.background entry, .osd entry, entry:disabled, popover.background entry:disabled, #XfceNotifyWindow entry:disabled, #login_window entry:disabled { box-shadow: none; } - entry progress, popover.background entry progress, .osd entry progress, - #XfceNotifyWindow entry progress, #login_window entry progress { + entry progress, popover.background entry progress, .osd entry progress, #XfceNotifyWindow entry progress, #login_window entry progress { background-color: #83a598; background-image: none; border-width: 0; - border-radius: 0px; + border-radius: 4px; color: #ebdbb2; } - entry image.left, - #XfceNotifyWindow entry image.left, #login_window entry image.left { - padding-right: 3px; } - entry image.right, - #XfceNotifyWindow entry image.right, #login_window entry image.right { - padding-left: 3px; } + entry image.left, #XfceNotifyWindow entry image.left, #login_window entry image.left { + padding-right: 0px; } + entry image.right, #XfceNotifyWindow entry image.right, #login_window entry image.right { + padding-left: 0px; } entry.warning, popover.background entry.warning, #XfceNotifyWindow entry.warning, #login_window entry.warning { - color: #fff; - border-color: #bf5600; - background-color: mix(#ebdbb2,#ef6c00,0.6); } - entry.warning image, - #XfceNotifyWindow entry.warning image, #login_window entry.warning image { - color: #fff; } + color: #32302f; + border-color: #ff5402; + background-color: mix(#ebdbb2,#ff7f42,0.6); } + entry.warning image, #XfceNotifyWindow entry.warning image, #login_window entry.warning image { + color: #32302f; } entry.warning:focus, #XfceNotifyWindow entry.warning:focus, #login_window entry.warning:focus { - color: #fff; + color: #32302f; border-color: #527065; - background-color: #ef6c00; + background-color: #ff7f42; box-shadow: none; } - entry.warning selection, - #XfceNotifyWindow entry.warning selection, #login_window entry.warning selection { - background-color: #fff; - color: #ef6c00; } + entry.warning selection, #XfceNotifyWindow entry.warning selection, #login_window entry.warning selection { + background-color: #32302f; + color: #ff7f42; } entry.error, popover.background entry.error, #XfceNotifyWindow entry.error, #login_window entry.error { - color: #fff; - border-color: #e21b0c; - background-color: mix(#ebdbb2,#f44336,0.6); } - entry.error image, - #XfceNotifyWindow entry.error image, #login_window entry.error image { - color: #fff; } + color: #32302f; + border-color: #eb0049; + background-color: mix(#ebdbb2,#ff276a,0.6); } + entry.error image, #XfceNotifyWindow entry.error image, #login_window entry.error image { + color: #32302f; } entry.error:focus, #XfceNotifyWindow entry.error:focus, #login_window entry.error:focus { - color: #fff; + color: #32302f; border-color: #527065; - background-color: #f44336; + background-color: #ff276a; box-shadow: none; } - entry.error selection, - #XfceNotifyWindow entry.error selection, #login_window entry.error selection { - background-color: #fff; - color: #f44336; } + entry.error selection, #XfceNotifyWindow entry.error selection, #login_window entry.error selection { + background-color: #32302f; + color: #ff276a; } entry.search-missing, popover.background entry.search-missing, #XfceNotifyWindow entry.search-missing, #login_window entry.search-missing { - color: #fff; - border-color: #e21b0c; - background-color: mix(#ebdbb2,#f44336,0.6); } - entry.search-missing image, - #XfceNotifyWindow entry.search-missing image, #login_window entry.search-missing image { - color: #fff; } + color: #32302f; + border-color: #eb0049; + background-color: mix(#ebdbb2,#ff276a,0.6); } + entry.search-missing image, #XfceNotifyWindow entry.search-missing image, #login_window entry.search-missing image { + color: #32302f; } entry.search-missing:focus, #XfceNotifyWindow entry.search-missing:focus, #login_window entry.search-missing:focus { - color: #fff; + color: #32302f; border-color: #527065; - background-color: #f44336; + background-color: #ff276a; box-shadow: none; } - entry.search-missing selection, - #XfceNotifyWindow entry.search-missing selection, #login_window entry.search-missing selection { - background-color: #fff; - color: #f44336; } + entry.search-missing selection, #XfceNotifyWindow entry.search-missing selection, #login_window entry.search-missing selection { + background-color: #32302f; + color: #ff276a; } entry { background-color: #ebdbb2; background-image: none; - border-color: shade(mix(#ebdbb2,#30302f,0.2),0.8); - padding: 3px; - color: #30302f; + border-color: shade(mix(#ebdbb2,#32302f,0.2),0.8); + padding: 0px; + color: #32302f; caret-color: #282828; -gtk-secondary-caret-color: #282828; } entry:focus, entry:hover { border-color: #527065; } entry:active, entry:active:hover, entry:active:focus, entry:active:hover:focus, entry:checked, entry:checked:hover, entry:checked:focus, entry:checked:hover:focus { - border-color: shade(mix(#ebdbb2,#30302f,0.2),0.7); } + border-color: shade(mix(#ebdbb2,#32302f,0.2),0.7); } entry:disabled { - border-color: shade(mix(#ebdbb2,#30302f,0.2),0.85); } + border-color: shade(mix(#ebdbb2,#32302f,0.2),0.85); } entry:active:disabled, entry:checked:disabled { - border-color: shade(mix(#ebdbb2,#30302f,0.2),0.8); } + border-color: shade(mix(#ebdbb2,#32302f,0.2),0.8); } entry:focus, entry:active { border-color: #527065; } entry:disabled { background-color: #e2cc91; background-image: none; - border-color: shade(alpha(mix(#ebdbb2,#30302f,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#ebdbb2,#32302f,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } entry:disabled:focus, entry:disabled:hover { border-color: #527065; } entry:disabled:active, entry:disabled:active:hover, entry:disabled:active:focus, entry:disabled:active:hover:focus, entry:disabled:checked, entry:disabled:checked:hover, entry:disabled:checked:focus, entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#ebdbb2,#30302f,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#ebdbb2,#32302f,0.2),0.4),0.7); } entry:disabled:disabled { - border-color: shade(alpha(mix(#ebdbb2,#30302f,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#ebdbb2,#32302f,0.2),0.4),0.85); } entry:disabled:active:disabled, entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#ebdbb2,#30302f,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#ebdbb2,#32302f,0.2),0.4),0.8); } /********* ! Buttons @@ -828,147 +818,150 @@ entry { ! Toolbar **********/ toolbar { - padding: 2px; + padding: -1px; border-style: none; } toolbar.horizontal separator { - margin: 0 5px 1px; } + margin: 0 2px 1px; } toolbar.vertical separator { - margin: 5px 1px 5px 0; } + margin: 2px 1px 2px 0; } headerbar { border-width: 0 0 1px; border-style: solid; } - headerbar entry, headerbar spinbutton, headerbar separator, headerbar button { - margin-top: 6px; - margin-bottom: 6px; } + headerbar entry, + headerbar spinbutton, + headerbar separator, + headerbar button { + margin-top: 3px; + margin-bottom: 3px; } headerbar switch { - margin-top: 4px; - margin-bottom: 4px; } + margin-top: 1px; + margin-bottom: 1px; } window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar, window:not(.tiled):not(.maximized) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized) headerbar:first-child { - border-top-left-radius: 0px; } + border-top-left-radius: 4px; } window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child { - border-top-right-radius: 0px; } + border-top-right-radius: 4px; } headerbar, .titlebar:not(headerbar) { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: #262626; - color: #ebdbb2; - background-color: #30302f; + border-color: #202020; + color: #d5c4a1; + background-color: #282828; background-image: none; - border-radius: 0px 0px 0 0; - color: mix(#ebdbb2,#30302f,0.1); - padding: 0 6px; + border-radius: 4px 4px 0 0; + color: mix(#d5c4a1,#282828,0.1); + padding: 0 0px; min-height: 42px; } headerbar:focus, .titlebar:focus:not(headerbar), headerbar:hover, .titlebar:hover:not(headerbar) { border-color: #527065; } headerbar:active, .titlebar:active:not(headerbar), headerbar:active:hover, .titlebar:active:hover:not(headerbar), headerbar:active:focus, .titlebar:active:focus:not(headerbar), headerbar:active:hover:focus, .titlebar:active:hover:focus:not(headerbar), headerbar:checked, .titlebar:checked:not(headerbar), headerbar:checked:hover, .titlebar:checked:hover:not(headerbar), headerbar:checked:focus, .titlebar:checked:focus:not(headerbar), headerbar:checked:hover:focus, .titlebar:checked:hover:focus:not(headerbar) { - border-color: #222221; } + border-color: #1c1c1c; } headerbar:disabled, .titlebar:disabled:not(headerbar) { - border-color: #292928; } + border-color: #222222; } headerbar:active:disabled, .titlebar:active:disabled:not(headerbar), headerbar:checked:disabled, .titlebar:checked:disabled:not(headerbar) { - border-color: #262626; } + border-color: #202020; } headerbar:disabled, .titlebar:disabled:not(headerbar) { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#d5c4a1,#282828,0.5); } headerbar .title, .titlebar:not(headerbar) .title { font-weight: bold; - padding: 0 6px; } + padding: 0 0px; } headerbar .subtitle, .titlebar:not(headerbar) .subtitle { font-size: smaller; - padding: 0 6px; } + padding: 0 0px; } headerbar button, .titlebar:not(headerbar) button { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button:hover, .titlebar:not(headerbar) button:hover { border-color: #527065; } headerbar button:active, .titlebar:not(headerbar) button:active, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover:focus, .titlebar:not(headerbar) button:active:hover:focus, headerbar button:checked, .titlebar:not(headerbar) button:checked, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover:focus, .titlebar:not(headerbar) button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } headerbar button:disabled, .titlebar:not(headerbar) button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } headerbar button.flat, .titlebar:not(headerbar) button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } headerbar button:hover, .titlebar:not(headerbar) button:hover, headerbar button.flat:hover, .titlebar:not(headerbar) button.flat:hover { - background-color: #323231; + background-color: #2a2a2a; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } headerbar button:hover:focus, .titlebar:not(headerbar) button:hover:focus, headerbar button:hover:hover, .titlebar:not(headerbar) button:hover:hover, headerbar button.flat:hover:focus, .titlebar:not(headerbar) button.flat:hover:focus, headerbar button.flat:hover:hover, .titlebar:not(headerbar) button.flat:hover:hover { border-color: #527065; } headerbar button:hover:active, .titlebar:not(headerbar) button:hover:active, headerbar button:hover:active:hover, .titlebar:not(headerbar) button:hover:active:hover, headerbar button:hover:active:focus, .titlebar:not(headerbar) button:hover:active:focus, headerbar button:hover:active:hover:focus, .titlebar:not(headerbar) button:hover:active:hover:focus, headerbar button:hover:checked, .titlebar:not(headerbar) button:hover:checked, headerbar button:hover:checked:hover, .titlebar:not(headerbar) button:hover:checked:hover, headerbar button:hover:checked:focus, .titlebar:not(headerbar) button:hover:checked:focus, headerbar button:hover:checked:hover:focus, .titlebar:not(headerbar) button:hover:checked:hover:focus, headerbar button.flat:hover:active, .titlebar:not(headerbar) button.flat:hover:active, headerbar button.flat:hover:active:hover, .titlebar:not(headerbar) button.flat:hover:active:hover, headerbar button.flat:hover:active:focus, .titlebar:not(headerbar) button.flat:hover:active:focus, headerbar button.flat:hover:active:hover:focus, .titlebar:not(headerbar) button.flat:hover:active:hover:focus, headerbar button.flat:hover:checked, .titlebar:not(headerbar) button.flat:hover:checked, headerbar button.flat:hover:checked:hover, .titlebar:not(headerbar) button.flat:hover:checked:hover, headerbar button.flat:hover:checked:focus, .titlebar:not(headerbar) button.flat:hover:checked:focus, headerbar button.flat:hover:checked:hover:focus, .titlebar:not(headerbar) button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:hover:disabled, .titlebar:not(headerbar) button:hover:disabled, headerbar button.flat:hover:disabled, .titlebar:not(headerbar) button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:hover:active:disabled, .titlebar:not(headerbar) button:hover:active:disabled, headerbar button:hover:checked:disabled, .titlebar:not(headerbar) button:hover:checked:disabled, headerbar button.flat:hover:active:disabled, .titlebar:not(headerbar) button.flat:hover:active:disabled, headerbar button.flat:hover:checked:disabled, .titlebar:not(headerbar) button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button.flat:focus, .titlebar:not(headerbar) button.flat:focus { - background-color: #323231; + background-color: #2a2a2a; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } headerbar button:focus:focus, .titlebar:not(headerbar) button:focus:focus, headerbar button:focus:hover, .titlebar:not(headerbar) button:focus:hover, headerbar button.flat:focus:focus, .titlebar:not(headerbar) button.flat:focus:focus, headerbar button.flat:focus:hover, .titlebar:not(headerbar) button.flat:focus:hover { border-color: #527065; } headerbar button:focus:active, .titlebar:not(headerbar) button:focus:active, headerbar button:focus:active:hover, .titlebar:not(headerbar) button:focus:active:hover, headerbar button:focus:active:focus, .titlebar:not(headerbar) button:focus:active:focus, headerbar button:focus:active:hover:focus, .titlebar:not(headerbar) button:focus:active:hover:focus, headerbar button:focus:checked, .titlebar:not(headerbar) button:focus:checked, headerbar button:focus:checked:hover, .titlebar:not(headerbar) button:focus:checked:hover, headerbar button:focus:checked:focus, .titlebar:not(headerbar) button:focus:checked:focus, headerbar button:focus:checked:hover:focus, .titlebar:not(headerbar) button:focus:checked:hover:focus, headerbar button.flat:focus:active, .titlebar:not(headerbar) button.flat:focus:active, headerbar button.flat:focus:active:hover, .titlebar:not(headerbar) button.flat:focus:active:hover, headerbar button.flat:focus:active:focus, .titlebar:not(headerbar) button.flat:focus:active:focus, headerbar button.flat:focus:active:hover:focus, .titlebar:not(headerbar) button.flat:focus:active:hover:focus, headerbar button.flat:focus:checked, .titlebar:not(headerbar) button.flat:focus:checked, headerbar button.flat:focus:checked:hover, .titlebar:not(headerbar) button.flat:focus:checked:hover, headerbar button.flat:focus:checked:focus, .titlebar:not(headerbar) button.flat:focus:checked:focus, headerbar button.flat:focus:checked:hover:focus, .titlebar:not(headerbar) button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:focus:disabled, .titlebar:not(headerbar) button:focus:disabled, headerbar button.flat:focus:disabled, .titlebar:not(headerbar) button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:focus:active:disabled, .titlebar:not(headerbar) button:focus:active:disabled, headerbar button:focus:checked:disabled, .titlebar:not(headerbar) button:focus:checked:disabled, headerbar button.flat:focus:active:disabled, .titlebar:not(headerbar) button.flat:focus:active:disabled, headerbar button.flat:focus:checked:disabled, .titlebar:not(headerbar) button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:focus:hover, .titlebar:not(headerbar) button:focus:hover, headerbar button.flat:focus:hover, .titlebar:not(headerbar) button.flat:focus:hover { - background-color: #353534; + background-color: #2c2c2c; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(190, 164, 109, 0.3); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } headerbar button:focus:hover:focus, .titlebar:not(headerbar) button:focus:hover:focus, headerbar button:focus:hover:hover, .titlebar:not(headerbar) button:focus:hover:hover, headerbar button.flat:focus:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:focus, headerbar button.flat:focus:hover:hover, .titlebar:not(headerbar) button.flat:focus:hover:hover { border-color: #527065; } headerbar button:focus:hover:active, .titlebar:not(headerbar) button:focus:hover:active, headerbar button:focus:hover:active:hover, .titlebar:not(headerbar) button:focus:hover:active:hover, headerbar button:focus:hover:active:focus, .titlebar:not(headerbar) button:focus:hover:active:focus, headerbar button:focus:hover:active:hover:focus, .titlebar:not(headerbar) button:focus:hover:active:hover:focus, headerbar button:focus:hover:checked, .titlebar:not(headerbar) button:focus:hover:checked, headerbar button:focus:hover:checked:hover, .titlebar:not(headerbar) button:focus:hover:checked:hover, headerbar button:focus:hover:checked:focus, .titlebar:not(headerbar) button:focus:hover:checked:focus, headerbar button:focus:hover:checked:hover:focus, .titlebar:not(headerbar) button:focus:hover:checked:hover:focus, headerbar button.flat:focus:hover:active, .titlebar:not(headerbar) button.flat:focus:hover:active, headerbar button.flat:focus:hover:active:hover, .titlebar:not(headerbar) button.flat:focus:hover:active:hover, headerbar button.flat:focus:hover:active:focus, .titlebar:not(headerbar) button.flat:focus:hover:active:focus, headerbar button.flat:focus:hover:active:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:active:hover:focus, headerbar button.flat:focus:hover:checked, .titlebar:not(headerbar) button.flat:focus:hover:checked, headerbar button.flat:focus:hover:checked:hover, .titlebar:not(headerbar) button.flat:focus:hover:checked:hover, headerbar button.flat:focus:hover:checked:focus, .titlebar:not(headerbar) button.flat:focus:hover:checked:focus, headerbar button.flat:focus:hover:checked:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:focus:hover:disabled, .titlebar:not(headerbar) button:focus:hover:disabled, headerbar button.flat:focus:hover:disabled, .titlebar:not(headerbar) button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:focus:hover:active:disabled, .titlebar:not(headerbar) button:focus:hover:active:disabled, headerbar button:focus:hover:checked:disabled, .titlebar:not(headerbar) button:focus:hover:checked:disabled, headerbar button.flat:focus:hover:active:disabled, .titlebar:not(headerbar) button.flat:focus:hover:active:disabled, headerbar button.flat:focus:hover:checked:disabled, .titlebar:not(headerbar) button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:checked, .titlebar:not(headerbar) button:checked, headerbar button:active, .titlebar:not(headerbar) button:active, headerbar button.flat:checked, .titlebar:not(headerbar) button.flat:checked, headerbar button.flat:active, .titlebar:not(headerbar) button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button.flat:checked:focus, .titlebar:not(headerbar) button.flat:checked:focus, headerbar button.flat:checked:hover, .titlebar:not(headerbar) button.flat:checked:hover, headerbar button.flat:active:focus, .titlebar:not(headerbar) button.flat:active:focus, headerbar button.flat:active:hover, .titlebar:not(headerbar) button.flat:active:hover { border-color: #527065; } headerbar button:checked:active, .titlebar:not(headerbar) button:checked:active, headerbar button:checked:active:hover, .titlebar:not(headerbar) button:checked:active:hover, headerbar button:checked:active:focus, .titlebar:not(headerbar) button:checked:active:focus, headerbar button:checked:active:hover:focus, .titlebar:not(headerbar) button:checked:active:hover:focus, headerbar button:checked:checked, .titlebar:not(headerbar) button:checked:checked, headerbar button:checked:checked:hover, .titlebar:not(headerbar) button:checked:checked:hover, headerbar button:checked:checked:focus, .titlebar:not(headerbar) button:checked:checked:focus, headerbar button:checked:checked:hover:focus, .titlebar:not(headerbar) button:checked:checked:hover:focus, headerbar button:active:active, .titlebar:not(headerbar) button:active:active, headerbar button:active:active:hover, .titlebar:not(headerbar) button:active:active:hover, headerbar button:active:active:focus, .titlebar:not(headerbar) button:active:active:focus, headerbar button:active:active:hover:focus, .titlebar:not(headerbar) button:active:active:hover:focus, headerbar button:active:checked, .titlebar:not(headerbar) button:active:checked, headerbar button:active:checked:hover, .titlebar:not(headerbar) button:active:checked:hover, headerbar button:active:checked:focus, .titlebar:not(headerbar) button:active:checked:focus, headerbar button:active:checked:hover:focus, .titlebar:not(headerbar) button:active:checked:hover:focus, headerbar button.flat:checked:active, .titlebar:not(headerbar) button.flat:checked:active, headerbar button.flat:checked:active:hover, .titlebar:not(headerbar) button.flat:checked:active:hover, headerbar button.flat:checked:active:focus, .titlebar:not(headerbar) button.flat:checked:active:focus, headerbar button.flat:checked:active:hover:focus, .titlebar:not(headerbar) button.flat:checked:active:hover:focus, headerbar button.flat:checked:checked, .titlebar:not(headerbar) button.flat:checked:checked, headerbar button.flat:checked:checked:hover, .titlebar:not(headerbar) button.flat:checked:checked:hover, headerbar button.flat:checked:checked:focus, .titlebar:not(headerbar) button.flat:checked:checked:focus, headerbar button.flat:checked:checked:hover:focus, .titlebar:not(headerbar) button.flat:checked:checked:hover:focus, headerbar button.flat:active:active, .titlebar:not(headerbar) button.flat:active:active, headerbar button.flat:active:active:hover, .titlebar:not(headerbar) button.flat:active:active:hover, headerbar button.flat:active:active:focus, .titlebar:not(headerbar) button.flat:active:active:focus, headerbar button.flat:active:active:hover:focus, .titlebar:not(headerbar) button.flat:active:active:hover:focus, headerbar button.flat:active:checked, .titlebar:not(headerbar) button.flat:active:checked, headerbar button.flat:active:checked:hover, .titlebar:not(headerbar) button.flat:active:checked:hover, headerbar button.flat:active:checked:focus, .titlebar:not(headerbar) button.flat:active:checked:focus, headerbar button.flat:active:checked:hover:focus, .titlebar:not(headerbar) button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled, headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button.flat:checked:disabled, .titlebar:not(headerbar) button.flat:checked:disabled, headerbar button.flat:active:disabled, .titlebar:not(headerbar) button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } headerbar button:checked:active:disabled, .titlebar:not(headerbar) button:checked:active:disabled, headerbar button:checked:checked:disabled, .titlebar:not(headerbar) button:checked:checked:disabled, headerbar button:active:active:disabled, .titlebar:not(headerbar) button:active:active:disabled, headerbar button:active:checked:disabled, .titlebar:not(headerbar) button:active:checked:disabled, headerbar button.flat:checked:active:disabled, .titlebar:not(headerbar) button.flat:checked:active:disabled, headerbar button.flat:checked:checked:disabled, .titlebar:not(headerbar) button.flat:checked:checked:disabled, headerbar button.flat:active:active:disabled, .titlebar:not(headerbar) button.flat:active:active:disabled, headerbar button.flat:active:checked:disabled, .titlebar:not(headerbar) button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button.flat:checked:focus, .titlebar:not(headerbar) button.flat:checked:focus, headerbar button.flat:checked:hover, .titlebar:not(headerbar) button.flat:checked:hover, headerbar button.flat:active:focus, .titlebar:not(headerbar) button.flat:active:focus, headerbar button.flat:active:hover, .titlebar:not(headerbar) button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button:hover, .titlebar:not(headerbar) button:hover, headerbar button.flat:focus, .titlebar:not(headerbar) button.flat:focus, headerbar button.flat:hover, .titlebar:not(headerbar) button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } headerbar button:disabled:disabled, .titlebar:not(headerbar) button:disabled:disabled, headerbar button.flat:disabled:disabled, .titlebar:not(headerbar) button.flat:disabled:disabled { - background-color: alpha(mix(#30302f,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#282828,#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#30302f,#ebdbb2,0.5); + color: mix(#282828,#d5c4a1,0.5); box-shadow: none; } headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled, headerbar button.flat:active:disabled, .titlebar:not(headerbar) button.flat:active:disabled, headerbar button.flat:checked:disabled, .titlebar:not(headerbar) button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -977,41 +970,41 @@ headerbar, .titlebar:not(headerbar) { box-shadow: none; } headerbar button.separator, .titlebar:not(headerbar) button.separator, headerbar button .separator, .titlebar:not(headerbar) button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.9); } + color: rgba(40, 40, 40, 0.9); } headerbar button.separator:disabled, .titlebar:not(headerbar) button.separator:disabled, headerbar button .separator:disabled, .titlebar:not(headerbar) button .separator:disabled { - color: rgba(48, 48, 47, 0.85); } + color: rgba(40, 40, 40, 0.85); } headerbar .linked > button, .titlebar:not(headerbar) .linked > button { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(10, 10, 9, 0.22); } headerbar .linked > button:focus, .titlebar:not(headerbar) .linked > button:focus, headerbar .linked > button:hover, .titlebar:not(headerbar) .linked > button:hover { - box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(10, 10, 9, 0.42); } headerbar .linked > button:active, .titlebar:not(headerbar) .linked > button:active, headerbar .linked > button:active:hover, .titlebar:not(headerbar) .linked > button:active:hover, headerbar .linked > button:active:focus, .titlebar:not(headerbar) .linked > button:active:focus, headerbar .linked > button:active:hover:focus, .titlebar:not(headerbar) .linked > button:active:hover:focus, headerbar .linked > button:checked, .titlebar:not(headerbar) .linked > button:checked, headerbar .linked > button:checked:hover, .titlebar:not(headerbar) .linked > button:checked:hover, headerbar .linked > button:checked:focus, .titlebar:not(headerbar) .linked > button:checked:focus, headerbar .linked > button:checked:hover:focus, .titlebar:not(headerbar) .linked > button:checked:hover:focus { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), inset 0 1px rgba(8, 8, 8, 0.07), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), inset 0 1px rgba(10, 10, 9, 0.07), inset 0 -1px rgba(10, 10, 9, 0.05); } headerbar .linked > button:disabled, .titlebar:not(headerbar) .linked > button:disabled { - box-shadow: inset -1px 0 #262626; } + box-shadow: inset -1px 0 #202020; } headerbar .linked > button:last-child, .titlebar:not(headerbar) .linked > button:last-child, headerbar .linked > button:only-child, .titlebar:not(headerbar) .linked > button:only-child { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } headerbar .linked > button:last-child:hover, .titlebar:not(headerbar) .linked > button:last-child:hover, headerbar .linked > button:only-child:hover, .titlebar:not(headerbar) .linked > button:only-child:hover { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } headerbar .linked > button:disabled:last-child, .titlebar:not(headerbar) .linked > button:disabled:last-child, headerbar .linked > button:disabled:only-child, .titlebar:not(headerbar) .linked > button:disabled:only-child, headerbar .linked > button:active:disabled:last-child, .titlebar:not(headerbar) .linked > button:active:disabled:last-child, headerbar .linked > button:active:disabled:only-child, .titlebar:not(headerbar) .linked > button:active:disabled:only-child, headerbar .linked > button:checked:disabled:last-child, .titlebar:not(headerbar) .linked > button:checked:disabled:last-child, headerbar .linked > button:checked:disabled:only-child, .titlebar:not(headerbar) .linked > button:checked:disabled:only-child { box-shadow: none; } headerbar .linked > button:active:last-child, .titlebar:not(headerbar) .linked > button:active:last-child, headerbar .linked > button:active:last-child:focus, .titlebar:not(headerbar) .linked > button:active:last-child:focus, headerbar .linked > button:active:last-child:hover, .titlebar:not(headerbar) .linked > button:active:last-child:hover, headerbar .linked > button:active:last-child:hover:focus, .titlebar:not(headerbar) .linked > button:active:last-child:hover:focus, headerbar .linked > button:checked:last-child, .titlebar:not(headerbar) .linked > button:checked:last-child, headerbar .linked > button:checked:last-child:focus, .titlebar:not(headerbar) .linked > button:checked:last-child:focus, headerbar .linked > button:checked:last-child:hover, .titlebar:not(headerbar) .linked > button:checked:last-child:hover, headerbar .linked > button:checked:last-child:hover:focus, .titlebar:not(headerbar) .linked > button:checked:last-child:hover:focus { - box-shadow: inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } headerbar .linked > button:active:only-child, .titlebar:not(headerbar) .linked > button:active:only-child, headerbar .linked > button:active:only-child:focus, .titlebar:not(headerbar) .linked > button:active:only-child:focus, headerbar .linked > button:active:only-child:hover, .titlebar:not(headerbar) .linked > button:active:only-child:hover, headerbar .linked > button:active:only-child:hover:focus, .titlebar:not(headerbar) .linked > button:active:only-child:hover:focus, headerbar .linked > button:checked:only-child, .titlebar:not(headerbar) .linked > button:checked:only-child, headerbar .linked > button:checked:only-child:focus, .titlebar:not(headerbar) .linked > button:checked:only-child:focus, headerbar .linked > button:checked:only-child:hover, .titlebar:not(headerbar) .linked > button:checked:only-child:hover, headerbar .linked > button:checked:only-child:hover:focus, .titlebar:not(headerbar) .linked > button:checked:only-child:hover:focus { - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.06), inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } headerbar combobox, .titlebar:not(headerbar) combobox, headerbar button, .titlebar:not(headerbar) button { - padding: 3px; } + padding: 0px; } headerbar combobox.text-button, .titlebar:not(headerbar) combobox.text-button, headerbar button.text-button, .titlebar:not(headerbar) button.text-button { - padding: 3px; } + padding: 0px; } headerbar combobox.image-button, .titlebar:not(headerbar) combobox.image-button, headerbar button.image-button, .titlebar:not(headerbar) button.image-button { - padding: 3px; } + padding: 0px; } headerbar separator, .titlebar:not(headerbar) separator, headerbar separator:disabled, .titlebar:not(headerbar) separator:disabled { - color: #1d1d1c; + color: #181818; border-color: currentColor; -GtkWidget-window-dragging: true; } headerbar:backdrop, .titlebar:backdrop:not(headerbar) { - background-color: #30302f; + background-color: #282828; background-image: none; - color: mix(#ebdbb2,#30302f,0.6); + color: mix(#d5c4a1,#282828,0.6); text-shadow: none; } headerbar.default-decoration, .default-decoration.titlebar:not(headerbar) { min-height: 24px; @@ -1031,96 +1024,96 @@ headerbar, .titlebar:not(headerbar) { headerbar .title, .titlebar:not(headerbar) .title { font-weight: bold; } headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton { - margin-left: 3px; } + margin-left: 0px; } headerbar button, .titlebar:not(headerbar) button { - background-color: #30302f; + background-color: #32302f; background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button:hover, .titlebar:not(headerbar) button:hover { border-color: #527065; } headerbar button:active, .titlebar:not(headerbar) button:active, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover:focus, .titlebar:not(headerbar) button:active:hover:focus, headerbar button:checked, .titlebar:not(headerbar) button:checked, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover:focus, .titlebar:not(headerbar) button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } headerbar button:disabled, .titlebar:not(headerbar) button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } headerbar button.flat, .titlebar:not(headerbar) button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(50, 48, 47, 0); + background-color: rgba(50, 48, 47, 0); background-image: none; box-shadow: none; } headerbar button:hover, .titlebar:not(headerbar) button:hover, headerbar button.flat:hover, .titlebar:not(headerbar) button.flat:hover { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } headerbar button:hover:focus, .titlebar:not(headerbar) button:hover:focus, headerbar button:hover:hover, .titlebar:not(headerbar) button:hover:hover, headerbar button.flat:hover:focus, .titlebar:not(headerbar) button.flat:hover:focus, headerbar button.flat:hover:hover, .titlebar:not(headerbar) button.flat:hover:hover { border-color: #527065; } headerbar button:hover:active, .titlebar:not(headerbar) button:hover:active, headerbar button:hover:active:hover, .titlebar:not(headerbar) button:hover:active:hover, headerbar button:hover:active:focus, .titlebar:not(headerbar) button:hover:active:focus, headerbar button:hover:active:hover:focus, .titlebar:not(headerbar) button:hover:active:hover:focus, headerbar button:hover:checked, .titlebar:not(headerbar) button:hover:checked, headerbar button:hover:checked:hover, .titlebar:not(headerbar) button:hover:checked:hover, headerbar button:hover:checked:focus, .titlebar:not(headerbar) button:hover:checked:focus, headerbar button:hover:checked:hover:focus, .titlebar:not(headerbar) button:hover:checked:hover:focus, headerbar button.flat:hover:active, .titlebar:not(headerbar) button.flat:hover:active, headerbar button.flat:hover:active:hover, .titlebar:not(headerbar) button.flat:hover:active:hover, headerbar button.flat:hover:active:focus, .titlebar:not(headerbar) button.flat:hover:active:focus, headerbar button.flat:hover:active:hover:focus, .titlebar:not(headerbar) button.flat:hover:active:hover:focus, headerbar button.flat:hover:checked, .titlebar:not(headerbar) button.flat:hover:checked, headerbar button.flat:hover:checked:hover, .titlebar:not(headerbar) button.flat:hover:checked:hover, headerbar button.flat:hover:checked:focus, .titlebar:not(headerbar) button.flat:hover:checked:focus, headerbar button.flat:hover:checked:hover:focus, .titlebar:not(headerbar) button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:hover:disabled, .titlebar:not(headerbar) button:hover:disabled, headerbar button.flat:hover:disabled, .titlebar:not(headerbar) button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:hover:active:disabled, .titlebar:not(headerbar) button:hover:active:disabled, headerbar button:hover:checked:disabled, .titlebar:not(headerbar) button:hover:checked:disabled, headerbar button.flat:hover:active:disabled, .titlebar:not(headerbar) button.flat:hover:active:disabled, headerbar button.flat:hover:checked:disabled, .titlebar:not(headerbar) button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button.flat:focus, .titlebar:not(headerbar) button.flat:focus { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } headerbar button:focus:focus, .titlebar:not(headerbar) button:focus:focus, headerbar button:focus:hover, .titlebar:not(headerbar) button:focus:hover, headerbar button.flat:focus:focus, .titlebar:not(headerbar) button.flat:focus:focus, headerbar button.flat:focus:hover, .titlebar:not(headerbar) button.flat:focus:hover { border-color: #527065; } headerbar button:focus:active, .titlebar:not(headerbar) button:focus:active, headerbar button:focus:active:hover, .titlebar:not(headerbar) button:focus:active:hover, headerbar button:focus:active:focus, .titlebar:not(headerbar) button:focus:active:focus, headerbar button:focus:active:hover:focus, .titlebar:not(headerbar) button:focus:active:hover:focus, headerbar button:focus:checked, .titlebar:not(headerbar) button:focus:checked, headerbar button:focus:checked:hover, .titlebar:not(headerbar) button:focus:checked:hover, headerbar button:focus:checked:focus, .titlebar:not(headerbar) button:focus:checked:focus, headerbar button:focus:checked:hover:focus, .titlebar:not(headerbar) button:focus:checked:hover:focus, headerbar button.flat:focus:active, .titlebar:not(headerbar) button.flat:focus:active, headerbar button.flat:focus:active:hover, .titlebar:not(headerbar) button.flat:focus:active:hover, headerbar button.flat:focus:active:focus, .titlebar:not(headerbar) button.flat:focus:active:focus, headerbar button.flat:focus:active:hover:focus, .titlebar:not(headerbar) button.flat:focus:active:hover:focus, headerbar button.flat:focus:checked, .titlebar:not(headerbar) button.flat:focus:checked, headerbar button.flat:focus:checked:hover, .titlebar:not(headerbar) button.flat:focus:checked:hover, headerbar button.flat:focus:checked:focus, .titlebar:not(headerbar) button.flat:focus:checked:focus, headerbar button.flat:focus:checked:hover:focus, .titlebar:not(headerbar) button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:focus:disabled, .titlebar:not(headerbar) button:focus:disabled, headerbar button.flat:focus:disabled, .titlebar:not(headerbar) button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:focus:active:disabled, .titlebar:not(headerbar) button:focus:active:disabled, headerbar button:focus:checked:disabled, .titlebar:not(headerbar) button:focus:checked:disabled, headerbar button.flat:focus:active:disabled, .titlebar:not(headerbar) button.flat:focus:active:disabled, headerbar button.flat:focus:checked:disabled, .titlebar:not(headerbar) button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:focus:hover, .titlebar:not(headerbar) button:focus:hover, headerbar button.flat:focus:hover, .titlebar:not(headerbar) button.flat:focus:hover { - background-color: #353534; + background-color: #373534; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(190, 164, 109, 0.3); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } headerbar button:focus:hover:focus, .titlebar:not(headerbar) button:focus:hover:focus, headerbar button:focus:hover:hover, .titlebar:not(headerbar) button:focus:hover:hover, headerbar button.flat:focus:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:focus, headerbar button.flat:focus:hover:hover, .titlebar:not(headerbar) button.flat:focus:hover:hover { border-color: #527065; } headerbar button:focus:hover:active, .titlebar:not(headerbar) button:focus:hover:active, headerbar button:focus:hover:active:hover, .titlebar:not(headerbar) button:focus:hover:active:hover, headerbar button:focus:hover:active:focus, .titlebar:not(headerbar) button:focus:hover:active:focus, headerbar button:focus:hover:active:hover:focus, .titlebar:not(headerbar) button:focus:hover:active:hover:focus, headerbar button:focus:hover:checked, .titlebar:not(headerbar) button:focus:hover:checked, headerbar button:focus:hover:checked:hover, .titlebar:not(headerbar) button:focus:hover:checked:hover, headerbar button:focus:hover:checked:focus, .titlebar:not(headerbar) button:focus:hover:checked:focus, headerbar button:focus:hover:checked:hover:focus, .titlebar:not(headerbar) button:focus:hover:checked:hover:focus, headerbar button.flat:focus:hover:active, .titlebar:not(headerbar) button.flat:focus:hover:active, headerbar button.flat:focus:hover:active:hover, .titlebar:not(headerbar) button.flat:focus:hover:active:hover, headerbar button.flat:focus:hover:active:focus, .titlebar:not(headerbar) button.flat:focus:hover:active:focus, headerbar button.flat:focus:hover:active:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:active:hover:focus, headerbar button.flat:focus:hover:checked, .titlebar:not(headerbar) button.flat:focus:hover:checked, headerbar button.flat:focus:hover:checked:hover, .titlebar:not(headerbar) button.flat:focus:hover:checked:hover, headerbar button.flat:focus:hover:checked:focus, .titlebar:not(headerbar) button.flat:focus:hover:checked:focus, headerbar button.flat:focus:hover:checked:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:focus:hover:disabled, .titlebar:not(headerbar) button:focus:hover:disabled, headerbar button.flat:focus:hover:disabled, .titlebar:not(headerbar) button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:focus:hover:active:disabled, .titlebar:not(headerbar) button:focus:hover:active:disabled, headerbar button:focus:hover:checked:disabled, .titlebar:not(headerbar) button:focus:hover:checked:disabled, headerbar button.flat:focus:hover:active:disabled, .titlebar:not(headerbar) button.flat:focus:hover:active:disabled, headerbar button.flat:focus:hover:checked:disabled, .titlebar:not(headerbar) button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:checked, .titlebar:not(headerbar) button:checked, headerbar button:active, .titlebar:not(headerbar) button:active, headerbar button.flat:checked, .titlebar:not(headerbar) button.flat:checked, headerbar button.flat:active, .titlebar:not(headerbar) button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button.flat:checked:focus, .titlebar:not(headerbar) button.flat:checked:focus, headerbar button.flat:checked:hover, .titlebar:not(headerbar) button.flat:checked:hover, headerbar button.flat:active:focus, .titlebar:not(headerbar) button.flat:active:focus, headerbar button.flat:active:hover, .titlebar:not(headerbar) button.flat:active:hover { border-color: #527065; } headerbar button:checked:active, .titlebar:not(headerbar) button:checked:active, headerbar button:checked:active:hover, .titlebar:not(headerbar) button:checked:active:hover, headerbar button:checked:active:focus, .titlebar:not(headerbar) button:checked:active:focus, headerbar button:checked:active:hover:focus, .titlebar:not(headerbar) button:checked:active:hover:focus, headerbar button:checked:checked, .titlebar:not(headerbar) button:checked:checked, headerbar button:checked:checked:hover, .titlebar:not(headerbar) button:checked:checked:hover, headerbar button:checked:checked:focus, .titlebar:not(headerbar) button:checked:checked:focus, headerbar button:checked:checked:hover:focus, .titlebar:not(headerbar) button:checked:checked:hover:focus, headerbar button:active:active, .titlebar:not(headerbar) button:active:active, headerbar button:active:active:hover, .titlebar:not(headerbar) button:active:active:hover, headerbar button:active:active:focus, .titlebar:not(headerbar) button:active:active:focus, headerbar button:active:active:hover:focus, .titlebar:not(headerbar) button:active:active:hover:focus, headerbar button:active:checked, .titlebar:not(headerbar) button:active:checked, headerbar button:active:checked:hover, .titlebar:not(headerbar) button:active:checked:hover, headerbar button:active:checked:focus, .titlebar:not(headerbar) button:active:checked:focus, headerbar button:active:checked:hover:focus, .titlebar:not(headerbar) button:active:checked:hover:focus, headerbar button.flat:checked:active, .titlebar:not(headerbar) button.flat:checked:active, headerbar button.flat:checked:active:hover, .titlebar:not(headerbar) button.flat:checked:active:hover, headerbar button.flat:checked:active:focus, .titlebar:not(headerbar) button.flat:checked:active:focus, headerbar button.flat:checked:active:hover:focus, .titlebar:not(headerbar) button.flat:checked:active:hover:focus, headerbar button.flat:checked:checked, .titlebar:not(headerbar) button.flat:checked:checked, headerbar button.flat:checked:checked:hover, .titlebar:not(headerbar) button.flat:checked:checked:hover, headerbar button.flat:checked:checked:focus, .titlebar:not(headerbar) button.flat:checked:checked:focus, headerbar button.flat:checked:checked:hover:focus, .titlebar:not(headerbar) button.flat:checked:checked:hover:focus, headerbar button.flat:active:active, .titlebar:not(headerbar) button.flat:active:active, headerbar button.flat:active:active:hover, .titlebar:not(headerbar) button.flat:active:active:hover, headerbar button.flat:active:active:focus, .titlebar:not(headerbar) button.flat:active:active:focus, headerbar button.flat:active:active:hover:focus, .titlebar:not(headerbar) button.flat:active:active:hover:focus, headerbar button.flat:active:checked, .titlebar:not(headerbar) button.flat:active:checked, headerbar button.flat:active:checked:hover, .titlebar:not(headerbar) button.flat:active:checked:hover, headerbar button.flat:active:checked:focus, .titlebar:not(headerbar) button.flat:active:checked:focus, headerbar button.flat:active:checked:hover:focus, .titlebar:not(headerbar) button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled, headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button.flat:checked:disabled, .titlebar:not(headerbar) button.flat:checked:disabled, headerbar button.flat:active:disabled, .titlebar:not(headerbar) button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } headerbar button:checked:active:disabled, .titlebar:not(headerbar) button:checked:active:disabled, headerbar button:checked:checked:disabled, .titlebar:not(headerbar) button:checked:checked:disabled, headerbar button:active:active:disabled, .titlebar:not(headerbar) button:active:active:disabled, headerbar button:active:checked:disabled, .titlebar:not(headerbar) button:active:checked:disabled, headerbar button.flat:checked:active:disabled, .titlebar:not(headerbar) button.flat:checked:active:disabled, headerbar button.flat:checked:checked:disabled, .titlebar:not(headerbar) button.flat:checked:checked:disabled, headerbar button.flat:active:active:disabled, .titlebar:not(headerbar) button.flat:active:active:disabled, headerbar button.flat:active:checked:disabled, .titlebar:not(headerbar) button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button.flat:checked:focus, .titlebar:not(headerbar) button.flat:checked:focus, headerbar button.flat:checked:hover, .titlebar:not(headerbar) button.flat:checked:hover, headerbar button.flat:active:focus, .titlebar:not(headerbar) button.flat:active:focus, headerbar button.flat:active:hover, .titlebar:not(headerbar) button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button:hover, .titlebar:not(headerbar) button:hover, headerbar button.flat:focus, .titlebar:not(headerbar) button.flat:focus, headerbar button.flat:hover, .titlebar:not(headerbar) button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } headerbar button:disabled:disabled, .titlebar:not(headerbar) button:disabled:disabled, headerbar button.flat:disabled:disabled, .titlebar:not(headerbar) button.flat:disabled:disabled { - background-color: alpha(mix(#30302f,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#32302f,#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#30302f,#ebdbb2,0.5); + color: mix(#32302f,#d5c4a1,0.5); box-shadow: none; } headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled, headerbar button.flat:active:disabled, .titlebar:not(headerbar) button.flat:active:disabled, headerbar button.flat:checked:disabled, .titlebar:not(headerbar) button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -1129,17 +1122,17 @@ headerbar, .titlebar:not(headerbar) { box-shadow: none; } headerbar button.separator, .titlebar:not(headerbar) button.separator, headerbar button .separator, .titlebar:not(headerbar) button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.9); } + color: rgba(50, 48, 47, 0.9); } headerbar button.separator:disabled, .titlebar:not(headerbar) button.separator:disabled, headerbar button .separator:disabled, .titlebar:not(headerbar) button .separator:disabled { - color: rgba(48, 48, 47, 0.85); } + color: rgba(50, 48, 47, 0.85); } headerbar button.titlebutton + separator.titlebutton, .titlebar:not(headerbar) button.titlebutton + separator.titlebutton { margin-left: 0; - margin-right: 3px; } + margin-right: 0px; } headerbar button.titlebutton, .titlebar:not(headerbar) button.titlebutton { border: 0; background-image: none; background-color: transparent; - color: mix(#ebdbb2,#30302f,0.1); + color: mix(#d5c4a1,#282828,0.1); box-shadow: none; } headerbar button.titlebutton:hover, .titlebar:not(headerbar) button.titlebutton:hover, headerbar button.titlebutton:hover:focus, .titlebar:not(headerbar) button.titlebutton:hover:focus { background-image: none; @@ -1153,14 +1146,14 @@ headerbar, .titlebar:not(headerbar) { box-shadow: none; } headerbar button.titlebutton:backdrop, .titlebar:not(headerbar) button.titlebutton:backdrop { background: none; - color: mix(#ebdbb2,#30302f,0.6); + color: mix(#d5c4a1,#282828,0.6); -gtk-icon-shadow: none; } toolbar { background-color: #ebdbb2; background-image: none; border-color: #dabc70; - color: #282828; } + color: #32302f; } toolbar:focus, toolbar:hover { border-color: #527065; } toolbar:active, toolbar:active:hover, toolbar:active:focus, toolbar:active:hover:focus, toolbar:checked, toolbar:checked:hover, toolbar:checked:focus, toolbar:checked:hover:focus { @@ -1172,29 +1165,29 @@ toolbar { toolbar:disabled { background-color: #e2cc91; background-image: none; - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } toolbar .title { font-weight: bold; - padding: 0 6px; } + padding: 0 0px; } toolbar .subtitle { font-size: smaller; - padding: 0 6px; } + padding: 0 0px; } toolbar button { background-color: #ebdbb2; background-image: none; - border-color: rgba(32, 32, 32, 0.32); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } toolbar button:focus, toolbar button:hover { border-color: #527065; } toolbar button:active, toolbar button:active:hover, toolbar button:active:focus, toolbar button:active:hover:focus, toolbar button:checked, toolbar button:checked:hover, toolbar button:checked:focus, toolbar button:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.32); } + border-color: rgba(35, 34, 33, 0.32); } toolbar button:disabled { - border-color: rgba(34, 34, 34, 0.32); } + border-color: rgba(43, 41, 40, 0.32); } toolbar button:active:disabled, toolbar button:checked:disabled { - border-color: rgba(32, 32, 32, 0.32); } + border-color: rgba(40, 38, 38, 0.32); } toolbar button.flat { - color: #282828; + color: #32302f; border-color: rgba(235, 219, 178, 0); background-color: rgba(235, 219, 178, 0); background-image: none; @@ -1202,72 +1195,72 @@ toolbar { toolbar button:hover, toolbar button.flat:hover { background-color: #efe3c2; background-image: none; - border-color: rgba(32, 32, 32, 0.4); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } toolbar button:hover:focus, toolbar button:hover:hover, toolbar button.flat:hover:focus, toolbar button.flat:hover:hover { border-color: #527065; } toolbar button:hover:active, toolbar button:hover:active:hover, toolbar button:hover:active:focus, toolbar button:hover:active:hover:focus, toolbar button:hover:checked, toolbar button:hover:checked:hover, toolbar button:hover:checked:focus, toolbar button:hover:checked:hover:focus, toolbar button.flat:hover:active, toolbar button.flat:hover:active:hover, toolbar button.flat:hover:active:focus, toolbar button.flat:hover:active:hover:focus, toolbar button.flat:hover:checked, toolbar button.flat:hover:checked:hover, toolbar button.flat:hover:checked:focus, toolbar button.flat:hover:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.4); } + border-color: rgba(35, 34, 33, 0.4); } toolbar button:hover:disabled, toolbar button.flat:hover:disabled { - border-color: rgba(34, 34, 34, 0.4); } + border-color: rgba(43, 41, 40, 0.4); } toolbar button:hover:active:disabled, toolbar button:hover:checked:disabled, toolbar button.flat:hover:active:disabled, toolbar button.flat:hover:checked:disabled { - border-color: rgba(32, 32, 32, 0.4); } + border-color: rgba(40, 38, 38, 0.4); } toolbar button:focus, toolbar button.flat:focus { background-color: #efe3c2; background-image: none; - border-color: rgba(32, 32, 32, 0.4); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } toolbar button:focus:focus, toolbar button:focus:hover, toolbar button.flat:focus:focus, toolbar button.flat:focus:hover { border-color: #527065; } toolbar button:focus:active, toolbar button:focus:active:hover, toolbar button:focus:active:focus, toolbar button:focus:active:hover:focus, toolbar button:focus:checked, toolbar button:focus:checked:hover, toolbar button:focus:checked:focus, toolbar button:focus:checked:hover:focus, toolbar button.flat:focus:active, toolbar button.flat:focus:active:hover, toolbar button.flat:focus:active:focus, toolbar button.flat:focus:active:hover:focus, toolbar button.flat:focus:checked, toolbar button.flat:focus:checked:hover, toolbar button.flat:focus:checked:focus, toolbar button.flat:focus:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.4); } + border-color: rgba(35, 34, 33, 0.4); } toolbar button:focus:disabled, toolbar button.flat:focus:disabled { - border-color: rgba(34, 34, 34, 0.4); } + border-color: rgba(43, 41, 40, 0.4); } toolbar button:focus:active:disabled, toolbar button:focus:checked:disabled, toolbar button.flat:focus:active:disabled, toolbar button.flat:focus:checked:disabled { - border-color: rgba(32, 32, 32, 0.4); } + border-color: rgba(40, 38, 38, 0.4); } toolbar button:focus:hover, toolbar button.flat:focus:hover { background-color: #f4ead3; background-image: none; - border-color: rgba(32, 32, 32, 0.4); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.38); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } toolbar button:focus:hover:focus, toolbar button:focus:hover:hover, toolbar button.flat:focus:hover:focus, toolbar button.flat:focus:hover:hover { border-color: #527065; } toolbar button:focus:hover:active, toolbar button:focus:hover:active:hover, toolbar button:focus:hover:active:focus, toolbar button:focus:hover:active:hover:focus, toolbar button:focus:hover:checked, toolbar button:focus:hover:checked:hover, toolbar button:focus:hover:checked:focus, toolbar button:focus:hover:checked:hover:focus, toolbar button.flat:focus:hover:active, toolbar button.flat:focus:hover:active:hover, toolbar button.flat:focus:hover:active:focus, toolbar button.flat:focus:hover:active:hover:focus, toolbar button.flat:focus:hover:checked, toolbar button.flat:focus:hover:checked:hover, toolbar button.flat:focus:hover:checked:focus, toolbar button.flat:focus:hover:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.4); } + border-color: rgba(35, 34, 33, 0.4); } toolbar button:focus:hover:disabled, toolbar button.flat:focus:hover:disabled { - border-color: rgba(34, 34, 34, 0.4); } + border-color: rgba(43, 41, 40, 0.4); } toolbar button:focus:hover:active:disabled, toolbar button:focus:hover:checked:disabled, toolbar button.flat:focus:hover:active:disabled, toolbar button.flat:focus:hover:checked:disabled { - border-color: rgba(32, 32, 32, 0.4); } + border-color: rgba(40, 38, 38, 0.4); } toolbar button:checked, toolbar button:active, toolbar button.flat:checked, toolbar button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(40, 40, 40, 0.06), inset 0 1px rgba(40, 40, 40, 0.07), inset -1px 0 rgba(40, 40, 40, 0.06), inset 0 -1px rgba(40, 40, 40, 0.05); - border-color: rgba(32, 32, 32, 0.32); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } toolbar button:checked:focus, toolbar button:checked:hover, toolbar button:active:focus, toolbar button:active:hover, toolbar button.flat:checked:focus, toolbar button.flat:checked:hover, toolbar button.flat:active:focus, toolbar button.flat:active:hover { border-color: #527065; } toolbar button:checked:active, toolbar button:checked:active:hover, toolbar button:checked:active:focus, toolbar button:checked:active:hover:focus, toolbar button:checked:checked, toolbar button:checked:checked:hover, toolbar button:checked:checked:focus, toolbar button:checked:checked:hover:focus, toolbar button:active:active, toolbar button:active:active:hover, toolbar button:active:active:focus, toolbar button:active:active:hover:focus, toolbar button:active:checked, toolbar button:active:checked:hover, toolbar button:active:checked:focus, toolbar button:active:checked:hover:focus, toolbar button.flat:checked:active, toolbar button.flat:checked:active:hover, toolbar button.flat:checked:active:focus, toolbar button.flat:checked:active:hover:focus, toolbar button.flat:checked:checked, toolbar button.flat:checked:checked:hover, toolbar button.flat:checked:checked:focus, toolbar button.flat:checked:checked:hover:focus, toolbar button.flat:active:active, toolbar button.flat:active:active:hover, toolbar button.flat:active:active:focus, toolbar button.flat:active:active:hover:focus, toolbar button.flat:active:checked, toolbar button.flat:active:checked:hover, toolbar button.flat:active:checked:focus, toolbar button.flat:active:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.32); } + border-color: rgba(35, 34, 33, 0.32); } toolbar button:checked:disabled, toolbar button:active:disabled, toolbar button.flat:checked:disabled, toolbar button.flat:active:disabled { - border-color: rgba(34, 34, 34, 0.32); } + border-color: rgba(43, 41, 40, 0.32); } toolbar button:checked:active:disabled, toolbar button:checked:checked:disabled, toolbar button:active:active:disabled, toolbar button:active:checked:disabled, toolbar button.flat:checked:active:disabled, toolbar button.flat:checked:checked:disabled, toolbar button.flat:active:active:disabled, toolbar button.flat:active:checked:disabled { - border-color: rgba(32, 32, 32, 0.32); } + border-color: rgba(40, 38, 38, 0.32); } toolbar button:checked:focus, toolbar button:checked:hover, toolbar button:active:focus, toolbar button:active:hover, toolbar button.flat:checked:focus, toolbar button.flat:checked:hover, toolbar button.flat:active:focus, toolbar button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } toolbar button:focus, toolbar button:hover, toolbar button.flat:focus, toolbar button.flat:hover { - color: #282828; } + color: #32302f; } toolbar button:disabled:disabled, toolbar button.flat:disabled:disabled { - background-color: alpha(mix(#ebdbb2,#282828,0.2),0.4); + background-color: alpha(mix(#ebdbb2,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#ebdbb2,#282828,0.5); + color: mix(#ebdbb2,#32302f,0.5); box-shadow: none; } toolbar button:active:disabled, toolbar button:checked:disabled, toolbar button.flat:active:disabled, toolbar button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -1280,29 +1273,29 @@ toolbar { toolbar button.separator:disabled, toolbar button .separator:disabled { color: rgba(235, 219, 178, 0.85); } toolbar .linked > button { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(10, 10, 9, 0.12); } toolbar .linked > button:focus, toolbar .linked > button:hover { - box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(10, 10, 9, 0.32); } toolbar .linked > button:active, toolbar .linked > button:active:hover, toolbar .linked > button:active:focus, toolbar .linked > button:active:hover:focus, toolbar .linked > button:checked, toolbar .linked > button:checked:hover, toolbar .linked > button:checked:focus, toolbar .linked > button:checked:hover:focus { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(8, 8, 8, 0.07), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(10, 10, 9, 0.07), inset 0 -1px rgba(10, 10, 9, 0.05); } toolbar .linked > button:disabled { box-shadow: inset -1px 0 #dabc70; } toolbar .linked > button:last-child, toolbar .linked > button:only-child { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } toolbar .linked > button:last-child:hover, toolbar .linked > button:only-child:hover { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } toolbar .linked > button:disabled:last-child, toolbar .linked > button:disabled:only-child, toolbar .linked > button:active:disabled:last-child, toolbar .linked > button:active:disabled:only-child, toolbar .linked > button:checked:disabled:last-child, toolbar .linked > button:checked:disabled:only-child { box-shadow: none; } toolbar .linked > button:active:last-child, toolbar .linked > button:active:last-child:focus, toolbar .linked > button:active:last-child:hover, toolbar .linked > button:active:last-child:hover:focus, toolbar .linked > button:checked:last-child, toolbar .linked > button:checked:last-child:focus, toolbar .linked > button:checked:last-child:hover, toolbar .linked > button:checked:last-child:hover:focus { - box-shadow: inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } toolbar .linked > button:active:only-child, toolbar .linked > button:active:only-child:focus, toolbar .linked > button:active:only-child:hover, toolbar .linked > button:active:only-child:hover:focus, toolbar .linked > button:checked:only-child, toolbar .linked > button:checked:only-child:focus, toolbar .linked > button:checked:only-child:hover, toolbar .linked > button:checked:only-child:hover:focus { - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.06), inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } toolbar combobox, toolbar button { - padding: 3px; } + padding: 0px; } toolbar combobox.text-button, toolbar button.text-button { - padding: 3px; } + padding: 0px; } toolbar combobox.image-button, toolbar button.image-button { - padding: 3px; } + padding: 0px; } toolbar separator, toolbar separator:disabled { color: #c59c33; border-color: currentColor; @@ -1311,29 +1304,29 @@ toolbar { padding: 1px; border-width: 0 1px 1px; border-style: solid; - border-color: #e1c98b; - background-color: mix(#e1c98b,#ebdbb2,0.7); + border-color: mix(#ebdbb2,#32302f,0.1); + background-color: mix(mix(#ebdbb2,#32302f,0.1),#ebdbb2,0.7); background-image: none; } toolbar.inline-toolbar:backdrop { - border-color: mix(#ebdbb2,#e1c98b,0.9); - background-color: mix(#ebdbb2,mix(#ebdbb2,#e1c98b,0.9),0.35); + border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); + background-color: mix(#ebdbb2,mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9),0.35); transition: 200ms ease-out; } toolbar.inline-toolbar button { background-color: #ebdbb2; background-image: none; - border-color: rgba(32, 32, 32, 0.32); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } toolbar.inline-toolbar button:focus, toolbar.inline-toolbar button:hover { border-color: #527065; } toolbar.inline-toolbar button:active, toolbar.inline-toolbar button:active:hover, toolbar.inline-toolbar button:active:focus, toolbar.inline-toolbar button:active:hover:focus, toolbar.inline-toolbar button:checked, toolbar.inline-toolbar button:checked:hover, toolbar.inline-toolbar button:checked:focus, toolbar.inline-toolbar button:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.32); } + border-color: rgba(35, 34, 33, 0.32); } toolbar.inline-toolbar button:disabled { - border-color: rgba(34, 34, 34, 0.32); } + border-color: rgba(43, 41, 40, 0.32); } toolbar.inline-toolbar button:active:disabled, toolbar.inline-toolbar button:checked:disabled { - border-color: rgba(32, 32, 32, 0.32); } + border-color: rgba(40, 38, 38, 0.32); } toolbar.inline-toolbar button.flat { - color: #282828; + color: #32302f; border-color: rgba(235, 219, 178, 0); background-color: rgba(235, 219, 178, 0); background-image: none; @@ -1341,72 +1334,72 @@ toolbar { toolbar.inline-toolbar button:hover, toolbar.inline-toolbar button.flat:hover { background-color: #efe3c2; background-image: none; - border-color: rgba(32, 32, 32, 0.4); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } toolbar.inline-toolbar button:hover:focus, toolbar.inline-toolbar button:hover:hover, toolbar.inline-toolbar button.flat:hover:focus, toolbar.inline-toolbar button.flat:hover:hover { border-color: #527065; } toolbar.inline-toolbar button:hover:active, toolbar.inline-toolbar button:hover:active:hover, toolbar.inline-toolbar button:hover:active:focus, toolbar.inline-toolbar button:hover:active:hover:focus, toolbar.inline-toolbar button:hover:checked, toolbar.inline-toolbar button:hover:checked:hover, toolbar.inline-toolbar button:hover:checked:focus, toolbar.inline-toolbar button:hover:checked:hover:focus, toolbar.inline-toolbar button.flat:hover:active, toolbar.inline-toolbar button.flat:hover:active:hover, toolbar.inline-toolbar button.flat:hover:active:focus, toolbar.inline-toolbar button.flat:hover:active:hover:focus, toolbar.inline-toolbar button.flat:hover:checked, toolbar.inline-toolbar button.flat:hover:checked:hover, toolbar.inline-toolbar button.flat:hover:checked:focus, toolbar.inline-toolbar button.flat:hover:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.4); } + border-color: rgba(35, 34, 33, 0.4); } toolbar.inline-toolbar button:hover:disabled, toolbar.inline-toolbar button.flat:hover:disabled { - border-color: rgba(34, 34, 34, 0.4); } + border-color: rgba(43, 41, 40, 0.4); } toolbar.inline-toolbar button:hover:active:disabled, toolbar.inline-toolbar button:hover:checked:disabled, toolbar.inline-toolbar button.flat:hover:active:disabled, toolbar.inline-toolbar button.flat:hover:checked:disabled { - border-color: rgba(32, 32, 32, 0.4); } + border-color: rgba(40, 38, 38, 0.4); } toolbar.inline-toolbar button:focus, toolbar.inline-toolbar button.flat:focus { background-color: #efe3c2; background-image: none; - border-color: rgba(32, 32, 32, 0.4); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } toolbar.inline-toolbar button:focus:focus, toolbar.inline-toolbar button:focus:hover, toolbar.inline-toolbar button.flat:focus:focus, toolbar.inline-toolbar button.flat:focus:hover { border-color: #527065; } toolbar.inline-toolbar button:focus:active, toolbar.inline-toolbar button:focus:active:hover, toolbar.inline-toolbar button:focus:active:focus, toolbar.inline-toolbar button:focus:active:hover:focus, toolbar.inline-toolbar button:focus:checked, toolbar.inline-toolbar button:focus:checked:hover, toolbar.inline-toolbar button:focus:checked:focus, toolbar.inline-toolbar button:focus:checked:hover:focus, toolbar.inline-toolbar button.flat:focus:active, toolbar.inline-toolbar button.flat:focus:active:hover, toolbar.inline-toolbar button.flat:focus:active:focus, toolbar.inline-toolbar button.flat:focus:active:hover:focus, toolbar.inline-toolbar button.flat:focus:checked, toolbar.inline-toolbar button.flat:focus:checked:hover, toolbar.inline-toolbar button.flat:focus:checked:focus, toolbar.inline-toolbar button.flat:focus:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.4); } + border-color: rgba(35, 34, 33, 0.4); } toolbar.inline-toolbar button:focus:disabled, toolbar.inline-toolbar button.flat:focus:disabled { - border-color: rgba(34, 34, 34, 0.4); } + border-color: rgba(43, 41, 40, 0.4); } toolbar.inline-toolbar button:focus:active:disabled, toolbar.inline-toolbar button:focus:checked:disabled, toolbar.inline-toolbar button.flat:focus:active:disabled, toolbar.inline-toolbar button.flat:focus:checked:disabled { - border-color: rgba(32, 32, 32, 0.4); } + border-color: rgba(40, 38, 38, 0.4); } toolbar.inline-toolbar button:focus:hover, toolbar.inline-toolbar button.flat:focus:hover { background-color: #f4ead3; background-image: none; - border-color: rgba(32, 32, 32, 0.4); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.38); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } toolbar.inline-toolbar button:focus:hover:focus, toolbar.inline-toolbar button:focus:hover:hover, toolbar.inline-toolbar button.flat:focus:hover:focus, toolbar.inline-toolbar button.flat:focus:hover:hover { border-color: #527065; } toolbar.inline-toolbar button:focus:hover:active, toolbar.inline-toolbar button:focus:hover:active:hover, toolbar.inline-toolbar button:focus:hover:active:focus, toolbar.inline-toolbar button:focus:hover:active:hover:focus, toolbar.inline-toolbar button:focus:hover:checked, toolbar.inline-toolbar button:focus:hover:checked:hover, toolbar.inline-toolbar button:focus:hover:checked:focus, toolbar.inline-toolbar button:focus:hover:checked:hover:focus, toolbar.inline-toolbar button.flat:focus:hover:active, toolbar.inline-toolbar button.flat:focus:hover:active:hover, toolbar.inline-toolbar button.flat:focus:hover:active:focus, toolbar.inline-toolbar button.flat:focus:hover:active:hover:focus, toolbar.inline-toolbar button.flat:focus:hover:checked, toolbar.inline-toolbar button.flat:focus:hover:checked:hover, toolbar.inline-toolbar button.flat:focus:hover:checked:focus, toolbar.inline-toolbar button.flat:focus:hover:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.4); } + border-color: rgba(35, 34, 33, 0.4); } toolbar.inline-toolbar button:focus:hover:disabled, toolbar.inline-toolbar button.flat:focus:hover:disabled { - border-color: rgba(34, 34, 34, 0.4); } + border-color: rgba(43, 41, 40, 0.4); } toolbar.inline-toolbar button:focus:hover:active:disabled, toolbar.inline-toolbar button:focus:hover:checked:disabled, toolbar.inline-toolbar button.flat:focus:hover:active:disabled, toolbar.inline-toolbar button.flat:focus:hover:checked:disabled { - border-color: rgba(32, 32, 32, 0.4); } + border-color: rgba(40, 38, 38, 0.4); } toolbar.inline-toolbar button:checked, toolbar.inline-toolbar button:active, toolbar.inline-toolbar button.flat:checked, toolbar.inline-toolbar button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(40, 40, 40, 0.06), inset 0 1px rgba(40, 40, 40, 0.07), inset -1px 0 rgba(40, 40, 40, 0.06), inset 0 -1px rgba(40, 40, 40, 0.05); - border-color: rgba(32, 32, 32, 0.32); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } toolbar.inline-toolbar button:checked:focus, toolbar.inline-toolbar button:checked:hover, toolbar.inline-toolbar button:active:focus, toolbar.inline-toolbar button:active:hover, toolbar.inline-toolbar button.flat:checked:focus, toolbar.inline-toolbar button.flat:checked:hover, toolbar.inline-toolbar button.flat:active:focus, toolbar.inline-toolbar button.flat:active:hover { border-color: #527065; } toolbar.inline-toolbar button:checked:active, toolbar.inline-toolbar button:checked:active:hover, toolbar.inline-toolbar button:checked:active:focus, toolbar.inline-toolbar button:checked:active:hover:focus, toolbar.inline-toolbar button:checked:checked, toolbar.inline-toolbar button:checked:checked:hover, toolbar.inline-toolbar button:checked:checked:focus, toolbar.inline-toolbar button:checked:checked:hover:focus, toolbar.inline-toolbar button:active:active, toolbar.inline-toolbar button:active:active:hover, toolbar.inline-toolbar button:active:active:focus, toolbar.inline-toolbar button:active:active:hover:focus, toolbar.inline-toolbar button:active:checked, toolbar.inline-toolbar button:active:checked:hover, toolbar.inline-toolbar button:active:checked:focus, toolbar.inline-toolbar button:active:checked:hover:focus, toolbar.inline-toolbar button.flat:checked:active, toolbar.inline-toolbar button.flat:checked:active:hover, toolbar.inline-toolbar button.flat:checked:active:focus, toolbar.inline-toolbar button.flat:checked:active:hover:focus, toolbar.inline-toolbar button.flat:checked:checked, toolbar.inline-toolbar button.flat:checked:checked:hover, toolbar.inline-toolbar button.flat:checked:checked:focus, toolbar.inline-toolbar button.flat:checked:checked:hover:focus, toolbar.inline-toolbar button.flat:active:active, toolbar.inline-toolbar button.flat:active:active:hover, toolbar.inline-toolbar button.flat:active:active:focus, toolbar.inline-toolbar button.flat:active:active:hover:focus, toolbar.inline-toolbar button.flat:active:checked, toolbar.inline-toolbar button.flat:active:checked:hover, toolbar.inline-toolbar button.flat:active:checked:focus, toolbar.inline-toolbar button.flat:active:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.32); } + border-color: rgba(35, 34, 33, 0.32); } toolbar.inline-toolbar button:checked:disabled, toolbar.inline-toolbar button:active:disabled, toolbar.inline-toolbar button.flat:checked:disabled, toolbar.inline-toolbar button.flat:active:disabled { - border-color: rgba(34, 34, 34, 0.32); } + border-color: rgba(43, 41, 40, 0.32); } toolbar.inline-toolbar button:checked:active:disabled, toolbar.inline-toolbar button:checked:checked:disabled, toolbar.inline-toolbar button:active:active:disabled, toolbar.inline-toolbar button:active:checked:disabled, toolbar.inline-toolbar button.flat:checked:active:disabled, toolbar.inline-toolbar button.flat:checked:checked:disabled, toolbar.inline-toolbar button.flat:active:active:disabled, toolbar.inline-toolbar button.flat:active:checked:disabled { - border-color: rgba(32, 32, 32, 0.32); } + border-color: rgba(40, 38, 38, 0.32); } toolbar.inline-toolbar button:checked:focus, toolbar.inline-toolbar button:checked:hover, toolbar.inline-toolbar button:active:focus, toolbar.inline-toolbar button:active:hover, toolbar.inline-toolbar button.flat:checked:focus, toolbar.inline-toolbar button.flat:checked:hover, toolbar.inline-toolbar button.flat:active:focus, toolbar.inline-toolbar button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } toolbar.inline-toolbar button:focus, toolbar.inline-toolbar button:hover, toolbar.inline-toolbar button.flat:focus, toolbar.inline-toolbar button.flat:hover { - color: #282828; } + color: #32302f; } toolbar.inline-toolbar button:disabled:disabled, toolbar.inline-toolbar button.flat:disabled:disabled { - background-color: alpha(mix(#ebdbb2,#282828,0.2),0.4); + background-color: alpha(mix(#ebdbb2,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#ebdbb2,#282828,0.5); + color: mix(#ebdbb2,#32302f,0.5); box-shadow: none; } toolbar.inline-toolbar button:active:disabled, toolbar.inline-toolbar button:checked:disabled, toolbar.inline-toolbar button.flat:active:disabled, toolbar.inline-toolbar button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -1428,11 +1421,11 @@ window.csd > .titlebar:not(headerbar) { box-shadow: none; } .titlebar:not(headerbar) > separator { - background-color: #2a2a29; } + background-color: #232323; } .background:not(.tiled):not(.maximized) .titlebar:backdrop, .background:not(.tiled):not(.maximized) .titlebar { - border-top-left-radius: 0px; - border-top-right-radius: 0px; } + border-top-left-radius: 4px; + border-top-right-radius: 4px; } .background:not(.csd):not(.ssd):not(.solid-csd) headerbar, .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:not(:last-child), .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:backdrop, .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:backdrop:not(:last-child) { border-radius: 0; @@ -1442,10 +1435,10 @@ window.csd > .titlebar:not(headerbar) { ! Action-bar * ***************/ actionbar > revealer > box { - padding: 3px; - border-top: 1px solid #e1c98b; } + padding: 0px; + border-top: 1px solid mix(#ebdbb2,#32302f,0.1); } actionbar > revealer > box:backdrop { - border-color: mix(#ebdbb2,#e1c98b,0.9); } + border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); } /**************************** ! Search and Location bars * @@ -1457,18 +1450,18 @@ searchbar, border-width: 0 0 1px; border-style: solid; border-color: #dabc70; - color: #282828; } + color: #32302f; } /****************** ! Action buttons * *******************/ .suggested-action, headerbar.selection-mode button.suggested-action, .titlebar:not(headerbar).selection-mode button.suggested-action { - background-color: #4caf50; + background-color: #c3a544; background-image: none; border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .suggested-action:focus, headerbar.selection-mode button.suggested-action:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:focus, .suggested-action:hover, headerbar.selection-mode button.suggested-action:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:hover { @@ -1491,18 +1484,18 @@ searchbar, .suggested-action.flat, headerbar.selection-mode button.flat.suggested-action, .titlebar:not(headerbar).selection-mode button.flat.suggested-action { color: #ebdbb2; - border-color: rgba(76, 175, 80, 0); - background-color: rgba(76, 175, 80, 0); + border-color: rgba(195, 165, 68, 0); + background-color: rgba(195, 165, 68, 0); background-image: none; box-shadow: none; } .suggested-action:hover, headerbar.selection-mode button.suggested-action:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:hover, .suggested-action.flat:hover, .titlebar:not(headerbar).selection-mode button.flat.suggested-action:hover { - background-color: #53b457; + background-color: #c6aa4e; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } .suggested-action:hover:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:hover:focus, .suggested-action:hover:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:hover:hover, .suggested-action.flat:hover:focus, .suggested-action.flat:hover:hover { @@ -1519,11 +1512,11 @@ searchbar, .suggested-action:focus, headerbar.selection-mode button.suggested-action:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:focus, .suggested-action.flat:focus, .titlebar:not(headerbar).selection-mode button.flat.suggested-action:focus { - background-color: #53b457; + background-color: #c6aa4e; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .suggested-action:focus:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:focus:focus, .suggested-action:focus:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:focus:hover, .suggested-action.flat:focus:focus, .suggested-action.flat:focus:hover { @@ -1539,10 +1532,10 @@ searchbar, border-color: rgba(218, 188, 112, 0.3); } .suggested-action:focus:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:focus:hover, .suggested-action.flat:focus:hover { - background-color: #5cb860; + background-color: #c9af58; background-image: none; border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } .suggested-action:focus:hover:focus, .suggested-action:focus:hover:hover, .suggested-action.flat:focus:hover:focus, .suggested-action.flat:focus:hover:hover { border-color: #527065; } .suggested-action:focus:hover:active, .suggested-action:focus:hover:active:hover, .suggested-action:focus:hover:active:focus, .suggested-action:focus:hover:active:hover:focus, .suggested-action:focus:hover:checked, .suggested-action:focus:hover:checked:hover, .suggested-action:focus:hover:checked:focus, .suggested-action:focus:hover:checked:hover:focus, .suggested-action.flat:focus:hover:active, .suggested-action.flat:focus:hover:active:hover, .suggested-action.flat:focus:hover:active:focus, .suggested-action.flat:focus:hover:active:hover:focus, .suggested-action.flat:focus:hover:checked, .suggested-action.flat:focus:hover:checked:hover, .suggested-action.flat:focus:hover:checked:focus, .suggested-action.flat:focus:hover:checked:hover:focus { @@ -1559,9 +1552,9 @@ searchbar, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } .suggested-action:checked:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:checked:focus, .suggested-action:checked:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:checked:hover, .suggested-action:active:focus, @@ -1597,11 +1590,11 @@ searchbar, color: #ebdbb2; } .suggested-action:disabled:disabled, .titlebar:not(headerbar).selection-mode button.suggested-action:disabled:disabled, .suggested-action.flat:disabled:disabled { - background-color: alpha(mix(#4caf50,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#c3a544,#ebdbb2,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#4caf50,#ebdbb2,0.5); + color: mix(#c3a544,#ebdbb2,0.5); box-shadow: none; } .suggested-action:active:disabled, .titlebar:not(headerbar).selection-mode button.suggested-action:active:disabled, .suggested-action:checked:disabled, @@ -1611,21 +1604,19 @@ searchbar, color: #ebdbb2; box-shadow: none; } .suggested-action.separator, headerbar.selection-mode button.separator.suggested-action, - .titlebar:not(headerbar).selection-mode button.separator.suggested-action, .suggested-action .separator, headerbar.selection-mode button.suggested-action .separator, - .titlebar:not(headerbar).selection-mode button.suggested-action .separator { + .titlebar:not(headerbar).selection-mode button.separator.suggested-action, .suggested-action .separator, headerbar.selection-mode button.suggested-action .separator, .titlebar:not(headerbar).selection-mode button.suggested-action .separator { border: 1px solid currentColor; - color: rgba(76, 175, 80, 0.9); } + color: rgba(195, 165, 68, 0.9); } .suggested-action.separator:disabled, - .titlebar:not(headerbar).selection-mode button.separator.suggested-action:disabled, .suggested-action .separator:disabled, - .titlebar:not(headerbar).selection-mode button.suggested-action .separator:disabled { - color: rgba(76, 175, 80, 0.85); } + .titlebar:not(headerbar).selection-mode button.separator.suggested-action:disabled, .suggested-action .separator:disabled, .titlebar:not(headerbar).selection-mode button.suggested-action .separator:disabled { + color: rgba(195, 165, 68, 0.85); } .destructive-action { - background-color: #f44336; + background-color: #ff276a; background-image: none; border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .destructive-action:focus, .destructive-action:hover { border-color: #527065; } .destructive-action:active, .destructive-action:active:hover, .destructive-action:active:focus, .destructive-action:active:hover:focus, .destructive-action:checked, .destructive-action:checked:hover, .destructive-action:checked:focus, .destructive-action:checked:hover:focus { @@ -1636,16 +1627,16 @@ searchbar, border-color: rgba(218, 188, 112, 0.22); } .destructive-action.flat { color: #ebdbb2; - border-color: rgba(244, 67, 54, 0); - background-color: rgba(244, 67, 54, 0); + border-color: rgba(255, 39, 106, 0); + background-color: rgba(255, 39, 106, 0); background-image: none; box-shadow: none; } .destructive-action:hover, .destructive-action.flat:hover { - background-color: #f55044; + background-color: #ff3674; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } .destructive-action:hover:focus, .destructive-action:hover:hover, .destructive-action.flat:hover:focus, .destructive-action.flat:hover:hover { border-color: #527065; } .destructive-action:hover:active, .destructive-action:hover:active:hover, .destructive-action:hover:active:focus, .destructive-action:hover:active:hover:focus, .destructive-action:hover:checked, .destructive-action:hover:checked:hover, .destructive-action:hover:checked:focus, .destructive-action:hover:checked:hover:focus, .destructive-action.flat:hover:active, .destructive-action.flat:hover:active:hover, .destructive-action.flat:hover:active:focus, .destructive-action.flat:hover:active:hover:focus, .destructive-action.flat:hover:checked, .destructive-action.flat:hover:checked:hover, .destructive-action.flat:hover:checked:focus, .destructive-action.flat:hover:checked:hover:focus { @@ -1655,11 +1646,11 @@ searchbar, .destructive-action:hover:active:disabled, .destructive-action:hover:checked:disabled, .destructive-action.flat:hover:active:disabled, .destructive-action.flat:hover:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } .destructive-action:focus, .destructive-action.flat:focus { - background-color: #f55044; + background-color: #ff3674; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .destructive-action:focus:focus, .destructive-action:focus:hover, .destructive-action.flat:focus:focus, .destructive-action.flat:focus:hover { border-color: #527065; } .destructive-action:focus:active, .destructive-action:focus:active:hover, .destructive-action:focus:active:focus, .destructive-action:focus:active:hover:focus, .destructive-action:focus:checked, .destructive-action:focus:checked:hover, .destructive-action:focus:checked:focus, .destructive-action:focus:checked:hover:focus, .destructive-action.flat:focus:active, .destructive-action.flat:focus:active:hover, .destructive-action.flat:focus:active:focus, .destructive-action.flat:focus:active:hover:focus, .destructive-action.flat:focus:checked, .destructive-action.flat:focus:checked:hover, .destructive-action.flat:focus:checked:focus, .destructive-action.flat:focus:checked:hover:focus { @@ -1669,10 +1660,10 @@ searchbar, .destructive-action:focus:active:disabled, .destructive-action:focus:checked:disabled, .destructive-action.flat:focus:active:disabled, .destructive-action.flat:focus:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } .destructive-action:focus:hover, .destructive-action.flat:focus:hover { - background-color: #f65d52; + background-color: #ff447e; background-image: none; border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.38); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } .destructive-action:focus:hover:focus, .destructive-action:focus:hover:hover, .destructive-action.flat:focus:hover:focus, .destructive-action.flat:focus:hover:hover { border-color: #527065; } .destructive-action:focus:hover:active, .destructive-action:focus:hover:active:hover, .destructive-action:focus:hover:active:focus, .destructive-action:focus:hover:active:hover:focus, .destructive-action:focus:hover:checked, .destructive-action:focus:hover:checked:hover, .destructive-action:focus:hover:checked:focus, .destructive-action:focus:hover:checked:hover:focus, .destructive-action.flat:focus:hover:active, .destructive-action.flat:focus:hover:active:hover, .destructive-action.flat:focus:hover:active:focus, .destructive-action.flat:focus:hover:active:hover:focus, .destructive-action.flat:focus:hover:checked, .destructive-action.flat:focus:hover:checked:hover, .destructive-action.flat:focus:hover:checked:focus, .destructive-action.flat:focus:hover:checked:hover:focus { @@ -1685,9 +1676,9 @@ searchbar, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } .destructive-action:checked:focus, .destructive-action:checked:hover, .destructive-action:active:focus, .destructive-action:active:hover, .destructive-action.flat:checked:focus, .destructive-action.flat:checked:hover, .destructive-action.flat:active:focus, .destructive-action.flat:active:hover { border-color: #527065; } .destructive-action:checked:active, .destructive-action:checked:active:hover, .destructive-action:checked:active:focus, .destructive-action:checked:active:hover:focus, .destructive-action:checked:checked, .destructive-action:checked:checked:hover, .destructive-action:checked:checked:focus, .destructive-action:checked:checked:hover:focus, .destructive-action:active:active, .destructive-action:active:active:hover, .destructive-action:active:active:focus, .destructive-action:active:active:hover:focus, .destructive-action:active:checked, .destructive-action:active:checked:hover, .destructive-action:active:checked:focus, .destructive-action:active:checked:hover:focus, .destructive-action.flat:checked:active, .destructive-action.flat:checked:active:hover, .destructive-action.flat:checked:active:focus, .destructive-action.flat:checked:active:hover:focus, .destructive-action.flat:checked:checked, .destructive-action.flat:checked:checked:hover, .destructive-action.flat:checked:checked:focus, .destructive-action.flat:checked:checked:hover:focus, .destructive-action.flat:active:active, .destructive-action.flat:active:active:hover, .destructive-action.flat:active:active:focus, .destructive-action.flat:active:active:hover:focus, .destructive-action.flat:active:checked, .destructive-action.flat:active:checked:hover, .destructive-action.flat:active:checked:focus, .destructive-action.flat:active:checked:hover:focus { @@ -1704,11 +1695,11 @@ searchbar, .destructive-action:focus, .destructive-action:hover, .destructive-action.flat:focus, .destructive-action.flat:hover { color: #ebdbb2; } .destructive-action:disabled:disabled, .destructive-action.flat:disabled:disabled { - background-color: alpha(mix(#f44336,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#ff276a,#ebdbb2,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#f44336,#ebdbb2,0.5); + color: mix(#ff276a,#ebdbb2,0.5); box-shadow: none; } .destructive-action:active:disabled, .destructive-action:checked:disabled, .destructive-action.flat:active:disabled, .destructive-action.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -1717,9 +1708,9 @@ searchbar, box-shadow: none; } .destructive-action.separator, .destructive-action .separator { border: 1px solid currentColor; - color: rgba(244, 67, 54, 0.9); } + color: rgba(255, 39, 106, 0.9); } .destructive-action.separator:disabled, .destructive-action .separator:disabled { - color: rgba(244, 67, 54, 0.85); } + color: rgba(255, 39, 106, 0.85); } /****************** ! Selection mode * @@ -1759,18 +1750,18 @@ headerbar.selection-mode, headerbar.selection-mode .title, .titlebar:not(headerbar).selection-mode .title { font-weight: bold; - padding: 0 6px; } + padding: 0 0px; } headerbar.selection-mode .subtitle, .titlebar:not(headerbar).selection-mode .subtitle { font-size: smaller; - padding: 0 6px; } + padding: 0 0px; } headerbar.selection-mode button, .titlebar:not(headerbar).selection-mode button { background-color: #83a598; background-image: none; border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } headerbar.selection-mode button:focus, headerbar.selection-mode button:hover, .titlebar:not(headerbar).selection-mode button:focus, .titlebar:not(headerbar).selection-mode button:hover { @@ -1806,7 +1797,7 @@ headerbar.selection-mode, background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } headerbar.selection-mode button:hover:focus, headerbar.selection-mode button:hover:hover, headerbar.selection-mode button.flat:hover:focus, headerbar.selection-mode button.flat:hover:hover, .titlebar:not(headerbar).selection-mode button:hover:focus, .titlebar:not(headerbar).selection-mode button:hover:hover, @@ -1848,7 +1839,7 @@ headerbar.selection-mode, background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } headerbar.selection-mode button:focus:focus, headerbar.selection-mode button:focus:hover, headerbar.selection-mode button.flat:focus:focus, headerbar.selection-mode button.flat:focus:hover, .titlebar:not(headerbar).selection-mode button:focus:focus, .titlebar:not(headerbar).selection-mode button:focus:hover, @@ -1889,7 +1880,7 @@ headerbar.selection-mode, background-color: #94b1a6; background-image: none; border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.38); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } headerbar.selection-mode button:focus:hover:focus, headerbar.selection-mode button:focus:hover:hover, headerbar.selection-mode button.flat:focus:hover:focus, headerbar.selection-mode button.flat:focus:hover:hover, .titlebar:not(headerbar).selection-mode button:focus:hover:focus, .titlebar:not(headerbar).selection-mode button:focus:hover:hover, @@ -1932,9 +1923,9 @@ headerbar.selection-mode, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } headerbar.selection-mode button:checked:focus, headerbar.selection-mode button:checked:hover, headerbar.selection-mode button:active:focus, headerbar.selection-mode button:active:hover, headerbar.selection-mode button.flat:checked:focus, headerbar.selection-mode button.flat:checked:hover, headerbar.selection-mode button.flat:active:focus, headerbar.selection-mode button.flat:active:hover, .titlebar:not(headerbar).selection-mode button:checked:focus, .titlebar:not(headerbar).selection-mode button:checked:hover, @@ -2043,11 +2034,11 @@ headerbar.selection-mode, color: rgba(131, 165, 152, 0.85); } headerbar.selection-mode .linked > button, .titlebar:not(headerbar).selection-mode .linked > button { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(10, 10, 9, 0.12); } headerbar.selection-mode .linked > button:focus, headerbar.selection-mode .linked > button:hover, .titlebar:not(headerbar).selection-mode .linked > button:focus, .titlebar:not(headerbar).selection-mode .linked > button:hover { - box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(10, 10, 9, 0.32); } headerbar.selection-mode .linked > button:active, headerbar.selection-mode .linked > button:active:hover, headerbar.selection-mode .linked > button:active:focus, headerbar.selection-mode .linked > button:active:hover:focus, headerbar.selection-mode .linked > button:checked, headerbar.selection-mode .linked > button:checked:hover, headerbar.selection-mode .linked > button:checked:focus, headerbar.selection-mode .linked > button:checked:hover:focus, .titlebar:not(headerbar).selection-mode .linked > button:active, .titlebar:not(headerbar).selection-mode .linked > button:active:hover, @@ -2057,18 +2048,18 @@ headerbar.selection-mode, .titlebar:not(headerbar).selection-mode .linked > button:checked:hover, .titlebar:not(headerbar).selection-mode .linked > button:checked:focus, .titlebar:not(headerbar).selection-mode .linked > button:checked:hover:focus { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(8, 8, 8, 0.07), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(10, 10, 9, 0.07), inset 0 -1px rgba(10, 10, 9, 0.05); } headerbar.selection-mode .linked > button:disabled, .titlebar:not(headerbar).selection-mode .linked > button:disabled { box-shadow: inset -1px 0 #64897b; } headerbar.selection-mode .linked > button:last-child, headerbar.selection-mode .linked > button:only-child, .titlebar:not(headerbar).selection-mode .linked > button:last-child, .titlebar:not(headerbar).selection-mode .linked > button:only-child { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } headerbar.selection-mode .linked > button:last-child:hover, headerbar.selection-mode .linked > button:only-child:hover, .titlebar:not(headerbar).selection-mode .linked > button:last-child:hover, .titlebar:not(headerbar).selection-mode .linked > button:only-child:hover { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } headerbar.selection-mode .linked > button:disabled:last-child, headerbar.selection-mode .linked > button:disabled:only-child, headerbar.selection-mode .linked > button:active:disabled:last-child, headerbar.selection-mode .linked > button:active:disabled:only-child, headerbar.selection-mode .linked > button:checked:disabled:last-child, headerbar.selection-mode .linked > button:checked:disabled:only-child, .titlebar:not(headerbar).selection-mode .linked > button:disabled:last-child, .titlebar:not(headerbar).selection-mode .linked > button:disabled:only-child, @@ -2086,7 +2077,7 @@ headerbar.selection-mode, .titlebar:not(headerbar).selection-mode .linked > button:checked:last-child:focus, .titlebar:not(headerbar).selection-mode .linked > button:checked:last-child:hover, .titlebar:not(headerbar).selection-mode .linked > button:checked:last-child:hover:focus { - box-shadow: inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } headerbar.selection-mode .linked > button:active:only-child, headerbar.selection-mode .linked > button:active:only-child:focus, headerbar.selection-mode .linked > button:active:only-child:hover, headerbar.selection-mode .linked > button:active:only-child:hover:focus, headerbar.selection-mode .linked > button:checked:only-child, headerbar.selection-mode .linked > button:checked:only-child:focus, headerbar.selection-mode .linked > button:checked:only-child:hover, headerbar.selection-mode .linked > button:checked:only-child:hover:focus, .titlebar:not(headerbar).selection-mode .linked > button:active:only-child, .titlebar:not(headerbar).selection-mode .linked > button:active:only-child:focus, @@ -2096,19 +2087,19 @@ headerbar.selection-mode, .titlebar:not(headerbar).selection-mode .linked > button:checked:only-child:focus, .titlebar:not(headerbar).selection-mode .linked > button:checked:only-child:hover, .titlebar:not(headerbar).selection-mode .linked > button:checked:only-child:hover:focus { - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.06), inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } headerbar.selection-mode combobox, headerbar.selection-mode button, .titlebar:not(headerbar).selection-mode combobox, .titlebar:not(headerbar).selection-mode button { - padding: 3px; } + padding: 0px; } headerbar.selection-mode combobox.text-button, headerbar.selection-mode button.text-button, .titlebar:not(headerbar).selection-mode combobox.text-button, .titlebar:not(headerbar).selection-mode button.text-button { - padding: 3px; } + padding: 0px; } headerbar.selection-mode combobox.image-button, headerbar.selection-mode button.image-button, .titlebar:not(headerbar).selection-mode combobox.image-button, .titlebar:not(headerbar).selection-mode button.image-button { - padding: 3px; } + padding: 0px; } headerbar.selection-mode separator, headerbar.selection-mode separator:disabled, .titlebar:not(headerbar).selection-mode separator, .titlebar:not(headerbar).selection-mode separator:disabled { @@ -2121,7 +2112,7 @@ headerbar.selection-mode, background-image: none; border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } headerbar.selection-mode button:focus, headerbar.selection-mode button:hover, .titlebar:not(headerbar).selection-mode button:focus, .titlebar:not(headerbar).selection-mode button:hover { @@ -2157,7 +2148,7 @@ headerbar.selection-mode, background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } headerbar.selection-mode button:hover:focus, headerbar.selection-mode button:hover:hover, headerbar.selection-mode button.flat:hover:focus, headerbar.selection-mode button.flat:hover:hover, .titlebar:not(headerbar).selection-mode button:hover:focus, .titlebar:not(headerbar).selection-mode button:hover:hover, @@ -2199,7 +2190,7 @@ headerbar.selection-mode, background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } headerbar.selection-mode button:focus:focus, headerbar.selection-mode button:focus:hover, headerbar.selection-mode button.flat:focus:focus, headerbar.selection-mode button.flat:focus:hover, .titlebar:not(headerbar).selection-mode button:focus:focus, .titlebar:not(headerbar).selection-mode button:focus:hover, @@ -2240,7 +2231,7 @@ headerbar.selection-mode, background-color: #94b1a6; background-image: none; border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.38); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } headerbar.selection-mode button:focus:hover:focus, headerbar.selection-mode button:focus:hover:hover, headerbar.selection-mode button.flat:focus:hover:focus, headerbar.selection-mode button.flat:focus:hover:hover, .titlebar:not(headerbar).selection-mode button:focus:hover:focus, .titlebar:not(headerbar).selection-mode button:focus:hover:hover, @@ -2283,9 +2274,9 @@ headerbar.selection-mode, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } headerbar.selection-mode button:checked:focus, headerbar.selection-mode button:checked:hover, headerbar.selection-mode button:active:focus, headerbar.selection-mode button:active:hover, headerbar.selection-mode button.flat:checked:focus, headerbar.selection-mode button.flat:checked:hover, headerbar.selection-mode button.flat:active:focus, headerbar.selection-mode button.flat:active:hover, .titlebar:not(headerbar).selection-mode button:checked:focus, .titlebar:not(headerbar).selection-mode button:checked:hover, @@ -2420,9 +2411,7 @@ headerbar.selection-mode, -gtk-icon-shadow: none; } headerbar.selection-mode .dim-label, headerbar.selection-mode label.separator, .selection-menu headerbar.selection-mode .dim-label, .selection-menu headerbar.selection-mode label.separator, .titlebar:not(headerbar).selection-mode .dim-label, - .titlebar:not(headerbar).selection-mode label.separator, .selection-menu - .titlebar:not(headerbar).selection-mode .dim-label, .selection-menu - .titlebar:not(headerbar).selection-mode label.separator { + .titlebar:not(headerbar).selection-mode label.separator, .selection-menu .titlebar:not(headerbar).selection-mode .dim-label, .selection-menu .titlebar:not(headerbar).selection-mode label.separator { color: #57786b; } /********** @@ -2431,34 +2420,34 @@ headerbar.selection-mode, calendar { padding: 1px 3px; outline-offset: -1px; - color: #30302f; } + color: #32302f; } calendar:selected { - border-radius: 0px; } + border-radius: 4px; } calendar.header { - border-bottom: 1px solid rgba(0, 0, 0, 0.1); + border-bottom: 1px solid rgba(20, 19, 19, 0.1); border-radius: 0; } calendar.header:backdrop { - border-color: rgba(0, 0, 0, 0.1); } + border-color: rgba(20, 19, 19, 0.1); } calendar.button { - color: rgba(40, 40, 40, 0.55); } + color: rgba(50, 48, 47, 0.55); } calendar.button:hover { - color: #282828; } + color: #32302f; } calendar.button:backdrop { - color: alpha(mix(#282828,#ebdbb2,0.5),0.55); } + color: alpha(mix(#32302f,#ebdbb2,0.5),0.55); } calendar.button:disabled { - color: alpha(mix(#282828,#ebdbb2,0.5),0.55); } + color: alpha(mix(#32302f,#ebdbb2,0.5),0.55); } calendar:indeterminate, calendar:indeterminate:backdrop { - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } calendar.highlight, calendar.highlight:backdrop { font-size: smaller; - color: mix(#83a598,#282828,0.5); } + color: mix(#83a598,#32302f,0.5); } calendar:backdrop { - color: mix(#ebdbb2,#30302f,0.8); } + color: mix(#ebdbb2,#32302f,0.8); } /* gnome-calendar */ .calendar-view { background-color: #ebdbb2; - color: #30302f; } + color: #32302f; } /*************** ! Color chooser @@ -2467,94 +2456,96 @@ colorswatch:drop(active), colorswatch { border-style: none; } colorswatch.top { - border-top-left-radius: 0.5px; - border-top-right-radius: 0.5px; } + border-top-left-radius: 4.5px; + border-top-right-radius: 4.5px; } colorswatch.top overlay { - border-top-left-radius: 0px; - border-top-right-radius: 0px; } + border-top-left-radius: 4px; + border-top-right-radius: 4px; } colorswatch.bottom { - border-bottom-left-radius: 0.5px; - border-bottom-right-radius: 0.5px; } + border-bottom-left-radius: 4.5px; + border-bottom-right-radius: 4.5px; } colorswatch.bottom overlay { - border-bottom-left-radius: 0px; - border-bottom-right-radius: 0px; } + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; } colorswatch.left, colorswatch:first-child:not(.top) { - border-top-left-radius: 0.5px; - border-bottom-left-radius: 0.5px; } + border-top-left-radius: 4.5px; + border-bottom-left-radius: 4.5px; } colorswatch.left overlay, colorswatch:first-child:not(.top) overlay { - border-top-left-radius: 0px; - border-bottom-left-radius: 0px; } + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; } colorswatch.right, colorswatch:last-child:not(.bottom) { - border-top-right-radius: 0.5px; - border-bottom-right-radius: 0.5px; } + border-top-right-radius: 4.5px; + border-bottom-right-radius: 4.5px; } colorswatch.right overlay, colorswatch:last-child:not(.bottom) overlay { - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; } + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; } colorswatch.dark overlay { color: #ebdbb2; } colorswatch.dark overlay:hover { - border-color: #e1c98b; } + border-color: mix(#ebdbb2,#32302f,0.1); } colorswatch.dark overlay:backdrop { color: mix(#83a598,#ebdbb2,0.66); } colorswatch.light overlay { - color: #30302f; } + color: #32302f; } colorswatch.light overlay:hover { - border-color: #e1c98b; } + border-color: mix(#ebdbb2,#32302f,0.1); } colorswatch.light overlay:backdrop { - color: mix(#ebdbb2,#30302f,0.8); } + color: mix(#ebdbb2,#32302f,0.8); } colorswatch:drop(active) { box-shadow: none; } colorswatch:drop(active).light overlay { - border-color: #4e9a06; - box-shadow: inset 0 0 0 2px #e1c98b, inset 0 0 0 1px #4e9a06; } + border-color: #83a598; + box-shadow: inset 0 0 0 2px mix(#ebdbb2,#32302f,0.1), inset 0 0 0 1px #83a598; } colorswatch:drop(active).dark overlay { - border-color: #4e9a06; - box-shadow: inset 0 0 0 2px #e1c98b, inset 0 0 0 1px #4e9a06; } + border-color: #83a598; + box-shadow: inset 0 0 0 2px mix(#ebdbb2,#32302f,0.1), inset 0 0 0 1px #83a598; } colorswatch overlay { - border: 1px solid #e1c98b; } + border: 1px solid mix(#ebdbb2,#32302f,0.1); } colorswatch overlay:hover { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.2); } + box-shadow: inset 0 1px rgba(236, 220, 180, 0.4), inset 0 -1px rgba(20, 19, 19, 0.2); } colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover { - border-color: #e1c98b; + border-color: mix(#ebdbb2,#32302f,0.1); box-shadow: none; } colorswatch:disabled { opacity: .5; } colorswatch:disabled overlay { - border-color: rgba(0, 0, 0, 0.6); + border-color: rgba(20, 19, 19, 0.6); box-shadow: none; } row:selected colorswatch { box-shadow: 0 0 0 2px #ebdbb2; } colorswatch#add-color-button { - border-radius: 0px 0px 0 0; } + border-radius: 4px 4px 0 0; } colorswatch#add-color-button:only-child { - border-radius: 0px; } + border-radius: 4px; } colorswatch#add-color-button overlay { background-color: #e7d3a2; - color: #282828; } + color: #32302f; } colorswatch#add-color-button overlay:hover { background-color: #e2cc91; } colorswatch#add-color-button overlay:backdrop { background-color: #e7d3a2; } colorswatch#editor-color-sample { - border-radius: 0px; } + border-radius: 4px; } colorswatch#editor-color-sample overlay { - border-radius: 0.5px; } + border-radius: 4.5px; } button.color { - padding: 3px; } + padding: 0px; } button.color colorswatch:only-child, button.color colorswatch:only-child overlay { - border-radius: 0; } + border-radius: 4px; } + button.color:disabled colorswatch:only-child, button.color:backdrop colorswatch:only-child, button.color:active colorswatch:only-child, button.color:checked colorswatch:only-child { + box-shadow: none; } /*********************** ! Font and file choosers @@ -2562,9 +2553,9 @@ button.color { filechooser { /* for fallback when header bar not used */ } filechooser .dialog-action-box { - border-top: 1px solid #e1c98b; } + border-top: 1px solid mix(#ebdbb2,#32302f,0.1); } filechooser .dialog-action-box:backdrop { - border-top-color: mix(#ebdbb2,#e1c98b,0.9); } + border-top-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); } filechooser #pathbarbox { border-bottom: 1px solid #ebdbb2; } @@ -2576,14 +2567,14 @@ filechooserbutton:drop(active) { ! Grid and flowbox *******************/ list { - color: #30302f; + color: #32302f; background-color: #ebdbb2; - border-color: #e1c98b; } + border-color: mix(#ebdbb2,#32302f,0.1); } list:backdrop { background-color: #ebdbb2; - border-color: mix(#ebdbb2,#e1c98b,0.9); } + border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); } list row { - padding: 3px; } + padding: 0px; } row { transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } @@ -2592,21 +2583,21 @@ row { row:backdrop { transition: 200ms ease-out; } row.activatable.has-open-popup, row.activatable:hover { - background-color: rgba(40, 40, 40, 0.05); } + background-color: rgba(50, 48, 47, 0.05); } row.activatable:active { - box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); } + box-shadow: inset 0 2px 2px -2px rgba(20, 19, 19, 0.2); } row.activatable:backdrop:hover { background-color: transparent; } row.activatable:selected:active { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } + box-shadow: inset 0 2px 3px -1px rgba(20, 19, 19, 0.5); } row.activatable:selected.has-open-popup, row.activatable:selected:hover { - background-color: mix(#83a598,#282828,0.1); } + background-color: mix(#83a598,#32302f,0.1); } row.activatable:selected:backdrop { background-color: #83a598; } flowbox flowboxchild { - padding: 3px; - border-radius: 0px; } + padding: 0px; + border-radius: 4px; } flowbox flowboxchild:selected { outline-offset: -2px; } @@ -2622,101 +2613,101 @@ flowbox flowboxchild { infobar { border: 0; } infobar.info, infobar.info:backdrop { - background-color: #03a9f4; + background-color: #a327c0; background-image: none; - border: 1px solid #0287c3; + border: 1px solid #821f9a; caret-color: currentColor; } infobar.info label, infobar.info, infobar.info:backdrop label, infobar.info:backdrop { - color: #fff; } + color: #32302f; } infobar.info button { - background-color: #03a9f4; + background-color: #a327c0; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } infobar.info button:focus, infobar.info button:hover { border-color: #527065; } infobar.info button:active, infobar.info button:active:hover, infobar.info button:active:focus, infobar.info button:active:hover:focus, infobar.info button:checked, infobar.info button:checked:hover, infobar.info button:checked:focus, infobar.info button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.info button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.info button:active:disabled, infobar.info button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.info button.flat { - color: #fff; - border-color: rgba(3, 169, 244, 0); - background-color: rgba(3, 169, 244, 0); + color: #32302f; + border-color: rgba(163, 39, 192, 0); + background-color: rgba(163, 39, 192, 0); background-image: none; box-shadow: none; } infobar.info button:hover, infobar.info button.flat:hover { - background-color: #07b0fc; + background-color: #ab29ca; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } infobar.info button:hover:focus, infobar.info button:hover:hover, infobar.info button.flat:hover:focus, infobar.info button.flat:hover:hover { border-color: #527065; } infobar.info button:hover:active, infobar.info button:hover:active:hover, infobar.info button:hover:active:focus, infobar.info button:hover:active:hover:focus, infobar.info button:hover:checked, infobar.info button:hover:checked:hover, infobar.info button:hover:checked:focus, infobar.info button:hover:checked:hover:focus, infobar.info button.flat:hover:active, infobar.info button.flat:hover:active:hover, infobar.info button.flat:hover:active:focus, infobar.info button.flat:hover:active:hover:focus, infobar.info button.flat:hover:checked, infobar.info button.flat:hover:checked:hover, infobar.info button.flat:hover:checked:focus, infobar.info button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.info button:hover:disabled, infobar.info button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.info button:hover:active:disabled, infobar.info button:hover:checked:disabled, infobar.info button.flat:hover:active:disabled, infobar.info button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.info button:focus, infobar.info button.flat:focus { - background-color: #07b0fc; + background-color: #ab29ca; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } infobar.info button:focus:focus, infobar.info button:focus:hover, infobar.info button.flat:focus:focus, infobar.info button.flat:focus:hover { border-color: #527065; } infobar.info button:focus:active, infobar.info button:focus:active:hover, infobar.info button:focus:active:focus, infobar.info button:focus:active:hover:focus, infobar.info button:focus:checked, infobar.info button:focus:checked:hover, infobar.info button:focus:checked:focus, infobar.info button:focus:checked:hover:focus, infobar.info button.flat:focus:active, infobar.info button.flat:focus:active:hover, infobar.info button.flat:focus:active:focus, infobar.info button.flat:focus:active:hover:focus, infobar.info button.flat:focus:checked, infobar.info button.flat:focus:checked:hover, infobar.info button.flat:focus:checked:focus, infobar.info button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.info button:focus:disabled, infobar.info button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.info button:focus:active:disabled, infobar.info button:focus:checked:disabled, infobar.info button.flat:focus:active:disabled, infobar.info button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.info button:focus:hover, infobar.info button.flat:focus:hover { - background-color: #14b4fc; + background-color: #b32bd3; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } infobar.info button:focus:hover:focus, infobar.info button:focus:hover:hover, infobar.info button.flat:focus:hover:focus, infobar.info button.flat:focus:hover:hover { border-color: #527065; } infobar.info button:focus:hover:active, infobar.info button:focus:hover:active:hover, infobar.info button:focus:hover:active:focus, infobar.info button:focus:hover:active:hover:focus, infobar.info button:focus:hover:checked, infobar.info button:focus:hover:checked:hover, infobar.info button:focus:hover:checked:focus, infobar.info button:focus:hover:checked:hover:focus, infobar.info button.flat:focus:hover:active, infobar.info button.flat:focus:hover:active:hover, infobar.info button.flat:focus:hover:active:focus, infobar.info button.flat:focus:hover:active:hover:focus, infobar.info button.flat:focus:hover:checked, infobar.info button.flat:focus:hover:checked:hover, infobar.info button.flat:focus:hover:checked:focus, infobar.info button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.info button:focus:hover:disabled, infobar.info button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.info button:focus:hover:active:disabled, infobar.info button:focus:hover:checked:disabled, infobar.info button.flat:focus:hover:active:disabled, infobar.info button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.info button:checked, infobar.info button:active, infobar.info button.flat:checked, infobar.info button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } infobar.info button:checked:focus, infobar.info button:checked:hover, infobar.info button:active:focus, infobar.info button:active:hover, infobar.info button.flat:checked:focus, infobar.info button.flat:checked:hover, infobar.info button.flat:active:focus, infobar.info button.flat:active:hover { border-color: #527065; } infobar.info button:checked:active, infobar.info button:checked:active:hover, infobar.info button:checked:active:focus, infobar.info button:checked:active:hover:focus, infobar.info button:checked:checked, infobar.info button:checked:checked:hover, infobar.info button:checked:checked:focus, infobar.info button:checked:checked:hover:focus, infobar.info button:active:active, infobar.info button:active:active:hover, infobar.info button:active:active:focus, infobar.info button:active:active:hover:focus, infobar.info button:active:checked, infobar.info button:active:checked:hover, infobar.info button:active:checked:focus, infobar.info button:active:checked:hover:focus, infobar.info button.flat:checked:active, infobar.info button.flat:checked:active:hover, infobar.info button.flat:checked:active:focus, infobar.info button.flat:checked:active:hover:focus, infobar.info button.flat:checked:checked, infobar.info button.flat:checked:checked:hover, infobar.info button.flat:checked:checked:focus, infobar.info button.flat:checked:checked:hover:focus, infobar.info button.flat:active:active, infobar.info button.flat:active:active:hover, infobar.info button.flat:active:active:focus, infobar.info button.flat:active:active:hover:focus, infobar.info button.flat:active:checked, infobar.info button.flat:active:checked:hover, infobar.info button.flat:active:checked:focus, infobar.info button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.info button:checked:disabled, infobar.info button:active:disabled, infobar.info button.flat:checked:disabled, infobar.info button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.info button:checked:active:disabled, infobar.info button:checked:checked:disabled, infobar.info button:active:active:disabled, infobar.info button:active:checked:disabled, infobar.info button.flat:checked:active:disabled, infobar.info button.flat:checked:checked:disabled, infobar.info button.flat:active:active:disabled, infobar.info button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.info button:checked:focus, infobar.info button:checked:hover, infobar.info button:active:focus, infobar.info button:active:hover, infobar.info button.flat:checked:focus, infobar.info button.flat:checked:hover, infobar.info button.flat:active:focus, infobar.info button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } infobar.info button:focus, infobar.info button:hover, infobar.info button.flat:focus, infobar.info button.flat:hover { - color: #fff; } + color: #32302f; } infobar.info button:disabled:disabled, infobar.info button.flat:disabled:disabled { - background-color: alpha(mix(#03a9f4,#fff,0.2),0.4); + background-color: alpha(mix(#a327c0,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#03a9f4,#fff,0.5); + color: mix(#a327c0,#32302f,0.5); box-shadow: none; } infobar.info button:active:disabled, infobar.info button:checked:disabled, infobar.info button.flat:active:disabled, infobar.info button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -2725,105 +2716,105 @@ infobar { box-shadow: none; } infobar.info button.separator, infobar.info button .separator { border: 1px solid currentColor; - color: rgba(3, 169, 244, 0.9); } + color: rgba(163, 39, 192, 0.9); } infobar.info button.separator:disabled, infobar.info button .separator:disabled { - color: rgba(3, 169, 244, 0.85); } + color: rgba(163, 39, 192, 0.85); } infobar.warning, infobar.warning:backdrop { - background-color: #ef6c00; + background-color: #ff7f42; background-image: none; - border: 1px solid #bf5600; + border: 1px solid #ff5402; caret-color: currentColor; } infobar.warning label, infobar.warning, infobar.warning:backdrop label, infobar.warning:backdrop { - color: #fff; } + color: #32302f; } infobar.warning button { - background-color: #ef6c00; + background-color: #ff7f42; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } infobar.warning button:focus, infobar.warning button:hover { border-color: #527065; } infobar.warning button:active, infobar.warning button:active:hover, infobar.warning button:active:focus, infobar.warning button:active:hover:focus, infobar.warning button:checked, infobar.warning button:checked:hover, infobar.warning button:checked:focus, infobar.warning button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.warning button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.warning button:active:disabled, infobar.warning button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.warning button.flat { - color: #fff; - border-color: rgba(239, 108, 0, 0); - background-color: rgba(239, 108, 0, 0); + color: #32302f; + border-color: rgba(255, 127, 66, 0); + background-color: rgba(255, 127, 66, 0); background-image: none; box-shadow: none; } infobar.warning button:hover, infobar.warning button.flat:hover { - background-color: #fb7100; + background-color: #ff8a52; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } infobar.warning button:hover:focus, infobar.warning button:hover:hover, infobar.warning button.flat:hover:focus, infobar.warning button.flat:hover:hover { border-color: #527065; } infobar.warning button:hover:active, infobar.warning button:hover:active:hover, infobar.warning button:hover:active:focus, infobar.warning button:hover:active:hover:focus, infobar.warning button:hover:checked, infobar.warning button:hover:checked:hover, infobar.warning button:hover:checked:focus, infobar.warning button:hover:checked:hover:focus, infobar.warning button.flat:hover:active, infobar.warning button.flat:hover:active:hover, infobar.warning button.flat:hover:active:focus, infobar.warning button.flat:hover:active:hover:focus, infobar.warning button.flat:hover:checked, infobar.warning button.flat:hover:checked:hover, infobar.warning button.flat:hover:checked:focus, infobar.warning button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.warning button:hover:disabled, infobar.warning button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.warning button:hover:active:disabled, infobar.warning button:hover:checked:disabled, infobar.warning button.flat:hover:active:disabled, infobar.warning button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.warning button:focus, infobar.warning button.flat:focus { - background-color: #fb7100; + background-color: #ff8a52; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } infobar.warning button:focus:focus, infobar.warning button:focus:hover, infobar.warning button.flat:focus:focus, infobar.warning button.flat:focus:hover { border-color: #527065; } infobar.warning button:focus:active, infobar.warning button:focus:active:hover, infobar.warning button:focus:active:focus, infobar.warning button:focus:active:hover:focus, infobar.warning button:focus:checked, infobar.warning button:focus:checked:hover, infobar.warning button:focus:checked:focus, infobar.warning button:focus:checked:hover:focus, infobar.warning button.flat:focus:active, infobar.warning button.flat:focus:active:hover, infobar.warning button.flat:focus:active:focus, infobar.warning button.flat:focus:active:hover:focus, infobar.warning button.flat:focus:checked, infobar.warning button.flat:focus:checked:hover, infobar.warning button.flat:focus:checked:focus, infobar.warning button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.warning button:focus:disabled, infobar.warning button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.warning button:focus:active:disabled, infobar.warning button:focus:checked:disabled, infobar.warning button.flat:focus:active:disabled, infobar.warning button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.warning button:focus:hover, infobar.warning button.flat:focus:hover { - background-color: #ff7808; + background-color: #ff9562; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } infobar.warning button:focus:hover:focus, infobar.warning button:focus:hover:hover, infobar.warning button.flat:focus:hover:focus, infobar.warning button.flat:focus:hover:hover { border-color: #527065; } infobar.warning button:focus:hover:active, infobar.warning button:focus:hover:active:hover, infobar.warning button:focus:hover:active:focus, infobar.warning button:focus:hover:active:hover:focus, infobar.warning button:focus:hover:checked, infobar.warning button:focus:hover:checked:hover, infobar.warning button:focus:hover:checked:focus, infobar.warning button:focus:hover:checked:hover:focus, infobar.warning button.flat:focus:hover:active, infobar.warning button.flat:focus:hover:active:hover, infobar.warning button.flat:focus:hover:active:focus, infobar.warning button.flat:focus:hover:active:hover:focus, infobar.warning button.flat:focus:hover:checked, infobar.warning button.flat:focus:hover:checked:hover, infobar.warning button.flat:focus:hover:checked:focus, infobar.warning button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.warning button:focus:hover:disabled, infobar.warning button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.warning button:focus:hover:active:disabled, infobar.warning button:focus:hover:checked:disabled, infobar.warning button.flat:focus:hover:active:disabled, infobar.warning button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.warning button:checked, infobar.warning button:active, infobar.warning button.flat:checked, infobar.warning button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } infobar.warning button:checked:focus, infobar.warning button:checked:hover, infobar.warning button:active:focus, infobar.warning button:active:hover, infobar.warning button.flat:checked:focus, infobar.warning button.flat:checked:hover, infobar.warning button.flat:active:focus, infobar.warning button.flat:active:hover { border-color: #527065; } infobar.warning button:checked:active, infobar.warning button:checked:active:hover, infobar.warning button:checked:active:focus, infobar.warning button:checked:active:hover:focus, infobar.warning button:checked:checked, infobar.warning button:checked:checked:hover, infobar.warning button:checked:checked:focus, infobar.warning button:checked:checked:hover:focus, infobar.warning button:active:active, infobar.warning button:active:active:hover, infobar.warning button:active:active:focus, infobar.warning button:active:active:hover:focus, infobar.warning button:active:checked, infobar.warning button:active:checked:hover, infobar.warning button:active:checked:focus, infobar.warning button:active:checked:hover:focus, infobar.warning button.flat:checked:active, infobar.warning button.flat:checked:active:hover, infobar.warning button.flat:checked:active:focus, infobar.warning button.flat:checked:active:hover:focus, infobar.warning button.flat:checked:checked, infobar.warning button.flat:checked:checked:hover, infobar.warning button.flat:checked:checked:focus, infobar.warning button.flat:checked:checked:hover:focus, infobar.warning button.flat:active:active, infobar.warning button.flat:active:active:hover, infobar.warning button.flat:active:active:focus, infobar.warning button.flat:active:active:hover:focus, infobar.warning button.flat:active:checked, infobar.warning button.flat:active:checked:hover, infobar.warning button.flat:active:checked:focus, infobar.warning button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.warning button:checked:disabled, infobar.warning button:active:disabled, infobar.warning button.flat:checked:disabled, infobar.warning button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.warning button:checked:active:disabled, infobar.warning button:checked:checked:disabled, infobar.warning button:active:active:disabled, infobar.warning button:active:checked:disabled, infobar.warning button.flat:checked:active:disabled, infobar.warning button.flat:checked:checked:disabled, infobar.warning button.flat:active:active:disabled, infobar.warning button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.warning button:checked:focus, infobar.warning button:checked:hover, infobar.warning button:active:focus, infobar.warning button:active:hover, infobar.warning button.flat:checked:focus, infobar.warning button.flat:checked:hover, infobar.warning button.flat:active:focus, infobar.warning button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } infobar.warning button:focus, infobar.warning button:hover, infobar.warning button.flat:focus, infobar.warning button.flat:hover { - color: #fff; } + color: #32302f; } infobar.warning button:disabled:disabled, infobar.warning button.flat:disabled:disabled { - background-color: alpha(mix(#ef6c00,#fff,0.2),0.4); + background-color: alpha(mix(#ff7f42,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#ef6c00,#fff,0.5); + color: mix(#ff7f42,#32302f,0.5); box-shadow: none; } infobar.warning button:active:disabled, infobar.warning button:checked:disabled, infobar.warning button.flat:active:disabled, infobar.warning button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -2832,105 +2823,105 @@ infobar { box-shadow: none; } infobar.warning button.separator, infobar.warning button .separator { border: 1px solid currentColor; - color: rgba(239, 108, 0, 0.9); } + color: rgba(255, 127, 66, 0.9); } infobar.warning button.separator:disabled, infobar.warning button .separator:disabled { - color: rgba(239, 108, 0, 0.85); } + color: rgba(255, 127, 66, 0.85); } infobar.question, infobar.question:backdrop { - background-color: #673ab7; + background-color: #a327c0; background-image: none; - border: 1px solid #522e92; + border: 1px solid #821f9a; caret-color: currentColor; } infobar.question label, infobar.question, infobar.question:backdrop label, infobar.question:backdrop { - color: #fff; } + color: #32302f; } infobar.question button { - background-color: #673ab7; + background-color: #a327c0; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } infobar.question button:focus, infobar.question button:hover { border-color: #527065; } infobar.question button:active, infobar.question button:active:hover, infobar.question button:active:focus, infobar.question button:active:hover:focus, infobar.question button:checked, infobar.question button:checked:hover, infobar.question button:checked:focus, infobar.question button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.question button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.question button:active:disabled, infobar.question button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.question button.flat { - color: #fff; - border-color: rgba(103, 58, 183, 0); - background-color: rgba(103, 58, 183, 0); + color: #32302f; + border-color: rgba(163, 39, 192, 0); + background-color: rgba(163, 39, 192, 0); background-image: none; box-shadow: none; } infobar.question button:hover, infobar.question button.flat:hover { - background-color: #6c3dc0; + background-color: #ab29ca; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } infobar.question button:hover:focus, infobar.question button:hover:hover, infobar.question button.flat:hover:focus, infobar.question button.flat:hover:hover { border-color: #527065; } infobar.question button:hover:active, infobar.question button:hover:active:hover, infobar.question button:hover:active:focus, infobar.question button:hover:active:hover:focus, infobar.question button:hover:checked, infobar.question button:hover:checked:hover, infobar.question button:hover:checked:focus, infobar.question button:hover:checked:hover:focus, infobar.question button.flat:hover:active, infobar.question button.flat:hover:active:hover, infobar.question button.flat:hover:active:focus, infobar.question button.flat:hover:active:hover:focus, infobar.question button.flat:hover:checked, infobar.question button.flat:hover:checked:hover, infobar.question button.flat:hover:checked:focus, infobar.question button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.question button:hover:disabled, infobar.question button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.question button:hover:active:disabled, infobar.question button:hover:checked:disabled, infobar.question button.flat:hover:active:disabled, infobar.question button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.question button:focus, infobar.question button.flat:focus { - background-color: #6c3dc0; + background-color: #ab29ca; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } infobar.question button:focus:focus, infobar.question button:focus:hover, infobar.question button.flat:focus:focus, infobar.question button.flat:focus:hover { border-color: #527065; } infobar.question button:focus:active, infobar.question button:focus:active:hover, infobar.question button:focus:active:focus, infobar.question button:focus:active:hover:focus, infobar.question button:focus:checked, infobar.question button:focus:checked:hover, infobar.question button:focus:checked:focus, infobar.question button:focus:checked:hover:focus, infobar.question button.flat:focus:active, infobar.question button.flat:focus:active:hover, infobar.question button.flat:focus:active:focus, infobar.question button.flat:focus:active:hover:focus, infobar.question button.flat:focus:checked, infobar.question button.flat:focus:checked:hover, infobar.question button.flat:focus:checked:focus, infobar.question button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.question button:focus:disabled, infobar.question button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.question button:focus:active:disabled, infobar.question button:focus:checked:disabled, infobar.question button.flat:focus:active:disabled, infobar.question button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.question button:focus:hover, infobar.question button.flat:focus:hover { - background-color: #7345c4; + background-color: #b32bd3; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } infobar.question button:focus:hover:focus, infobar.question button:focus:hover:hover, infobar.question button.flat:focus:hover:focus, infobar.question button.flat:focus:hover:hover { border-color: #527065; } infobar.question button:focus:hover:active, infobar.question button:focus:hover:active:hover, infobar.question button:focus:hover:active:focus, infobar.question button:focus:hover:active:hover:focus, infobar.question button:focus:hover:checked, infobar.question button:focus:hover:checked:hover, infobar.question button:focus:hover:checked:focus, infobar.question button:focus:hover:checked:hover:focus, infobar.question button.flat:focus:hover:active, infobar.question button.flat:focus:hover:active:hover, infobar.question button.flat:focus:hover:active:focus, infobar.question button.flat:focus:hover:active:hover:focus, infobar.question button.flat:focus:hover:checked, infobar.question button.flat:focus:hover:checked:hover, infobar.question button.flat:focus:hover:checked:focus, infobar.question button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.question button:focus:hover:disabled, infobar.question button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.question button:focus:hover:active:disabled, infobar.question button:focus:hover:checked:disabled, infobar.question button.flat:focus:hover:active:disabled, infobar.question button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.question button:checked, infobar.question button:active, infobar.question button.flat:checked, infobar.question button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } infobar.question button:checked:focus, infobar.question button:checked:hover, infobar.question button:active:focus, infobar.question button:active:hover, infobar.question button.flat:checked:focus, infobar.question button.flat:checked:hover, infobar.question button.flat:active:focus, infobar.question button.flat:active:hover { border-color: #527065; } infobar.question button:checked:active, infobar.question button:checked:active:hover, infobar.question button:checked:active:focus, infobar.question button:checked:active:hover:focus, infobar.question button:checked:checked, infobar.question button:checked:checked:hover, infobar.question button:checked:checked:focus, infobar.question button:checked:checked:hover:focus, infobar.question button:active:active, infobar.question button:active:active:hover, infobar.question button:active:active:focus, infobar.question button:active:active:hover:focus, infobar.question button:active:checked, infobar.question button:active:checked:hover, infobar.question button:active:checked:focus, infobar.question button:active:checked:hover:focus, infobar.question button.flat:checked:active, infobar.question button.flat:checked:active:hover, infobar.question button.flat:checked:active:focus, infobar.question button.flat:checked:active:hover:focus, infobar.question button.flat:checked:checked, infobar.question button.flat:checked:checked:hover, infobar.question button.flat:checked:checked:focus, infobar.question button.flat:checked:checked:hover:focus, infobar.question button.flat:active:active, infobar.question button.flat:active:active:hover, infobar.question button.flat:active:active:focus, infobar.question button.flat:active:active:hover:focus, infobar.question button.flat:active:checked, infobar.question button.flat:active:checked:hover, infobar.question button.flat:active:checked:focus, infobar.question button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.question button:checked:disabled, infobar.question button:active:disabled, infobar.question button.flat:checked:disabled, infobar.question button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.question button:checked:active:disabled, infobar.question button:checked:checked:disabled, infobar.question button:active:active:disabled, infobar.question button:active:checked:disabled, infobar.question button.flat:checked:active:disabled, infobar.question button.flat:checked:checked:disabled, infobar.question button.flat:active:active:disabled, infobar.question button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.question button:checked:focus, infobar.question button:checked:hover, infobar.question button:active:focus, infobar.question button:active:hover, infobar.question button.flat:checked:focus, infobar.question button.flat:checked:hover, infobar.question button.flat:active:focus, infobar.question button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } infobar.question button:focus, infobar.question button:hover, infobar.question button.flat:focus, infobar.question button.flat:hover { - color: #fff; } + color: #32302f; } infobar.question button:disabled:disabled, infobar.question button.flat:disabled:disabled { - background-color: alpha(mix(#673ab7,#fff,0.2),0.4); + background-color: alpha(mix(#a327c0,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#673ab7,#fff,0.5); + color: mix(#a327c0,#32302f,0.5); box-shadow: none; } infobar.question button:active:disabled, infobar.question button:checked:disabled, infobar.question button.flat:active:disabled, infobar.question button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -2939,105 +2930,105 @@ infobar { box-shadow: none; } infobar.question button.separator, infobar.question button .separator { border: 1px solid currentColor; - color: rgba(103, 58, 183, 0.9); } + color: rgba(163, 39, 192, 0.9); } infobar.question button.separator:disabled, infobar.question button .separator:disabled { - color: rgba(103, 58, 183, 0.85); } + color: rgba(163, 39, 192, 0.85); } infobar.error, infobar.error:backdrop { - background-color: #f44336; + background-color: #ff276a; background-image: none; - border: 1px solid #e21b0c; + border: 1px solid #eb0049; caret-color: currentColor; } infobar.error label, infobar.error, infobar.error:backdrop label, infobar.error:backdrop { - color: #fff; } + color: #32302f; } infobar.error button { - background-color: #f44336; + background-color: #ff276a; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } infobar.error button:focus, infobar.error button:hover { border-color: #527065; } infobar.error button:active, infobar.error button:active:hover, infobar.error button:active:focus, infobar.error button:active:hover:focus, infobar.error button:checked, infobar.error button:checked:hover, infobar.error button:checked:focus, infobar.error button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.error button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.error button:active:disabled, infobar.error button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.error button.flat { - color: #fff; - border-color: rgba(244, 67, 54, 0); - background-color: rgba(244, 67, 54, 0); + color: #32302f; + border-color: rgba(255, 39, 106, 0); + background-color: rgba(255, 39, 106, 0); background-image: none; box-shadow: none; } infobar.error button:hover, infobar.error button.flat:hover { - background-color: #f55044; + background-color: #ff3674; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } infobar.error button:hover:focus, infobar.error button:hover:hover, infobar.error button.flat:hover:focus, infobar.error button.flat:hover:hover { border-color: #527065; } infobar.error button:hover:active, infobar.error button:hover:active:hover, infobar.error button:hover:active:focus, infobar.error button:hover:active:hover:focus, infobar.error button:hover:checked, infobar.error button:hover:checked:hover, infobar.error button:hover:checked:focus, infobar.error button:hover:checked:hover:focus, infobar.error button.flat:hover:active, infobar.error button.flat:hover:active:hover, infobar.error button.flat:hover:active:focus, infobar.error button.flat:hover:active:hover:focus, infobar.error button.flat:hover:checked, infobar.error button.flat:hover:checked:hover, infobar.error button.flat:hover:checked:focus, infobar.error button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.error button:hover:disabled, infobar.error button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.error button:hover:active:disabled, infobar.error button:hover:checked:disabled, infobar.error button.flat:hover:active:disabled, infobar.error button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.error button:focus, infobar.error button.flat:focus { - background-color: #f55044; + background-color: #ff3674; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } infobar.error button:focus:focus, infobar.error button:focus:hover, infobar.error button.flat:focus:focus, infobar.error button.flat:focus:hover { border-color: #527065; } infobar.error button:focus:active, infobar.error button:focus:active:hover, infobar.error button:focus:active:focus, infobar.error button:focus:active:hover:focus, infobar.error button:focus:checked, infobar.error button:focus:checked:hover, infobar.error button:focus:checked:focus, infobar.error button:focus:checked:hover:focus, infobar.error button.flat:focus:active, infobar.error button.flat:focus:active:hover, infobar.error button.flat:focus:active:focus, infobar.error button.flat:focus:active:hover:focus, infobar.error button.flat:focus:checked, infobar.error button.flat:focus:checked:hover, infobar.error button.flat:focus:checked:focus, infobar.error button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.error button:focus:disabled, infobar.error button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.error button:focus:active:disabled, infobar.error button:focus:checked:disabled, infobar.error button.flat:focus:active:disabled, infobar.error button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.error button:focus:hover, infobar.error button.flat:focus:hover { - background-color: #f65d52; + background-color: #ff447e; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.38); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } infobar.error button:focus:hover:focus, infobar.error button:focus:hover:hover, infobar.error button.flat:focus:hover:focus, infobar.error button.flat:focus:hover:hover { border-color: #527065; } infobar.error button:focus:hover:active, infobar.error button:focus:hover:active:hover, infobar.error button:focus:hover:active:focus, infobar.error button:focus:hover:active:hover:focus, infobar.error button:focus:hover:checked, infobar.error button:focus:hover:checked:hover, infobar.error button:focus:hover:checked:focus, infobar.error button:focus:hover:checked:hover:focus, infobar.error button.flat:focus:hover:active, infobar.error button.flat:focus:hover:active:hover, infobar.error button.flat:focus:hover:active:focus, infobar.error button.flat:focus:hover:active:hover:focus, infobar.error button.flat:focus:hover:checked, infobar.error button.flat:focus:hover:checked:hover, infobar.error button.flat:focus:hover:checked:focus, infobar.error button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.error button:focus:hover:disabled, infobar.error button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.error button:focus:hover:active:disabled, infobar.error button:focus:hover:checked:disabled, infobar.error button.flat:focus:hover:active:disabled, infobar.error button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.error button:checked, infobar.error button:active, infobar.error button.flat:checked, infobar.error button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } infobar.error button:checked:focus, infobar.error button:checked:hover, infobar.error button:active:focus, infobar.error button:active:hover, infobar.error button.flat:checked:focus, infobar.error button.flat:checked:hover, infobar.error button.flat:active:focus, infobar.error button.flat:active:hover { border-color: #527065; } infobar.error button:checked:active, infobar.error button:checked:active:hover, infobar.error button:checked:active:focus, infobar.error button:checked:active:hover:focus, infobar.error button:checked:checked, infobar.error button:checked:checked:hover, infobar.error button:checked:checked:focus, infobar.error button:checked:checked:hover:focus, infobar.error button:active:active, infobar.error button:active:active:hover, infobar.error button:active:active:focus, infobar.error button:active:active:hover:focus, infobar.error button:active:checked, infobar.error button:active:checked:hover, infobar.error button:active:checked:focus, infobar.error button:active:checked:hover:focus, infobar.error button.flat:checked:active, infobar.error button.flat:checked:active:hover, infobar.error button.flat:checked:active:focus, infobar.error button.flat:checked:active:hover:focus, infobar.error button.flat:checked:checked, infobar.error button.flat:checked:checked:hover, infobar.error button.flat:checked:checked:focus, infobar.error button.flat:checked:checked:hover:focus, infobar.error button.flat:active:active, infobar.error button.flat:active:active:hover, infobar.error button.flat:active:active:focus, infobar.error button.flat:active:active:hover:focus, infobar.error button.flat:active:checked, infobar.error button.flat:active:checked:hover, infobar.error button.flat:active:checked:focus, infobar.error button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.error button:checked:disabled, infobar.error button:active:disabled, infobar.error button.flat:checked:disabled, infobar.error button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.error button:checked:active:disabled, infobar.error button:checked:checked:disabled, infobar.error button:active:active:disabled, infobar.error button:active:checked:disabled, infobar.error button.flat:checked:active:disabled, infobar.error button.flat:checked:checked:disabled, infobar.error button.flat:active:active:disabled, infobar.error button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.error button:checked:focus, infobar.error button:checked:hover, infobar.error button:active:focus, infobar.error button:active:hover, infobar.error button.flat:checked:focus, infobar.error button.flat:checked:hover, infobar.error button.flat:active:focus, infobar.error button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } infobar.error button:focus, infobar.error button:hover, infobar.error button.flat:focus, infobar.error button.flat:hover { - color: #fff; } + color: #32302f; } infobar.error button:disabled:disabled, infobar.error button.flat:disabled:disabled { - background-color: alpha(mix(#f44336,#fff,0.2),0.4); + background-color: alpha(mix(#ff276a,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#f44336,#fff,0.5); + color: mix(#ff276a,#32302f,0.5); box-shadow: none; } infobar.error button:active:disabled, infobar.error button:checked:disabled, infobar.error button.flat:active:disabled, infobar.error button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -3046,9 +3037,9 @@ infobar { box-shadow: none; } infobar.error button.separator, infobar.error button .separator { border: 1px solid currentColor; - color: rgba(244, 67, 54, 0.9); } + color: rgba(255, 39, 106, 0.9); } infobar.error button.separator:disabled, infobar.error button .separator:disabled { - color: rgba(244, 67, 54, 0.85); } + color: rgba(255, 39, 106, 0.85); } /********* ! Entry * @@ -3060,7 +3051,7 @@ infobar { border-left-width: 0; } .linked:not(.vertical) > entry:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-right-width: 0; border-bottom-right-radius: 0; border-top-right-radius: 0; } @@ -3069,7 +3060,7 @@ infobar { border-right-width: 1px; } .linked:not(.vertical) > entry:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-left-width: 0; border-bottom-left-radius: 0; border-top-left-radius: 0; } @@ -3079,7 +3070,7 @@ infobar { .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > entry:first-child:only-child { border-width: 1px; } .linked:not(.vertical) > entry:only-child { - border-radius: 0px; } + border-radius: 4px; } .linked.vertical > entry { border-width: 1px; @@ -3088,7 +3079,7 @@ infobar { border-bottom-width: 0; } .linked.vertical > entry:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-width: 1px; border-bottom-width: 0; border-bottom-left-radius: 0; @@ -3098,7 +3089,7 @@ infobar { border-bottom-width: 1px; } .linked.vertical > entry:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-width: 0; border-bottom-width: 1px; border-top-left-radius: 0; @@ -3109,16 +3100,15 @@ infobar { .linked.vertical > entry:only-child, .linked.vertical > entry:first-child:only-child { border-width: 1px; } .linked.vertical > entry:only-child { - border-radius: 0px; } + border-radius: 4px; } entry, menuitem entry, popover.background entry, .osd entry, #XfceNotifyWindow entry, #login_window entry { border-width: 1px; border-style: solid; - border-radius: 0px; - border-color: #dabc70; + border-radius: 4px; transition: border 100ms ease-out; - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.1), inset 0 1px rgba(8, 8, 8, 0.12), inset -1px 0 rgba(8, 8, 8, 0.1), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.1), inset 0 1px rgba(10, 10, 9, 0.12), inset -1px 0 rgba(10, 10, 9, 0.1), inset 0 -1px rgba(10, 10, 9, 0.05); } entry:focus, popover.background entry:focus, #XfceNotifyWindow entry:focus, #login_window entry:focus, entry:hover, popover.background entry:hover, #XfceNotifyWindow entry:hover, #login_window entry:hover, entry:active, popover.background entry:active, @@ -3132,73 +3122,64 @@ entry, menuitem entry, popover.background entry, .osd entry, entry:disabled, popover.background entry:disabled, #XfceNotifyWindow entry:disabled, #login_window entry:disabled { box-shadow: none; } - entry progress, popover.background entry progress, .osd entry progress, - #XfceNotifyWindow entry progress, #login_window entry progress { + entry progress, popover.background entry progress, .osd entry progress, #XfceNotifyWindow entry progress, #login_window entry progress { background-color: #83a598; background-image: none; border-width: 0; - border-radius: 0px; + border-radius: 4px; color: #ebdbb2; } - entry image.left, - #XfceNotifyWindow entry image.left, #login_window entry image.left { - padding-right: 3px; } - entry image.right, - #XfceNotifyWindow entry image.right, #login_window entry image.right { - padding-left: 3px; } + entry image.left, #XfceNotifyWindow entry image.left, #login_window entry image.left { + padding-right: 0px; } + entry image.right, #XfceNotifyWindow entry image.right, #login_window entry image.right { + padding-left: 0px; } entry.warning, popover.background entry.warning, #XfceNotifyWindow entry.warning, #login_window entry.warning { - color: #fff; - border-color: #bf5600; - background-color: mix(#ebdbb2,#ef6c00,0.6); } - entry.warning image, - #XfceNotifyWindow entry.warning image, #login_window entry.warning image { - color: #fff; } + color: #32302f; + border-color: #ff5402; + background-color: mix(#ebdbb2,#ff7f42,0.6); } + entry.warning image, #XfceNotifyWindow entry.warning image, #login_window entry.warning image { + color: #32302f; } entry.warning:focus, #XfceNotifyWindow entry.warning:focus, #login_window entry.warning:focus { - color: #fff; + color: #32302f; border-color: #527065; - background-color: #ef6c00; + background-color: #ff7f42; box-shadow: none; } - entry.warning selection, - #XfceNotifyWindow entry.warning selection, #login_window entry.warning selection { - background-color: #fff; - color: #ef6c00; } + entry.warning selection, #XfceNotifyWindow entry.warning selection, #login_window entry.warning selection { + background-color: #32302f; + color: #ff7f42; } entry.error, popover.background entry.error, #XfceNotifyWindow entry.error, #login_window entry.error { - color: #fff; - border-color: #e21b0c; - background-color: mix(#ebdbb2,#f44336,0.6); } - entry.error image, - #XfceNotifyWindow entry.error image, #login_window entry.error image { - color: #fff; } + color: #32302f; + border-color: #eb0049; + background-color: mix(#ebdbb2,#ff276a,0.6); } + entry.error image, #XfceNotifyWindow entry.error image, #login_window entry.error image { + color: #32302f; } entry.error:focus, #XfceNotifyWindow entry.error:focus, #login_window entry.error:focus { - color: #fff; + color: #32302f; border-color: #527065; - background-color: #f44336; + background-color: #ff276a; box-shadow: none; } - entry.error selection, - #XfceNotifyWindow entry.error selection, #login_window entry.error selection { - background-color: #fff; - color: #f44336; } + entry.error selection, #XfceNotifyWindow entry.error selection, #login_window entry.error selection { + background-color: #32302f; + color: #ff276a; } entry.search-missing, popover.background entry.search-missing, #XfceNotifyWindow entry.search-missing, #login_window entry.search-missing { - color: #fff; - border-color: #e21b0c; - background-color: mix(#ebdbb2,#f44336,0.6); } - entry.search-missing image, - #XfceNotifyWindow entry.search-missing image, #login_window entry.search-missing image { - color: #fff; } + color: #32302f; + border-color: #eb0049; + background-color: mix(#ebdbb2,#ff276a,0.6); } + entry.search-missing image, #XfceNotifyWindow entry.search-missing image, #login_window entry.search-missing image { + color: #32302f; } entry.search-missing:focus, #XfceNotifyWindow entry.search-missing:focus, #login_window entry.search-missing:focus { - color: #fff; + color: #32302f; border-color: #527065; - background-color: #f44336; + background-color: #ff276a; box-shadow: none; } - entry.search-missing selection, - #XfceNotifyWindow entry.search-missing selection, #login_window entry.search-missing selection { - background-color: #fff; - color: #f44336; } + entry.search-missing selection, #XfceNotifyWindow entry.search-missing selection, #login_window entry.search-missing selection { + background-color: #32302f; + color: #ff276a; } /********* ! Menubar @@ -3207,23 +3188,23 @@ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0; border: 0; - background-color: #30302f; + background-color: #282828; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } menubar > menuitem, .menubar > menuitem { min-height: 16px; - padding: 4.5px 7.5px; + padding: 0px 0px; border: 1px solid transparent; background-color: transparent; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } menubar > menuitem:hover, .menubar > menuitem:hover { - border-color: mix(#30302f,#ebdbb2,0.21); - background-color: mix(#30302f,#ebdbb2,0.21); + border-color: mix(#282828,#d5c4a1,0.21); + background-color: mix(#282828,#d5c4a1,0.21); background-image: none; - color: #f2e7cc; } + color: #ded1b6; } menubar > menuitem *:hover, .menubar > menuitem *:hover { - color: #f2e7cc; } + color: #ded1b6; } /****** ! Menu @@ -3233,9 +3214,9 @@ menu, .context-menu { border: 0; border-radius: 0; - padding: 3px; - background-color: #30302f; - color: #ebdbb2; } + padding: 0px; + background-color: #282828; + color: #d5c4a1; } .csd menu, .csd .menu, .csd .context-menu { @@ -3252,8 +3233,8 @@ menu, .context-menu separator, .csd .context-menu separator { - background-color: #2b2b2a; - margin: 1px 0; } + background-color: #242424; + margin: -2px 0; } menu .separator, .csd menu .separator, .menu .separator, @@ -3262,13 +3243,13 @@ menu, .context-menu .separator, .csd .context-menu .separator { - color: #2b2b2a; } + color: #242424; } menu menuitem, .menu menuitem, .context-menu menuitem { min-height: 16px; min-width: 40px; - padding: 3px; + padding: 0px; border-radius: 0; } menu menuitem:active, menu menuitem:hover, .menu menuitem:active, @@ -3290,7 +3271,7 @@ menu, .menu menuitem *:disabled, .context-menu menuitem:disabled, .context-menu menuitem *:disabled { - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#d5c4a1,#282828,0.5); } menu menuitem arrow, .menu menuitem arrow, .context-menu menuitem arrow { @@ -3355,30 +3336,30 @@ menu, menu menuitem calendar, .menu menuitem calendar, .context-menu menuitem calendar { - color: #ebdbb2; } + color: #d5c4a1; } menu menuitem calendar.header, .menu menuitem calendar.header, .context-menu menuitem calendar.header { - border-bottom: 1px solid #2b2b2a; + border-bottom: 1px solid #242424; border-radius: 0; } menu menuitem calendar.header:backdrop, .menu menuitem calendar.header:backdrop, .context-menu menuitem calendar.header:backdrop { - border-color: #2b2b2a; } + border-color: #242424; } menu menuitem calendar.button, .menu menuitem calendar.button, .context-menu menuitem calendar.button { - color: rgba(235, 219, 178, 0.55); } + color: rgba(213, 196, 161, 0.55); } menu menuitem calendar.button:hover, .menu menuitem calendar.button:hover, .context-menu menuitem calendar.button:hover { - color: #ebdbb2; } + color: #d5c4a1; } menu menuitem calendar:indeterminate, menu menuitem calendar:indeterminate:backdrop, .menu menuitem calendar:indeterminate, .menu menuitem calendar:indeterminate:backdrop, .context-menu menuitem calendar:indeterminate, .context-menu menuitem calendar:indeterminate:backdrop { - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#d5c4a1,#282828,0.5); } menu menuitem label:dir(rtl), menu menuitem label:dir(ltr), .menu menuitem label:dir(rtl), .menu menuitem label:dir(ltr), @@ -3390,25 +3371,25 @@ menu, .context-menu > arrow { min-height: 16px; min-width: 16px; - padding: 3px; - background-color: #30302f; + padding: 0px; + background-color: #282828; border-radius: 0; } menu > arrow.top, .menu > arrow.top, .context-menu > arrow.top { margin-top: -6px; - border-bottom: 1px solid mix(#282828,#ebdbb2,0.1); + border-bottom: 1px solid mix(#32302f,#ebdbb2,0.1); -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } menu > arrow.bottom, .menu > arrow.bottom, .context-menu > arrow.bottom { margin-bottom: -6px; - border-top: 1px solid mix(#282828,#ebdbb2,0.1); + border-top: 1px solid mix(#32302f,#ebdbb2,0.1); -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } menu > arrow:hover, .menu > arrow:hover, .context-menu > arrow:hover { - background-color: mix(#282828,#ebdbb2,0.1); } + background-color: mix(#32302f,#ebdbb2,0.1); } menu > arrow:backdrop, .menu > arrow:backdrop, .context-menu > arrow:backdrop { @@ -3427,11 +3408,11 @@ menu, font-family: monospace; } menuitem accelerator { - color: rgba(235, 219, 178, 0.6); } + color: rgba(213, 196, 161, 0.6); } menuitem accelerator:hover { color: rgba(235, 219, 178, 0.8); } menuitem accelerator:disabled { - color: alpha(mix(#ebdbb2,#30302f,0.5),0.4); } + color: alpha(mix(#d5c4a1,#282828,0.5),0.4); } menuitem check, menuitem radio { min-height: 16px; @@ -3442,216 +3423,216 @@ menuitem check, menuitem radio { margin-left: 7px; } menuitem window decoration { - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.2); } + box-shadow: 0 2px 3px rgba(20, 19, 19, 0.2); } menuitem entry { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); - padding: 3px; - color: #ebdbb2; + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); + padding: 0px; + color: #d5c4a1; caret-color: #282828; -gtk-secondary-caret-color: #282828; } menuitem entry:focus, menuitem entry:hover { border-color: #527065; } menuitem entry:active, menuitem entry:active:hover, menuitem entry:active:focus, menuitem entry:active:hover:focus, menuitem entry:checked, menuitem entry:checked:hover, menuitem entry:checked:focus, menuitem entry:checked:hover:focus { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.7); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.7); } menuitem entry:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.85); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.85); } menuitem entry:active:disabled, menuitem entry:checked:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); } menuitem entry:focus, menuitem entry:active { border-color: #527065; } menuitem entry:disabled { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#282828,#d5c4a1,0.5); } menuitem entry:disabled:focus, menuitem entry:disabled:hover { border-color: #527065; } menuitem entry:disabled:active, menuitem entry:disabled:active:hover, menuitem entry:disabled:active:focus, menuitem entry:disabled:active:hover:focus, menuitem entry:disabled:checked, menuitem entry:disabled:checked:hover, menuitem entry:disabled:checked:focus, menuitem entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.7); } menuitem entry:disabled:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.85); } menuitem entry:disabled:active:disabled, menuitem entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); } /********* ! Popover **********/ popover.background { - padding: 0px; - border-radius: 0px; + padding: -3px; + border-radius: 4px; background-clip: border-box; - background-color: #30302f; + background-color: #282828; background-image: none; - color: #ebdbb2; - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16); } + color: #d5c4a1; + box-shadow: 0 3px 6px rgba(20, 19, 19, 0.16); } .csd popover.background, popover.background { /*@include border($menu_bg_color);*/ - border-color: rgba(218, 188, 112, 0.5); + border-color: rgba(190, 164, 109, 0.5); border-width: 1px; border-style: solid; } .csd popover.background:focus, .csd popover.background:hover, popover.background:focus, popover.background:hover { border-color: #527065; } .csd popover.background:active, .csd popover.background:active:hover, .csd popover.background:active:focus, .csd popover.background:active:hover:focus, .csd popover.background:checked, .csd popover.background:checked:hover, .csd popover.background:checked:focus, .csd popover.background:checked:hover:focus, popover.background:active, popover.background:active:hover, popover.background:active:focus, popover.background:active:hover:focus, popover.background:checked, popover.background:checked:hover, popover.background:checked:focus, popover.background:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.5); } + border-color: rgba(178, 147, 83, 0.5); } .csd popover.background:disabled, popover.background:disabled { - border-color: rgba(222, 196, 129, 0.5); } + border-color: rgba(196, 172, 122, 0.5); } .csd popover.background:active:disabled, .csd popover.background:checked:disabled, popover.background:active:disabled, popover.background:checked:disabled { - border-color: rgba(218, 188, 112, 0.5); } + border-color: rgba(190, 164, 109, 0.5); } popover.background:backdrop { box-shadow: none; } popover.background treeview.view:hover, popover.background treeview.view:selected, popover.background treeview.view:selected:focus, popover.background treeview.view:backdrop:selected, popover.background treeview.view:backdrop:selected:focus { border-top-color: #83a598; } popover.background treeview.view, popover.background treeview.view:backdrop { - border-top-color: #3a3a38; } + border-top-color: #303030; } popover.background view:hover, popover.background .view:hover, popover.background iconview:hover, popover.background list:hover { background-image: none; background-color: #83a598; color: #ebdbb2; } popover.background view, popover.background view:backdrop, popover.background .view, popover.background iconview, popover.background .view:backdrop, popover.background iconview:backdrop, popover.background list, popover.background list:backdrop { - background-color: #3e3e3d; + background-color: #343434; background-image: none; - color: #ebdbb2; - border-color: #262626; } + color: #d5c4a1; + border-color: #202020; } popover.background list row, popover.background list row .button { background-color: transparent; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } popover.background list row:focus, popover.background list row:hover, popover.background list row:active, popover.background list row .button:focus, popover.background list row .button:hover, popover.background list row .button:active { background-image: none; background-color: #83a598; color: #ebdbb2; } popover.background .frame { - border-color: #262626; - border-radius: 0px; } + border-color: #202020; + border-radius: 4px; } popover.background entry { background-color: #ebdbb2; background-image: none; - border-color: shade(mix(#ebdbb2,#30302f,0.2),0.8); - padding: 3px; - color: #30302f; + border-color: shade(mix(#ebdbb2,#32302f,0.2),0.8); + padding: 0px; + color: #32302f; caret-color: #282828; -gtk-secondary-caret-color: #282828; } popover.background entry:focus, popover.background entry:hover { border-color: #527065; } popover.background entry:active, popover.background entry:active:hover, popover.background entry:active:focus, popover.background entry:active:hover:focus, popover.background entry:checked, popover.background entry:checked:hover, popover.background entry:checked:focus, popover.background entry:checked:hover:focus { - border-color: shade(mix(#ebdbb2,#30302f,0.2),0.7); } + border-color: shade(mix(#ebdbb2,#32302f,0.2),0.7); } popover.background entry:disabled { - border-color: shade(mix(#ebdbb2,#30302f,0.2),0.85); } + border-color: shade(mix(#ebdbb2,#32302f,0.2),0.85); } popover.background entry:active:disabled, popover.background entry:checked:disabled { - border-color: shade(mix(#ebdbb2,#30302f,0.2),0.8); } + border-color: shade(mix(#ebdbb2,#32302f,0.2),0.8); } popover.background entry:focus, popover.background entry:active { border-color: #527065; } popover.background entry:disabled { background-color: #e2cc91; background-image: none; - border-color: shade(alpha(mix(#ebdbb2,#30302f,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#ebdbb2,#32302f,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } popover.background entry:disabled:focus, popover.background entry:disabled:hover { border-color: #527065; } popover.background entry:disabled:active, popover.background entry:disabled:active:hover, popover.background entry:disabled:active:focus, popover.background entry:disabled:active:hover:focus, popover.background entry:disabled:checked, popover.background entry:disabled:checked:hover, popover.background entry:disabled:checked:focus, popover.background entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#ebdbb2,#30302f,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#ebdbb2,#32302f,0.2),0.4),0.7); } popover.background entry:disabled:disabled { - border-color: shade(alpha(mix(#ebdbb2,#30302f,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#ebdbb2,#32302f,0.2),0.4),0.85); } popover.background entry:disabled:active:disabled, popover.background entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#ebdbb2,#30302f,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#ebdbb2,#32302f,0.2),0.4),0.8); } popover.background button { - background-color: #30302f; + background-color: #32302f; background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } popover.background button:focus, popover.background button:hover { border-color: #527065; } popover.background button:active, popover.background button:active:hover, popover.background button:active:focus, popover.background button:active:hover:focus, popover.background button:checked, popover.background button:checked:hover, popover.background button:checked:focus, popover.background button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } popover.background button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } popover.background button:active:disabled, popover.background button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } popover.background button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(50, 48, 47, 0); + background-color: rgba(50, 48, 47, 0); background-image: none; box-shadow: none; } popover.background button:hover, popover.background button.flat:hover { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } popover.background button:hover:focus, popover.background button:hover:hover, popover.background button.flat:hover:focus, popover.background button.flat:hover:hover { border-color: #527065; } popover.background button:hover:active, popover.background button:hover:active:hover, popover.background button:hover:active:focus, popover.background button:hover:active:hover:focus, popover.background button:hover:checked, popover.background button:hover:checked:hover, popover.background button:hover:checked:focus, popover.background button:hover:checked:hover:focus, popover.background button.flat:hover:active, popover.background button.flat:hover:active:hover, popover.background button.flat:hover:active:focus, popover.background button.flat:hover:active:hover:focus, popover.background button.flat:hover:checked, popover.background button.flat:hover:checked:hover, popover.background button.flat:hover:checked:focus, popover.background button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } popover.background button:hover:disabled, popover.background button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } popover.background button:hover:active:disabled, popover.background button:hover:checked:disabled, popover.background button.flat:hover:active:disabled, popover.background button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } popover.background button:focus, popover.background button.flat:focus { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } popover.background button:focus:focus, popover.background button:focus:hover, popover.background button.flat:focus:focus, popover.background button.flat:focus:hover { border-color: #527065; } popover.background button:focus:active, popover.background button:focus:active:hover, popover.background button:focus:active:focus, popover.background button:focus:active:hover:focus, popover.background button:focus:checked, popover.background button:focus:checked:hover, popover.background button:focus:checked:focus, popover.background button:focus:checked:hover:focus, popover.background button.flat:focus:active, popover.background button.flat:focus:active:hover, popover.background button.flat:focus:active:focus, popover.background button.flat:focus:active:hover:focus, popover.background button.flat:focus:checked, popover.background button.flat:focus:checked:hover, popover.background button.flat:focus:checked:focus, popover.background button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } popover.background button:focus:disabled, popover.background button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } popover.background button:focus:active:disabled, popover.background button:focus:checked:disabled, popover.background button.flat:focus:active:disabled, popover.background button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } popover.background button:focus:hover, popover.background button.flat:focus:hover { - background-color: #353534; + background-color: #373534; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(190, 164, 109, 0.3); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } popover.background button:focus:hover:focus, popover.background button:focus:hover:hover, popover.background button.flat:focus:hover:focus, popover.background button.flat:focus:hover:hover { border-color: #527065; } popover.background button:focus:hover:active, popover.background button:focus:hover:active:hover, popover.background button:focus:hover:active:focus, popover.background button:focus:hover:active:hover:focus, popover.background button:focus:hover:checked, popover.background button:focus:hover:checked:hover, popover.background button:focus:hover:checked:focus, popover.background button:focus:hover:checked:hover:focus, popover.background button.flat:focus:hover:active, popover.background button.flat:focus:hover:active:hover, popover.background button.flat:focus:hover:active:focus, popover.background button.flat:focus:hover:active:hover:focus, popover.background button.flat:focus:hover:checked, popover.background button.flat:focus:hover:checked:hover, popover.background button.flat:focus:hover:checked:focus, popover.background button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } popover.background button:focus:hover:disabled, popover.background button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } popover.background button:focus:hover:active:disabled, popover.background button:focus:hover:checked:disabled, popover.background button.flat:focus:hover:active:disabled, popover.background button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } popover.background button:checked, popover.background button:active, popover.background button.flat:checked, popover.background button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } popover.background button:checked:focus, popover.background button:checked:hover, popover.background button:active:focus, popover.background button:active:hover, popover.background button.flat:checked:focus, popover.background button.flat:checked:hover, popover.background button.flat:active:focus, popover.background button.flat:active:hover { border-color: #527065; } popover.background button:checked:active, popover.background button:checked:active:hover, popover.background button:checked:active:focus, popover.background button:checked:active:hover:focus, popover.background button:checked:checked, popover.background button:checked:checked:hover, popover.background button:checked:checked:focus, popover.background button:checked:checked:hover:focus, popover.background button:active:active, popover.background button:active:active:hover, popover.background button:active:active:focus, popover.background button:active:active:hover:focus, popover.background button:active:checked, popover.background button:active:checked:hover, popover.background button:active:checked:focus, popover.background button:active:checked:hover:focus, popover.background button.flat:checked:active, popover.background button.flat:checked:active:hover, popover.background button.flat:checked:active:focus, popover.background button.flat:checked:active:hover:focus, popover.background button.flat:checked:checked, popover.background button.flat:checked:checked:hover, popover.background button.flat:checked:checked:focus, popover.background button.flat:checked:checked:hover:focus, popover.background button.flat:active:active, popover.background button.flat:active:active:hover, popover.background button.flat:active:active:focus, popover.background button.flat:active:active:hover:focus, popover.background button.flat:active:checked, popover.background button.flat:active:checked:hover, popover.background button.flat:active:checked:focus, popover.background button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } popover.background button:checked:disabled, popover.background button:active:disabled, popover.background button.flat:checked:disabled, popover.background button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } popover.background button:checked:active:disabled, popover.background button:checked:checked:disabled, popover.background button:active:active:disabled, popover.background button:active:checked:disabled, popover.background button.flat:checked:active:disabled, popover.background button.flat:checked:checked:disabled, popover.background button.flat:active:active:disabled, popover.background button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } popover.background button:checked:focus, popover.background button:checked:hover, popover.background button:active:focus, popover.background button:active:hover, popover.background button.flat:checked:focus, popover.background button.flat:checked:hover, popover.background button.flat:active:focus, popover.background button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } popover.background button:focus, popover.background button:hover, popover.background button.flat:focus, popover.background button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } popover.background button:disabled:disabled, popover.background button.flat:disabled:disabled { - background-color: alpha(mix(#30302f,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#32302f,#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#30302f,#ebdbb2,0.5); + color: mix(#32302f,#d5c4a1,0.5); box-shadow: none; } popover.background button:active:disabled, popover.background button:checked:disabled, popover.background button.flat:active:disabled, popover.background button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -3660,34 +3641,34 @@ popover.background { box-shadow: none; } popover.background button.separator, popover.background button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.9); } + color: rgba(50, 48, 47, 0.9); } popover.background button.separator:disabled, popover.background button .separator:disabled { - color: rgba(48, 48, 47, 0.85); } + color: rgba(50, 48, 47, 0.85); } popover.background .linked > button { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(10, 10, 9, 0.22); } popover.background .linked > button:focus, popover.background .linked > button:hover { - box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(10, 10, 9, 0.42); } popover.background .linked > button:active, popover.background .linked > button:active:hover, popover.background .linked > button:active:focus, popover.background .linked > button:active:hover:focus, popover.background .linked > button:checked, popover.background .linked > button:checked:hover, popover.background .linked > button:checked:focus, popover.background .linked > button:checked:hover:focus { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), inset 0 1px rgba(8, 8, 8, 0.07), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), inset 0 1px rgba(10, 10, 9, 0.07), inset 0 -1px rgba(10, 10, 9, 0.05); } popover.background .linked > button:disabled { - box-shadow: inset -1px 0 #262626; } + box-shadow: inset -1px 0 #282626; } popover.background .linked > button:last-child, popover.background .linked > button:only-child { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } popover.background .linked > button:last-child:hover, popover.background .linked > button:only-child:hover { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } popover.background .linked > button:disabled:last-child, popover.background .linked > button:disabled:only-child, popover.background .linked > button:active:disabled:last-child, popover.background .linked > button:active:disabled:only-child, popover.background .linked > button:checked:disabled:last-child, popover.background .linked > button:checked:disabled:only-child { box-shadow: none; } popover.background .linked > button:active:last-child, popover.background .linked > button:active:last-child:focus, popover.background .linked > button:active:last-child:hover, popover.background .linked > button:active:last-child:hover:focus, popover.background .linked > button:checked:last-child, popover.background .linked > button:checked:last-child:focus, popover.background .linked > button:checked:last-child:hover, popover.background .linked > button:checked:last-child:hover:focus { - box-shadow: inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } popover.background .linked > button:active:only-child, popover.background .linked > button:active:only-child:focus, popover.background .linked > button:active:only-child:hover, popover.background .linked > button:active:only-child:hover:focus, popover.background .linked > button:checked:only-child, popover.background .linked > button:checked:only-child:focus, popover.background .linked > button:checked:only-child:hover, popover.background .linked > button:checked:only-child:hover:focus { - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.06), inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } popover.background > list, popover.background > .view, popover.background > iconview, popover.background > toolbar { border-style: none; background-color: transparent; } modelbutton.flat, menuitem.button.flat { - padding: 3px 5px; + padding: 0px 2px; outline-color: transparent; transition: none; } modelbutton.flat:hover, @@ -3696,7 +3677,7 @@ menuitem.button.flat { color: #ebdbb2; } modelbutton.flat:checked, menuitem.button.flat:checked { - color: #282828; } + color: #32302f; } modelbutton.flat arrow.left, menuitem.button.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } @@ -3727,10 +3708,10 @@ menuitem.button.flat { .tooltip.background, .tooltip.background.csd, tooltip.background, tooltip.background.csd { - background-color: #282828; + background-color: #32302f; background-clip: padding-box; - border: 1px solid #202020; - border-radius: 0px; + border: 1px solid #282626; + border-radius: 4px; color: #ebdbb2; } .tooltip *, @@ -3744,123 +3725,125 @@ tooltip * { messagedialog, .message-dialog, .prompt { -GtkDialog-content-area-border: 0; -GtkDialog-action-area-border: 0; - -GtkDialog-button-spacing: 3px; + -GtkDialog-button-spacing: 0px; margin: 0; padding: 0; } + messagedialog .dialog-action-box, .message-dialog .dialog-action-box, .prompt .dialog-action-box { + margin: 0px; } printdialog paper { - color: #282828; - border: 1px solid #e1c98b; - background: #fff; + color: #32302f; + border: 1px solid mix(#ebdbb2,#32302f,0.1); + background: #ecdcb4; padding: 0; } printdialog paper:backdrop { - color: mix(#282828,#ebdbb2,0.5); - border-color: mix(#ebdbb2,#e1c98b,0.9); } + color: mix(#32302f,#ebdbb2,0.5); + border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); } printdialog .dialog-action-box { - margin: 6px; } + margin: 0px; } /********************* ! App notifications * **********************/ frame.app-notification { border-style: solid; - border-color: rgba(38, 38, 38, 0.8); + border-color: rgba(32, 32, 32, 0.8); border-width: 0 1px 1px; - border-radius: 0 0 0px 0px; - padding: 6px; - background-color: rgba(48, 48, 47, 0.8); + border-radius: 0 0 4px 4px; + padding: 0px; + background-color: rgba(40, 40, 40, 0.8); background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } frame.app-notification button { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } frame.app-notification button:focus, frame.app-notification button:hover { border-color: #527065; } frame.app-notification button:active, frame.app-notification button:active:hover, frame.app-notification button:active:focus, frame.app-notification button:active:hover:focus, frame.app-notification button:checked, frame.app-notification button:checked:hover, frame.app-notification button:checked:focus, frame.app-notification button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } frame.app-notification button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } frame.app-notification button:active:disabled, frame.app-notification button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } frame.app-notification button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } frame.app-notification button:hover, frame.app-notification button.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } frame.app-notification button:hover:focus, frame.app-notification button:hover:hover, frame.app-notification button.flat:hover:focus, frame.app-notification button.flat:hover:hover { border-color: #527065; } frame.app-notification button:hover:active, frame.app-notification button:hover:active:hover, frame.app-notification button:hover:active:focus, frame.app-notification button:hover:active:hover:focus, frame.app-notification button:hover:checked, frame.app-notification button:hover:checked:hover, frame.app-notification button:hover:checked:focus, frame.app-notification button:hover:checked:hover:focus, frame.app-notification button.flat:hover:active, frame.app-notification button.flat:hover:active:hover, frame.app-notification button.flat:hover:active:focus, frame.app-notification button.flat:hover:active:hover:focus, frame.app-notification button.flat:hover:checked, frame.app-notification button.flat:hover:checked:hover, frame.app-notification button.flat:hover:checked:focus, frame.app-notification button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } frame.app-notification button:hover:disabled, frame.app-notification button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } frame.app-notification button:hover:active:disabled, frame.app-notification button:hover:checked:disabled, frame.app-notification button.flat:hover:active:disabled, frame.app-notification button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } frame.app-notification button:focus, frame.app-notification button.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } frame.app-notification button:focus:focus, frame.app-notification button:focus:hover, frame.app-notification button.flat:focus:focus, frame.app-notification button.flat:focus:hover { border-color: #527065; } frame.app-notification button:focus:active, frame.app-notification button:focus:active:hover, frame.app-notification button:focus:active:focus, frame.app-notification button:focus:active:hover:focus, frame.app-notification button:focus:checked, frame.app-notification button:focus:checked:hover, frame.app-notification button:focus:checked:focus, frame.app-notification button:focus:checked:hover:focus, frame.app-notification button.flat:focus:active, frame.app-notification button.flat:focus:active:hover, frame.app-notification button.flat:focus:active:focus, frame.app-notification button.flat:focus:active:hover:focus, frame.app-notification button.flat:focus:checked, frame.app-notification button.flat:focus:checked:hover, frame.app-notification button.flat:focus:checked:focus, frame.app-notification button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } frame.app-notification button:focus:disabled, frame.app-notification button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } frame.app-notification button:focus:active:disabled, frame.app-notification button:focus:checked:disabled, frame.app-notification button.flat:focus:active:disabled, frame.app-notification button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } frame.app-notification button:focus:hover, frame.app-notification button.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(190, 164, 109, 0.3); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } frame.app-notification button:focus:hover:focus, frame.app-notification button:focus:hover:hover, frame.app-notification button.flat:focus:hover:focus, frame.app-notification button.flat:focus:hover:hover { border-color: #527065; } frame.app-notification button:focus:hover:active, frame.app-notification button:focus:hover:active:hover, frame.app-notification button:focus:hover:active:focus, frame.app-notification button:focus:hover:active:hover:focus, frame.app-notification button:focus:hover:checked, frame.app-notification button:focus:hover:checked:hover, frame.app-notification button:focus:hover:checked:focus, frame.app-notification button:focus:hover:checked:hover:focus, frame.app-notification button.flat:focus:hover:active, frame.app-notification button.flat:focus:hover:active:hover, frame.app-notification button.flat:focus:hover:active:focus, frame.app-notification button.flat:focus:hover:active:hover:focus, frame.app-notification button.flat:focus:hover:checked, frame.app-notification button.flat:focus:hover:checked:hover, frame.app-notification button.flat:focus:hover:checked:focus, frame.app-notification button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } frame.app-notification button:focus:hover:disabled, frame.app-notification button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } frame.app-notification button:focus:hover:active:disabled, frame.app-notification button:focus:hover:checked:disabled, frame.app-notification button.flat:focus:hover:active:disabled, frame.app-notification button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } frame.app-notification button:checked, frame.app-notification button:active, frame.app-notification button.flat:checked, frame.app-notification button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } frame.app-notification button:checked:focus, frame.app-notification button:checked:hover, frame.app-notification button:active:focus, frame.app-notification button:active:hover, frame.app-notification button.flat:checked:focus, frame.app-notification button.flat:checked:hover, frame.app-notification button.flat:active:focus, frame.app-notification button.flat:active:hover { border-color: #527065; } frame.app-notification button:checked:active, frame.app-notification button:checked:active:hover, frame.app-notification button:checked:active:focus, frame.app-notification button:checked:active:hover:focus, frame.app-notification button:checked:checked, frame.app-notification button:checked:checked:hover, frame.app-notification button:checked:checked:focus, frame.app-notification button:checked:checked:hover:focus, frame.app-notification button:active:active, frame.app-notification button:active:active:hover, frame.app-notification button:active:active:focus, frame.app-notification button:active:active:hover:focus, frame.app-notification button:active:checked, frame.app-notification button:active:checked:hover, frame.app-notification button:active:checked:focus, frame.app-notification button:active:checked:hover:focus, frame.app-notification button.flat:checked:active, frame.app-notification button.flat:checked:active:hover, frame.app-notification button.flat:checked:active:focus, frame.app-notification button.flat:checked:active:hover:focus, frame.app-notification button.flat:checked:checked, frame.app-notification button.flat:checked:checked:hover, frame.app-notification button.flat:checked:checked:focus, frame.app-notification button.flat:checked:checked:hover:focus, frame.app-notification button.flat:active:active, frame.app-notification button.flat:active:active:hover, frame.app-notification button.flat:active:active:focus, frame.app-notification button.flat:active:active:hover:focus, frame.app-notification button.flat:active:checked, frame.app-notification button.flat:active:checked:hover, frame.app-notification button.flat:active:checked:focus, frame.app-notification button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } frame.app-notification button:checked:disabled, frame.app-notification button:active:disabled, frame.app-notification button.flat:checked:disabled, frame.app-notification button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } frame.app-notification button:checked:active:disabled, frame.app-notification button:checked:checked:disabled, frame.app-notification button:active:active:disabled, frame.app-notification button:active:checked:disabled, frame.app-notification button.flat:checked:active:disabled, frame.app-notification button.flat:checked:checked:disabled, frame.app-notification button.flat:active:active:disabled, frame.app-notification button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } frame.app-notification button:checked:focus, frame.app-notification button:checked:hover, frame.app-notification button:active:focus, frame.app-notification button:active:hover, frame.app-notification button.flat:checked:focus, frame.app-notification button.flat:checked:hover, frame.app-notification button.flat:active:focus, frame.app-notification button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } frame.app-notification button:focus, frame.app-notification button:hover, frame.app-notification button.flat:focus, frame.app-notification button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } frame.app-notification button:disabled:disabled, frame.app-notification button.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } frame.app-notification button:active:disabled, frame.app-notification button:checked:disabled, frame.app-notification button.flat:active:disabled, frame.app-notification button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -3869,9 +3852,9 @@ frame.app-notification { box-shadow: none; } frame.app-notification button.separator, frame.app-notification button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } frame.app-notification button.separator:disabled, frame.app-notification button .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } frame.app-notification border { border: 0; } @@ -3906,8 +3889,8 @@ expander arrow { background-color: #ebdbb2; background-image: none; border: 1px solid #dabc70; - border-radius: 0px; - color: #282828; } + border-radius: 4px; + color: #32302f; } .floating-bar.top { border-top-width: 0; border-top-right-radius: 0; @@ -3933,10 +3916,10 @@ expander arrow { ! Touch text selections * **************************/ GtkBubbleWindow { - border-radius: 0px; + border-radius: 4px; background-clip: border-box; } GtkBubbleWindow.osd.background { - background-color: rgba(48, 48, 47, 0.8); } + background-color: rgba(40, 40, 40, 0.8); } GtkBubbleWindow .toolbar { background-color: transparent; } @@ -3944,21 +3927,21 @@ GtkBubbleWindow { ! Font-viewer * ****************/ SushiFontWidget { - padding: 3px 6px; } + padding: 0px 0px; } /************* ! Gucharmap * **************/ GucharmapChartable { background-color: #ebdbb2; - color: #30302f; } + color: #32302f; } /************* ! Evolution * **************/ EPreviewPane .entry { background-color: #ebdbb2; - color: #30302f; } + color: #32302f; } /******************* ! Gnome Bluetooth * @@ -3966,8 +3949,8 @@ EPreviewPane .entry { entry.entry.pin-entry { font-style: normal; font-size: 50px; - padding-left: 15px; - padding-right: 15px; } + padding-left: 0px; + padding-right: 0px; } label.pin-label { font-style: normal; @@ -3980,19 +3963,19 @@ label.pin-label { min-width: 20px; min-height: 24px; margin-top: 2px; - padding-bottom: 1.5px; - padding-left: 3px; - padding-right: 3px; - color: #282828; + padding-bottom: 0px; + padding-left: 0px; + padding-right: 0px; + color: #32302f; background-color: #ebdbb2; border: 1px solid; - border-color: #e1c98b; - border-radius: 0px; - box-shadow: inset 0 -3px mix(#e1c98b,#ebdbb2,0.6); + border-color: mix(#ebdbb2,#32302f,0.1); + border-radius: 4px; + box-shadow: inset 0 -3px mix(mix(#ebdbb2,#32302f,0.1),#ebdbb2,0.6); font-size: smaller; } .keycap:backdrop { background-color: #ebdbb2; - color: mix(#282828,#ebdbb2,0.5); + color: mix(#32302f,#ebdbb2,0.5); transition: 200ms ease-out; } /***************** @@ -4009,8 +3992,7 @@ stackswitcher button.circular, stackswitcher button.nautilus-circular-button.ima /******************* ! Selected Items * ********************/ -entry selection, menuitem entry selection, popover.background entry selection, .osd entry selection, -#XfceNotifyWindow entry selection, #login_window entry selection, calendar:selected, row:selected, flowbox flowboxchild:selected, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, modelbutton.flat:selected arrow, +entry selection, menuitem entry selection, popover.background entry selection, .osd entry selection, #XfceNotifyWindow entry selection, #login_window entry selection, calendar:selected, row:selected, flowbox flowboxchild:selected, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, modelbutton.flat:selected arrow, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, @@ -4018,10 +4000,9 @@ menuitem.button.flat:selected arrow, .view:selected:focus, iconview:selected:foc textview text:selected:focus, .view text:selected, iconview text:selected, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, -textview text selection, treeview.view:selected:focus, treeview.view:selected, .cs-category-view:selected:focus, .cs-category-view:selected, .cs-category-view .view:selected:focus, .cs-category-view iconview:selected:focus, .cs-category-view .view:selected, .cs-category-view iconview:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected, .nemo-window .sidebar .nemo-places-sidebar .view:selected:focus, .nemo-window .sidebar .nemo-places-sidebar iconview:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:selected { +textview text selection, treeview.view:selected:focus, treeview.view:selected, .cs-category-view:selected:focus, .cs-category-view:selected, .cs-category-view .view:selected:focus, .cs-category-view iconview:selected:focus, .cs-category-view .view:selected, .cs-category-view iconview:selected, .nemo-window .sidebar .nemo-places-sidebar .view:selected:focus, .nemo-window .sidebar .nemo-places-sidebar iconview:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected { background-color: #83a598; } - row:selected label, label:selected, entry selection, menuitem entry selection, popover.background entry selection, .osd entry selection, - #XfceNotifyWindow entry selection, #login_window entry selection, calendar:selected, row:selected, flowbox flowboxchild:selected, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, modelbutton.flat:selected arrow, + row:selected label, label:selected, entry selection, menuitem entry selection, popover.background entry selection, .osd entry selection, #XfceNotifyWindow entry selection, #login_window entry selection, calendar:selected, row:selected, flowbox flowboxchild:selected, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, modelbutton.flat:selected arrow, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, @@ -4029,37 +4010,34 @@ textview text selection, treeview.view:selected:focus, treeview.view:selected, . textview text:selected:focus, .view text:selected, iconview text:selected, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, - textview text selection, treeview.view:selected:focus, treeview.view:selected, .cs-category-view:selected:focus, .cs-category-view:selected, .cs-category-view .view:selected:focus, .cs-category-view iconview:selected:focus, .cs-category-view .view:selected, .cs-category-view iconview:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected, .nemo-window .sidebar .nemo-places-sidebar .view:selected:focus, .nemo-window .sidebar .nemo-places-sidebar iconview:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:selected { + textview text selection, treeview.view:selected:focus, treeview.view:selected, .cs-category-view:selected:focus, .cs-category-view:selected, .cs-category-view .view:selected:focus, .cs-category-view iconview:selected:focus, .cs-category-view .view:selected, .cs-category-view iconview:selected, .nemo-window .sidebar .nemo-places-sidebar .view:selected:focus, .nemo-window .sidebar .nemo-places-sidebar iconview:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected { color: #ebdbb2; } - row:selected label:disabled, label:disabled:selected, label:disabled selection, entry selection:disabled, - #XfceNotifyWindow entry selection:disabled, #login_window entry selection:disabled, calendar:disabled:selected, row:disabled:selected, flowbox flowboxchild:disabled:selected, modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, modelbutton.flat:selected arrow:disabled, + row:selected label:disabled, label:disabled:selected, label:disabled selection, entry selection:disabled, #XfceNotifyWindow entry selection:disabled, #login_window entry selection:disabled, calendar:disabled:selected, row:disabled:selected, flowbox flowboxchild:disabled:selected, modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, modelbutton.flat:selected arrow:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:active arrow:disabled, menuitem.button.flat:disabled:selected, menuitem.button.flat:selected arrow:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus, textview text:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, - textview text selection:disabled, .cs-category-view:disabled:selected, .cs-category-view iconview:disabled:selected:focus, .cs-category-view iconview:disabled:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:disabled:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:disabled:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:disabled:selected { + textview text selection:disabled, .cs-category-view:disabled:selected, .cs-category-view iconview:disabled:selected:focus, .cs-category-view iconview:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:disabled:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:disabled:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:disabled:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:disabled:selected { color: mix(#ebdbb2,#83a598,0.5); } - row:selected label:backdrop, label:backdrop:selected, label:backdrop selection, entry selection:backdrop, - #XfceNotifyWindow entry selection:backdrop, #login_window entry selection:backdrop, calendar:backdrop:selected, row:backdrop:selected, flowbox flowboxchild:backdrop:selected, modelbutton.flat:backdrop:active, modelbutton.flat:active arrow:backdrop, modelbutton.flat:backdrop:selected, modelbutton.flat:selected arrow:backdrop, + row:selected label:backdrop, label:backdrop:selected, label:backdrop selection, entry selection:backdrop, #XfceNotifyWindow entry selection:backdrop, #login_window entry selection:backdrop, calendar:backdrop:selected, row:backdrop:selected, flowbox flowboxchild:backdrop:selected, modelbutton.flat:backdrop:active, modelbutton.flat:active arrow:backdrop, modelbutton.flat:backdrop:selected, modelbutton.flat:selected arrow:backdrop, menuitem.button.flat:backdrop:active, menuitem.button.flat:active arrow:backdrop, menuitem.button.flat:backdrop:selected, menuitem.button.flat:selected arrow:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview text:backdrop:selected:focus, textview text:backdrop:selected:focus, .view text:backdrop:selected, iconview text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, - textview text selection:backdrop, .cs-category-view:backdrop:selected, .cs-category-view iconview:backdrop:selected:focus, .cs-category-view iconview:backdrop:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:backdrop:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:selected { + textview text selection:backdrop, .cs-category-view:backdrop:selected, .cs-category-view iconview:backdrop:selected:focus, .cs-category-view iconview:backdrop:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:backdrop:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:selected { background-color: #83a598; color: mix(#83a598,#ebdbb2,0.66); } - row:selected label:backdrop:disabled, label:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, entry selection:backdrop:disabled, - #XfceNotifyWindow entry selection:backdrop:disabled, #login_window entry selection:backdrop:disabled, calendar:backdrop:disabled:selected, row:backdrop:disabled:selected, flowbox flowboxchild:backdrop:disabled:selected, modelbutton.flat:backdrop:disabled:active, modelbutton.flat:active arrow:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, modelbutton.flat:selected arrow:backdrop:disabled, + row:selected label:backdrop:disabled, label:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, entry selection:backdrop:disabled, #XfceNotifyWindow entry selection:backdrop:disabled, #login_window entry selection:backdrop:disabled, calendar:backdrop:disabled:selected, row:backdrop:disabled:selected, flowbox flowboxchild:backdrop:disabled:selected, modelbutton.flat:backdrop:disabled:active, modelbutton.flat:active arrow:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, modelbutton.flat:selected arrow:backdrop:disabled, menuitem.button.flat:backdrop:disabled:active, menuitem.button.flat:active arrow:backdrop:disabled, menuitem.button.flat:backdrop:disabled:selected, menuitem.button.flat:selected arrow:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, - textview text selection:backdrop:disabled, .cs-category-view:backdrop:disabled:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar .view:backdrop:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:disabled:selected { + textview text selection:backdrop:disabled, .cs-category-view:backdrop:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar .view:backdrop:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:disabled:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:disabled:selected { color: mix(mix(#83a598,#ebdbb2,0.66),#83a598,0.3); } /********* @@ -4074,7 +4052,7 @@ textview text selection, treeview.view:selected:focus, treeview.view:selected, . notebook { padding: 0; } notebook.frame { - border: 1px solid #e1c98b; } + border: 1px solid mix(#ebdbb2,#32302f,0.1); } notebook.frame > header { margin: -1px; } notebook.frame > header.top { @@ -4094,76 +4072,16 @@ notebook { notebook > stack:not(:only-child) { background-color: #ebdbb2; } notebook > header { - padding: 3px; + padding: 0px; background-color: #ebdbb2; } notebook > header.top { - box-shadow: inset 0 -1px #e1c98b; } + box-shadow: inset 0 -1px mix(#ebdbb2,#32302f,0.1); } notebook > header.bottom { - box-shadow: inset 0 1px #e1c98b; } + box-shadow: inset 0 1px mix(#ebdbb2,#32302f,0.1); } notebook > header.right { - box-shadow: inset 1px 0 #e1c98b; } + box-shadow: inset 1px 0 mix(#ebdbb2,#32302f,0.1); } notebook > header.left { - box-shadow: inset -1px 0 #e1c98b; } - notebook > header.top { - padding-bottom: 0; } - notebook > header.top > tabs > tab { - padding: 3px 11px; - min-width: 20px; - min-height: 20px; - outline-offset: -4px; - border: 1px solid transparent; - border-bottom: none; - border-top-width: 3px; - border-radius: 1px 1px 0 0; } - notebook > header.top > tabs > tab:checked { - border-top-color: #83a598; } - notebook > header.top > tabs > tab + tab { - margin-left: -1px; } - notebook > header.bottom { - padding-top: 0; } - notebook > header.bottom > tabs > tab { - padding: 3px 11px; - min-width: 20px; - min-height: 20px; - outline-offset: -4px; - border: 1px solid transparent; - border-top: none; - border-bottom-width: 3px; - border-radius: 0 0 1px 1px; } - notebook > header.bottom > tabs > tab:checked { - border-bottom-color: #83a598; } - notebook > header.bottom > tabs > tab + tab { - margin-left: -1px; } - notebook > header.right { - padding-left: 0; } - notebook > header.right > tabs > tab { - padding: 3px 11px; - min-width: 20px; - min-height: 20px; - outline-offset: -4px; - border: 1px solid transparent; - border-left: none; - border-right-width: 3px; - border-radius: 0 1px 1px 0; } - notebook > header.right > tabs > tab:checked { - border-right-color: #83a598; } - notebook > header.right > tabs > tab + tab { - margin-top: -1px; } - notebook > header.left { - padding-right: 0; } - notebook > header.left > tabs > tab { - padding: 3px 11px; - min-width: 20px; - min-height: 20px; - outline-offset: -4px; - border: 1px solid transparent; - border-right: none; - border-left-width: 3px; - border-radius: 1px 0 0 1px; } - notebook > header.left > tabs > tab:checked { - border-left-color: #83a598; } - notebook > header.left > tabs > tab + tab { - margin-top: -1px; } + box-shadow: inset -1px 0 mix(#ebdbb2,#32302f,0.1); } notebook > header.top > tabs > arrow.up, notebook > header.bottom > tabs > arrow.up { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } notebook > header.top > tabs > arrow.up:last-child, notebook > header.bottom > tabs > arrow.up:last-child { @@ -4181,41 +4099,138 @@ notebook { notebook > header.left > tabs > arrow.down:first-child, notebook > header.right > tabs > arrow.down:first-child { margin-bottom: 2px; } notebook > header > tabs > arrow { - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } notebook > header > tabs > arrow:hover { - color: mix(#282828,mix(#282828,#ebdbb2,0.5),0.5); } + color: mix(#32302f,mix(#32302f,#ebdbb2,0.5),0.5); } notebook > header > tabs > arrow:active { - color: #282828; } + color: #32302f; } notebook > header > tabs > arrow:disabled { - color: alpha(mix(#282828,#ebdbb2,0.5),0.3); } - notebook > header.top > tabs > tab:hover:not(:checked) { - box-shadow: inset 0 -1px #e1c98b; } - notebook > header.bottom > tabs > tab:hover:not(:checked) { - box-shadow: inset 0 1px #e1c98b; } - notebook > header.left > tabs > tab:hover:not(:checked) { - box-shadow: inset -1px 0 #e1c98b; } - notebook > header.right > tabs > tab:hover:not(:checked) { - box-shadow: inset 1px 0 #e1c98b; } + color: alpha(mix(#32302f,#ebdbb2,0.5),0.3); } notebook > header > tabs > tab { - color: rgba(40, 40, 40, 0.8); - background-color: alpha(mix(#ebdbb2,#282828,0.1),0.7); } + background-color: alpha(mix(#ebdbb2,#32302f,0.1),0.7); + background-image: none; + border-color: mix(mix(#ebdbb2,#32302f,0.1),mix(#32302f,#ebdbb2,0.5),0.15); + color: rgba(50, 48, 47, 0.8); + padding: 0px 8px; + min-width: 20px; + min-height: 20px; + outline-offset: -4px; + border-width: 1px; + border-style: solid; } notebook > header > tabs > tab:hover:not(:checked) { - color: mix(#282828,mix(#282828,#ebdbb2,0.5),0.5); - background-color: rgba(235, 219, 178, 0.5); - border-color: #e1c98b; } - notebook > header > tabs > tab:checked { - border-color: #e1c98b; - color: #282828; - background-color: #ebdbb2; } + background-color: mix(#ebdbb2,#32302f,0.12); + background-image: none; + border-color: mix(mix(#ebdbb2,#32302f,0.1),#83a598,0.3); + color: mix(#32302f,mix(#32302f,#ebdbb2,0.5),0.5); } + notebook > header > tabs > tab:checked, notebook > header > tabs > tab:checked:hover { + background: #ebdbb2; + border-color: mix(#ebdbb2,#32302f,0.1); + color: #32302f; } notebook > header > tabs > tab button.flat { min-height: 22px; - min-width: 16px; + min-width: 22px; padding: 0; - color: mix(#ebdbb2,#282828,0.35); } + color: mix(#ebdbb2,#32302f,0.35); } notebook > header > tabs > tab button.flat:hover { - color: #ff4d4d; } + color: #ff749f; } notebook > header > tabs > tab button.flat:active, notebook > header > tabs > tab button.flat:active:hover { color: #83a598; } + notebook > header.top > tabs > tab:hover:not(:checked) { + box-shadow: inset 0 -1px mix(#ebdbb2,#32302f,0.1); } + notebook > header.bottom > tabs > tab:hover:not(:checked) { + box-shadow: inset 0 1px mix(#ebdbb2,#32302f,0.1); } + notebook > header.left > tabs > tab:hover:not(:checked) { + box-shadow: inset -1px 0 mix(#ebdbb2,#32302f,0.1); } + notebook > header.right > tabs > tab:hover:not(:checked) { + box-shadow: inset 1px 0 mix(#ebdbb2,#32302f,0.1); } + notebook > header.top { + padding-bottom: 0; } + notebook > header.top > tabs > tab { + border-bottom: none; + padding-left: 8px; + padding-right: 8px; + -gtk-outline-radius: 0; + margin-top: 4px; } + notebook > header.top > tabs > tab + tab { + margin-left: -1px; } + notebook > header.top > tabs > tab:first-child { + border-radius: 4px 0 0; + -gtk-outline-radius: 4px 0 0; } + notebook > header.top > tabs > tab:last-child { + border-radius: 0 4px 0 0; + -gtk-outline-radius: 0 4px 0 0; } + notebook > header.top > tabs > tab:checked { + border-top-width: 3px; + border-top-color: #83a598; + margin-top: 0; + -gtk-outline-radius: 4px; + border-radius: 4px 4px 0 0; } + notebook > header.bottom { + padding-top: 0; } + notebook > header.bottom > tabs > tab { + border-top: none; + padding-left: 8px; + padding-right: 8px; + -gtk-outline-radius: 0; + margin-bottom: 4px; } + notebook > header.bottom > tabs > tab + tab { + margin-left: -1px; } + notebook > header.bottom > tabs > tab:first-child { + border-radius: 0 0 0 4px; + -gtk-outline-radius: 0 0 0 4px; } + notebook > header.bottom > tabs > tab:last-child { + border-radius: 0 0 4px; + -gtk-outline-radius: 0 0 4px; } + notebook > header.bottom > tabs > tab:checked { + border-bottom-width: 3px; + border-bottom-color: #83a598; + margin-bottom: 0; + -gtk-outline-radius: 4px; + border-radius: 0 0 4px 4px; } + notebook > header.right { + padding-left: 0; } + notebook > header.right > tabs > tab { + border-left: none; + padding-left: 8px; + padding-right: 8px; + -gtk-outline-radius: 0; + margin-right: 4px; } + notebook > header.right > tabs > tab + tab { + margin-top: -1px; } + notebook > header.right > tabs > tab:first-child { + border-radius: 0 4px 0 0; + -gtk-outline-radius: 0 4px 0 0; } + notebook > header.right > tabs > tab:last-child { + border-radius: 0 0 4px; + -gtk-outline-radius: 0 0 4px; } + notebook > header.right > tabs > tab:checked { + border-right-width: 3px; + border-right-color: #83a598; + margin-right: 0; + -gtk-outline-radius: 4px; + border-radius: 0 4px 4px 0; } + notebook > header.left { + padding-right: 0; } + notebook > header.left > tabs > tab { + border-right: none; + padding-left: 8px; + padding-right: 8px; + -gtk-outline-radius: 0; + margin-left: 4px; } + notebook > header.left > tabs > tab + tab { + margin-top: -1px; } + notebook > header.left > tabs > tab:first-child { + border-radius: 4px 0 0; + -gtk-outline-radius: 4px 0 0; } + notebook > header.left > tabs > tab:last-child { + border-radius: 0 0 0 4px; + -gtk-outline-radius: 0 0 0 4px; } + notebook > header.left > tabs > tab:checked { + border-left-width: 3px; + border-left-color: #83a598; + margin-left: 0; + -gtk-outline-radius: 4px; + border-radius: 4px 0 0 4px; } /********* ! Buttons @@ -4230,18 +4245,18 @@ overlay.osd { background-color: transparent; } colorchooser .popover.osd { - border-radius: 0px; } + border-radius: 4px; } button.color .osd colorswatch:only-child { box-shadow: none; } button.osd, #XfceNotifyWindow button { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } button.osd:focus, button.osd:hover, #XfceNotifyWindow button:focus, #XfceNotifyWindow button:hover { @@ -4255,29 +4270,29 @@ button.osd, #XfceNotifyWindow button:checked:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } button.osd:disabled, #XfceNotifyWindow button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } button.osd:active:disabled, button.osd:checked:disabled, #XfceNotifyWindow button:active:disabled, #XfceNotifyWindow button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } button.osd.flat, #XfceNotifyWindow button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } button.osd:hover, button.osd.flat:hover, #XfceNotifyWindow button:hover, #XfceNotifyWindow button.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } button.osd:hover:focus, button.osd:hover:hover, button.osd.flat:hover:focus, button.osd.flat:hover:hover, #XfceNotifyWindow button:hover:focus, #XfceNotifyWindow button:hover:hover, @@ -4301,25 +4316,25 @@ button.osd, #XfceNotifyWindow button.flat:hover:checked:hover, #XfceNotifyWindow button.flat:hover:checked:focus, #XfceNotifyWindow button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } button.osd:hover:disabled, button.osd.flat:hover:disabled, #XfceNotifyWindow button:hover:disabled, #XfceNotifyWindow button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } button.osd:hover:active:disabled, button.osd:hover:checked:disabled, button.osd.flat:hover:active:disabled, button.osd.flat:hover:checked:disabled, #XfceNotifyWindow button:hover:active:disabled, #XfceNotifyWindow button:hover:checked:disabled, #XfceNotifyWindow button.flat:hover:active:disabled, #XfceNotifyWindow button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } button.osd:focus, button.osd.flat:focus, #XfceNotifyWindow button:focus, #XfceNotifyWindow button.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } button.osd:focus:focus, button.osd:focus:hover, button.osd.flat:focus:focus, button.osd.flat:focus:hover, #XfceNotifyWindow button:focus:focus, #XfceNotifyWindow button:focus:hover, @@ -4343,24 +4358,24 @@ button.osd, #XfceNotifyWindow button.flat:focus:checked:hover, #XfceNotifyWindow button.flat:focus:checked:focus, #XfceNotifyWindow button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } button.osd:focus:disabled, button.osd.flat:focus:disabled, #XfceNotifyWindow button:focus:disabled, #XfceNotifyWindow button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } button.osd:focus:active:disabled, button.osd:focus:checked:disabled, button.osd.flat:focus:active:disabled, button.osd.flat:focus:checked:disabled, #XfceNotifyWindow button:focus:active:disabled, #XfceNotifyWindow button:focus:checked:disabled, #XfceNotifyWindow button.flat:focus:active:disabled, #XfceNotifyWindow button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } button.osd:focus:hover, button.osd.flat:focus:hover, #XfceNotifyWindow button:focus:hover, #XfceNotifyWindow button.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(190, 164, 109, 0.3); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } button.osd:focus:hover:focus, button.osd:focus:hover:hover, button.osd.flat:focus:hover:focus, button.osd.flat:focus:hover:hover, #XfceNotifyWindow button:focus:hover:focus, #XfceNotifyWindow button:focus:hover:hover, @@ -4384,17 +4399,17 @@ button.osd, #XfceNotifyWindow button.flat:focus:hover:checked:hover, #XfceNotifyWindow button.flat:focus:hover:checked:focus, #XfceNotifyWindow button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } button.osd:focus:hover:disabled, button.osd.flat:focus:hover:disabled, #XfceNotifyWindow button:focus:hover:disabled, #XfceNotifyWindow button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } button.osd:focus:hover:active:disabled, button.osd:focus:hover:checked:disabled, button.osd.flat:focus:hover:active:disabled, button.osd.flat:focus:hover:checked:disabled, #XfceNotifyWindow button:focus:hover:active:disabled, #XfceNotifyWindow button:focus:hover:checked:disabled, #XfceNotifyWindow button.flat:focus:hover:active:disabled, #XfceNotifyWindow button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } button.osd:checked, button.osd:active, button.osd.flat:checked, button.osd.flat:active, #XfceNotifyWindow button:checked, #XfceNotifyWindow button:active, @@ -4403,9 +4418,9 @@ button.osd, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } button.osd:checked:focus, button.osd:checked:hover, button.osd:active:focus, button.osd:active:hover, button.osd.flat:checked:focus, button.osd.flat:checked:hover, button.osd.flat:active:focus, button.osd.flat:active:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover, @@ -4449,13 +4464,13 @@ button.osd, #XfceNotifyWindow button.flat:active:checked:hover, #XfceNotifyWindow button.flat:active:checked:focus, #XfceNotifyWindow button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } button.osd:checked:disabled, button.osd:active:disabled, button.osd.flat:checked:disabled, button.osd.flat:active:disabled, #XfceNotifyWindow button:checked:disabled, #XfceNotifyWindow button:active:disabled, #XfceNotifyWindow button.flat:checked:disabled, #XfceNotifyWindow button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } button.osd:checked:active:disabled, button.osd:checked:checked:disabled, button.osd:active:active:disabled, button.osd:active:checked:disabled, button.osd.flat:checked:active:disabled, button.osd.flat:checked:checked:disabled, button.osd.flat:active:active:disabled, button.osd.flat:active:checked:disabled, #XfceNotifyWindow button:checked:active:disabled, #XfceNotifyWindow button:checked:checked:disabled, @@ -4465,7 +4480,7 @@ button.osd, #XfceNotifyWindow button.flat:checked:checked:disabled, #XfceNotifyWindow button.flat:active:active:disabled, #XfceNotifyWindow button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } button.osd:checked:focus, button.osd:checked:hover, button.osd:active:focus, button.osd:active:hover, button.osd.flat:checked:focus, button.osd.flat:checked:hover, button.osd.flat:active:focus, button.osd.flat:active:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover, @@ -4484,15 +4499,15 @@ button.osd, #XfceNotifyWindow button:hover, #XfceNotifyWindow button.flat:focus, #XfceNotifyWindow button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } button.osd:disabled:disabled, button.osd.flat:disabled:disabled, #XfceNotifyWindow button:disabled:disabled, #XfceNotifyWindow button.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } button.osd:active:disabled, button.osd:checked:disabled, button.osd.flat:active:disabled, button.osd.flat:checked:disabled, #XfceNotifyWindow button:active:disabled, @@ -4507,11 +4522,11 @@ button.osd, #XfceNotifyWindow button.separator, #XfceNotifyWindow button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } button.osd.separator:disabled, button.osd .separator:disabled, #XfceNotifyWindow button.separator:disabled, #XfceNotifyWindow button .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } button.osd.image-button, #XfceNotifyWindow button.image-button { padding: 0; @@ -4520,14 +4535,14 @@ button.osd, toolbar.osd { -GtkToolbar-button-relief: normal; - padding: 3px; - border: 1px solid rgba(38, 38, 38, 0.8); - border-radius: 0px; - background-color: rgba(48, 48, 47, 0.8); + padding: 0px; + border: 1px solid rgba(32, 32, 32, 0.8); + border-radius: 4px; + background-color: rgba(40, 40, 40, 0.8); background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } toolbar.osd separator { - color: rgba(43, 43, 42, 0.8); } + color: rgba(36, 36, 36, 0.8); } toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom { border-radius: 0; } @@ -4548,25 +4563,25 @@ progressbar.osd { .osd, #XfceNotifyWindow { - background-color: rgba(48, 48, 47, 0.8); - color: #ebdbb2; + background-color: rgba(40, 40, 40, 0.8); + color: #d5c4a1; /* used by gnome-settings-daemon's media-keys OSD */ /* used by Documents */ } .osd.background, #XfceNotifyWindow.background { - background-color: rgba(48, 48, 47, 0.6); - color: #ebdbb2; } + background-color: rgba(40, 40, 40, 0.6); + color: #d5c4a1; } .osd .frame, #XfceNotifyWindow .frame { background-clip: border-box; background-origin: border-box; } .osd button, #XfceNotifyWindow button { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } .osd button:focus, .osd button:hover, #XfceNotifyWindow button:focus, #XfceNotifyWindow button:hover { @@ -4580,29 +4595,29 @@ progressbar.osd { #XfceNotifyWindow button:checked:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd button:disabled, #XfceNotifyWindow button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd button:active:disabled, .osd button:checked:disabled, #XfceNotifyWindow button:active:disabled, #XfceNotifyWindow button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd button.flat, #XfceNotifyWindow button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } .osd button:hover, .osd button.flat:hover, #XfceNotifyWindow button:hover, #XfceNotifyWindow button.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .osd button:hover:focus, .osd button:hover:hover, .osd button.flat:hover:focus, .osd button.flat:hover:hover, #XfceNotifyWindow button:hover:focus, #XfceNotifyWindow button:hover:hover, @@ -4626,25 +4641,25 @@ progressbar.osd { #XfceNotifyWindow button.flat:hover:checked:hover, #XfceNotifyWindow button.flat:hover:checked:focus, #XfceNotifyWindow button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd button:hover:disabled, .osd button.flat:hover:disabled, #XfceNotifyWindow button:hover:disabled, #XfceNotifyWindow button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd button:hover:active:disabled, .osd button:hover:checked:disabled, .osd button.flat:hover:active:disabled, .osd button.flat:hover:checked:disabled, #XfceNotifyWindow button:hover:active:disabled, #XfceNotifyWindow button:hover:checked:disabled, #XfceNotifyWindow button.flat:hover:active:disabled, #XfceNotifyWindow button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd button:focus, .osd button.flat:focus, #XfceNotifyWindow button:focus, #XfceNotifyWindow button.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } .osd button:focus:focus, .osd button:focus:hover, .osd button.flat:focus:focus, .osd button.flat:focus:hover, #XfceNotifyWindow button:focus:focus, #XfceNotifyWindow button:focus:hover, @@ -4668,24 +4683,24 @@ progressbar.osd { #XfceNotifyWindow button.flat:focus:checked:hover, #XfceNotifyWindow button.flat:focus:checked:focus, #XfceNotifyWindow button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd button:focus:disabled, .osd button.flat:focus:disabled, #XfceNotifyWindow button:focus:disabled, #XfceNotifyWindow button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd button:focus:active:disabled, .osd button:focus:checked:disabled, .osd button.flat:focus:active:disabled, .osd button.flat:focus:checked:disabled, #XfceNotifyWindow button:focus:active:disabled, #XfceNotifyWindow button:focus:checked:disabled, #XfceNotifyWindow button.flat:focus:active:disabled, #XfceNotifyWindow button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd button:focus:hover, .osd button.flat:focus:hover, #XfceNotifyWindow button:focus:hover, #XfceNotifyWindow button.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(190, 164, 109, 0.3); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } .osd button:focus:hover:focus, .osd button:focus:hover:hover, .osd button.flat:focus:hover:focus, .osd button.flat:focus:hover:hover, #XfceNotifyWindow button:focus:hover:focus, #XfceNotifyWindow button:focus:hover:hover, @@ -4709,17 +4724,17 @@ progressbar.osd { #XfceNotifyWindow button.flat:focus:hover:checked:hover, #XfceNotifyWindow button.flat:focus:hover:checked:focus, #XfceNotifyWindow button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd button:focus:hover:disabled, .osd button.flat:focus:hover:disabled, #XfceNotifyWindow button:focus:hover:disabled, #XfceNotifyWindow button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd button:focus:hover:active:disabled, .osd button:focus:hover:checked:disabled, .osd button.flat:focus:hover:active:disabled, .osd button.flat:focus:hover:checked:disabled, #XfceNotifyWindow button:focus:hover:active:disabled, #XfceNotifyWindow button:focus:hover:checked:disabled, #XfceNotifyWindow button.flat:focus:hover:active:disabled, #XfceNotifyWindow button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd button:checked, .osd button:active, .osd button.flat:checked, .osd button.flat:active, #XfceNotifyWindow button:checked, #XfceNotifyWindow button:active, @@ -4728,9 +4743,9 @@ progressbar.osd { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } .osd button:checked:focus, .osd button:checked:hover, .osd button:active:focus, .osd button:active:hover, .osd button.flat:checked:focus, .osd button.flat:checked:hover, .osd button.flat:active:focus, .osd button.flat:active:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover, @@ -4774,13 +4789,13 @@ progressbar.osd { #XfceNotifyWindow button.flat:active:checked:hover, #XfceNotifyWindow button.flat:active:checked:focus, #XfceNotifyWindow button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd button:checked:disabled, .osd button:active:disabled, .osd button.flat:checked:disabled, .osd button.flat:active:disabled, #XfceNotifyWindow button:checked:disabled, #XfceNotifyWindow button:active:disabled, #XfceNotifyWindow button.flat:checked:disabled, #XfceNotifyWindow button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd button:checked:active:disabled, .osd button:checked:checked:disabled, .osd button:active:active:disabled, .osd button:active:checked:disabled, .osd button.flat:checked:active:disabled, .osd button.flat:checked:checked:disabled, .osd button.flat:active:active:disabled, .osd button.flat:active:checked:disabled, #XfceNotifyWindow button:checked:active:disabled, #XfceNotifyWindow button:checked:checked:disabled, @@ -4790,7 +4805,7 @@ progressbar.osd { #XfceNotifyWindow button.flat:checked:checked:disabled, #XfceNotifyWindow button.flat:active:active:disabled, #XfceNotifyWindow button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd button:checked:focus, .osd button:checked:hover, .osd button:active:focus, .osd button:active:hover, .osd button.flat:checked:focus, .osd button.flat:checked:hover, .osd button.flat:active:focus, .osd button.flat:active:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover, @@ -4809,15 +4824,15 @@ progressbar.osd { #XfceNotifyWindow button:hover, #XfceNotifyWindow button.flat:focus, #XfceNotifyWindow button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } .osd button:disabled:disabled, .osd button.flat:disabled:disabled, #XfceNotifyWindow button:disabled:disabled, #XfceNotifyWindow button.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } .osd button:active:disabled, .osd button:checked:disabled, .osd button.flat:active:disabled, .osd button.flat:checked:disabled, #XfceNotifyWindow button:active:disabled, @@ -4832,18 +4847,18 @@ progressbar.osd { #XfceNotifyWindow button.separator, #XfceNotifyWindow button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } .osd button.separator:disabled, .osd button .separator:disabled, #XfceNotifyWindow button.separator:disabled, #XfceNotifyWindow button .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } .osd entry, #XfceNotifyWindow entry { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); - padding: 3px; - color: #ebdbb2; + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); + padding: 0px; + color: #d5c4a1; caret-color: #282828; -gtk-secondary-caret-color: #282828; } .osd entry:focus, .osd entry:hover, @@ -4859,27 +4874,27 @@ progressbar.osd { #XfceNotifyWindow entry:checked:hover, #XfceNotifyWindow entry:checked:focus, #XfceNotifyWindow entry:checked:hover:focus { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.7); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.7); } .osd entry:disabled, #XfceNotifyWindow entry:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.85); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.85); } .osd entry:active:disabled, .osd entry:checked:disabled, #XfceNotifyWindow entry:active:disabled, #XfceNotifyWindow entry:checked:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); } .osd entry:focus, .osd entry:active, #XfceNotifyWindow entry:focus, #XfceNotifyWindow entry:active { border-color: #527065; } .osd entry:disabled, #XfceNotifyWindow entry:disabled { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#282828,#d5c4a1,0.5); } .osd entry:disabled:focus, .osd entry:disabled:hover, #XfceNotifyWindow entry:disabled:focus, #XfceNotifyWindow entry:disabled:hover { @@ -4893,27 +4908,27 @@ progressbar.osd { #XfceNotifyWindow entry:disabled:checked:hover, #XfceNotifyWindow entry:disabled:checked:focus, #XfceNotifyWindow entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.7); } .osd entry:disabled:disabled, #XfceNotifyWindow entry:disabled:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.85); } .osd entry:disabled:active:disabled, .osd entry:disabled:checked:disabled, #XfceNotifyWindow entry:disabled:active:disabled, #XfceNotifyWindow entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); } .osd trough, .osd.trough, #XfceNotifyWindow trough, #XfceNotifyWindow.trough { - background-color: rgba(235, 219, 178, 0.3); } + background-color: rgba(213, 196, 161, 0.3); } .osd progressbar, .osd.progressbar, #XfceNotifyWindow progressbar, #XfceNotifyWindow.progressbar { - background-color: #ebdbb2; } + background-color: #d5c4a1; } .osd scale slider, #XfceNotifyWindow scale slider { - background-color: rgba(52, 52, 51, 0.8); + background-color: rgba(43, 43, 43, 0.8); background-image: none; - border-color: rgba(38, 38, 38, 0.8); } + border-color: rgba(32, 32, 32, 0.8); } .osd scale slider:focus, .osd scale slider:hover, #XfceNotifyWindow scale slider:focus, #XfceNotifyWindow scale slider:hover { @@ -4927,22 +4942,22 @@ progressbar.osd { #XfceNotifyWindow scale slider:checked:hover, #XfceNotifyWindow scale slider:checked:focus, #XfceNotifyWindow scale slider:checked:hover:focus { - border-color: rgba(34, 34, 33, 0.8); } + border-color: rgba(28, 28, 28, 0.8); } .osd scale slider:disabled, #XfceNotifyWindow scale slider:disabled { - border-color: rgba(41, 41, 40, 0.8); } + border-color: rgba(34, 34, 34, 0.8); } .osd scale slider:active:disabled, .osd scale slider:checked:disabled, #XfceNotifyWindow scale slider:active:disabled, #XfceNotifyWindow scale slider:checked:disabled { - border-color: rgba(38, 38, 38, 0.8); } + border-color: rgba(32, 32, 32, 0.8); } .osd scale slider:disabled, #XfceNotifyWindow scale slider:disabled { - background-color: rgba(43, 43, 42, 0.8); + background-color: rgba(36, 36, 36, 0.8); background-image: none; } .osd scale trough, #XfceNotifyWindow scale trough { - border-color: rgba(38, 38, 38, 0.8); - background-color: rgba(52, 52, 51, 0.8); + border-color: rgba(32, 32, 32, 0.8); + background-color: rgba(43, 43, 43, 0.8); background-image: none; } .osd scale trough.highlight, #XfceNotifyWindow scale trough.highlight { @@ -4952,12 +4967,12 @@ progressbar.osd { .osd scale trough:disabled, .osd scale trough.highlight:disabled, #XfceNotifyWindow scale trough:disabled, #XfceNotifyWindow scale trough.highlight:disabled { - border-color: rgba(41, 41, 40, 0.8); - background-color: rgba(43, 43, 42, 0.8); + border-color: rgba(34, 34, 34, 0.8); + background-color: rgba(36, 36, 36, 0.8); background-image: none; } .osd scale trough, #XfceNotifyWindow scale trough { - background-color: rgba(66, 66, 65, 0.8); } + background-color: rgba(58, 58, 58, 0.8); } .osd scale trough highlight, #XfceNotifyWindow scale trough highlight { background-color: #83a598; } @@ -4980,19 +4995,19 @@ progressbar.osd { #XfceNotifyWindow .view, #XfceNotifyWindow iconview, #XfceNotifyWindow view { - background-color: rgba(48, 48, 47, 0.8); } + background-color: rgba(40, 40, 40, 0.8); } .osd scrollbar trough, #XfceNotifyWindow scrollbar trough { - background-color: rgba(48, 48, 47, 0.8); } + background-color: rgba(40, 40, 40, 0.8); } .osd scrollbar slider, #XfceNotifyWindow scrollbar slider { - border: 1px solid mix(rgba(42, 42, 41, 0.8),#ebdbb2,0.21); + border: 1px solid mix(rgba(35, 35, 35, 0.8),#d5c4a1,0.21); border-radius: 0; - background-color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.21); } + background-color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.21); } .osd scrollbar slider:hover, #XfceNotifyWindow scrollbar slider:hover { - border-color: mix(rgba(42, 42, 41, 0.8),#ebdbb2,0.31); - background-color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.31); } + border-color: mix(rgba(35, 35, 35, 0.8),#d5c4a1,0.31); + background-color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.31); } .osd scrollbar slider:active, #XfceNotifyWindow scrollbar slider:active { border-color: #72998a; @@ -5001,17 +5016,17 @@ progressbar.osd { #XfceNotifyWindow iconview.cell:selected, #XfceNotifyWindow iconview.cell:selected:focus { background-color: transparent; - border: 3px solid mix(rgba(42, 42, 41, 0.8),#ebdbb2,0.21); - border-radius: 0px; + border: 3px solid mix(rgba(35, 35, 35, 0.8),#d5c4a1,0.21); + border-radius: 4px; outline-color: transparent; } .osd .page-thumbnail, #XfceNotifyWindow .page-thumbnail { - border: 1px solid rgba(43, 43, 42, 0.8); + border: 1px solid rgba(36, 36, 36, 0.8); /* when there's no pixbuf yet */ - background-color: rgba(48, 48, 47, 0.8); } + background-color: rgba(40, 40, 40, 0.8); } .osd popover.background, #XfceNotifyWindow popover.background { - box-shadow: 0 2px 7px 3px rgba(0, 0, 0, 0.5); } + box-shadow: 0 2px 7px 3px rgba(20, 19, 19, 0.5); } .osd popover.background > toolbar button, #XfceNotifyWindow popover.background > toolbar button { border-radius: 0; @@ -5020,12 +5035,12 @@ progressbar.osd { background-image: none; } .osd spinbutton:not(.vertical), #XfceNotifyWindow spinbutton:not(.vertical) { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: #262626; + border-color: #202020; padding: 0; - color: #ebdbb2; - caret-color: #ebdbb2; } + color: #d5c4a1; + caret-color: #d5c4a1; } .osd spinbutton:not(.vertical):focus, .osd spinbutton:not(.vertical):hover, #XfceNotifyWindow spinbutton:not(.vertical):focus, #XfceNotifyWindow spinbutton:not(.vertical):hover { @@ -5039,32 +5054,32 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical):checked:hover, #XfceNotifyWindow spinbutton:not(.vertical):checked:focus, #XfceNotifyWindow spinbutton:not(.vertical):checked:hover:focus { - border-color: #222221; } + border-color: #1c1c1c; } .osd spinbutton:not(.vertical):disabled, #XfceNotifyWindow spinbutton:not(.vertical):disabled { - border-color: #292928; } + border-color: #222222; } .osd spinbutton:not(.vertical):active:disabled, .osd spinbutton:not(.vertical):checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical):active:disabled, #XfceNotifyWindow spinbutton:not(.vertical):checked:disabled { - border-color: #262626; } + border-color: #202020; } .osd spinbutton:not(.vertical):focus, .osd spinbutton:not(.vertical):active, #XfceNotifyWindow spinbutton:not(.vertical):focus, #XfceNotifyWindow spinbutton:not(.vertical):active { border-color: #527065; } .osd spinbutton:not(.vertical):disabled, #XfceNotifyWindow spinbutton:not(.vertical):disabled { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#282828,#d5c4a1,0.5); } .osd spinbutton:not(.vertical) button, #XfceNotifyWindow spinbutton:not(.vertical) button { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); border-radius: 0; - border-color: rgba(41, 41, 40, 0.5); + border-color: rgba(34, 34, 34, 0.5); border-style: none none none solid; background-image: none; box-shadow: none; } @@ -5081,29 +5096,29 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd spinbutton:not(.vertical) button:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd spinbutton:not(.vertical) button:active:disabled, .osd spinbutton:not(.vertical) button:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd spinbutton:not(.vertical) button.flat, #XfceNotifyWindow spinbutton:not(.vertical) button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } .osd spinbutton:not(.vertical) button:hover, .osd spinbutton:not(.vertical) button.flat:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .osd spinbutton:not(.vertical) button:hover:focus, .osd spinbutton:not(.vertical) button:hover:hover, .osd spinbutton:not(.vertical) button.flat:hover:focus, .osd spinbutton:not(.vertical) button.flat:hover:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:hover, @@ -5127,25 +5142,25 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton:not(.vertical) button:hover:disabled, .osd spinbutton:not(.vertical) button.flat:hover:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton:not(.vertical) button:hover:active:disabled, .osd spinbutton:not(.vertical) button:hover:checked:disabled, .osd spinbutton:not(.vertical) button.flat:hover:active:disabled, .osd spinbutton:not(.vertical) button.flat:hover:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton:not(.vertical) button:focus, .osd spinbutton:not(.vertical) button.flat:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } .osd spinbutton:not(.vertical) button:focus:focus, .osd spinbutton:not(.vertical) button:focus:hover, .osd spinbutton:not(.vertical) button.flat:focus:focus, .osd spinbutton:not(.vertical) button.flat:focus:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover, @@ -5169,24 +5184,24 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton:not(.vertical) button:focus:disabled, .osd spinbutton:not(.vertical) button.flat:focus:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton:not(.vertical) button:focus:active:disabled, .osd spinbutton:not(.vertical) button:focus:checked:disabled, .osd spinbutton:not(.vertical) button.flat:focus:active:disabled, .osd spinbutton:not(.vertical) button.flat:focus:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton:not(.vertical) button:focus:hover, .osd spinbutton:not(.vertical) button.flat:focus:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(190, 164, 109, 0.3); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } .osd spinbutton:not(.vertical) button:focus:hover:focus, .osd spinbutton:not(.vertical) button:focus:hover:hover, .osd spinbutton:not(.vertical) button.flat:focus:hover:focus, .osd spinbutton:not(.vertical) button.flat:focus:hover:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:hover, @@ -5210,17 +5225,17 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton:not(.vertical) button:focus:hover:disabled, .osd spinbutton:not(.vertical) button.flat:focus:hover:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton:not(.vertical) button:focus:hover:active:disabled, .osd spinbutton:not(.vertical) button:focus:hover:checked:disabled, .osd spinbutton:not(.vertical) button.flat:focus:hover:active:disabled, .osd spinbutton:not(.vertical) button.flat:focus:hover:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton:not(.vertical) button:checked, .osd spinbutton:not(.vertical) button:active, .osd spinbutton:not(.vertical) button.flat:checked, .osd spinbutton:not(.vertical) button.flat:active, #XfceNotifyWindow spinbutton:not(.vertical) button:checked, #XfceNotifyWindow spinbutton:not(.vertical) button:active, @@ -5229,9 +5244,9 @@ progressbar.osd { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } .osd spinbutton:not(.vertical) button:checked:focus, .osd spinbutton:not(.vertical) button:checked:hover, .osd spinbutton:not(.vertical) button:active:focus, .osd spinbutton:not(.vertical) button:active:hover, .osd spinbutton:not(.vertical) button.flat:checked:focus, .osd spinbutton:not(.vertical) button.flat:checked:hover, .osd spinbutton:not(.vertical) button.flat:active:focus, .osd spinbutton:not(.vertical) button.flat:active:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:hover, @@ -5275,13 +5290,13 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd spinbutton:not(.vertical) button:checked:disabled, .osd spinbutton:not(.vertical) button:active:disabled, .osd spinbutton:not(.vertical) button.flat:checked:disabled, .osd spinbutton:not(.vertical) button.flat:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd spinbutton:not(.vertical) button:checked:active:disabled, .osd spinbutton:not(.vertical) button:checked:checked:disabled, .osd spinbutton:not(.vertical) button:active:active:disabled, .osd spinbutton:not(.vertical) button:active:checked:disabled, .osd spinbutton:not(.vertical) button.flat:checked:active:disabled, .osd spinbutton:not(.vertical) button.flat:checked:checked:disabled, .osd spinbutton:not(.vertical) button.flat:active:active:disabled, .osd spinbutton:not(.vertical) button.flat:active:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:checked:disabled, @@ -5291,7 +5306,7 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:checked:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd spinbutton:not(.vertical) button:checked:focus, .osd spinbutton:not(.vertical) button:checked:hover, .osd spinbutton:not(.vertical) button:active:focus, .osd spinbutton:not(.vertical) button:active:hover, .osd spinbutton:not(.vertical) button.flat:checked:focus, .osd spinbutton:not(.vertical) button.flat:checked:hover, .osd spinbutton:not(.vertical) button.flat:active:focus, .osd spinbutton:not(.vertical) button.flat:active:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:hover, @@ -5310,15 +5325,15 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } .osd spinbutton:not(.vertical) button:disabled:disabled, .osd spinbutton:not(.vertical) button.flat:disabled:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:disabled:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } .osd spinbutton:not(.vertical) button:active:disabled, .osd spinbutton:not(.vertical) button:checked:disabled, .osd spinbutton:not(.vertical) button.flat:active:disabled, .osd spinbutton:not(.vertical) button.flat:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:active:disabled, @@ -5333,11 +5348,11 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.separator, #XfceNotifyWindow spinbutton:not(.vertical) button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } .osd spinbutton:not(.vertical) button.separator:disabled, .osd spinbutton:not(.vertical) button .separator:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.separator:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } .osd spinbutton:not(.vertical) button:dir(rtl), #XfceNotifyWindow spinbutton:not(.vertical) button:dir(rtl) { border-style: none solid none none; } @@ -5345,16 +5360,16 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button:active, #XfceNotifyWindow spinbutton:not(.vertical) button:checked, #XfceNotifyWindow spinbutton:not(.vertical) button:hover { - color: #ebdbb2; } + color: #d5c4a1; } .osd spinbutton:not(.vertical) button:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:disabled { - color: alpha(mix(#ebdbb2,#30302f,0.6),0.8); } + color: alpha(mix(#d5c4a1,#282828,0.6),0.8); } .osd spinbutton:not(.vertical) button:backdrop, #XfceNotifyWindow spinbutton:not(.vertical) button:backdrop { - color: mix(#ebdbb2,mix(#282828,#ebdbb2,0.5),0.9); } + color: mix(#ebdbb2,mix(#32302f,#ebdbb2,0.5),0.9); } .osd spinbutton:not(.vertical) button:active, #XfceNotifyWindow spinbutton:not(.vertical) button:active { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } + box-shadow: inset 0 2px 3px -1px rgba(20, 19, 19, 0.2); } .osd spinbutton:not(.vertical) button:backdrop:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(251, 247, 239, 0.8); @@ -5364,17 +5379,17 @@ progressbar.osd { border-style: none solid none none; } .osd spinbutton:not(.vertical) button:dir(rtl):first-child, #XfceNotifyWindow spinbutton:not(.vertical) button:dir(rtl):first-child { - border-radius: 0px 0 0 0px; } + border-radius: 4px 0 0 4px; } .osd spinbutton:not(.vertical) button:dir(ltr):last-child, #XfceNotifyWindow spinbutton:not(.vertical) button:dir(ltr):last-child { - border-radius: 0 0px 0px 0; } + border-radius: 0 4px 4px 0; } .osd spinbutton.vertical button:first-child, #XfceNotifyWindow spinbutton.vertical button:first-child { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } .osd spinbutton.vertical button:first-child:focus, .osd spinbutton.vertical button:first-child:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:hover { @@ -5388,29 +5403,29 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd spinbutton.vertical button:first-child:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd spinbutton.vertical button:first-child:active:disabled, .osd spinbutton.vertical button:first-child:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd spinbutton.vertical button:first-child.flat, #XfceNotifyWindow spinbutton.vertical button:first-child.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } .osd spinbutton.vertical button:first-child:hover, .osd spinbutton.vertical button:first-child.flat:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .osd spinbutton.vertical button:first-child:hover:focus, .osd spinbutton.vertical button:first-child:hover:hover, .osd spinbutton.vertical button:first-child.flat:hover:focus, .osd spinbutton.vertical button:first-child.flat:hover:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:hover, @@ -5434,25 +5449,25 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton.vertical button:first-child:hover:disabled, .osd spinbutton.vertical button:first-child.flat:hover:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton.vertical button:first-child:hover:active:disabled, .osd spinbutton.vertical button:first-child:hover:checked:disabled, .osd spinbutton.vertical button:first-child.flat:hover:active:disabled, .osd spinbutton.vertical button:first-child.flat:hover:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton.vertical button:first-child:focus, .osd spinbutton.vertical button:first-child.flat:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } .osd spinbutton.vertical button:first-child:focus:focus, .osd spinbutton.vertical button:first-child:focus:hover, .osd spinbutton.vertical button:first-child.flat:focus:focus, .osd spinbutton.vertical button:first-child.flat:focus:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover, @@ -5476,24 +5491,24 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton.vertical button:first-child:focus:disabled, .osd spinbutton.vertical button:first-child.flat:focus:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton.vertical button:first-child:focus:active:disabled, .osd spinbutton.vertical button:first-child:focus:checked:disabled, .osd spinbutton.vertical button:first-child.flat:focus:active:disabled, .osd spinbutton.vertical button:first-child.flat:focus:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton.vertical button:first-child:focus:hover, .osd spinbutton.vertical button:first-child.flat:focus:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(190, 164, 109, 0.3); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } .osd spinbutton.vertical button:first-child:focus:hover:focus, .osd spinbutton.vertical button:first-child:focus:hover:hover, .osd spinbutton.vertical button:first-child.flat:focus:hover:focus, .osd spinbutton.vertical button:first-child.flat:focus:hover:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:hover, @@ -5517,17 +5532,17 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton.vertical button:first-child:focus:hover:disabled, .osd spinbutton.vertical button:first-child.flat:focus:hover:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton.vertical button:first-child:focus:hover:active:disabled, .osd spinbutton.vertical button:first-child:focus:hover:checked:disabled, .osd spinbutton.vertical button:first-child.flat:focus:hover:active:disabled, .osd spinbutton.vertical button:first-child.flat:focus:hover:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton.vertical button:first-child:checked, .osd spinbutton.vertical button:first-child:active, .osd spinbutton.vertical button:first-child.flat:checked, .osd spinbutton.vertical button:first-child.flat:active, #XfceNotifyWindow spinbutton.vertical button:first-child:checked, #XfceNotifyWindow spinbutton.vertical button:first-child:active, @@ -5536,9 +5551,9 @@ progressbar.osd { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } .osd spinbutton.vertical button:first-child:checked:focus, .osd spinbutton.vertical button:first-child:checked:hover, .osd spinbutton.vertical button:first-child:active:focus, .osd spinbutton.vertical button:first-child:active:hover, .osd spinbutton.vertical button:first-child.flat:checked:focus, .osd spinbutton.vertical button:first-child.flat:checked:hover, .osd spinbutton.vertical button:first-child.flat:active:focus, .osd spinbutton.vertical button:first-child.flat:active:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:hover, @@ -5582,13 +5597,13 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd spinbutton.vertical button:first-child:checked:disabled, .osd spinbutton.vertical button:first-child:active:disabled, .osd spinbutton.vertical button:first-child.flat:checked:disabled, .osd spinbutton.vertical button:first-child.flat:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd spinbutton.vertical button:first-child:checked:active:disabled, .osd spinbutton.vertical button:first-child:checked:checked:disabled, .osd spinbutton.vertical button:first-child:active:active:disabled, .osd spinbutton.vertical button:first-child:active:checked:disabled, .osd spinbutton.vertical button:first-child.flat:checked:active:disabled, .osd spinbutton.vertical button:first-child.flat:checked:checked:disabled, .osd spinbutton.vertical button:first-child.flat:active:active:disabled, .osd spinbutton.vertical button:first-child.flat:active:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:checked:disabled, @@ -5598,7 +5613,7 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:checked:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd spinbutton.vertical button:first-child:checked:focus, .osd spinbutton.vertical button:first-child:checked:hover, .osd spinbutton.vertical button:first-child:active:focus, .osd spinbutton.vertical button:first-child:active:hover, .osd spinbutton.vertical button:first-child.flat:checked:focus, .osd spinbutton.vertical button:first-child.flat:checked:hover, .osd spinbutton.vertical button:first-child.flat:active:focus, .osd spinbutton.vertical button:first-child.flat:active:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:hover, @@ -5617,15 +5632,15 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } .osd spinbutton.vertical button:first-child:disabled:disabled, .osd spinbutton.vertical button:first-child.flat:disabled:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:disabled:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } .osd spinbutton.vertical button:first-child:active:disabled, .osd spinbutton.vertical button:first-child:checked:disabled, .osd spinbutton.vertical button:first-child.flat:active:disabled, .osd spinbutton.vertical button:first-child.flat:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:active:disabled, @@ -5640,11 +5655,11 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.separator, #XfceNotifyWindow spinbutton.vertical button:first-child .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } .osd spinbutton.vertical button:first-child.separator:disabled, .osd spinbutton.vertical button:first-child .separator:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.separator:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } scrolledwindow viewport.frame { border-style: none; } @@ -5771,12 +5786,12 @@ scrolledwindow undershoot.right { scrolledwindow junction { border-color: transparent; - border-image: linear-gradient(to bottom, #e1c98b 1px, transparent 1px) 0 0 0 1/0 1px stretch; + border-image: linear-gradient(to bottom, mix(#ebdbb2,#32302f,0.1) 1px, transparent 1px) 0 0 0 1/0 1px stretch; background-color: mix(#ebdbb2,#ebdbb2,0.4); } scrolledwindow junction:dir(rtl) { border-image-slice: 0 1 0 0; } scrolledwindow junction:backdrop { - border-image-source: linear-gradient(to bottom, mix(#ebdbb2,#e1c98b,0.9) 1px, transparent 1px); + border-image-source: linear-gradient(to bottom, mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9) 1px, transparent 1px); background-color: #e8d5a6; transition: 200ms ease-out; } @@ -5785,9 +5800,9 @@ scrolledwindow junction { ******************/ progressbar { padding: 0; - border-radius: 0px; + border-radius: 4px; font-size: smaller; - color: rgba(40, 40, 40, 0.6); } + color: rgba(50, 48, 47, 0.6); } progressbar.horizontal trough, progressbar.horizontal progress { min-height: 6px; } @@ -5795,26 +5810,26 @@ progressbar { progressbar.vertical progress { min-width: 6px; } progressbar trough { - border: 1px solid mix(#ebdbb2,#282828,0.17); + border: 1px solid mix(#ebdbb2,#32302f,0.17); background-color: #f2e7cc; background-image: none; - border-radius: 0px; } + border-radius: 4px; } progressbar progress { background-color: #83a598; background-image: none; border-radius: 0; } progressbar progress.left { - border-top-left-radius: 0px; - border-bottom-left-radius: 0px; } + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; } progressbar progress.right { - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; } + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; } progressbar progress.bottom { - border-bottom-left-radius: 0px; - border-bottom-right-radius: 0px; } + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; } progressbar progress.top { - border-top-left-radius: 0px; - border-top-right-radius: 0px; } + border-top-left-radius: 4px; + border-top-right-radius: 4px; } levelbar.horizontal block { min-width: 34px; @@ -5829,9 +5844,8 @@ levelbar:backdrop { levelbar trough { background-color: #f2e7cc; - background-image: none; - border: 1px solid mix(#ebdbb2,#282828,0.17); - border-radius: 0px; + border: 1px solid mix(#ebdbb2,#32302f,0.17); + border-radius: 4px; padding: 2px; } levelbar.horizontal.discrete block { @@ -5846,14 +5860,13 @@ levelbar.vertical.discrete block { levelbar block { background-color: #83a598; - background-image: none; border-color: transparent; - border-radius: 0px; } + border-radius: 4px; } levelbar block.low { - background-color: #ef6c00; + background-color: #ff7f42; border-color: transparent; } levelbar block.high, levelbar block:not(.empty) { - background-color: #4caf50; + background-color: #c3a544; border-color: transparent; } levelbar block.full { background-color: #64897b; @@ -5866,7 +5879,7 @@ levelbar block { scale { min-height: 10px; min-width: 10px; - padding: 3px; } + padding: 0px; } scale.horizontal trough { padding: 0 3px; } scale.horizontal highlight, scale.horizontal fill { @@ -5892,13 +5905,13 @@ scale { outline-offset: 2px; -gtk-outline-radius: 4.5px; border-radius: 2.5px; - background-color: mix(#ebdbb2,#282828,0.2); } + background-color: mix(#ebdbb2,#32302f,0.2); } scale trough:disabled { - background-color: mix(#ebdbb2,#282828,0.1); } + background-color: mix(#ebdbb2,#32302f,0.1); } menuitem:hover scale trough, row:selected scale trough, infobar scale trough { - background-color: rgba(0, 0, 0, 0.2); } + background-color: rgba(20, 19, 19, 0.2); } menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { @@ -5910,7 +5923,7 @@ scale { menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { - background-color: rgba(0, 0, 0, 0.1); } + background-color: rgba(20, 19, 19, 0.1); } scale highlight { border-radius: 2.5px; background-color: #83a598; } @@ -6002,7 +6015,7 @@ scale { scale.color highlight, scale.color fill { margin: 0; } scale.color.horizontal { - padding: 0 0 6px 0; } + padding: 0 0 6px; } scale.color.horizontal trough { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -6036,30 +6049,30 @@ scrollbar { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } scrollbar.top { - border-bottom: 1px solid #e1c98b; } + border-bottom: 1px solid mix(#ebdbb2,#32302f,0.1); } scrollbar.bottom { - border-top: 1px solid #e1c98b; } + border-top: 1px solid mix(#ebdbb2,#32302f,0.1); } scrollbar.left { - border-right: 1px solid #e1c98b; } + border-right: 1px solid mix(#ebdbb2,#32302f,0.1); } scrollbar.right { - border-left: 1px solid #e1c98b; } + border-left: 1px solid mix(#ebdbb2,#32302f,0.1); } scrollbar:backdrop { background-color: #e8d5a6; - border-color: mix(#ebdbb2,#e1c98b,0.9); + border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); transition: 400ms ease-in; } scrollbar slider { min-width: 7px; min-height: 7px; border: 1px solid transparent; - border-radius: 0px; + border-radius: 4px; background-clip: padding-box; - background-color: mix(#ebdbb2,#282828,0.5); } + background-color: mix(#ebdbb2,#32302f,0.5); } scrollbar slider:hover { - background-color: mix(#ebdbb2,#282828,0.7); } + background-color: mix(#ebdbb2,#32302f,0.7); } scrollbar slider:hover:active { background-color: #a1bab1; } scrollbar slider:backdrop { - background-color: mix(mix(#282828,#ebdbb2,0.5),#ebdbb2,0.4); } + background-color: mix(mix(#32302f,#ebdbb2,0.5),#ebdbb2,0.4); } scrollbar slider:disabled { background-color: transparent; } scrollbar.horizontal slider { @@ -6077,8 +6090,8 @@ scrollbar { scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { min-width: 4px; min-height: 4px; - background-color: #282828; - border: 1px solid #000; } + background-color: #32302f; + border: 1px solid #141313; } scrollbar.overlay-indicator:not(.dragging):not(.hovering) button { min-width: 4px; min-height: 4px; @@ -6098,28 +6111,28 @@ scrollbar { padding: 0; border: 0; border-radius: 0; - border-color: #e1c98b; + border-color: mix(#ebdbb2,#32302f,0.1); background-color: transparent; box-shadow: none; - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } scrollbar button:hover { - color: mix(#ebdbb2,#282828,0.7); } + color: mix(#ebdbb2,#32302f,0.7); } scrollbar button:active, scrollbar button:checked { color: #a1bab1; } scrollbar button:backdrop { - color: mix(mix(#282828,#ebdbb2,0.5),#ebdbb2,0.4); } + color: mix(mix(#32302f,#ebdbb2,0.5),#ebdbb2,0.4); } scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); - border-top: 1px solid #e1c98b; } + border-top: 1px solid mix(#ebdbb2,#32302f,0.1); } scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); - border-bottom: 1px solid #e1c98b; } + border-bottom: 1px solid mix(#ebdbb2,#32302f,0.1); } scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - border-left: 1px solid #e1c98b; } + border-left: 1px solid mix(#ebdbb2,#32302f,0.1); } scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); - border-right: 1px solid #e1c98b; } + border-right: 1px solid mix(#ebdbb2,#32302f,0.1); } /********* ! Sidebar @@ -6128,14 +6141,14 @@ scrollbar { border-style: none; background-color: mix(#ebdbb2,#ebdbb2,0.5); } stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) { - border-right: 1px solid #e1c98b; + border-right: 1px solid mix(#ebdbb2,#32302f,0.1); border-left-style: none; } stacksidebar.sidebar:dir(rtl) list .sidebar:dir(rtl), stacksidebar.sidebar.right list .sidebar:dir(rtl), .sidebar.right { - border-left: 1px solid #e1c98b; + border-left: 1px solid mix(#ebdbb2,#32302f,0.1); border-right-style: none; } .sidebar:backdrop { background-color: mix(#ebdbb2,#ebdbb2,0.5); - border-color: mix(#ebdbb2,#e1c98b,0.9); + border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); transition: 200ms ease-out; } .sidebar .frame, .sidebar frame { border-width: 0; } @@ -6145,10 +6158,10 @@ scrollbar { border-style: none; } stacksidebar row { - padding: 6px 3px; } + padding: 0px 0px; } stacksidebar row > label { - padding-left: 3px; - padding-right: 3px; } + padding-left: 0px; + padding-right: 0px; } stacksidebar row.needs-attention > label { background-size: 6px 6px, 0 0; } @@ -6159,13 +6172,13 @@ placessidebar row { min-height: 32px; padding: 0; } placessidebar row > revealer { - padding: 0 6px; } + padding: 0 0px; } placessidebar row:selected { color: #ebdbb2; } placessidebar row:disabled { - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } placessidebar row:backdrop { - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } placessidebar row:backdrop:selected { color: mix(#83a598,#ebdbb2,0.66); } placessidebar row:backdrop:disabled { @@ -6173,11 +6186,11 @@ placessidebar row { placessidebar row image.sidebar-icon { opacity: 0.7; } placessidebar row image.sidebar-icon:dir(ltr) { - padding-right: 8px; - padding-left: 3px; } + padding-right: 2px; + padding-left: 0px; } placessidebar row image.sidebar-icon:dir(rtl) { - padding-left: 8px; - padding-right: 3px; } + padding-left: 2px; + padding-right: 0px; } placessidebar row label.sidebar-label:dir(ltr) { padding-right: 2px; } placessidebar row label.sidebar-label:dir(rtl) { @@ -6197,16 +6210,16 @@ placessidebar row { placessidebar row.sidebar-placeholder-row { padding: 0 8px; min-height: 2px; - background-image: image(#4e9a06); + background-image: image(#83a598); background-clip: content-box; } placessidebar row.sidebar-new-bookmark-row { color: #83a598; } placessidebar row:drop(active):not(:disabled) { - color: #4e9a06; - box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; } + color: #83a598; + box-shadow: inset 0 1px #83a598, inset 0 -1px #83a598; } placessidebar row:drop(active):not(:disabled):selected { color: #ebdbb2; - background-color: #4e9a06; } + background-color: #83a598; } /****** ! Paned @@ -6223,7 +6236,7 @@ paned > separator { paned > separator:selected { background-image: image(#83a598); } paned > separator:backdrop { - background-image: image(mix(#ebdbb2,#e1c98b,0.9)); } + background-image: image(mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9)); } paned > separator.wide { min-width: 5px; min-height: 5px; @@ -6232,7 +6245,7 @@ paned > separator { background-size: 1px 1px, 1px 1px; } paned > separator.wide:backdrop { background-color: #ebdbb2; - background-image: image(mix(#ebdbb2,#e1c98b,0.9)), image(mix(#ebdbb2,#e1c98b,0.9)); } + background-image: image(mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9)), image(mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9)); } paned.horizontal > separator { background-repeat: repeat-y; @@ -6255,7 +6268,7 @@ paned.vertical > separator { background-position: bottom, top; } paned.titlebar > separator { - background-image: image(#2b2b2a); } + background-image: image(#242424); } /******************* ! Spinner animation @@ -6283,70 +6296,70 @@ radio { -gtk-icon-source: url("../assets/radio-unchecked-dark.svg"); min-width: 16px; min-height: 16px; - margin-right: 3px; } + margin-right: 0px; } radio:disabled { - -gtk-icon-source: url("../assets/radio-unchecked-disabled-dark.svg"); } + -gtk-icon-source: url("../assets/radio-unchecked-insensitive-dark.svg"); } radio:checked, radio:active { -gtk-icon-source: url("../assets/radio-checked-dark.svg"); } radio:checked:disabled, radio:active:disabled { - -gtk-icon-source: url("../assets/radio-checked-disabled-dark.svg"); } + -gtk-icon-source: url("../assets/radio-checked-insensitive-dark.svg"); } radio:indeterminate { -gtk-icon-source: url("../assets/radio-mixed-dark.svg"); } radio:indeterminate:disabled { - -gtk-icon-source: url("../assets/radio-mixed-disabled-dark.svg"); } + -gtk-icon-source: url("../assets/radio-mixed-insensitive-dark.svg"); } menuitem radio, modelbutton radio { -gtk-icon-source: url("../assets/menuitem-radio-unchecked.svg"); } menuitem radio:disabled, modelbutton radio:disabled { - -gtk-icon-source: url("../assets/menuitem-radio-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-radio-checked-insensitive.svg"); } menuitem radio:checked, menuitem radio:active, modelbutton radio:checked, modelbutton radio:active { -gtk-icon-source: url("../assets/menuitem-radio-checked.svg"); } menuitem radio:checked:hover, menuitem radio:active:hover, modelbutton radio:checked:hover, modelbutton radio:active:hover { -gtk-icon-source: url("../assets/menuitem-radio-checked-hover.svg"); } menuitem radio:checked:disabled, menuitem radio:active:disabled, modelbutton radio:checked:disabled, modelbutton radio:active:disabled { - -gtk-icon-source: url("../assets/menuitem-radio-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-radio-checked-insensitive.svg"); } menuitem radio:indeterminate, modelbutton radio:indeterminate { -gtk-icon-source: url("../assets/menuitem-radio-mixed.svg"); } menuitem radio:indeterminate:hover, modelbutton radio:indeterminate:hover { -gtk-icon-source: url("../assets/menuitem-radio-mixed-hover.svg"); } menuitem radio:indeterminate:disabled, modelbutton radio:indeterminate:disabled { - -gtk-icon-source: url("../assets/menuitem-radio-mixed-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-radio-mixed-insensitive.svg"); } check { background-image: none; -gtk-icon-source: url("../assets/checkbox-unchecked-dark.svg"); min-width: 16px; min-height: 16px; - margin-right: 3px; } + margin-right: 0px; } check:disabled { - -gtk-icon-source: url("../assets/checkbox-unchecked-disabled-dark.svg"); } + -gtk-icon-source: url("../assets/checkbox-unchecked-insensitive-dark.svg"); } check:checked, check:active { -gtk-icon-source: url("../assets/checkbox-checked-dark.svg"); } check:checked:disabled, check:active:disabled { - -gtk-icon-source: url("../assets/checkbox-checked-disabled-dark.svg"); } + -gtk-icon-source: url("../assets/checkbox-checked-insensitive-dark.svg"); } check:indeterminate { -gtk-icon-source: url("../assets/checkbox-mixed-dark.svg"); } check:indeterminate:disabled { - -gtk-icon-source: url("../assets/checkbox-mixed-disabled-dark.svg"); } + -gtk-icon-source: url("../assets/checkbox-mixed-insensitive-dark.svg"); } menuitem check, modelbutton check { -gtk-icon-source: url("../assets/menuitem-checkbox-unchecked.svg"); } menuitem check:disabled, modelbutton check:disabled { - -gtk-icon-source: url("../assets/menuitem-checkbox-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-checkbox-checked-insensitive.svg"); } menuitem check:checked, menuitem check:active, modelbutton check:checked, modelbutton check:active { -gtk-icon-source: url("../assets/menuitem-checkbox-checked.svg"); } menuitem check:checked:hover, menuitem check:active:hover, modelbutton check:checked:hover, modelbutton check:active:hover { -gtk-icon-source: url("../assets/menuitem-checkbox-checked-hover.svg"); } menuitem check:checked:disabled, menuitem check:active:disabled, modelbutton check:checked:disabled, modelbutton check:active:disabled { - -gtk-icon-source: url("../assets/menuitem-checkbox-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-checkbox-checked-insensitive.svg"); } menuitem check:indeterminate, modelbutton check:indeterminate { -gtk-icon-source: url("../assets/menuitem-checkbox-mixed.svg"); } menuitem check:indeterminate:hover, modelbutton check:indeterminate:hover { -gtk-icon-source: url("../assets/menuitem-checkbox-mixed-hover.svg"); } menuitem check:indeterminate:disabled, modelbutton check:indeterminate:disabled { - -gtk-icon-source: url("../assets/menuitem-checkbox-mixed-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-checkbox-mixed-insensitive.svg"); } radio:dir(rtl), check:dir(rtl) { margin-right: 0; - margin-left: 3px; } + margin-left: 0px; } .view.content-view.check:not(list), iconview.content-view.check:not(list) { -gtk-icon-shadow: none; @@ -6392,29 +6405,29 @@ radio:dir(rtl), check:dir(rtl) { ! Switch *********/ switch { - border-radius: 0px; - padding: 2px; - border: none; + border-radius: 4px; + padding: -1px; + border: 0; outline: none; transition: background-color .3s linear; min-width: 88px; min-height: 24px; background-color: mix(#ebdbb2,#ebdbb2,0.3); - color: #30302f; - box-shadow: inset 1px -1px 0 rgba(8, 8, 8, 0.06), inset -1px 1px 0 rgba(8, 8, 8, 0.06); } + color: #32302f; + box-shadow: inset 1px -1px 0 rgba(10, 10, 9, 0.06), inset -1px 1px 0 rgba(10, 10, 9, 0.06); } switch slider { - background-color: mix(#30302f,#ebdbb2,0.5); - transition: all 0.3s ease-in; - box-shadow: 0 1px 2px 0 rgba(8, 8, 8, 0.07), 1px 0 2px 0 rgba(8, 8, 8, 0.07); - border-radius: 0px; } + background-color: mix(#32302f,#ebdbb2,0.5); + transition: all .3s ease-in; + box-shadow: 0 1px 2px 0 rgba(10, 10, 9, 0.07), 1px 0 2px 0 rgba(10, 10, 9, 0.07); + border-radius: 4px; } switch:checked { background-color: #83a598; background-image: none; border-color: #83a598; color: #ebdbb2; } switch:checked slider { - background-color: #fff; - box-shadow: 0 1px 3px 0 rgba(8, 8, 8, 0.1); } + background-color: #ecdcb4; + box-shadow: 0 1px 3px 0 rgba(10, 10, 9, 0.1); } switch:disabled { background-color: mix(#ebdbb2,#ebdbb2,0.5); background-image: none; @@ -6430,7 +6443,7 @@ switch { background-color: mix(mix(#ebdbb2,#ebdbb2,0.5),#ebdbb2,0.4); } list row:selected switch:checked { color: #83a598; - background-color: mix(#30302f,#ebdbb2,0.5); } + background-color: mix(#32302f,#ebdbb2,0.5); } list row:selected switch:checked slider { background-color: #83a598; } @@ -6450,7 +6463,7 @@ switch { .view text, iconview text, textview text { - color: #30302f; + color: #32302f; background-color: #ebdbb2; caret-color: #282828; -gtk-secondary-caret-color: #282828; } @@ -6458,7 +6471,7 @@ textview text { .view text:backdrop, iconview text:backdrop, textview text:backdrop { - color: mix(#ebdbb2,#30302f,0.8); + color: mix(#ebdbb2,#32302f,0.8); background-color: #ebdbb2; } .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, @@ -6467,7 +6480,7 @@ textview text { .view text:selected, iconview text:selected, textview text:selected { - border-radius: 0px; } + border-radius: 4px; } textview border { background-color: mix(#ebdbb2,#ebdbb2,0.5); } @@ -6494,7 +6507,7 @@ treeview entry.flat, treeview entry { border-color: #83a598; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { - padding: 1px 4px; + padding: -2px 1px; border-radius: 0; background-image: none; text-shadow: none; @@ -6506,7 +6519,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he treeview.view header button:backdrop { border-color: #ebdbb2; border-style: none solid solid none; - color: mix(mix(#282828,#ebdbb2,0.5),#ebdbb2,0.5); + color: mix(mix(#32302f,#ebdbb2,0.5),#ebdbb2,0.5); background-image: none; background-color: #ebdbb2; } treeview.view header button:backdrop:disabled { @@ -6515,18 +6528,18 @@ treeview.view header button, treeview.view header button:hover, treeview.view he treeview.view { -GtkTreeView-grid-line-width: 1; - -GtkTreeView-grid-line-pattern: ''; + -GtkTreeView-grid-line-pattern: ""; -GtkTreeView-tree-line-width: 1; - -GtkTreeView-tree-line-pattern: ''; - border-left-color: mix(#282828,#ebdbb2,0.5); + -GtkTreeView-tree-line-pattern: ""; + border-left-color: mix(#32302f,#ebdbb2,0.5); border-top-color: #ebdbb2; } treeview.view:selected:focus, treeview.view:selected { border-radius: 0; } treeview.view:selected:backdrop, treeview.view:selected { border-left-color: mix(#ebdbb2,#83a598,0.5); - border-top-color: rgba(40, 40, 40, 0.1); } + border-top-color: rgba(50, 48, 47, 0.1); } treeview.view:disabled { - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } treeview.view:disabled:selected { color: mix(#ebdbb2,#83a598,0.4); } treeview.view:disabled:selected:backdrop { @@ -6539,7 +6552,7 @@ treeview.view { treeview.view.separator:backdrop { color: rgba(235, 219, 178, 0.1); } treeview.view:backdrop { - border-left-color: mix(mix(#282828,#ebdbb2,0.5),#ebdbb2,0.5); + border-left-color: mix(mix(#32302f,#ebdbb2,0.5),#ebdbb2,0.5); border-top: #ebdbb2; } treeview.view:drop(active) { border-style: solid none; @@ -6551,11 +6564,11 @@ treeview.view { border-bottom-style: none; } treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: mix(#ebdbb2,#282828,0.7); } + color: mix(#ebdbb2,#32302f,0.7); } treeview.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } treeview.view.expander:hover { - color: #282828; } + color: #32302f; } treeview.view.expander:selected { color: mix(#83a598,#ebdbb2,0.7); } treeview.view.expander:selected:hover { @@ -6565,18 +6578,18 @@ treeview.view { treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } treeview.view.expander:backdrop { - color: mix(#ebdbb2,mix(#282828,#ebdbb2,0.5),0.7); } + color: mix(#ebdbb2,mix(#32302f,#ebdbb2,0.5),0.7); } treeview.view.progressbar { - border-radius: 0px; + border-radius: 4px; border: 1px solid #527065; background-color: #83a598; } treeview.view.progressbar:selected { border: 1px solid mix(#83a598,#ebdbb2,0.2); } treeview.view.progressbar:selected:focus, treeview.view.progressbar:selected { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + box-shadow: inset 0 1px rgba(236, 220, 180, 0.05); background-color: #83a598; background-image: none; - border-radius: 0px; } + border-radius: 4px; } treeview.view.progressbar:selected:focus:backdrop, treeview.view.progressbar:selected:backdrop { border-color: #ebdbb2; background-color: mix(#ebdbb2,#83a598,0.9); } @@ -6589,23 +6602,23 @@ treeview.view { background-image: none; box-shadow: none; } treeview.view.trough { - background-color: rgba(40, 40, 40, 0.1); - border-radius: 0px; } + background-color: rgba(50, 48, 47, 0.1); + border-radius: 4px; } treeview.view.trough:selected:focus, treeview.view.trough:selected { background-color: #83a598; - border-radius: 0px; } + border-radius: 4px; } treeview.view header button { - color: mix(#282828,#ebdbb2,0.5); + color: mix(#32302f,#ebdbb2,0.5); background-color: #ebdbb2; font-weight: bold; text-shadow: none; box-shadow: none; } treeview.view header button:hover { - color: mix(mix(#282828,#ebdbb2,0.5),#282828,0.5); + color: mix(mix(#32302f,#ebdbb2,0.5),#32302f,0.5); box-shadow: none; transition: none; } treeview.view header button:active { - color: #282828; + color: #32302f; transition: none; } treeview.view header button:last-child:backdrop, treeview.view header button:last-child { border-right-style: none; } @@ -6630,7 +6643,7 @@ treeview.view { ! Separator ************/ separator { - background: rgba(0, 0, 0, 0.1); + background: rgba(20, 19, 19, 0.1); min-width: 1px; min-height: 1px; } @@ -6638,11 +6651,17 @@ separator { ! Frames * ***********/ frame > border, .frame { - border: 1px solid #e1c98b; } + border: 1px solid mix(#ebdbb2,#32302f,0.1); } frame > border.flat, .frame.flat { border-style: none; } frame > border:backdrop, .frame:backdrop { - border-color: mix(#ebdbb2,#e1c98b,0.9); } + border-color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.1),0.9); } + +frame.border-inset > border, +frame.border-outset > border, +frame.border-groove > border, +frame.border-ridge > border { + border: 1px solid alpha(mix(#ebdbb2,#32302f,0.1),1.1098); } /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ scrolledwindow viewport.frame { @@ -6670,12 +6689,14 @@ placesview > actionbar > revealer > box > label { ! Window frame ***************/ decoration { - border-radius: 0px 0px 0 0; + border-radius: 4px 4px 0 0; + box-shadow: 0 3px 9px 1px rgba(20, 19, 19, 0.7), 0 0 0 1px #282828; /* this is used for the resize cursor area */ - border-width: 1px; + border-width: 0px; border-style: solid; border-color: #282828; } decoration:backdrop { + box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(20, 19, 19, 0.4), 0 0 0 1px #282828; border-color: #282828; transition: 200ms ease-out; } .maximized decoration, .fullscreen decoration, .tiled decoration { @@ -6683,19 +6704,19 @@ decoration { .popup decoration { box-shadow: none; } .ssd decoration { - box-shadow: 0 0 0 1px #32302f; } + box-shadow: 0 0 0 1px #282828; } .solid-csd decoration { border-radius: 0; box-shadow: none; } .csd.popup decoration { border-radius: 0; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(225, 201, 139, 0.8); } + box-shadow: 0 1px 2px rgba(20, 19, 19, 0.2), 0 0 0 1px rgba(40, 40, 40, 0.13); } tooltip.csd decoration { - border-radius: 0px; + border-radius: 4px; box-shadow: none; } messagedialog.csd decoration { - border-radius: 0px; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(225, 201, 139, 0.8); } + border-radius: 4px; + box-shadow: 0 1px 2px rgba(20, 19, 19, 0.2), 0 0 0 1px rgba(40, 40, 40, 0.13); } /*********************** ! Fallback mode panel * @@ -6710,9 +6731,9 @@ panel-applet > menubar menuitem, panel-applet > menubar:backdrop menuitem, panel-toplevel .gnome-panel-menu-bar menuitem, panel-toplevel .gnome-panel-menu-bar:backdrop menuitem, wnck-pager, wnck-tasklist, .mate-panel-menu-bar, .xfce4-panel, UnityPanelWidget, .unity-panel { - background-color: #30302f; + background-color: #282828; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } clock-box menuitem label, clock-box:backdrop menuitem label, panel-applet > menubar menuitem label, @@ -6723,7 +6744,7 @@ panel-toplevel .gnome-panel-menu-bar:backdrop menuitem label, gp-calendar-window #clock-applet-button label, #showdesktop-button label { font-weight: normal; - color: #ebdbb2; } + color: #d5c4a1; } #clock-applet-button, #clock-applet-button:backdrop, panel-applet button, panel-applet button:backdrop, .xfce4-panel button, #login_window, #shutdown_dialog, #restart_dialog { border-width: 0 1px; @@ -6731,28 +6752,28 @@ panel-toplevel .gnome-panel-menu-bar:backdrop menuitem label, gp-calendar-window border-color: transparent; background-color: transparent; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } #clock-applet-button:hover, panel-applet button:hover, .xfce4-panel button:hover, #login_window:hover, #shutdown_dialog:hover, #restart_dialog:hover { - background-color: mix(#30302f,#ebdbb2,0.11); + background-color: mix(#282828,#d5c4a1,0.11); background-image: none; - border-color: mix(#30302f,#ebdbb2,0.11); - color: #f2e7cc; } + border-color: mix(#282828,#d5c4a1,0.11); + color: #ded1b6; } #clock-applet-button:active, panel-applet button:active, .xfce4-panel button:active, #login_window:active, #shutdown_dialog:active, #restart_dialog:active, #clock-applet-button:checked, panel-applet button:checked, .xfce4-panel button:checked, #login_window:checked, #shutdown_dialog:checked, #restart_dialog:checked { - background-color: mix(#30302f,#ebdbb2,0.21); + background-color: mix(#282828,#d5c4a1,0.21); background-image: none; - border-color: mix(#30302f,#ebdbb2,0.21); - color: #f2e7cc; } + border-color: mix(#282828,#d5c4a1,0.21); + color: #ded1b6; } #clock-applet-button:active:hover, panel-applet button:active:hover, .xfce4-panel button:active:hover, #login_window:active:hover, #shutdown_dialog:active:hover, #restart_dialog:active:hover, #clock-applet-button:checked:hover, panel-applet button:checked:hover, .xfce4-panel button:checked:hover, #login_window:checked:hover, #shutdown_dialog:checked:hover, #restart_dialog:checked:hover { - background-color: mix(#30302f,#ebdbb2,0.31); + background-color: mix(#282828,#d5c4a1,0.31); background-image: none; - border-color: mix(#30302f,#ebdbb2,0.31); } + border-color: mix(#282828,#d5c4a1,0.31); } panel-plug, panel-toplevel.background { padding: 0; } .gp-text-color { - color: #000; } + color: #141313; } panel-applet { border: 0; } @@ -6774,7 +6795,7 @@ panel-toplevel .gnome-panel-menu-bar:backdrop menuitem { #PanelApplet label, .mate-panel-menu-bar menubar > menuitem { - color: #ebdbb2; } + color: #d5c4a1; } PanelSeparator, MatePanelAppletFrameDBus { border-width: 0; @@ -6793,7 +6814,7 @@ PanelSeparator, MatePanelAppletFrameDBus { border-style: solid; border-radius: 0; border-width: 1px; - color: #ebdbb2; + color: #d5c4a1; text-shadow: none; box-shadow: none; padding: 2px; } @@ -6811,11 +6832,11 @@ PanelSeparator, MatePanelAppletFrameDBus { #PanelApplet button.flat.toggle:checked, #PanelApplet button.flat.toggle:checked:hover { background-image: none; - background-color: darker(#30302f); + background-color: darker(#282828); border-color: transparent; border-radius: 0; border-width: 1px; - color: lighter(#ebdbb2); + color: lighter(#d5c4a1); text-shadow: none; padding: 2px; } @@ -6824,7 +6845,7 @@ PanelSeparator, MatePanelAppletFrameDBus { #PanelApplet button.toggle:hover, #PanelApplet button.flat.toggle:hover { background-image: none; - background-color: #3e3e3d; + background-color: #343434; border-color: transparent; border-radius: 0; border-width: 1px; @@ -6845,7 +6866,7 @@ PanelSeparator, MatePanelAppletFrameDBus { ! Gnome clocks * *****************/ .clocks-analog-frame.trough { - color: mix(#282828,#ebdbb2,0.85); } + color: mix(#32302f,#ebdbb2,0.85); } .clocks-analog-frame.progress { color: mix(#ebdbb2,#83a598,0.5); } @@ -6862,15 +6883,19 @@ workbench.csd > stack.titlebar:not(headerbar) { border: 0; box-shadow: none; } workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { - border-radius: 0px 0px 0 0; } + border-radius: 4px 4px 0 0; } -/************************ - ! Unity-Control-Center * -*************************/ -.background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame { - border: 0 none transparent; } - .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:backdrop, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop { - background-color: transparent; } +/**************** + ! Geary * +*****************/ +.geary-expanded .geary-message-summary { + background-color: #e7d3a2; } + +.geary-folder-popover-list-row { + border-color: #303030; + box-shadow: None; } + .geary-folder-popover-list-row > label { + color: #ebdbb2; } /*********************** ! Unity Greeter * @@ -6881,27 +6906,27 @@ workbench.csd > stack.titlebar:not(headerbar) { .lightdm.button, .lightdm-combo.combobox-entry .button, .lightdm-combo .cell, .lightdm-combo .button, .lightdm-combo .entry { background-image: none; - background-color: rgba(0, 0, 0, 0.3); - border-color: rgba(255, 255, 255, 0.9); - border-radius: 1px; - padding: 3px; - color: #fff; } + background-color: rgba(20, 19, 19, 0.3); + border-color: rgba(236, 220, 180, 0.9); + border-radius: 9px; + padding: 0px; + color: #ecdcb4; } .lightdm.menu { background-image: none; - background-color: rgba(0, 0, 0, 0.6); - border-color: rgba(255, 255, 255, 0.2); - border-radius: 0px; + background-color: rgba(20, 19, 19, 0.6); + border-color: rgba(236, 220, 180, 0.2); + border-radius: 8px; padding: 1px; - color: #fff; } + color: #ecdcb4; } .lightdm.menu .menuitem *, .lightdm.menu .menuitem.check:active, .lightdm.menu .menuitem.radio:active { - color: #fff; } + color: #ecdcb4; } .lightdm.menubar *, .lightdm.menubar.menuitem { - padding: 0px; } + padding: -3px; } .lightdm.option-button { - padding: 3px; + padding: 0px; background: none; border: 0; } @@ -6909,24 +6934,24 @@ workbench.csd > stack.titlebar:not(headerbar) { background: none; border-width: 0; } .lightdm.toggle-button.selected { - background-color: rgba(0, 0, 0, 0.3); - border-color: rgba(255, 255, 255, 0.3); + background-color: rgba(20, 19, 19, 0.3); + border-color: rgba(236, 220, 180, 0.3); border-width: 1px; } .lightdm.toggle-button.selected:hover { - background-color: rgba(255, 255, 255, 0.3); } + background-color: rgba(236, 220, 180, 0.3); } .lightdm.button:hover { - background-color: rgba(255, 255, 255, 0.3); - border-color: rgba(255, 255, 255, 0.6); + background-color: rgba(236, 220, 180, 0.3); + border-color: rgba(236, 220, 180, 0.6); text-shadow: none; } .lightdm.entry, .lightdm.button:active, .lightdm.button:active:focus, .lightdm.button:focus { background-image: none; - background-color: rgba(0, 0, 0, 0.3); - border-color: rgba(255, 255, 255, 0.6); - border-radius: 1px; - padding: 5px; - color: #fff; + background-color: rgba(20, 19, 19, 0.3); + border-color: rgba(236, 220, 180, 0.6); + border-radius: 9px; + padding: 2px; + color: #ecdcb4; text-shadow: none; } .lightdm.entry:hover, .lightdm.entry:active, .lightdm.entry:active:focus { @@ -6938,19 +6963,19 @@ workbench.csd > stack.titlebar:not(headerbar) { animation: dashentry_spinner 1s infinite linear; } .lightdm.entry:focus { - border-color: rgba(255, 255, 255, 0.6); + border-color: rgba(236, 220, 180, 0.6); border-width: 1px; border-style: solid; - color: #fff; } + color: #ecdcb4; } .lightdm.entry:selected { - background-color: rgba(255, 255, 255, 0.2); } + background-color: rgba(236, 220, 180, 0.2); } .lightdm-combo.menu { - background-color: #343433; + background-color: #2b2b2b; border-radius: 0; padding: 0; - color: #fff; } + color: #ecdcb4; } /********* ! Gedit * @@ -6964,12 +6989,12 @@ GeditWindow .pane-separator { .gedit-document-panel { background-color: #ebdbb2; - color: mix(#282828,#ebdbb2,0.1); } + color: mix(#32302f,#ebdbb2,0.1); } .gedit-document-panel list row { - padding: 3px; } + padding: 0px; } .gedit-document-panel list row button { padding: 1px; - border-radius: 0px; + border-radius: 4px; border-style: solid; border-color: transparent; border-width: 1px; @@ -6978,15 +7003,15 @@ GeditWindow .pane-separator { color: transparent; -gtk-icon-shadow: none; } .gedit-document-panel .prelight-row button { - border-color: rgba(0, 0, 0, 0.1); - color: rgba(255, 255, 255, 0.8); } + border-color: rgba(20, 19, 19, 0.1); + color: rgba(236, 220, 180, 0.8); } .gedit-document-panel .prelight-row button:active { - border-color: rgba(0, 0, 0, 0.2); - background-color: rgba(0, 0, 0, 0.08); - color: #fff; } + border-color: rgba(20, 19, 19, 0.2); + background-color: rgba(20, 19, 19, 0.08); + color: #ecdcb4; } .gedit-document-panel list row button:hover, .gedit-document-panel .prelight-row button:hover { - border-color: rgba(0, 0, 0, 0.1); - color: #fff; } + border-color: rgba(20, 19, 19, 0.1); + color: #ecdcb4; } .gedit-document-panel-group-row, .gedit-document-panel-group-row:hover { border-top: 1px solid #e2cc91; @@ -6996,13 +7021,13 @@ GeditWindow .pane-separator { background-color: #efe3c2; } .gedit-document-panel-dragged-row { - border: 1px solid rgba(0, 0, 0, 0.1); - background-color: rgba(0, 0, 0, 0.5); - color: #fff; } + border: 1px solid rgba(20, 19, 19, 0.1); + background-color: rgba(20, 19, 19, 0.5); + color: #ecdcb4; } .gedit-document-panel-placeholder-row { border: 0; - background-color: rgba(0, 0, 0, 0.08); + background-color: rgba(20, 19, 19, 0.08); transition: all 200ms ease-in; } statusbar GeditSmallButton, GeditStatusMenuButton { @@ -7017,30 +7042,30 @@ statusbar GeditSmallButton, GeditStatusMenuButton { border-color: #dabc70; } statusbar GeditSmallButton button:active, GeditStatusMenuButton button:active { background-color: #e7d3a2; - color: #282828; } + color: #32302f; } GeditViewFrame .gedit-search-slider { - padding: 3px; - border-radius: 0 0 0px 0px; + padding: 0px; + border-radius: 0 0 4px 4px; border-width: 0 1px 1px; border-style: solid; border-color: #dabc70; background-color: #ebdbb2; } GeditViewFrame .gedit-search-slider .not-found { - background-color: #f44336; + background-color: #ff276a; background-image: none; - color: #fff; } + color: #32302f; } GeditFileBrowserWidget .toolbar { - padding: 1.5px; + padding: 0px; border-top: 0; background-color: #ebdbb2; background-image: none; } .gedit-search-entry-occurrences-tag { - margin: 1.5px; - padding: 1.5px; - color: mix(#30302f,#ebdbb2,0.5); } + margin: 0px; + padding: 0px; + color: mix(#32302f,#ebdbb2,0.5); } .gedit-bottom-panel-paned, .gedit-side-panel-paned, @@ -7048,16 +7073,16 @@ paned.titlebar { margin-right: 0; } .gedit-bottom-panel-paned notebook { - border-top: none; } + border-top: 0; } /************ ! Nautilus * *************/ .nautilus-desktop, .nautilus-desktop:backdrop, .nautilus-desktop *, .nautilus-desktop *:backdrop { - color: #fff; - text-shadow: 1px 1px #000; } + color: #ecdcb4; + text-shadow: 1px 1px #141313; } .nautilus-desktop:active, .nautilus-desktop:backdrop:active, .nautilus-desktop *:active, .nautilus-desktop *:backdrop:active { - color: #282828; } + color: #32302f; } .nautilus-desktop:selected, .nautilus-desktop:backdrop:selected, .nautilus-desktop *:selected, .nautilus-desktop *:backdrop:selected { color: #ebdbb2; } .nautilus-desktop:active, .nautilus-desktop:hover, .nautilus-desktop:selected, .nautilus-desktop:backdrop:active, .nautilus-desktop:backdrop:hover, .nautilus-desktop:backdrop:selected, .nautilus-desktop *:active, .nautilus-desktop *:hover, .nautilus-desktop *:selected, .nautilus-desktop *:backdrop:active, .nautilus-desktop *:backdrop:hover, .nautilus-desktop *:backdrop:selected { @@ -7082,16 +7107,16 @@ paned.titlebar { .nautilus-window .searchbar-container { margin-top: -1px; } .nautilus-window .searchbar-container searchbar { - padding-top: 0px; - padding-bottom: 1px; - border-bottom: 1px solid #e1c98b; } + padding-top: -3px; + padding-bottom: -2px; + border-bottom: 1px solid mix(#ebdbb2,#32302f,0.1); } .disk-space-display { border-style: solid; border-width: 1px; } .disk-space-display.unknown { - background-color: rgba(40, 40, 40, 0.5); - border-color: rgba(36, 36, 36, 0.5); } + background-color: rgba(50, 48, 47, 0.5); + border-color: rgba(45, 43, 42, 0.5); } .disk-space-display.used { background-color: rgba(131, 165, 152, 0.8); border-color: rgba(114, 153, 138, 0.8); } @@ -7100,11 +7125,11 @@ paned.titlebar { border-color: #dfc582; } .conflict-row.activatable, .conflict-row.activatable:active { - color: #fff; - background-color: #f44336; } + color: #32302f; + background-color: #ff276a; } .conflict-row.activatable:hover { - background-color: #f65d52; } + background-color: #ff447e; } .conflict-row.activatable:selected { color: #ebdbb2; @@ -7114,10 +7139,10 @@ paned.titlebar { ! Nemo * *********/ .nemo-desktop, .nemo-desktop:backdrop, .nemo-desktop *, .nemo-desktop *:backdrop { - color: #fff; - text-shadow: 1px 1px #000; } + color: #ecdcb4; + text-shadow: 1px 1px #141313; } .nemo-desktop:active, .nemo-desktop:backdrop:active, .nemo-desktop *:active, .nemo-desktop *:backdrop:active { - color: #282828; } + color: #32302f; } .nemo-desktop:selected, .nemo-desktop:backdrop:selected, .nemo-desktop *:selected, .nemo-desktop *:backdrop:selected { color: #ebdbb2; } .nemo-desktop:active, .nemo-desktop:hover, .nemo-desktop:selected, .nemo-desktop:backdrop:active, .nemo-desktop:backdrop:hover, .nemo-desktop:backdrop:selected, .nemo-desktop *:active, .nemo-desktop *:hover, .nemo-desktop *:selected, .nemo-desktop *:backdrop:active, .nemo-desktop *:backdrop:hover, .nemo-desktop *:backdrop:selected { @@ -7133,19 +7158,19 @@ paned.titlebar { .nemo-window toolbar button { background-color: #ebdbb2; background-image: none; - border-color: rgba(32, 32, 32, 0.32); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .nemo-window toolbar button:focus, .nemo-window toolbar button:hover { border-color: #527065; } .nemo-window toolbar button:active, .nemo-window toolbar button:active:hover, .nemo-window toolbar button:active:focus, .nemo-window toolbar button:active:hover:focus, .nemo-window toolbar button:checked, .nemo-window toolbar button:checked:hover, .nemo-window toolbar button:checked:focus, .nemo-window toolbar button:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.32); } + border-color: rgba(35, 34, 33, 0.32); } .nemo-window toolbar button:disabled { - border-color: rgba(34, 34, 34, 0.32); } + border-color: rgba(43, 41, 40, 0.32); } .nemo-window toolbar button:active:disabled, .nemo-window toolbar button:checked:disabled { - border-color: rgba(32, 32, 32, 0.32); } + border-color: rgba(40, 38, 38, 0.32); } .nemo-window toolbar button.flat { - color: #282828; + color: #32302f; border-color: rgba(235, 219, 178, 0); background-color: rgba(235, 219, 178, 0); background-image: none; @@ -7153,72 +7178,72 @@ paned.titlebar { .nemo-window toolbar button:hover, .nemo-window toolbar button.flat:hover { background-color: #efe3c2; background-image: none; - border-color: rgba(32, 32, 32, 0.4); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } .nemo-window toolbar button:hover:focus, .nemo-window toolbar button:hover:hover, .nemo-window toolbar button.flat:hover:focus, .nemo-window toolbar button.flat:hover:hover { border-color: #527065; } .nemo-window toolbar button:hover:active, .nemo-window toolbar button:hover:active:hover, .nemo-window toolbar button:hover:active:focus, .nemo-window toolbar button:hover:active:hover:focus, .nemo-window toolbar button:hover:checked, .nemo-window toolbar button:hover:checked:hover, .nemo-window toolbar button:hover:checked:focus, .nemo-window toolbar button:hover:checked:hover:focus, .nemo-window toolbar button.flat:hover:active, .nemo-window toolbar button.flat:hover:active:hover, .nemo-window toolbar button.flat:hover:active:focus, .nemo-window toolbar button.flat:hover:active:hover:focus, .nemo-window toolbar button.flat:hover:checked, .nemo-window toolbar button.flat:hover:checked:hover, .nemo-window toolbar button.flat:hover:checked:focus, .nemo-window toolbar button.flat:hover:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.4); } + border-color: rgba(35, 34, 33, 0.4); } .nemo-window toolbar button:hover:disabled, .nemo-window toolbar button.flat:hover:disabled { - border-color: rgba(34, 34, 34, 0.4); } + border-color: rgba(43, 41, 40, 0.4); } .nemo-window toolbar button:hover:active:disabled, .nemo-window toolbar button:hover:checked:disabled, .nemo-window toolbar button.flat:hover:active:disabled, .nemo-window toolbar button.flat:hover:checked:disabled { - border-color: rgba(32, 32, 32, 0.4); } + border-color: rgba(40, 38, 38, 0.4); } .nemo-window toolbar button:focus, .nemo-window toolbar button.flat:focus { background-color: #efe3c2; background-image: none; - border-color: rgba(32, 32, 32, 0.4); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .nemo-window toolbar button:focus:focus, .nemo-window toolbar button:focus:hover, .nemo-window toolbar button.flat:focus:focus, .nemo-window toolbar button.flat:focus:hover { border-color: #527065; } .nemo-window toolbar button:focus:active, .nemo-window toolbar button:focus:active:hover, .nemo-window toolbar button:focus:active:focus, .nemo-window toolbar button:focus:active:hover:focus, .nemo-window toolbar button:focus:checked, .nemo-window toolbar button:focus:checked:hover, .nemo-window toolbar button:focus:checked:focus, .nemo-window toolbar button:focus:checked:hover:focus, .nemo-window toolbar button.flat:focus:active, .nemo-window toolbar button.flat:focus:active:hover, .nemo-window toolbar button.flat:focus:active:focus, .nemo-window toolbar button.flat:focus:active:hover:focus, .nemo-window toolbar button.flat:focus:checked, .nemo-window toolbar button.flat:focus:checked:hover, .nemo-window toolbar button.flat:focus:checked:focus, .nemo-window toolbar button.flat:focus:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.4); } + border-color: rgba(35, 34, 33, 0.4); } .nemo-window toolbar button:focus:disabled, .nemo-window toolbar button.flat:focus:disabled { - border-color: rgba(34, 34, 34, 0.4); } + border-color: rgba(43, 41, 40, 0.4); } .nemo-window toolbar button:focus:active:disabled, .nemo-window toolbar button:focus:checked:disabled, .nemo-window toolbar button.flat:focus:active:disabled, .nemo-window toolbar button.flat:focus:checked:disabled { - border-color: rgba(32, 32, 32, 0.4); } + border-color: rgba(40, 38, 38, 0.4); } .nemo-window toolbar button:focus:hover, .nemo-window toolbar button.flat:focus:hover { background-color: #f4ead3; background-image: none; - border-color: rgba(32, 32, 32, 0.4); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.38); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } .nemo-window toolbar button:focus:hover:focus, .nemo-window toolbar button:focus:hover:hover, .nemo-window toolbar button.flat:focus:hover:focus, .nemo-window toolbar button.flat:focus:hover:hover { border-color: #527065; } .nemo-window toolbar button:focus:hover:active, .nemo-window toolbar button:focus:hover:active:hover, .nemo-window toolbar button:focus:hover:active:focus, .nemo-window toolbar button:focus:hover:active:hover:focus, .nemo-window toolbar button:focus:hover:checked, .nemo-window toolbar button:focus:hover:checked:hover, .nemo-window toolbar button:focus:hover:checked:focus, .nemo-window toolbar button:focus:hover:checked:hover:focus, .nemo-window toolbar button.flat:focus:hover:active, .nemo-window toolbar button.flat:focus:hover:active:hover, .nemo-window toolbar button.flat:focus:hover:active:focus, .nemo-window toolbar button.flat:focus:hover:active:hover:focus, .nemo-window toolbar button.flat:focus:hover:checked, .nemo-window toolbar button.flat:focus:hover:checked:hover, .nemo-window toolbar button.flat:focus:hover:checked:focus, .nemo-window toolbar button.flat:focus:hover:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.4); } + border-color: rgba(35, 34, 33, 0.4); } .nemo-window toolbar button:focus:hover:disabled, .nemo-window toolbar button.flat:focus:hover:disabled { - border-color: rgba(34, 34, 34, 0.4); } + border-color: rgba(43, 41, 40, 0.4); } .nemo-window toolbar button:focus:hover:active:disabled, .nemo-window toolbar button:focus:hover:checked:disabled, .nemo-window toolbar button.flat:focus:hover:active:disabled, .nemo-window toolbar button.flat:focus:hover:checked:disabled { - border-color: rgba(32, 32, 32, 0.4); } + border-color: rgba(40, 38, 38, 0.4); } .nemo-window toolbar button:checked, .nemo-window toolbar button:active, .nemo-window toolbar button.flat:checked, .nemo-window toolbar button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(40, 40, 40, 0.06), inset 0 1px rgba(40, 40, 40, 0.07), inset -1px 0 rgba(40, 40, 40, 0.06), inset 0 -1px rgba(40, 40, 40, 0.05); - border-color: rgba(32, 32, 32, 0.32); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } .nemo-window toolbar button:checked:focus, .nemo-window toolbar button:checked:hover, .nemo-window toolbar button:active:focus, .nemo-window toolbar button:active:hover, .nemo-window toolbar button.flat:checked:focus, .nemo-window toolbar button.flat:checked:hover, .nemo-window toolbar button.flat:active:focus, .nemo-window toolbar button.flat:active:hover { border-color: #527065; } .nemo-window toolbar button:checked:active, .nemo-window toolbar button:checked:active:hover, .nemo-window toolbar button:checked:active:focus, .nemo-window toolbar button:checked:active:hover:focus, .nemo-window toolbar button:checked:checked, .nemo-window toolbar button:checked:checked:hover, .nemo-window toolbar button:checked:checked:focus, .nemo-window toolbar button:checked:checked:hover:focus, .nemo-window toolbar button:active:active, .nemo-window toolbar button:active:active:hover, .nemo-window toolbar button:active:active:focus, .nemo-window toolbar button:active:active:hover:focus, .nemo-window toolbar button:active:checked, .nemo-window toolbar button:active:checked:hover, .nemo-window toolbar button:active:checked:focus, .nemo-window toolbar button:active:checked:hover:focus, .nemo-window toolbar button.flat:checked:active, .nemo-window toolbar button.flat:checked:active:hover, .nemo-window toolbar button.flat:checked:active:focus, .nemo-window toolbar button.flat:checked:active:hover:focus, .nemo-window toolbar button.flat:checked:checked, .nemo-window toolbar button.flat:checked:checked:hover, .nemo-window toolbar button.flat:checked:checked:focus, .nemo-window toolbar button.flat:checked:checked:hover:focus, .nemo-window toolbar button.flat:active:active, .nemo-window toolbar button.flat:active:active:hover, .nemo-window toolbar button.flat:active:active:focus, .nemo-window toolbar button.flat:active:active:hover:focus, .nemo-window toolbar button.flat:active:checked, .nemo-window toolbar button.flat:active:checked:hover, .nemo-window toolbar button.flat:active:checked:focus, .nemo-window toolbar button.flat:active:checked:hover:focus { - border-color: rgba(28, 28, 28, 0.32); } + border-color: rgba(35, 34, 33, 0.32); } .nemo-window toolbar button:checked:disabled, .nemo-window toolbar button:active:disabled, .nemo-window toolbar button.flat:checked:disabled, .nemo-window toolbar button.flat:active:disabled { - border-color: rgba(34, 34, 34, 0.32); } + border-color: rgba(43, 41, 40, 0.32); } .nemo-window toolbar button:checked:active:disabled, .nemo-window toolbar button:checked:checked:disabled, .nemo-window toolbar button:active:active:disabled, .nemo-window toolbar button:active:checked:disabled, .nemo-window toolbar button.flat:checked:active:disabled, .nemo-window toolbar button.flat:checked:checked:disabled, .nemo-window toolbar button.flat:active:active:disabled, .nemo-window toolbar button.flat:active:checked:disabled { - border-color: rgba(32, 32, 32, 0.32); } + border-color: rgba(40, 38, 38, 0.32); } .nemo-window toolbar button:checked:focus, .nemo-window toolbar button:checked:hover, .nemo-window toolbar button:active:focus, .nemo-window toolbar button:active:hover, .nemo-window toolbar button.flat:checked:focus, .nemo-window toolbar button.flat:checked:hover, .nemo-window toolbar button.flat:active:focus, .nemo-window toolbar button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } .nemo-window toolbar button:focus, .nemo-window toolbar button:hover, .nemo-window toolbar button.flat:focus, .nemo-window toolbar button.flat:hover { - color: #282828; } + color: #32302f; } .nemo-window toolbar button:disabled:disabled, .nemo-window toolbar button.flat:disabled:disabled { - background-color: alpha(mix(#ebdbb2,#282828,0.2),0.4); + background-color: alpha(mix(#ebdbb2,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#ebdbb2,#282828,0.5); + color: mix(#ebdbb2,#32302f,0.5); box-shadow: none; } .nemo-window toolbar button:active:disabled, .nemo-window toolbar button:checked:disabled, .nemo-window toolbar button.flat:active:disabled, .nemo-window toolbar button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -7231,60 +7256,60 @@ paned.titlebar { .nemo-window toolbar button.separator:disabled, .nemo-window toolbar button .separator:disabled { color: rgba(235, 219, 178, 0.85); } .nemo-window toolbar .linked > button { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .nemo-window toolbar .linked > button:focus, .nemo-window toolbar .linked > button:hover { - box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .nemo-window toolbar .linked > button:active, .nemo-window toolbar .linked > button:active:hover, .nemo-window toolbar .linked > button:active:focus, .nemo-window toolbar .linked > button:active:hover:focus, .nemo-window toolbar .linked > button:checked, .nemo-window toolbar .linked > button:checked:hover, .nemo-window toolbar .linked > button:checked:focus, .nemo-window toolbar .linked > button:checked:hover:focus { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(8, 8, 8, 0.07), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(10, 10, 9, 0.07), inset 0 -1px rgba(10, 10, 9, 0.05); } .nemo-window toolbar .linked > button:disabled { box-shadow: inset -1px 0 #dabc70; } .nemo-window toolbar .linked > button:last-child, .nemo-window toolbar .linked > button:only-child { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .nemo-window toolbar .linked > button:last-child:hover, .nemo-window toolbar .linked > button:only-child:hover { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .nemo-window toolbar .linked > button:disabled:last-child, .nemo-window toolbar .linked > button:disabled:only-child, .nemo-window toolbar .linked > button:active:disabled:last-child, .nemo-window toolbar .linked > button:active:disabled:only-child, .nemo-window toolbar .linked > button:checked:disabled:last-child, .nemo-window toolbar .linked > button:checked:disabled:only-child { box-shadow: none; } .nemo-window toolbar .linked > button:active:last-child, .nemo-window toolbar .linked > button:active:last-child:focus, .nemo-window toolbar .linked > button:active:last-child:hover, .nemo-window toolbar .linked > button:active:last-child:hover:focus, .nemo-window toolbar .linked > button:checked:last-child, .nemo-window toolbar .linked > button:checked:last-child:focus, .nemo-window toolbar .linked > button:checked:last-child:hover, .nemo-window toolbar .linked > button:checked:last-child:hover:focus { - box-shadow: inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } .nemo-window toolbar .linked > button:active:only-child, .nemo-window toolbar .linked > button:active:only-child:focus, .nemo-window toolbar .linked > button:active:only-child:hover, .nemo-window toolbar .linked > button:active:only-child:hover:focus, .nemo-window toolbar .linked > button:checked:only-child, .nemo-window toolbar .linked > button:checked:only-child:focus, .nemo-window toolbar .linked > button:checked:only-child:hover, .nemo-window toolbar .linked > button:checked:only-child:hover:focus { - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.06), inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } .nemo-window toolbar separator, .nemo-window toolbar separator:disabled { color: #e2cc91; border-color: currentColor; -GtkWidget-window-dragging: true; } .nemo-window toolbar.primary-toolbar button.image-button { - padding: 0 8px; } + padding: 0 5px; } .nemo-window toolbar combobox, .nemo-window toolbar button { - padding: 3px; } + padding: 0px; } .nemo-window toolbar combobox.text-button, .nemo-window toolbar button.text-button { - padding: 3px; } + padding: 0px; } .nemo-window toolbar combobox.image-button, .nemo-window toolbar button.image-button { - padding: 3px; } + padding: 0px; } .nemo-window toolbar toolitem stack { margin-left: 15px; } .nemo-window toolbar toolitem stack widget button { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(8, 8, 8, 0.12); - -NemoPathbarButton-border-radius: 0px; } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), 0 1px 2px -1px rgba(10, 10, 9, 0.12); + -NemoPathbarButton-border-radius: 4px; } .nemo-window toolbar toolitem stack widget button:focus, .nemo-window toolbar toolitem stack widget button:hover { - box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: inset -1px 0 #527065, 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .nemo-window toolbar toolitem stack widget button:active, .nemo-window toolbar toolitem stack widget button:active:hover, .nemo-window toolbar toolitem stack widget button:active:focus, .nemo-window toolbar toolitem stack widget button:active:hover:focus, .nemo-window toolbar toolitem stack widget button:checked, .nemo-window toolbar toolitem stack widget button:checked:hover, .nemo-window toolbar toolitem stack widget button:checked:focus, .nemo-window toolbar toolitem stack widget button:checked:hover:focus { - box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(8, 8, 8, 0.07), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset -1px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(10, 10, 9, 0.07), inset 0 -1px rgba(10, 10, 9, 0.05); } .nemo-window toolbar toolitem stack widget button:disabled { box-shadow: inset -1px 0 #dabc70; } .nemo-window toolbar toolitem stack widget button:last-child, .nemo-window toolbar toolitem stack widget button:only-child { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } .nemo-window toolbar toolitem stack widget button:last-child:hover, .nemo-window toolbar toolitem stack widget button:only-child:hover { - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } .nemo-window toolbar toolitem stack widget button:disabled:last-child, .nemo-window toolbar toolitem stack widget button:disabled:only-child, .nemo-window toolbar toolitem stack widget button:active:disabled:last-child, .nemo-window toolbar toolitem stack widget button:active:disabled:only-child, .nemo-window toolbar toolitem stack widget button:checked:disabled:last-child, .nemo-window toolbar toolitem stack widget button:checked:disabled:only-child { box-shadow: none; } .nemo-window toolbar toolitem stack widget button:active:last-child, .nemo-window toolbar toolitem stack widget button:active:last-child:focus, .nemo-window toolbar toolitem stack widget button:active:last-child:hover, .nemo-window toolbar toolitem stack widget button:active:last-child:hover:focus, .nemo-window toolbar toolitem stack widget button:checked:last-child, .nemo-window toolbar toolitem stack widget button:checked:last-child:focus, .nemo-window toolbar toolitem stack widget button:checked:last-child:hover, .nemo-window toolbar toolitem stack widget button:checked:last-child:hover:focus { - box-shadow: inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } .nemo-window toolbar toolitem stack widget button:active:only-child, .nemo-window toolbar toolitem stack widget button:active:only-child:focus, .nemo-window toolbar toolitem stack widget button:active:only-child:hover, .nemo-window toolbar toolitem stack widget button:active:only-child:hover:focus, .nemo-window toolbar toolitem stack widget button:checked:only-child, .nemo-window toolbar toolitem stack widget button:checked:only-child:focus, .nemo-window toolbar toolitem stack widget button:checked:only-child:hover, .nemo-window toolbar toolitem stack widget button:checked:only-child:hover:focus { - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.06), inset 0 1px rgba(8, 8, 8, 0.07), inset -1px 0 rgba(8, 8, 8, 0.06); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.06), inset 0 1px rgba(10, 10, 9, 0.07), inset -1px 0 rgba(10, 10, 9, 0.06); } .nemo-window grid > widget:last-child button { min-height: 16px; min-width: 16px; - padding: 2px 4px; } + padding: -1px -2px; } .nemo-window grid > widget:last-child button:first-child { margin-left: 20px; } .nemo-window grid > widget:last-child button:first-child + button { @@ -7300,8 +7325,8 @@ paned.titlebar { .nemo-window .sidebar .frame { border: 0; } .nemo-window .sidebar image { - padding-left: 3px; - padding-right: 3px; } + padding-left: 0px; + padding-right: 0px; } .nemo-window .sidebar .nemo-places-sidebar, .nemo-window .sidebar .nemo-places-sidebar .view, .nemo-window .sidebar .nemo-places-sidebar iconview { background-color: mix(#ebdbb2,#ebdbb2,0.5); } .nemo-window .sidebar .nemo-places-sidebar .view, .nemo-window .sidebar .nemo-places-sidebar iconview { @@ -7317,24 +7342,24 @@ paned.titlebar { .nemo-window .sidebar + separator + box .primary-toolbar { background-color: #e9d8ab; background-image: none; - padding-top: 0px; - padding-bottom: 0px; - border-bottom: 1px solid #e1c98b; } + padding-top: -3px; + padding-bottom: -3px; + border-bottom: 1px solid mix(#ebdbb2,#32302f,0.1); } .nemo-window .sidebar + separator + box .primary-toolbar button:nth-child(2) { - border-right: none; + border-right: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; } .nemo-window .sidebar + separator + box .primary-toolbar button:nth-child(3) { margin-left: -6px; - border-left: none; + border-left: 0; border-top-left-radius: 0; border-bottom-left-radius: 0; } .nemo-window .sidebar + separator + box .primary-toolbar button.flat { background-color: #ebdbb2; background-image: none; border-color: rgba(0, 0, 0, 0.12); - color: #282828; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); padding: 5px 6px; } .nemo-window .sidebar + separator + box .primary-toolbar button.flat:focus, .nemo-window .sidebar + separator + box .primary-toolbar button.flat:hover { border-color: #527065; } @@ -7359,9 +7384,9 @@ paned.titlebar { GtkWindow > GtkVBox > .dock, GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar { background-color: #ebdbb2; background-image: none; - padding: 3px; + padding: 0px; border: 0; - color: #282828; } + color: #32302f; } /*********************** ! Fallback mode panel * @@ -7375,7 +7400,7 @@ GtkWindow > GtkVBox > .dock, GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar border: 0; background-image: none; background-color: #ebdbb2; - color: #30302f; } + color: #32302f; } .xfce4-panel { font: inherit; } @@ -7404,175 +7429,183 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0; } UnityDecoration .top { - border: 1px solid #32302f; + border: 1px solid #282828; border-bottom: 0; - border-radius: 0px 0px 0 0; - padding: 1px 6px 0 6px; - background-color: #30302f; - color: mix(#ebdbb2,#30302f,0.1); + border-radius: 4px 4px 0 0; + padding: 1px 3px 0; + background-color: #282828; + color: mix(#d5c4a1,#282828,0.1); text-shadow: none; } UnityDecoration .top:hover { border-radius: 0; - border-color: mix(#30302f,#ebdbb2,0.21); - background-color: mix(#30302f,#ebdbb2,0.21); + border-color: mix(#282828,#d5c4a1,0.21); + background-color: mix(#282828,#d5c4a1,0.21); background-image: none; - color: #f2e7cc; } + color: #ded1b6; } UnityDecoration .top:backdrop { border: 1px solid #282828; - color: mix(#ebdbb2,#30302f,0.4); } + color: mix(#d5c4a1,#282828,0.4); } UnityDecoration .left, UnityDecoration .right, UnityDecoration .bottom { - background-color: #30302f; } + background-color: #282828; } UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration .bottom:backdrop { - background-color: mix(#222221,#ebdbb2,0.21); } + background-color: mix(#1c1c1c,#d5c4a1,0.21); } UnityPanelWidget, .unity-panel { border: 0; } .unity-panel.menuitem, .unity-panel .menuitem { border-width: 0 1px; - color: #ebdbb2; } + color: #d5c4a1; } .unity-panel.menuitem:hover, .unity-panel.menuitem *:hover, .unity-panel .menuitem:hover, .unity-panel .menuitem *:hover { - border-color: mix(#30302f,#ebdbb2,0.21); - background-color: mix(#30302f,#ebdbb2,0.21); + border-color: mix(#282828,#d5c4a1,0.21); + background-color: mix(#282828,#d5c4a1,0.21); background-image: none; - color: #f2e7cc; } + color: #ded1b6; } SheetStyleDialog.unity-force-quit { background-color: #ebdbb2; } +/************************ + ! Unity-Control-Center * +*************************/ +.background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame { + border: 0 none transparent; } + .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:backdrop, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop { + background-color: transparent; } + /*********************** ! LightDM GTK Greeter * ***********************/ #panel_window { - background-color: #30302f; + background-color: #282828; background-image: none; - color: #fff; + color: #d5c4a1; font-weight: bold; - text-shadow: 0 1px rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: 0 1px rgba(0, 0, 0, 0.5); } + text-shadow: 0 1px rgba(20, 19, 19, 0.5); + -gtk-icon-shadow: 0 1px rgba(20, 19, 19, 0.5); } #panel_window menubar { - padding-left: 3px; } + padding-left: 0px; } #panel_window menubar, #panel_window menubar > menuitem { background-color: transparent; background-image: none; border-style: none; - color: #fff; - text-shadow: 0 1px rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: 0 1px rgba(0, 0, 0, 0.5); } + color: #d5c4a1; + text-shadow: 0 1px rgba(20, 19, 19, 0.5); + -gtk-icon-shadow: 0 1px rgba(20, 19, 19, 0.5); } #panel_window menubar:hover, #panel_window menubar > menuitem:hover { - background-color: rgba(255, 255, 255, 0.2); + background-color: rgba(213, 196, 161, 0.2); background-image: none; - color: #fff; } + color: #d5c4a1; } #panel_window menubar *:hover, #panel_window menubar > menuitem *:hover { - color: #fff; } + color: #d5c4a1; } #panel_window menubar:disabled, #panel_window menubar > menuitem:disabled { - color: rgba(255, 255, 255, 0.7); } + color: rgba(213, 196, 161, 0.7); } #panel_window menubar menu > menuitem { font-weight: normal; } #content_frame { - padding-bottom: 9px; } + padding-bottom: 0px; } #login_window, #shutdown_dialog, #restart_dialog { border-style: none; - border-radius: 0px; - background-color: #30302f; - color: #ebdbb2; + border-radius: 4px; + background-color: #282828; + color: #d5c4a1; /* draw border using box-shadow */ - box-shadow: inset 1px 0 mix(#222221,#ebdbb2,0.21), inset -1px 0 mix(#222221,#ebdbb2,0.21), inset 0 1px mix(#222221,#ebdbb2,0.21), inset 0 -1px mix(#222221,#ebdbb2,0.21); } + box-shadow: inset 1px 0 mix(#1c1c1c,#d5c4a1,0.21), inset -1px 0 mix(#1c1c1c,#d5c4a1,0.21), inset 0 1px mix(#1c1c1c,#d5c4a1,0.21), inset 0 -1px mix(#1c1c1c,#d5c4a1,0.21); } #login_window menu { border-radius: 0; } #login_window button { - background-color: #30302f; + background-color: #32302f; background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } #login_window button:focus, #login_window button:hover { border-color: #527065; } #login_window button:active, #login_window button:active:hover, #login_window button:active:focus, #login_window button:active:hover:focus, #login_window button:checked, #login_window button:checked:hover, #login_window button:checked:focus, #login_window button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } #login_window button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } #login_window button:active:disabled, #login_window button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } #login_window button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(50, 48, 47, 0); + background-color: rgba(50, 48, 47, 0); background-image: none; box-shadow: none; } #login_window button:hover, #login_window button.flat:hover { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } #login_window button:hover:focus, #login_window button:hover:hover, #login_window button.flat:hover:focus, #login_window button.flat:hover:hover { border-color: #527065; } #login_window button:hover:active, #login_window button:hover:active:hover, #login_window button:hover:active:focus, #login_window button:hover:active:hover:focus, #login_window button:hover:checked, #login_window button:hover:checked:hover, #login_window button:hover:checked:focus, #login_window button:hover:checked:hover:focus, #login_window button.flat:hover:active, #login_window button.flat:hover:active:hover, #login_window button.flat:hover:active:focus, #login_window button.flat:hover:active:hover:focus, #login_window button.flat:hover:checked, #login_window button.flat:hover:checked:hover, #login_window button.flat:hover:checked:focus, #login_window button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } #login_window button:hover:disabled, #login_window button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } #login_window button:hover:active:disabled, #login_window button:hover:checked:disabled, #login_window button.flat:hover:active:disabled, #login_window button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } #login_window button:focus, #login_window button.flat:focus { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.42); } #login_window button:focus:focus, #login_window button:focus:hover, #login_window button.flat:focus:focus, #login_window button.flat:focus:hover { border-color: #527065; } #login_window button:focus:active, #login_window button:focus:active:hover, #login_window button:focus:active:focus, #login_window button:focus:active:hover:focus, #login_window button:focus:checked, #login_window button:focus:checked:hover, #login_window button:focus:checked:focus, #login_window button:focus:checked:hover:focus, #login_window button.flat:focus:active, #login_window button.flat:focus:active:hover, #login_window button.flat:focus:active:focus, #login_window button.flat:focus:active:hover:focus, #login_window button.flat:focus:checked, #login_window button.flat:focus:checked:hover, #login_window button.flat:focus:checked:focus, #login_window button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } #login_window button:focus:disabled, #login_window button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } #login_window button:focus:active:disabled, #login_window button:focus:checked:disabled, #login_window button.flat:focus:active:disabled, #login_window button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } #login_window button:focus:hover, #login_window button.flat:focus:hover { - background-color: #353534; + background-color: #373534; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(190, 164, 109, 0.3); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.48); } #login_window button:focus:hover:focus, #login_window button:focus:hover:hover, #login_window button.flat:focus:hover:focus, #login_window button.flat:focus:hover:hover { border-color: #527065; } #login_window button:focus:hover:active, #login_window button:focus:hover:active:hover, #login_window button:focus:hover:active:focus, #login_window button:focus:hover:active:hover:focus, #login_window button:focus:hover:checked, #login_window button:focus:hover:checked:hover, #login_window button:focus:hover:checked:focus, #login_window button:focus:hover:checked:hover:focus, #login_window button.flat:focus:hover:active, #login_window button.flat:focus:hover:active:hover, #login_window button.flat:focus:hover:active:focus, #login_window button.flat:focus:hover:active:hover:focus, #login_window button.flat:focus:hover:checked, #login_window button.flat:focus:hover:checked:hover, #login_window button.flat:focus:hover:checked:focus, #login_window button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } #login_window button:focus:hover:disabled, #login_window button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } #login_window button:focus:hover:active:disabled, #login_window button:focus:hover:checked:disabled, #login_window button.flat:focus:hover:active:disabled, #login_window button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } #login_window button:checked, #login_window button:active, #login_window button.flat:checked, #login_window button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } #login_window button:checked:focus, #login_window button:checked:hover, #login_window button:active:focus, #login_window button:active:hover, #login_window button.flat:checked:focus, #login_window button.flat:checked:hover, #login_window button.flat:active:focus, #login_window button.flat:active:hover { border-color: #527065; } #login_window button:checked:active, #login_window button:checked:active:hover, #login_window button:checked:active:focus, #login_window button:checked:active:hover:focus, #login_window button:checked:checked, #login_window button:checked:checked:hover, #login_window button:checked:checked:focus, #login_window button:checked:checked:hover:focus, #login_window button:active:active, #login_window button:active:active:hover, #login_window button:active:active:focus, #login_window button:active:active:hover:focus, #login_window button:active:checked, #login_window button:active:checked:hover, #login_window button:active:checked:focus, #login_window button:active:checked:hover:focus, #login_window button.flat:checked:active, #login_window button.flat:checked:active:hover, #login_window button.flat:checked:active:focus, #login_window button.flat:checked:active:hover:focus, #login_window button.flat:checked:checked, #login_window button.flat:checked:checked:hover, #login_window button.flat:checked:checked:focus, #login_window button.flat:checked:checked:hover:focus, #login_window button.flat:active:active, #login_window button.flat:active:active:hover, #login_window button.flat:active:active:focus, #login_window button.flat:active:active:hover:focus, #login_window button.flat:active:checked, #login_window button.flat:active:checked:hover, #login_window button.flat:active:checked:focus, #login_window button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } #login_window button:checked:disabled, #login_window button:active:disabled, #login_window button.flat:checked:disabled, #login_window button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } #login_window button:checked:active:disabled, #login_window button:checked:checked:disabled, #login_window button:active:active:disabled, #login_window button:active:checked:disabled, #login_window button.flat:checked:active:disabled, #login_window button.flat:checked:checked:disabled, #login_window button.flat:active:active:disabled, #login_window button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } #login_window button:checked:focus, #login_window button:checked:hover, #login_window button:active:focus, #login_window button:active:hover, #login_window button.flat:checked:focus, #login_window button.flat:checked:hover, #login_window button.flat:active:focus, #login_window button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } #login_window button:focus, #login_window button:hover, #login_window button.flat:focus, #login_window button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } #login_window button:disabled:disabled, #login_window button.flat:disabled:disabled { - background-color: alpha(mix(#30302f,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#32302f,#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#30302f,#ebdbb2,0.5); + color: mix(#32302f,#d5c4a1,0.5); box-shadow: none; } #login_window button:active:disabled, #login_window button:checked:disabled, #login_window button.flat:active:disabled, #login_window button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -7581,164 +7614,164 @@ SheetStyleDialog.unity-force-quit { box-shadow: none; } #login_window button.separator, #login_window button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.9); } + color: rgba(50, 48, 47, 0.9); } #login_window button.separator:disabled, #login_window button .separator:disabled { - color: rgba(48, 48, 47, 0.85); } + color: rgba(50, 48, 47, 0.85); } #login_window entry { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); - padding: 3px; - color: #ebdbb2; + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); + padding: 0px; + color: #d5c4a1; caret-color: #282828; -gtk-secondary-caret-color: #282828; } #login_window entry:focus, #login_window entry:hover { border-color: #527065; } #login_window entry:active, #login_window entry:active:hover, #login_window entry:active:focus, #login_window entry:active:hover:focus, #login_window entry:checked, #login_window entry:checked:hover, #login_window entry:checked:focus, #login_window entry:checked:hover:focus { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.7); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.7); } #login_window entry:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.85); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.85); } #login_window entry:active:disabled, #login_window entry:checked:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); } #login_window entry:focus, #login_window entry:active { border-color: #527065; } #login_window entry:disabled { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#282828,#d5c4a1,0.5); } #login_window entry:disabled:focus, #login_window entry:disabled:hover { border-color: #527065; } #login_window entry:disabled:active, #login_window entry:disabled:active:hover, #login_window entry:disabled:active:focus, #login_window entry:disabled:active:hover:focus, #login_window entry:disabled:checked, #login_window entry:disabled:checked:hover, #login_window entry:disabled:checked:focus, #login_window entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.7); } #login_window entry:disabled:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.85); } #login_window entry:disabled:active:disabled, #login_window entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); } #user_combobox { - color: #ebdbb2; + color: #d5c4a1; font-size: 18px; } #user_combobox menu { font-weight: normal; } #user_combobox arrow { - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#d5c4a1,#282828,0.5); } #user_image { - border-radius: 0px; + border-radius: 4px; /* draw border using box-shadow */ - box-shadow: inset 1px 0 #222221, inset -1px 0 #222221, inset 0 1px #222221, inset 0 -1px #222221; } + box-shadow: inset 1px 0 #1c1c1c, inset -1px 0 #1c1c1c, inset 0 1px #1c1c1c, inset 0 -1px #1c1c1c; } #user_image_border { - border-radius: 0px; - background-color: #2b2b2a; + border-radius: 4px; + background-color: #242424; background-image: none; - box-shadow: inset 1px 0 rgba(8, 8, 8, 0.07), inset 0 1px rgba(8, 8, 8, 0.08), inset -1px 0 rgba(8, 8, 8, 0.07), inset 0 -1px rgba(8, 8, 8, 0.05); } + box-shadow: inset 1px 0 rgba(10, 10, 9, 0.07), inset 0 1px rgba(10, 10, 9, 0.08), inset -1px 0 rgba(10, 10, 9, 0.07), inset 0 -1px rgba(10, 10, 9, 0.05); } #buttonbox_frame { - padding-top: 6px; + padding-top: 0px; padding-bottom: 0; border-style: none; - border-bottom-left-radius: 0px; - border-bottom-right-radius: 0px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; background-color: transparent; background-image: none; box-shadow: none; } /* shutdown button */ #shutdown_button button { - background-color: #f44336; + background-color: #ff276a; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.12); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } #shutdown_button button:focus, #shutdown_button button:hover { border-color: #527065; } #shutdown_button button:active, #shutdown_button button:active:hover, #shutdown_button button:active:focus, #shutdown_button button:active:hover:focus, #shutdown_button button:checked, #shutdown_button button:checked:hover, #shutdown_button button:checked:focus, #shutdown_button button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } #shutdown_button button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } #shutdown_button button:active:disabled, #shutdown_button button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } #shutdown_button button.flat { - color: #fff; - border-color: rgba(244, 67, 54, 0); - background-color: rgba(244, 67, 54, 0); + color: #32302f; + border-color: rgba(255, 39, 106, 0); + background-color: rgba(255, 39, 106, 0); background-image: none; box-shadow: none; } #shutdown_button button:hover, #shutdown_button button.flat:hover { - background-color: #f55044; + background-color: #ff3674; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } #shutdown_button button:hover:focus, #shutdown_button button:hover:hover, #shutdown_button button.flat:hover:focus, #shutdown_button button.flat:hover:hover { border-color: #527065; } #shutdown_button button:hover:active, #shutdown_button button:hover:active:hover, #shutdown_button button:hover:active:focus, #shutdown_button button:hover:active:hover:focus, #shutdown_button button:hover:checked, #shutdown_button button:hover:checked:hover, #shutdown_button button:hover:checked:focus, #shutdown_button button:hover:checked:hover:focus, #shutdown_button button.flat:hover:active, #shutdown_button button.flat:hover:active:hover, #shutdown_button button.flat:hover:active:focus, #shutdown_button button.flat:hover:active:hover:focus, #shutdown_button button.flat:hover:checked, #shutdown_button button.flat:hover:checked:hover, #shutdown_button button.flat:hover:checked:focus, #shutdown_button button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #shutdown_button button:hover:disabled, #shutdown_button button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #shutdown_button button:hover:active:disabled, #shutdown_button button:hover:checked:disabled, #shutdown_button button.flat:hover:active:disabled, #shutdown_button button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #shutdown_button button:focus, #shutdown_button button.flat:focus { - background-color: #f55044; + background-color: #ff3674; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } #shutdown_button button:focus:focus, #shutdown_button button:focus:hover, #shutdown_button button.flat:focus:focus, #shutdown_button button.flat:focus:hover { border-color: #527065; } #shutdown_button button:focus:active, #shutdown_button button:focus:active:hover, #shutdown_button button:focus:active:focus, #shutdown_button button:focus:active:hover:focus, #shutdown_button button:focus:checked, #shutdown_button button:focus:checked:hover, #shutdown_button button:focus:checked:focus, #shutdown_button button:focus:checked:hover:focus, #shutdown_button button.flat:focus:active, #shutdown_button button.flat:focus:active:hover, #shutdown_button button.flat:focus:active:focus, #shutdown_button button.flat:focus:active:hover:focus, #shutdown_button button.flat:focus:checked, #shutdown_button button.flat:focus:checked:hover, #shutdown_button button.flat:focus:checked:focus, #shutdown_button button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #shutdown_button button:focus:disabled, #shutdown_button button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #shutdown_button button:focus:active:disabled, #shutdown_button button:focus:checked:disabled, #shutdown_button button.flat:focus:active:disabled, #shutdown_button button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #shutdown_button button:focus:hover, #shutdown_button button.flat:focus:hover { - background-color: #f65d52; + background-color: #ff447e; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.38); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } #shutdown_button button:focus:hover:focus, #shutdown_button button:focus:hover:hover, #shutdown_button button.flat:focus:hover:focus, #shutdown_button button.flat:focus:hover:hover { border-color: #527065; } #shutdown_button button:focus:hover:active, #shutdown_button button:focus:hover:active:hover, #shutdown_button button:focus:hover:active:focus, #shutdown_button button:focus:hover:active:hover:focus, #shutdown_button button:focus:hover:checked, #shutdown_button button:focus:hover:checked:hover, #shutdown_button button:focus:hover:checked:focus, #shutdown_button button:focus:hover:checked:hover:focus, #shutdown_button button.flat:focus:hover:active, #shutdown_button button.flat:focus:hover:active:hover, #shutdown_button button.flat:focus:hover:active:focus, #shutdown_button button.flat:focus:hover:active:hover:focus, #shutdown_button button.flat:focus:hover:checked, #shutdown_button button.flat:focus:hover:checked:hover, #shutdown_button button.flat:focus:hover:checked:focus, #shutdown_button button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #shutdown_button button:focus:hover:disabled, #shutdown_button button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #shutdown_button button:focus:hover:active:disabled, #shutdown_button button:focus:hover:checked:disabled, #shutdown_button button.flat:focus:hover:active:disabled, #shutdown_button button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #shutdown_button button:checked, #shutdown_button button:active, #shutdown_button button.flat:checked, #shutdown_button button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } #shutdown_button button:checked:focus, #shutdown_button button:checked:hover, #shutdown_button button:active:focus, #shutdown_button button:active:hover, #shutdown_button button.flat:checked:focus, #shutdown_button button.flat:checked:hover, #shutdown_button button.flat:active:focus, #shutdown_button button.flat:active:hover { border-color: #527065; } #shutdown_button button:checked:active, #shutdown_button button:checked:active:hover, #shutdown_button button:checked:active:focus, #shutdown_button button:checked:active:hover:focus, #shutdown_button button:checked:checked, #shutdown_button button:checked:checked:hover, #shutdown_button button:checked:checked:focus, #shutdown_button button:checked:checked:hover:focus, #shutdown_button button:active:active, #shutdown_button button:active:active:hover, #shutdown_button button:active:active:focus, #shutdown_button button:active:active:hover:focus, #shutdown_button button:active:checked, #shutdown_button button:active:checked:hover, #shutdown_button button:active:checked:focus, #shutdown_button button:active:checked:hover:focus, #shutdown_button button.flat:checked:active, #shutdown_button button.flat:checked:active:hover, #shutdown_button button.flat:checked:active:focus, #shutdown_button button.flat:checked:active:hover:focus, #shutdown_button button.flat:checked:checked, #shutdown_button button.flat:checked:checked:hover, #shutdown_button button.flat:checked:checked:focus, #shutdown_button button.flat:checked:checked:hover:focus, #shutdown_button button.flat:active:active, #shutdown_button button.flat:active:active:hover, #shutdown_button button.flat:active:active:focus, #shutdown_button button.flat:active:active:hover:focus, #shutdown_button button.flat:active:checked, #shutdown_button button.flat:active:checked:hover, #shutdown_button button.flat:active:checked:focus, #shutdown_button button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } #shutdown_button button:checked:disabled, #shutdown_button button:active:disabled, #shutdown_button button.flat:checked:disabled, #shutdown_button button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } #shutdown_button button:checked:active:disabled, #shutdown_button button:checked:checked:disabled, #shutdown_button button:active:active:disabled, #shutdown_button button:active:checked:disabled, #shutdown_button button.flat:checked:active:disabled, #shutdown_button button.flat:checked:checked:disabled, #shutdown_button button.flat:active:active:disabled, #shutdown_button button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } #shutdown_button button:checked:focus, #shutdown_button button:checked:hover, #shutdown_button button:active:focus, #shutdown_button button:active:hover, #shutdown_button button.flat:checked:focus, #shutdown_button button.flat:checked:hover, #shutdown_button button.flat:active:focus, #shutdown_button button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } #shutdown_button button:focus, #shutdown_button button:hover, #shutdown_button button.flat:focus, #shutdown_button button.flat:hover { - color: #fff; } + color: #32302f; } #shutdown_button button:disabled:disabled, #shutdown_button button.flat:disabled:disabled { - background-color: alpha(mix(#f44336,#fff,0.2),0.4); + background-color: alpha(mix(#ff276a,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#f44336,#fff,0.5); + color: mix(#ff276a,#32302f,0.5); box-shadow: none; } #shutdown_button button:active:disabled, #shutdown_button button:checked:disabled, #shutdown_button button.flat:active:disabled, #shutdown_button button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -7747,100 +7780,100 @@ SheetStyleDialog.unity-force-quit { box-shadow: none; } #shutdown_button button.separator, #shutdown_button button .separator { border: 1px solid currentColor; - color: rgba(244, 67, 54, 0.9); } + color: rgba(255, 39, 106, 0.9); } #shutdown_button button.separator:disabled, #shutdown_button button .separator:disabled { - color: rgba(244, 67, 54, 0.85); } + color: rgba(255, 39, 106, 0.85); } /* restart button */ #restart_button button { - background-color: #ef6c00; + background-color: #ff7f42; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.22); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.12); } #restart_button button:focus, #restart_button button:hover { border-color: #527065; } #restart_button button:active, #restart_button button:active:hover, #restart_button button:active:focus, #restart_button button:active:hover:focus, #restart_button button:checked, #restart_button button:checked:hover, #restart_button button:checked:focus, #restart_button button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } #restart_button button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } #restart_button button:active:disabled, #restart_button button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } #restart_button button.flat { - color: #fff; - border-color: rgba(239, 108, 0, 0); - background-color: rgba(239, 108, 0, 0); + color: #32302f; + border-color: rgba(255, 127, 66, 0); + background-color: rgba(255, 127, 66, 0); background-image: none; box-shadow: none; } #restart_button button:hover, #restart_button button.flat:hover { - background-color: #fb7100; + background-color: #ff8a52; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.22); } #restart_button button:hover:focus, #restart_button button:hover:hover, #restart_button button.flat:hover:focus, #restart_button button.flat:hover:hover { border-color: #527065; } #restart_button button:hover:active, #restart_button button:hover:active:hover, #restart_button button:hover:active:focus, #restart_button button:hover:active:hover:focus, #restart_button button:hover:checked, #restart_button button:hover:checked:hover, #restart_button button:hover:checked:focus, #restart_button button:hover:checked:hover:focus, #restart_button button.flat:hover:active, #restart_button button.flat:hover:active:hover, #restart_button button.flat:hover:active:focus, #restart_button button.flat:hover:active:hover:focus, #restart_button button.flat:hover:checked, #restart_button button.flat:hover:checked:hover, #restart_button button.flat:hover:checked:focus, #restart_button button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #restart_button button:hover:disabled, #restart_button button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #restart_button button:hover:active:disabled, #restart_button button:hover:checked:disabled, #restart_button button.flat:hover:active:disabled, #restart_button button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #restart_button button:focus, #restart_button button.flat:focus { - background-color: #fb7100; + background-color: #ff8a52; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.42); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.32); } #restart_button button:focus:focus, #restart_button button:focus:hover, #restart_button button.flat:focus:focus, #restart_button button.flat:focus:hover { border-color: #527065; } #restart_button button:focus:active, #restart_button button:focus:active:hover, #restart_button button:focus:active:focus, #restart_button button:focus:active:hover:focus, #restart_button button:focus:checked, #restart_button button:focus:checked:hover, #restart_button button:focus:checked:focus, #restart_button button:focus:checked:hover:focus, #restart_button button.flat:focus:active, #restart_button button.flat:focus:active:hover, #restart_button button.flat:focus:active:focus, #restart_button button.flat:focus:active:hover:focus, #restart_button button.flat:focus:checked, #restart_button button.flat:focus:checked:hover, #restart_button button.flat:focus:checked:focus, #restart_button button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #restart_button button:focus:disabled, #restart_button button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #restart_button button:focus:active:disabled, #restart_button button:focus:checked:disabled, #restart_button button.flat:focus:active:disabled, #restart_button button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #restart_button button:focus:hover, #restart_button button.flat:focus:hover { - background-color: #ff7808; + background-color: #ff9562; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - box-shadow: 0 1px 2px -1px rgba(8, 8, 8, 0.48); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(10, 10, 9, 0.38); } #restart_button button:focus:hover:focus, #restart_button button:focus:hover:hover, #restart_button button.flat:focus:hover:focus, #restart_button button.flat:focus:hover:hover { border-color: #527065; } #restart_button button:focus:hover:active, #restart_button button:focus:hover:active:hover, #restart_button button:focus:hover:active:focus, #restart_button button:focus:hover:active:hover:focus, #restart_button button:focus:hover:checked, #restart_button button:focus:hover:checked:hover, #restart_button button:focus:hover:checked:focus, #restart_button button:focus:hover:checked:hover:focus, #restart_button button.flat:focus:hover:active, #restart_button button.flat:focus:hover:active:hover, #restart_button button.flat:focus:hover:active:focus, #restart_button button.flat:focus:hover:active:hover:focus, #restart_button button.flat:focus:hover:checked, #restart_button button.flat:focus:hover:checked:hover, #restart_button button.flat:focus:hover:checked:focus, #restart_button button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #restart_button button:focus:hover:disabled, #restart_button button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #restart_button button:focus:hover:active:disabled, #restart_button button:focus:hover:checked:disabled, #restart_button button.flat:focus:hover:active:disabled, #restart_button button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #restart_button button:checked, #restart_button button:active, #restart_button button.flat:checked, #restart_button button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } #restart_button button:checked:focus, #restart_button button:checked:hover, #restart_button button:active:focus, #restart_button button:active:hover, #restart_button button.flat:checked:focus, #restart_button button.flat:checked:hover, #restart_button button.flat:active:focus, #restart_button button.flat:active:hover { border-color: #527065; } #restart_button button:checked:active, #restart_button button:checked:active:hover, #restart_button button:checked:active:focus, #restart_button button:checked:active:hover:focus, #restart_button button:checked:checked, #restart_button button:checked:checked:hover, #restart_button button:checked:checked:focus, #restart_button button:checked:checked:hover:focus, #restart_button button:active:active, #restart_button button:active:active:hover, #restart_button button:active:active:focus, #restart_button button:active:active:hover:focus, #restart_button button:active:checked, #restart_button button:active:checked:hover, #restart_button button:active:checked:focus, #restart_button button:active:checked:hover:focus, #restart_button button.flat:checked:active, #restart_button button.flat:checked:active:hover, #restart_button button.flat:checked:active:focus, #restart_button button.flat:checked:active:hover:focus, #restart_button button.flat:checked:checked, #restart_button button.flat:checked:checked:hover, #restart_button button.flat:checked:checked:focus, #restart_button button.flat:checked:checked:hover:focus, #restart_button button.flat:active:active, #restart_button button.flat:active:active:hover, #restart_button button.flat:active:active:focus, #restart_button button.flat:active:active:hover:focus, #restart_button button.flat:active:checked, #restart_button button.flat:active:checked:hover, #restart_button button.flat:active:checked:focus, #restart_button button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } #restart_button button:checked:disabled, #restart_button button:active:disabled, #restart_button button.flat:checked:disabled, #restart_button button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } #restart_button button:checked:active:disabled, #restart_button button:checked:checked:disabled, #restart_button button:active:active:disabled, #restart_button button:active:checked:disabled, #restart_button button.flat:checked:active:disabled, #restart_button button.flat:checked:checked:disabled, #restart_button button.flat:active:active:disabled, #restart_button button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } #restart_button button:checked:focus, #restart_button button:checked:hover, #restart_button button:active:focus, #restart_button button:active:hover, #restart_button button.flat:checked:focus, #restart_button button.flat:checked:hover, #restart_button button.flat:active:focus, #restart_button button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } #restart_button button:focus, #restart_button button:hover, #restart_button button.flat:focus, #restart_button button.flat:hover { - color: #fff; } + color: #32302f; } #restart_button button:disabled:disabled, #restart_button button.flat:disabled:disabled { - background-color: alpha(mix(#ef6c00,#fff,0.2),0.4); + background-color: alpha(mix(#ff7f42,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#ef6c00,#fff,0.5); + color: mix(#ff7f42,#32302f,0.5); box-shadow: none; } #restart_button button:active:disabled, #restart_button button:checked:disabled, #restart_button button.flat:active:disabled, #restart_button button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -7849,9 +7882,9 @@ SheetStyleDialog.unity-force-quit { box-shadow: none; } #restart_button button.separator, #restart_button button .separator { border: 1px solid currentColor; - color: rgba(239, 108, 0, 0.9); } + color: rgba(255, 127, 66, 0.9); } #restart_button button.separator:disabled, #restart_button button .separator:disabled { - color: rgba(239, 108, 0, 0.85); } + color: rgba(255, 127, 66, 0.85); } /* password warning */ #greeter_infobar { @@ -7861,17 +7894,17 @@ SheetStyleDialog.unity-force-quit { ! Genome Terminal * ***********************/ VteTerminal { - background-color: #30302f; - color: #ebdbb2; } + background-color: #282828; + color: #d5c4a1; } terminal-window junction, terminal-window scrollbar trough { - background-color: #30302f; - border-color: #262626; } + background-color: #282828; + border-color: #202020; } terminal-window scrollbar.vertical slider { - background-color: mix(#30302f,#ebdbb2,0.2); } + background-color: mix(#282828,#d5c4a1,0.2); } terminal-window scrollbar.vertical slider:hover { - background-color: mix(#30302f,#ebdbb2,0.3); } + background-color: mix(#282828,#d5c4a1,0.3); } terminal-window scrollbar.vertical slider:hover:active { background-color: #83a598; } terminal-window scrollbar.vertical slider:disabled { @@ -7887,7 +7920,7 @@ terminal-window scrollbar.vertical slider { background-color: rgba(235, 219, 178, 0.93); } .raven .raven-header { background-color: #ebdbb2; - border: solid #e1c98b; + border: solid mix(#ebdbb2,#32302f,0.1); border-width: 1px 0; } .raven .raven-background { background-color: rgba(235, 219, 178, 0.93); } diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/dist/gtk.css b/.themes/oomox-gruvbox/gtk-3.20/dist/gtk.css similarity index 86% rename from .themes/oomox-numix-gruvbox/gtk-3.20/dist/gtk.css rename to .themes/oomox-gruvbox/gtk-3.20/dist/gtk.css index 1fd57bc7..129a0572 100644 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/dist/gtk.css +++ b/.themes/oomox-gruvbox/gtk-3.20/dist/gtk.css @@ -1,43 +1,43 @@ -/*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ -/*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ /*$dark_shadow: #000;*/ /*$light_shadow: #fff;*/ +/*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ +/*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ /*$button_border_strength: if(lightness($bg) > 50, 0, .1);*/ /*$button_shadow_strength: if(lightness($bg) > 50, 0, .1);*/ -/*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ -/*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ /*$dark_shadow: #000;*/ /*$light_shadow: #fff;*/ +/*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ +/*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ /*$button_border_strength: if(lightness($bg) > 50, 0, .1);*/ /*$button_shadow_strength: if(lightness($bg) > 50, 0, .1);*/ /* dark color scheme */ -@define-color dark_bg_color #30302f; -@define-color dark_fg_color #ebdbb2; +@define-color dark_bg_color #282828; +@define-color dark_fg_color #d5c4a1; /* colormap actually used by the theme, to be overridden in other css files */ -@define-color theme_bg_color #282828; +@define-color theme_bg_color #32302f; @define-color theme_fg_color #ebdbb2; -@define-color theme_base_color #30302f; +@define-color theme_base_color #32302f; @define-color theme_text_color #ebdbb2; @define-color theme_selected_bg_color #83a598; @define-color theme_selected_fg_color #ebdbb2; -@define-color theme_tooltip_bg_color #282828; +@define-color theme_tooltip_bg_color #32302f; @define-color theme_tooltip_fg_color #ebdbb2; /* shadow effects */ -@define-color light_shadow #292929; +@define-color light_shadow #333130; @define-color dark_shadow #423411; /* misc colors used by gtk+ */ -@define-color info_fg_color #fff; -@define-color info_bg_color #03a9f4; -@define-color warning_fg_color #fff; -@define-color warning_bg_color #ef6c00; -@define-color question_fg_color #fff; -@define-color question_bg_color #673ab7; -@define-color error_fg_color #fff; -@define-color error_bg_color #f44336; -@define-color link_color #3f51b5; -@define-color success_color #4caf50; -@define-color warning_color #ef6c00; -@define-color error_color #f44336; +@define-color info_fg_color #32302f; +@define-color info_bg_color #a327c0; +@define-color warning_fg_color #32302f; +@define-color warning_bg_color #ff7f42; +@define-color question_fg_color #32302f; +@define-color question_bg_color #a327c0; +@define-color error_fg_color #32302f; +@define-color error_bg_color #ff276a; +@define-color link_color #9400af; +@define-color success_color #c3a544; +@define-color warning_color #ff7f42; +@define-color error_color #ff276a; /* widget colors */ @define-color titlebar_bg_color @dark_bg_color; @define-color titlebar_fg_color @dark_fg_color; @@ -49,48 +49,48 @@ @define-color menu_fg_color @dark_fg_color; @define-color panel_bg_color @dark_bg_color; @define-color panel_fg_color @dark_fg_color; -@define-color borders mix(#282828,#ebdbb2,0.08); -@define-color unfocused_borders mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); +@define-color borders mix(#32302f,#ebdbb2,0.18); +@define-color unfocused_borders mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); @define-color button_bg_color #32302f; @define-color button_fg_color #ebdbb2; -@define-color header_button_bg_color #30302f; -@define-color header_button_fg_color #ebdbb2; -@define-color insensitive_bg_color mix(#282828,#30302f,0.6); -@define-color insensitive_fg_color mix(#ebdbb2,#282828,0.5); +@define-color header_button_bg_color #32302f; +@define-color header_button_fg_color #d5c4a1; +@define-color insensitive_bg_color mix(#32302f,#32302f,0.6); +@define-color insensitive_fg_color mix(#ebdbb2,#32302f,0.5); /* osd */ -@define-color osd_base #30302f; -@define-color osd_bg rgba(48, 48, 47, 0.8); -@define-color osd_fg #ebdbb2; -@define-color osd_insensitive_bg_color mix(#ebdbb2,rgba(48, 48, 47, 0.8),0.5); -@define-color osd_insensitive_fg_color mix(#ebdbb2,#30302f,0.6); -@define-color osd_borders_color rgba(41, 41, 40, 0.8); +@define-color osd_base #282828; +@define-color osd_bg rgba(40, 40, 40, 0.8); +@define-color osd_fg #d5c4a1; +@define-color osd_insensitive_bg_color mix(#d5c4a1,rgba(40, 40, 40, 0.8),0.5); +@define-color osd_insensitive_fg_color mix(#d5c4a1,#282828,0.6); +@define-color osd_borders_color rgba(34, 34, 34, 0.8); /* lightdm greeter colors */ -@define-color lightdm_bg_color #30302f; -@define-color lightdm_fg_color #ebdbb2; +@define-color lightdm_bg_color #282828; +@define-color lightdm_fg_color #d5c4a1; /* widget text/foreground color on backdrop windows */ -@define-color theme_unfocused_fg_color mix(#ebdbb2,#282828,0.5); +@define-color theme_unfocused_fg_color mix(#ebdbb2,#32302f,0.5); /* text color for entries, views and content in general on backdrop windows */ @define-color theme_unfocused_text_color #ebdbb2; /* widget base background color on backdrop windows */ -@define-color theme_unfocused_bg_color #282828; +@define-color theme_unfocused_bg_color #32302f; /* text widgets and the like base background color on backdrop windows */ -@define-color theme_unfocused_base_color #30302f; +@define-color theme_unfocused_base_color #32302f; /* base background color of selections on backdrop windows */ @define-color theme_unfocused_selected_bg_color #83a598; /* text/foreground color of selections on backdrop windows */ @define-color theme_unfocused_selected_fg_color #ebdbb2; /* insensitive color on backdrop windows*/ -@define-color unfocused_insensitive_color #020202; +@define-color unfocused_insensitive_color #0b0a0a; /* window manager colors */ -@define-color wm_bg #30302f; -@define-color wm_border_focused #32302f; +@define-color wm_bg #282828; +@define-color wm_border_focused #282828; @define-color wm_border_unfocused #282828; -@define-color wm_title_focused mix(#ebdbb2,#30302f,0.1); -@define-color wm_title_unfocused mix(#ebdbb2,#30302f,0.4); -@define-color wm_icons_focused mix(#ebdbb2,#30302f,0.1); +@define-color wm_title_focused mix(#d5c4a1,#282828,0.1); +@define-color wm_title_unfocused mix(#d5c4a1,#282828,0.4); +@define-color wm_icons_focused mix(#d5c4a1,#282828,0.1); @define-color wm_icons_focused_prelight #83a598; @define-color wm_icons_focused_pressed #64897b; -@define-color wm_icons_unfocused mix(#ebdbb2,#30302f,0.4); +@define-color wm_icons_unfocused mix(#d5c4a1,#282828,0.4); @define-color wm_icons_unfocused_prelight #83a598; @define-color wm_icons_unfocused_pressed #64897b; /************** @@ -105,7 +105,7 @@ outline-style: dashed; outline-width: 1px; outline-offset: -1px; - -gtk-outline-radius: 0px; } + -gtk-outline-radius: 4px; } /************* ! Base states @@ -116,37 +116,37 @@ * { /* hyperlinks */ - -GtkIMHtml-hyperlink-color: #3f51b5; } + -GtkIMHtml-hyperlink-color: #9400af; } *:disabled, *:disabled:disabled { - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } *:disabled, *:disabled { -gtk-icon-effect: dim; } *:hover { -gtk-icon-effect: highlight; } *:link, *:visited { - color: #3f51b5; } + color: #9400af; } .background { - background-color: #282828; + background-color: #32302f; color: #ebdbb2; } .background:backdrop { text-shadow: none; -gtk-icon-shadow: none; } .background.csd { - background-color: #282828; } + background-color: #32302f; } .gtkstyle-fallback { - background-color: rgba(40, 40, 40, 0.5); + background-color: rgba(50, 48, 47, 0.5); color: #ebdbb2; } .gtkstyle-fallback:hover { - background-color: #2c2c2c; + background-color: #373534; color: #ebdbb2; } .gtkstyle-fallback:active { - background-color: #242424; + background-color: #2d2b2a; color: #ebdbb2; } .gtkstyle-fallback:disabled { - background-color: #282828; - color: mix(#ebdbb2,#282828,0.5); } + background-color: #32302f; + color: mix(#ebdbb2,#32302f,0.5); } image, image:disabled, label, label:disabled, box, box:disabled, grid, grid:disabled { background-color: transparent; } @@ -154,35 +154,35 @@ image, image:disabled, label, label:disabled, box, box:disabled, grid, grid:disa label.separator { color: #ebdbb2; } label.separator:backdrop { - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } label selection { background-color: #83a598; color: #ebdbb2; } label:disabled { - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } label:disabled:backdrop { - color: #020202; } + color: #0b0a0a; } label:backdrop { - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } assistant .sidebar { - background-color: #30302f; - border-top: 1px solid mix(#282828,#ebdbb2,0.08); } + background-color: #32302f; + border-top: 1px solid mix(#32302f,#ebdbb2,0.18); } assistant .sidebar:backdrop { - background-color: #30302f; - border-color: mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); } + background-color: #32302f; + border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); } assistant.csd .sidebar { border-top-style: none; } assistant .sidebar label { - padding: 3px 6px; } + padding: 0px 0px; } assistant .sidebar label.highlight { - background-color: mix(#ebdbb2,#282828,0.8); } + background-color: mix(#ebdbb2,#32302f,0.8); } /********* ! Buttons @@ -195,7 +195,7 @@ assistant .sidebar label.highlight { stacksidebar row.needs-attention > label { animation: needs_attention 150ms ease-in; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#83a598), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(0, 0, 0, 0.87451)), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#83a598), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(131, 104, 34, 0.847843)), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 4px; } @@ -210,12 +210,12 @@ button, headerbar button, .titlebar:not(headerbar) button, toolbar button, toolb #XfceNotifyWindow button, .osd button, .osd spinbutton:not(.vertical) button, #XfceNotifyWindow spinbutton:not(.vertical) button, .osd spinbutton.vertical button:first-child, #XfceNotifyWindow spinbutton.vertical button:first-child, .nemo-window toolbar button, .nemo-window .sidebar + separator + box .primary-toolbar button.flat, #login_window button, #shutdown_button button, #restart_button button { - min-height: 20px; - min-width: 20px; - padding: 3px 5px; + min-height: 14px; + min-width: 14px; + padding: 0px 2px; border-width: 1px; border-style: solid; - border-radius: 0px; + border-radius: 4px; transition: 150ms ease; outline-color: transparent; } @@ -262,7 +262,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { .linked > button:first-child, combobox box button:first-child, combobox box entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, headerbar .linked > button:first-child, .titlebar:not(headerbar) .linked > button:first-child, toolbar .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, popover.background .linked > button:first-child, .nemo-window toolbar toolitem stack widget button:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-left-style: solid; border-right-style: none; border-top-right-radius: 0; @@ -276,7 +276,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { .linked > button:last-child, combobox box button:last-child, combobox box entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, headerbar .linked > button:last-child, .titlebar:not(headerbar) .linked > button:last-child, toolbar .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, popover.background .linked > button:last-child, .nemo-window toolbar toolitem stack widget button:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-left-style: none; border-right-style: solid; border-top-left-radius: 0; @@ -295,7 +295,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { .inline-toolbar button:only-child, .linked > button:only-child, combobox box button:only-child, combobox box entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, headerbar .linked > button:only-child, .titlebar:not(headerbar) .linked > button:only-child, toolbar .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, popover.background .linked > button:only-child, .nemo-window toolbar toolitem stack widget button:only-child { - border-radius: 0px; } + border-radius: 4px; } .linked.vertical > button { border-width: 1px; @@ -305,7 +305,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { border-bottom-style: none; } .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > box > button.combo { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-style: solid; border-bottom-style: none; border-bottom-left-radius: 0; @@ -315,7 +315,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { border-bottom-style: solid; } .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > box > button.combo { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-style: none; border-bottom-style: solid; border-top-left-radius: 0; @@ -327,7 +327,7 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat { border-width: 1px; border-style: solid; } .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > box > button.combo { - border-radius: 0px; } + border-radius: 4px; } infobar.info button.close, infobar.warning button.close, infobar.question button.close, infobar.error button.close, notebook > header > tabs > arrow { border: 1px solid transparent; @@ -335,7 +335,7 @@ infobar.info button.close, infobar.warning button.close, infobar.question button background-image: none; box-shadow: none; } infobar.info button.close:focus, infobar.warning button.close:focus, infobar.question button.close:focus, infobar.error button.close:focus, notebook > header > tabs > arrow:focus, infobar.info button.close:hover, infobar.warning button.close:hover, infobar.question button.close:hover, infobar.error button.close:hover, notebook > header > tabs > arrow:hover { - border: 1px solid rgba(40, 40, 40, 0.3); + border: 1px solid rgba(50, 48, 47, 0.3); background-color: rgba(235, 219, 178, 0.2); background-image: none; box-shadow: none; } @@ -410,9 +410,9 @@ button { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } button:checked:focus, button:checked:hover, button:active:focus, button:active:hover, button.flat:checked:focus, button.flat:checked:hover, button.flat:active:focus, button.flat:active:hover { border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } button:checked:active, button:checked:active:hover, button:checked:active:focus, button:checked:active:hover:focus, button:checked:checked, button:checked:checked:hover, button:checked:checked:focus, button:checked:checked:hover:focus, button:active:active, button:active:active:hover, button:active:active:focus, button:active:active:hover:focus, button:active:checked, button:active:checked:hover, button:active:checked:focus, button:active:checked:hover:focus, button.flat:checked:active, button.flat:checked:active:hover, button.flat:checked:active:focus, button.flat:checked:active:hover:focus, button.flat:checked:checked, button.flat:checked:checked:hover, button.flat:checked:checked:focus, button.flat:checked:checked:hover:focus, button.flat:active:active, button.flat:active:active:hover, button.flat:active:active:focus, button.flat:active:active:hover:focus, button.flat:active:checked, button.flat:active:checked:hover, button.flat:active:checked:focus, button.flat:active:checked:hover:focus { @@ -537,28 +537,28 @@ spinbutton button { background-color: #3c3a38; background-image: none; } spinbutton button:disabled { - color: mix(#ebdbb2,#282828,0.7); } + color: mix(#ebdbb2,#32302f,0.7); } spinbutton button:backdrop { - color: mix(#30302f,mix(#ebdbb2,#282828,0.5),0.9); } + color: mix(#32302f,mix(#ebdbb2,#32302f,0.5),0.9); } spinbutton button:backdrop:disabled { - color: rgba(2, 2, 2, 0.8); } + color: rgba(11, 10, 10, 0.8); } spinbutton:not(.vertical) { /*@extend %entry;*/ - background-color: #30302f; + background-color: #32302f; background-image: none; /*@include border($base_color);*/ padding: 0; - border-radius: 0px; + border-radius: 4px; color: #ebdbb2; caret-color: #ebdbb2; /*&:focus, &:active { border-color: border_focus($borders_color); }*/ } spinbutton:not(.vertical):disabled { - background-color: #2b2b2a; + background-color: #2d2b2a; background-image: none; - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } spinbutton:not(.vertical) entry { - border-radius: 0px 0 0 0px; + border-radius: 4px 0 0 4px; border-right-width: 0; box-shadow: none; } spinbutton:not(.vertical) button { @@ -572,31 +572,31 @@ spinbutton:not(.vertical) { background-color: shade($bg_color, 1.08); } - &:hover { + &:hover { @if (lightness($bg_color) > 50) { background-color: shade($bg_color, 1.11); - } + } } - */ } + */ } spinbutton:not(.vertical) button:dir(rtl) { border-style: none solid none none; } spinbutton:not(.vertical) button:active { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } + box-shadow: inset 0 2px 3px -1px rgba(131, 104, 34, 0.2); } spinbutton:not(.vertical) button:backdrop { - border-color: alpha(mix(#282828,mix(#282828,#ebdbb2,0.08),0.9),0.8); } + border-color: alpha(mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9),0.8); } spinbutton:not(.vertical) button:backdrop:disabled { border-style: none none none solid; } spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } spinbutton:not(.vertical) button:dir(rtl):first-child { - border-radius: 0px 0 0 0px; } + border-radius: 4px 0 0 4px; } spinbutton:not(.vertical) button:dir(ltr):last-child { - border-radius: 0 0px 0px 0; } + border-radius: 0 4px 4px 0; } spinbutton.vertical button, spinbutton.vertical entry { min-width: 0; - padding-left: 1px; - padding-right: 1px; } + padding-left: -2px; + padding-right: -2px; } spinbutton.vertical entry { border-radius: 0; @@ -604,20 +604,20 @@ spinbutton.vertical entry { border-bottom-width: 0; } spinbutton.vertical button.up { - border-style: solid solid none solid; - border-radius: 0px 0px 0 0; } + border-style: solid solid none; + border-radius: 4px 4px 0 0; } spinbutton.vertical button.down { - border-style: none solid solid solid; - border-radius: 0 0 0px 0px; } + border-style: none solid solid; + border-radius: 0 0 4px 4px; } /****************** ! ComboBoxes * *******************/ combobox button.combo { min-width: 0; - padding-left: 5px; - padding-right: 5px; } + padding-left: 2px; + padding-right: 2px; } combobox arrow { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); @@ -625,7 +625,7 @@ combobox arrow { min-width: 16px; } combobox box button, combobox box entry { - padding: 3px 5px; } + padding: 0px 2px; } /********* ! Entry * @@ -637,7 +637,7 @@ combobox box button, combobox box entry { border-left-width: 0; } .linked:not(.vertical) > entry:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-right-width: 0; border-bottom-right-radius: 0; border-top-right-radius: 0; } @@ -646,7 +646,7 @@ combobox box button, combobox box entry { border-right-width: 1px; } .linked:not(.vertical) > entry:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-left-width: 0; border-bottom-left-radius: 0; border-top-left-radius: 0; } @@ -656,7 +656,7 @@ combobox box button, combobox box entry { .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > entry:first-child:only-child { border-width: 1px; } .linked:not(.vertical) > entry:only-child { - border-radius: 0px; } + border-radius: 4px; } .linked.vertical > entry { border-width: 1px; @@ -665,7 +665,7 @@ combobox box button, combobox box entry { border-bottom-width: 0; } .linked.vertical > entry:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-width: 1px; border-bottom-width: 0; border-bottom-left-radius: 0; @@ -675,7 +675,7 @@ combobox box button, combobox box entry { border-bottom-width: 1px; } .linked.vertical > entry:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-width: 0; border-bottom-width: 1px; border-top-left-radius: 0; @@ -686,14 +686,13 @@ combobox box button, combobox box entry { .linked.vertical > entry:only-child, .linked.vertical > entry:first-child:only-child { border-width: 1px; } .linked.vertical > entry:only-child { - border-radius: 0px; } + border-radius: 4px; } entry, menuitem entry, popover.background entry, .osd entry, #XfceNotifyWindow entry, #login_window entry { border-width: 1px; border-style: solid; - border-radius: 0px; - border-color: #202020; + border-radius: 4px; transition: border 100ms ease-out; box-shadow: inset 1px 0 rgba(66, 52, 17, 0.1), inset 0 1px rgba(66, 52, 17, 0.12), inset -1px 0 rgba(66, 52, 17, 0.1), inset 0 -1px rgba(66, 52, 17, 0.05); } entry:focus, popover.background entry:focus, @@ -709,108 +708,99 @@ entry, menuitem entry, popover.background entry, .osd entry, entry:disabled, popover.background entry:disabled, #XfceNotifyWindow entry:disabled, #login_window entry:disabled { box-shadow: none; } - entry progress, popover.background entry progress, .osd entry progress, - #XfceNotifyWindow entry progress, #login_window entry progress { + entry progress, popover.background entry progress, .osd entry progress, #XfceNotifyWindow entry progress, #login_window entry progress { background-color: #83a598; background-image: none; border-width: 0; - border-radius: 0px; + border-radius: 4px; color: #ebdbb2; } - entry image.left, - #XfceNotifyWindow entry image.left, #login_window entry image.left { - padding-right: 3px; } - entry image.right, - #XfceNotifyWindow entry image.right, #login_window entry image.right { - padding-left: 3px; } + entry image.left, #XfceNotifyWindow entry image.left, #login_window entry image.left { + padding-right: 0px; } + entry image.right, #XfceNotifyWindow entry image.right, #login_window entry image.right { + padding-left: 0px; } entry.warning, popover.background entry.warning, #XfceNotifyWindow entry.warning, #login_window entry.warning { - color: #fff; - border-color: #bf5600; - background-color: mix(#30302f,#ef6c00,0.6); } - entry.warning image, - #XfceNotifyWindow entry.warning image, #login_window entry.warning image { - color: #fff; } + color: #32302f; + border-color: #ff5402; + background-color: mix(#32302f,#ff7f42,0.6); } + entry.warning image, #XfceNotifyWindow entry.warning image, #login_window entry.warning image { + color: #32302f; } entry.warning:focus, #XfceNotifyWindow entry.warning:focus, #login_window entry.warning:focus { - color: #fff; - border-color: mix(#83a598,#ef6c00,0.3); - background-color: #ef6c00; + color: #32302f; + border-color: mix(#83a598,#ff7f42,0.3); + background-color: #ff7f42; box-shadow: none; } - entry.warning selection, - #XfceNotifyWindow entry.warning selection, #login_window entry.warning selection { - background-color: #fff; - color: #ef6c00; } + entry.warning selection, #XfceNotifyWindow entry.warning selection, #login_window entry.warning selection { + background-color: #32302f; + color: #ff7f42; } entry.error, popover.background entry.error, #XfceNotifyWindow entry.error, #login_window entry.error { - color: #fff; - border-color: #e21b0c; - background-color: mix(#30302f,#f44336,0.6); } - entry.error image, - #XfceNotifyWindow entry.error image, #login_window entry.error image { - color: #fff; } + color: #32302f; + border-color: #eb0049; + background-color: mix(#32302f,#ff276a,0.6); } + entry.error image, #XfceNotifyWindow entry.error image, #login_window entry.error image { + color: #32302f; } entry.error:focus, #XfceNotifyWindow entry.error:focus, #login_window entry.error:focus { - color: #fff; - border-color: mix(#83a598,#f44336,0.3); - background-color: #f44336; + color: #32302f; + border-color: mix(#83a598,#ff276a,0.3); + background-color: #ff276a; box-shadow: none; } - entry.error selection, - #XfceNotifyWindow entry.error selection, #login_window entry.error selection { - background-color: #fff; - color: #f44336; } + entry.error selection, #XfceNotifyWindow entry.error selection, #login_window entry.error selection { + background-color: #32302f; + color: #ff276a; } entry.search-missing, popover.background entry.search-missing, #XfceNotifyWindow entry.search-missing, #login_window entry.search-missing { - color: #fff; - border-color: #e21b0c; - background-color: mix(#30302f,#f44336,0.6); } - entry.search-missing image, - #XfceNotifyWindow entry.search-missing image, #login_window entry.search-missing image { - color: #fff; } + color: #32302f; + border-color: #eb0049; + background-color: mix(#32302f,#ff276a,0.6); } + entry.search-missing image, #XfceNotifyWindow entry.search-missing image, #login_window entry.search-missing image { + color: #32302f; } entry.search-missing:focus, #XfceNotifyWindow entry.search-missing:focus, #login_window entry.search-missing:focus { - color: #fff; - border-color: mix(#83a598,#f44336,0.3); - background-color: #f44336; + color: #32302f; + border-color: mix(#83a598,#ff276a,0.3); + background-color: #ff276a; box-shadow: none; } - entry.search-missing selection, - #XfceNotifyWindow entry.search-missing selection, #login_window entry.search-missing selection { - background-color: #fff; - color: #f44336; } + entry.search-missing selection, #XfceNotifyWindow entry.search-missing selection, #login_window entry.search-missing selection { + background-color: #32302f; + color: #ff276a; } entry { - background-color: #30302f; + background-color: #32302f; background-image: none; - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); - padding: 3px; + border-color: shade(mix(#32302f,#ebdbb2,0.2),0.8); + padding: 0px; color: #ebdbb2; caret-color: #282828; -gtk-secondary-caret-color: #282828; } entry:focus, entry:hover { - border-color: mix(#83a598,mix(#30302f,#ebdbb2,0.2),0.3); } + border-color: mix(#83a598,mix(#32302f,#ebdbb2,0.2),0.3); } entry:active, entry:active:hover, entry:active:focus, entry:active:hover:focus, entry:checked, entry:checked:hover, entry:checked:focus, entry:checked:hover:focus { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.7); } + border-color: shade(mix(#32302f,#ebdbb2,0.2),0.7); } entry:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.85); } + border-color: shade(mix(#32302f,#ebdbb2,0.2),0.85); } entry:active:disabled, entry:checked:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); } + border-color: shade(mix(#32302f,#ebdbb2,0.2),0.8); } entry:focus, entry:active { - border-color: mix(#83a598,mix(#282828,#ebdbb2,0.08),0.3); } + border-color: mix(#83a598,mix(#32302f,#ebdbb2,0.18),0.3); } entry:disabled { - background-color: #2b2b2a; + background-color: #2d2b2a; background-image: none; - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } entry:disabled:focus, entry:disabled:hover { - border-color: mix(#83a598,alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.3); } + border-color: mix(#83a598,alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.3); } entry:disabled:active, entry:disabled:active:hover, entry:disabled:active:focus, entry:disabled:active:hover:focus, entry:disabled:checked, entry:disabled:checked:hover, entry:disabled:checked:focus, entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.7); } entry:disabled:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.85); } entry:disabled:active:disabled, entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.8); } /********* ! Buttons @@ -828,147 +818,150 @@ entry { ! Toolbar **********/ toolbar { - padding: 2px; + padding: -1px; border-style: none; } toolbar.horizontal separator { - margin: 0 5px 1px; } + margin: 0 2px 1px; } toolbar.vertical separator { - margin: 5px 1px 5px 0; } + margin: 2px 1px 2px 0; } headerbar { border-width: 0 0 1px; border-style: solid; } - headerbar entry, headerbar spinbutton, headerbar separator, headerbar button { - margin-top: 6px; - margin-bottom: 6px; } + headerbar entry, + headerbar spinbutton, + headerbar separator, + headerbar button { + margin-top: 3px; + margin-bottom: 3px; } headerbar switch { - margin-top: 4px; - margin-bottom: 4px; } + margin-top: 1px; + margin-bottom: 1px; } window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar, window:not(.tiled):not(.maximized) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized) headerbar:first-child { - border-top-left-radius: 0px; } + border-top-left-radius: 4px; } window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child { - border-top-right-radius: 0px; } + border-top-right-radius: 4px; } headerbar, .titlebar:not(headerbar) { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: #262626; - color: #ebdbb2; - background-color: #30302f; + border-color: #202020; + color: #d5c4a1; + background-color: #282828; background-image: none; - border-radius: 0px 0px 0 0; - color: mix(#ebdbb2,#30302f,0.1); - padding: 0 6px; + border-radius: 4px 4px 0 0; + color: mix(#d5c4a1,#282828,0.1); + padding: 0 0px; min-height: 42px; } headerbar:focus, .titlebar:focus:not(headerbar), headerbar:hover, .titlebar:hover:not(headerbar) { - border-color: mix(#83a598,#30302f,0.3); } + border-color: mix(#83a598,#282828,0.3); } headerbar:active, .titlebar:active:not(headerbar), headerbar:active:hover, .titlebar:active:hover:not(headerbar), headerbar:active:focus, .titlebar:active:focus:not(headerbar), headerbar:active:hover:focus, .titlebar:active:hover:focus:not(headerbar), headerbar:checked, .titlebar:checked:not(headerbar), headerbar:checked:hover, .titlebar:checked:hover:not(headerbar), headerbar:checked:focus, .titlebar:checked:focus:not(headerbar), headerbar:checked:hover:focus, .titlebar:checked:hover:focus:not(headerbar) { - border-color: #222221; } + border-color: #1c1c1c; } headerbar:disabled, .titlebar:disabled:not(headerbar) { - border-color: #292928; } + border-color: #222222; } headerbar:active:disabled, .titlebar:active:disabled:not(headerbar), headerbar:checked:disabled, .titlebar:checked:disabled:not(headerbar) { - border-color: #262626; } + border-color: #202020; } headerbar:disabled, .titlebar:disabled:not(headerbar) { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#d5c4a1,#282828,0.5); } headerbar .title, .titlebar:not(headerbar) .title { font-weight: bold; - padding: 0 6px; } + padding: 0 0px; } headerbar .subtitle, .titlebar:not(headerbar) .subtitle { font-size: smaller; - padding: 0 6px; } + padding: 0 0px; } headerbar button, .titlebar:not(headerbar) button { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button:hover, .titlebar:not(headerbar) button:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } headerbar button:active, .titlebar:not(headerbar) button:active, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover:focus, .titlebar:not(headerbar) button:active:hover:focus, headerbar button:checked, .titlebar:not(headerbar) button:checked, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover:focus, .titlebar:not(headerbar) button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } headerbar button:disabled, .titlebar:not(headerbar) button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } headerbar button.flat, .titlebar:not(headerbar) button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } headerbar button:hover, .titlebar:not(headerbar) button:hover, headerbar button.flat:hover, .titlebar:not(headerbar) button.flat:hover { - background-color: #323231; + background-color: #2a2a2a; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } headerbar button:hover:focus, .titlebar:not(headerbar) button:hover:focus, headerbar button:hover:hover, .titlebar:not(headerbar) button:hover:hover, headerbar button.flat:hover:focus, .titlebar:not(headerbar) button.flat:hover:focus, headerbar button.flat:hover:hover, .titlebar:not(headerbar) button.flat:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } headerbar button:hover:active, .titlebar:not(headerbar) button:hover:active, headerbar button:hover:active:hover, .titlebar:not(headerbar) button:hover:active:hover, headerbar button:hover:active:focus, .titlebar:not(headerbar) button:hover:active:focus, headerbar button:hover:active:hover:focus, .titlebar:not(headerbar) button:hover:active:hover:focus, headerbar button:hover:checked, .titlebar:not(headerbar) button:hover:checked, headerbar button:hover:checked:hover, .titlebar:not(headerbar) button:hover:checked:hover, headerbar button:hover:checked:focus, .titlebar:not(headerbar) button:hover:checked:focus, headerbar button:hover:checked:hover:focus, .titlebar:not(headerbar) button:hover:checked:hover:focus, headerbar button.flat:hover:active, .titlebar:not(headerbar) button.flat:hover:active, headerbar button.flat:hover:active:hover, .titlebar:not(headerbar) button.flat:hover:active:hover, headerbar button.flat:hover:active:focus, .titlebar:not(headerbar) button.flat:hover:active:focus, headerbar button.flat:hover:active:hover:focus, .titlebar:not(headerbar) button.flat:hover:active:hover:focus, headerbar button.flat:hover:checked, .titlebar:not(headerbar) button.flat:hover:checked, headerbar button.flat:hover:checked:hover, .titlebar:not(headerbar) button.flat:hover:checked:hover, headerbar button.flat:hover:checked:focus, .titlebar:not(headerbar) button.flat:hover:checked:focus, headerbar button.flat:hover:checked:hover:focus, .titlebar:not(headerbar) button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:hover:disabled, .titlebar:not(headerbar) button:hover:disabled, headerbar button.flat:hover:disabled, .titlebar:not(headerbar) button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:hover:active:disabled, .titlebar:not(headerbar) button:hover:active:disabled, headerbar button:hover:checked:disabled, .titlebar:not(headerbar) button:hover:checked:disabled, headerbar button.flat:hover:active:disabled, .titlebar:not(headerbar) button.flat:hover:active:disabled, headerbar button.flat:hover:checked:disabled, .titlebar:not(headerbar) button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button.flat:focus, .titlebar:not(headerbar) button.flat:focus { - background-color: #323231; + background-color: #2a2a2a; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } headerbar button:focus:focus, .titlebar:not(headerbar) button:focus:focus, headerbar button:focus:hover, .titlebar:not(headerbar) button:focus:hover, headerbar button.flat:focus:focus, .titlebar:not(headerbar) button.flat:focus:focus, headerbar button.flat:focus:hover, .titlebar:not(headerbar) button.flat:focus:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } headerbar button:focus:active, .titlebar:not(headerbar) button:focus:active, headerbar button:focus:active:hover, .titlebar:not(headerbar) button:focus:active:hover, headerbar button:focus:active:focus, .titlebar:not(headerbar) button:focus:active:focus, headerbar button:focus:active:hover:focus, .titlebar:not(headerbar) button:focus:active:hover:focus, headerbar button:focus:checked, .titlebar:not(headerbar) button:focus:checked, headerbar button:focus:checked:hover, .titlebar:not(headerbar) button:focus:checked:hover, headerbar button:focus:checked:focus, .titlebar:not(headerbar) button:focus:checked:focus, headerbar button:focus:checked:hover:focus, .titlebar:not(headerbar) button:focus:checked:hover:focus, headerbar button.flat:focus:active, .titlebar:not(headerbar) button.flat:focus:active, headerbar button.flat:focus:active:hover, .titlebar:not(headerbar) button.flat:focus:active:hover, headerbar button.flat:focus:active:focus, .titlebar:not(headerbar) button.flat:focus:active:focus, headerbar button.flat:focus:active:hover:focus, .titlebar:not(headerbar) button.flat:focus:active:hover:focus, headerbar button.flat:focus:checked, .titlebar:not(headerbar) button.flat:focus:checked, headerbar button.flat:focus:checked:hover, .titlebar:not(headerbar) button.flat:focus:checked:hover, headerbar button.flat:focus:checked:focus, .titlebar:not(headerbar) button.flat:focus:checked:focus, headerbar button.flat:focus:checked:hover:focus, .titlebar:not(headerbar) button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:focus:disabled, .titlebar:not(headerbar) button:focus:disabled, headerbar button.flat:focus:disabled, .titlebar:not(headerbar) button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:focus:active:disabled, .titlebar:not(headerbar) button:focus:active:disabled, headerbar button:focus:checked:disabled, .titlebar:not(headerbar) button:focus:checked:disabled, headerbar button.flat:focus:active:disabled, .titlebar:not(headerbar) button.flat:focus:active:disabled, headerbar button.flat:focus:checked:disabled, .titlebar:not(headerbar) button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:focus:hover, .titlebar:not(headerbar) button:focus:hover, headerbar button.flat:focus:hover, .titlebar:not(headerbar) button.flat:focus:hover { - background-color: #353534; + background-color: #2c2c2c; background-image: none; - border-color: rgba(218, 188, 112, 0.3); + border-color: rgba(190, 164, 109, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } headerbar button:focus:hover:focus, .titlebar:not(headerbar) button:focus:hover:focus, headerbar button:focus:hover:hover, .titlebar:not(headerbar) button:focus:hover:hover, headerbar button.flat:focus:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:focus, headerbar button.flat:focus:hover:hover, .titlebar:not(headerbar) button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } headerbar button:focus:hover:active, .titlebar:not(headerbar) button:focus:hover:active, headerbar button:focus:hover:active:hover, .titlebar:not(headerbar) button:focus:hover:active:hover, headerbar button:focus:hover:active:focus, .titlebar:not(headerbar) button:focus:hover:active:focus, headerbar button:focus:hover:active:hover:focus, .titlebar:not(headerbar) button:focus:hover:active:hover:focus, headerbar button:focus:hover:checked, .titlebar:not(headerbar) button:focus:hover:checked, headerbar button:focus:hover:checked:hover, .titlebar:not(headerbar) button:focus:hover:checked:hover, headerbar button:focus:hover:checked:focus, .titlebar:not(headerbar) button:focus:hover:checked:focus, headerbar button:focus:hover:checked:hover:focus, .titlebar:not(headerbar) button:focus:hover:checked:hover:focus, headerbar button.flat:focus:hover:active, .titlebar:not(headerbar) button.flat:focus:hover:active, headerbar button.flat:focus:hover:active:hover, .titlebar:not(headerbar) button.flat:focus:hover:active:hover, headerbar button.flat:focus:hover:active:focus, .titlebar:not(headerbar) button.flat:focus:hover:active:focus, headerbar button.flat:focus:hover:active:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:active:hover:focus, headerbar button.flat:focus:hover:checked, .titlebar:not(headerbar) button.flat:focus:hover:checked, headerbar button.flat:focus:hover:checked:hover, .titlebar:not(headerbar) button.flat:focus:hover:checked:hover, headerbar button.flat:focus:hover:checked:focus, .titlebar:not(headerbar) button.flat:focus:hover:checked:focus, headerbar button.flat:focus:hover:checked:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:focus:hover:disabled, .titlebar:not(headerbar) button:focus:hover:disabled, headerbar button.flat:focus:hover:disabled, .titlebar:not(headerbar) button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:focus:hover:active:disabled, .titlebar:not(headerbar) button:focus:hover:active:disabled, headerbar button:focus:hover:checked:disabled, .titlebar:not(headerbar) button:focus:hover:checked:disabled, headerbar button.flat:focus:hover:active:disabled, .titlebar:not(headerbar) button.flat:focus:hover:active:disabled, headerbar button.flat:focus:hover:checked:disabled, .titlebar:not(headerbar) button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:checked, .titlebar:not(headerbar) button:checked, headerbar button:active, .titlebar:not(headerbar) button:active, headerbar button.flat:checked, .titlebar:not(headerbar) button.flat:checked, headerbar button.flat:active, .titlebar:not(headerbar) button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button.flat:checked:focus, .titlebar:not(headerbar) button.flat:checked:focus, headerbar button.flat:checked:hover, .titlebar:not(headerbar) button.flat:checked:hover, headerbar button.flat:active:focus, .titlebar:not(headerbar) button.flat:active:focus, headerbar button.flat:active:hover, .titlebar:not(headerbar) button.flat:active:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } headerbar button:checked:active, .titlebar:not(headerbar) button:checked:active, headerbar button:checked:active:hover, .titlebar:not(headerbar) button:checked:active:hover, headerbar button:checked:active:focus, .titlebar:not(headerbar) button:checked:active:focus, headerbar button:checked:active:hover:focus, .titlebar:not(headerbar) button:checked:active:hover:focus, headerbar button:checked:checked, .titlebar:not(headerbar) button:checked:checked, headerbar button:checked:checked:hover, .titlebar:not(headerbar) button:checked:checked:hover, headerbar button:checked:checked:focus, .titlebar:not(headerbar) button:checked:checked:focus, headerbar button:checked:checked:hover:focus, .titlebar:not(headerbar) button:checked:checked:hover:focus, headerbar button:active:active, .titlebar:not(headerbar) button:active:active, headerbar button:active:active:hover, .titlebar:not(headerbar) button:active:active:hover, headerbar button:active:active:focus, .titlebar:not(headerbar) button:active:active:focus, headerbar button:active:active:hover:focus, .titlebar:not(headerbar) button:active:active:hover:focus, headerbar button:active:checked, .titlebar:not(headerbar) button:active:checked, headerbar button:active:checked:hover, .titlebar:not(headerbar) button:active:checked:hover, headerbar button:active:checked:focus, .titlebar:not(headerbar) button:active:checked:focus, headerbar button:active:checked:hover:focus, .titlebar:not(headerbar) button:active:checked:hover:focus, headerbar button.flat:checked:active, .titlebar:not(headerbar) button.flat:checked:active, headerbar button.flat:checked:active:hover, .titlebar:not(headerbar) button.flat:checked:active:hover, headerbar button.flat:checked:active:focus, .titlebar:not(headerbar) button.flat:checked:active:focus, headerbar button.flat:checked:active:hover:focus, .titlebar:not(headerbar) button.flat:checked:active:hover:focus, headerbar button.flat:checked:checked, .titlebar:not(headerbar) button.flat:checked:checked, headerbar button.flat:checked:checked:hover, .titlebar:not(headerbar) button.flat:checked:checked:hover, headerbar button.flat:checked:checked:focus, .titlebar:not(headerbar) button.flat:checked:checked:focus, headerbar button.flat:checked:checked:hover:focus, .titlebar:not(headerbar) button.flat:checked:checked:hover:focus, headerbar button.flat:active:active, .titlebar:not(headerbar) button.flat:active:active, headerbar button.flat:active:active:hover, .titlebar:not(headerbar) button.flat:active:active:hover, headerbar button.flat:active:active:focus, .titlebar:not(headerbar) button.flat:active:active:focus, headerbar button.flat:active:active:hover:focus, .titlebar:not(headerbar) button.flat:active:active:hover:focus, headerbar button.flat:active:checked, .titlebar:not(headerbar) button.flat:active:checked, headerbar button.flat:active:checked:hover, .titlebar:not(headerbar) button.flat:active:checked:hover, headerbar button.flat:active:checked:focus, .titlebar:not(headerbar) button.flat:active:checked:focus, headerbar button.flat:active:checked:hover:focus, .titlebar:not(headerbar) button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled, headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button.flat:checked:disabled, .titlebar:not(headerbar) button.flat:checked:disabled, headerbar button.flat:active:disabled, .titlebar:not(headerbar) button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } headerbar button:checked:active:disabled, .titlebar:not(headerbar) button:checked:active:disabled, headerbar button:checked:checked:disabled, .titlebar:not(headerbar) button:checked:checked:disabled, headerbar button:active:active:disabled, .titlebar:not(headerbar) button:active:active:disabled, headerbar button:active:checked:disabled, .titlebar:not(headerbar) button:active:checked:disabled, headerbar button.flat:checked:active:disabled, .titlebar:not(headerbar) button.flat:checked:active:disabled, headerbar button.flat:checked:checked:disabled, .titlebar:not(headerbar) button.flat:checked:checked:disabled, headerbar button.flat:active:active:disabled, .titlebar:not(headerbar) button.flat:active:active:disabled, headerbar button.flat:active:checked:disabled, .titlebar:not(headerbar) button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button.flat:checked:focus, .titlebar:not(headerbar) button.flat:checked:focus, headerbar button.flat:checked:hover, .titlebar:not(headerbar) button.flat:checked:hover, headerbar button.flat:active:focus, .titlebar:not(headerbar) button.flat:active:focus, headerbar button.flat:active:hover, .titlebar:not(headerbar) button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button:hover, .titlebar:not(headerbar) button:hover, headerbar button.flat:focus, .titlebar:not(headerbar) button.flat:focus, headerbar button.flat:hover, .titlebar:not(headerbar) button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } headerbar button:disabled:disabled, .titlebar:not(headerbar) button:disabled:disabled, headerbar button.flat:disabled:disabled, .titlebar:not(headerbar) button.flat:disabled:disabled { - background-color: alpha(mix(#30302f,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#282828,#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#30302f,#ebdbb2,0.5); + color: mix(#282828,#d5c4a1,0.5); box-shadow: none; } headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled, headerbar button.flat:active:disabled, .titlebar:not(headerbar) button.flat:active:disabled, headerbar button.flat:checked:disabled, .titlebar:not(headerbar) button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -977,9 +970,9 @@ headerbar, .titlebar:not(headerbar) { box-shadow: none; } headerbar button.separator, .titlebar:not(headerbar) button.separator, headerbar button .separator, .titlebar:not(headerbar) button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.9); } + color: rgba(40, 40, 40, 0.9); } headerbar button.separator:disabled, .titlebar:not(headerbar) button.separator:disabled, headerbar button .separator:disabled, .titlebar:not(headerbar) button .separator:disabled { - color: rgba(48, 48, 47, 0.85); } + color: rgba(40, 40, 40, 0.85); } headerbar .linked > button, .titlebar:not(headerbar) .linked > button { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(66, 52, 17, 0.22); } headerbar .linked > button:focus, .titlebar:not(headerbar) .linked > button:focus, headerbar .linked > button:hover, .titlebar:not(headerbar) .linked > button:hover { @@ -987,7 +980,7 @@ headerbar, .titlebar:not(headerbar) { headerbar .linked > button:active, .titlebar:not(headerbar) .linked > button:active, headerbar .linked > button:active:hover, .titlebar:not(headerbar) .linked > button:active:hover, headerbar .linked > button:active:focus, .titlebar:not(headerbar) .linked > button:active:focus, headerbar .linked > button:active:hover:focus, .titlebar:not(headerbar) .linked > button:active:hover:focus, headerbar .linked > button:checked, .titlebar:not(headerbar) .linked > button:checked, headerbar .linked > button:checked:hover, .titlebar:not(headerbar) .linked > button:checked:hover, headerbar .linked > button:checked:focus, .titlebar:not(headerbar) .linked > button:checked:focus, headerbar .linked > button:checked:hover:focus, .titlebar:not(headerbar) .linked > button:checked:hover:focus { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), inset 0 1px rgba(66, 52, 17, 0.07), inset 0 -1px rgba(66, 52, 17, 0.05); } headerbar .linked > button:disabled, .titlebar:not(headerbar) .linked > button:disabled { - box-shadow: inset -1px 0 #262626; } + box-shadow: inset -1px 0 #202020; } headerbar .linked > button:last-child, .titlebar:not(headerbar) .linked > button:last-child, headerbar .linked > button:only-child, .titlebar:not(headerbar) .linked > button:only-child { box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } headerbar .linked > button:last-child:hover, .titlebar:not(headerbar) .linked > button:last-child:hover, headerbar .linked > button:only-child:hover, .titlebar:not(headerbar) .linked > button:only-child:hover { @@ -999,19 +992,19 @@ headerbar, .titlebar:not(headerbar) { headerbar .linked > button:active:only-child, .titlebar:not(headerbar) .linked > button:active:only-child, headerbar .linked > button:active:only-child:focus, .titlebar:not(headerbar) .linked > button:active:only-child:focus, headerbar .linked > button:active:only-child:hover, .titlebar:not(headerbar) .linked > button:active:only-child:hover, headerbar .linked > button:active:only-child:hover:focus, .titlebar:not(headerbar) .linked > button:active:only-child:hover:focus, headerbar .linked > button:checked:only-child, .titlebar:not(headerbar) .linked > button:checked:only-child, headerbar .linked > button:checked:only-child:focus, .titlebar:not(headerbar) .linked > button:checked:only-child:focus, headerbar .linked > button:checked:only-child:hover, .titlebar:not(headerbar) .linked > button:checked:only-child:hover, headerbar .linked > button:checked:only-child:hover:focus, .titlebar:not(headerbar) .linked > button:checked:only-child:hover:focus { box-shadow: inset 1px 0 rgba(66, 52, 17, 0.06), inset 0 1px rgba(66, 52, 17, 0.07), inset -1px 0 rgba(66, 52, 17, 0.06); } headerbar combobox, .titlebar:not(headerbar) combobox, headerbar button, .titlebar:not(headerbar) button { - padding: 3px; } + padding: 0px; } headerbar combobox.text-button, .titlebar:not(headerbar) combobox.text-button, headerbar button.text-button, .titlebar:not(headerbar) button.text-button { - padding: 3px; } + padding: 0px; } headerbar combobox.image-button, .titlebar:not(headerbar) combobox.image-button, headerbar button.image-button, .titlebar:not(headerbar) button.image-button { - padding: 3px; } + padding: 0px; } headerbar separator, .titlebar:not(headerbar) separator, headerbar separator:disabled, .titlebar:not(headerbar) separator:disabled { - color: #1d1d1c; + color: #181818; border-color: currentColor; -GtkWidget-window-dragging: true; } headerbar:backdrop, .titlebar:backdrop:not(headerbar) { - background-color: #30302f; + background-color: #282828; background-image: none; - color: mix(#ebdbb2,#30302f,0.6); + color: mix(#d5c4a1,#282828,0.6); text-shadow: none; } headerbar.default-decoration, .default-decoration.titlebar:not(headerbar) { min-height: 24px; @@ -1031,96 +1024,96 @@ headerbar, .titlebar:not(headerbar) { headerbar .title, .titlebar:not(headerbar) .title { font-weight: bold; } headerbar separator.titlebutton, .titlebar:not(headerbar) separator.titlebutton { - margin-left: 3px; } + margin-left: 0px; } headerbar button, .titlebar:not(headerbar) button { - background-color: #30302f; + background-color: #32302f; background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button:hover, .titlebar:not(headerbar) button:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } headerbar button:active, .titlebar:not(headerbar) button:active, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover:focus, .titlebar:not(headerbar) button:active:hover:focus, headerbar button:checked, .titlebar:not(headerbar) button:checked, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover:focus, .titlebar:not(headerbar) button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } headerbar button:disabled, .titlebar:not(headerbar) button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } headerbar button.flat, .titlebar:not(headerbar) button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(50, 48, 47, 0); + background-color: rgba(50, 48, 47, 0); background-image: none; box-shadow: none; } headerbar button:hover, .titlebar:not(headerbar) button:hover, headerbar button.flat:hover, .titlebar:not(headerbar) button.flat:hover { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } headerbar button:hover:focus, .titlebar:not(headerbar) button:hover:focus, headerbar button:hover:hover, .titlebar:not(headerbar) button:hover:hover, headerbar button.flat:hover:focus, .titlebar:not(headerbar) button.flat:hover:focus, headerbar button.flat:hover:hover, .titlebar:not(headerbar) button.flat:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } headerbar button:hover:active, .titlebar:not(headerbar) button:hover:active, headerbar button:hover:active:hover, .titlebar:not(headerbar) button:hover:active:hover, headerbar button:hover:active:focus, .titlebar:not(headerbar) button:hover:active:focus, headerbar button:hover:active:hover:focus, .titlebar:not(headerbar) button:hover:active:hover:focus, headerbar button:hover:checked, .titlebar:not(headerbar) button:hover:checked, headerbar button:hover:checked:hover, .titlebar:not(headerbar) button:hover:checked:hover, headerbar button:hover:checked:focus, .titlebar:not(headerbar) button:hover:checked:focus, headerbar button:hover:checked:hover:focus, .titlebar:not(headerbar) button:hover:checked:hover:focus, headerbar button.flat:hover:active, .titlebar:not(headerbar) button.flat:hover:active, headerbar button.flat:hover:active:hover, .titlebar:not(headerbar) button.flat:hover:active:hover, headerbar button.flat:hover:active:focus, .titlebar:not(headerbar) button.flat:hover:active:focus, headerbar button.flat:hover:active:hover:focus, .titlebar:not(headerbar) button.flat:hover:active:hover:focus, headerbar button.flat:hover:checked, .titlebar:not(headerbar) button.flat:hover:checked, headerbar button.flat:hover:checked:hover, .titlebar:not(headerbar) button.flat:hover:checked:hover, headerbar button.flat:hover:checked:focus, .titlebar:not(headerbar) button.flat:hover:checked:focus, headerbar button.flat:hover:checked:hover:focus, .titlebar:not(headerbar) button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:hover:disabled, .titlebar:not(headerbar) button:hover:disabled, headerbar button.flat:hover:disabled, .titlebar:not(headerbar) button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:hover:active:disabled, .titlebar:not(headerbar) button:hover:active:disabled, headerbar button:hover:checked:disabled, .titlebar:not(headerbar) button:hover:checked:disabled, headerbar button.flat:hover:active:disabled, .titlebar:not(headerbar) button.flat:hover:active:disabled, headerbar button.flat:hover:checked:disabled, .titlebar:not(headerbar) button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button.flat:focus, .titlebar:not(headerbar) button.flat:focus { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } headerbar button:focus:focus, .titlebar:not(headerbar) button:focus:focus, headerbar button:focus:hover, .titlebar:not(headerbar) button:focus:hover, headerbar button.flat:focus:focus, .titlebar:not(headerbar) button.flat:focus:focus, headerbar button.flat:focus:hover, .titlebar:not(headerbar) button.flat:focus:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } headerbar button:focus:active, .titlebar:not(headerbar) button:focus:active, headerbar button:focus:active:hover, .titlebar:not(headerbar) button:focus:active:hover, headerbar button:focus:active:focus, .titlebar:not(headerbar) button:focus:active:focus, headerbar button:focus:active:hover:focus, .titlebar:not(headerbar) button:focus:active:hover:focus, headerbar button:focus:checked, .titlebar:not(headerbar) button:focus:checked, headerbar button:focus:checked:hover, .titlebar:not(headerbar) button:focus:checked:hover, headerbar button:focus:checked:focus, .titlebar:not(headerbar) button:focus:checked:focus, headerbar button:focus:checked:hover:focus, .titlebar:not(headerbar) button:focus:checked:hover:focus, headerbar button.flat:focus:active, .titlebar:not(headerbar) button.flat:focus:active, headerbar button.flat:focus:active:hover, .titlebar:not(headerbar) button.flat:focus:active:hover, headerbar button.flat:focus:active:focus, .titlebar:not(headerbar) button.flat:focus:active:focus, headerbar button.flat:focus:active:hover:focus, .titlebar:not(headerbar) button.flat:focus:active:hover:focus, headerbar button.flat:focus:checked, .titlebar:not(headerbar) button.flat:focus:checked, headerbar button.flat:focus:checked:hover, .titlebar:not(headerbar) button.flat:focus:checked:hover, headerbar button.flat:focus:checked:focus, .titlebar:not(headerbar) button.flat:focus:checked:focus, headerbar button.flat:focus:checked:hover:focus, .titlebar:not(headerbar) button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:focus:disabled, .titlebar:not(headerbar) button:focus:disabled, headerbar button.flat:focus:disabled, .titlebar:not(headerbar) button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:focus:active:disabled, .titlebar:not(headerbar) button:focus:active:disabled, headerbar button:focus:checked:disabled, .titlebar:not(headerbar) button:focus:checked:disabled, headerbar button.flat:focus:active:disabled, .titlebar:not(headerbar) button.flat:focus:active:disabled, headerbar button.flat:focus:checked:disabled, .titlebar:not(headerbar) button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:focus:hover, .titlebar:not(headerbar) button:focus:hover, headerbar button.flat:focus:hover, .titlebar:not(headerbar) button.flat:focus:hover { - background-color: #353534; + background-color: #373534; background-image: none; - border-color: rgba(218, 188, 112, 0.3); + border-color: rgba(190, 164, 109, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } headerbar button:focus:hover:focus, .titlebar:not(headerbar) button:focus:hover:focus, headerbar button:focus:hover:hover, .titlebar:not(headerbar) button:focus:hover:hover, headerbar button.flat:focus:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:focus, headerbar button.flat:focus:hover:hover, .titlebar:not(headerbar) button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } headerbar button:focus:hover:active, .titlebar:not(headerbar) button:focus:hover:active, headerbar button:focus:hover:active:hover, .titlebar:not(headerbar) button:focus:hover:active:hover, headerbar button:focus:hover:active:focus, .titlebar:not(headerbar) button:focus:hover:active:focus, headerbar button:focus:hover:active:hover:focus, .titlebar:not(headerbar) button:focus:hover:active:hover:focus, headerbar button:focus:hover:checked, .titlebar:not(headerbar) button:focus:hover:checked, headerbar button:focus:hover:checked:hover, .titlebar:not(headerbar) button:focus:hover:checked:hover, headerbar button:focus:hover:checked:focus, .titlebar:not(headerbar) button:focus:hover:checked:focus, headerbar button:focus:hover:checked:hover:focus, .titlebar:not(headerbar) button:focus:hover:checked:hover:focus, headerbar button.flat:focus:hover:active, .titlebar:not(headerbar) button.flat:focus:hover:active, headerbar button.flat:focus:hover:active:hover, .titlebar:not(headerbar) button.flat:focus:hover:active:hover, headerbar button.flat:focus:hover:active:focus, .titlebar:not(headerbar) button.flat:focus:hover:active:focus, headerbar button.flat:focus:hover:active:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:active:hover:focus, headerbar button.flat:focus:hover:checked, .titlebar:not(headerbar) button.flat:focus:hover:checked, headerbar button.flat:focus:hover:checked:hover, .titlebar:not(headerbar) button.flat:focus:hover:checked:hover, headerbar button.flat:focus:hover:checked:focus, .titlebar:not(headerbar) button.flat:focus:hover:checked:focus, headerbar button.flat:focus:hover:checked:hover:focus, .titlebar:not(headerbar) button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } headerbar button:focus:hover:disabled, .titlebar:not(headerbar) button:focus:hover:disabled, headerbar button.flat:focus:hover:disabled, .titlebar:not(headerbar) button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } headerbar button:focus:hover:active:disabled, .titlebar:not(headerbar) button:focus:hover:active:disabled, headerbar button:focus:hover:checked:disabled, .titlebar:not(headerbar) button:focus:hover:checked:disabled, headerbar button.flat:focus:hover:active:disabled, .titlebar:not(headerbar) button.flat:focus:hover:active:disabled, headerbar button.flat:focus:hover:checked:disabled, .titlebar:not(headerbar) button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } headerbar button:checked, .titlebar:not(headerbar) button:checked, headerbar button:active, .titlebar:not(headerbar) button:active, headerbar button.flat:checked, .titlebar:not(headerbar) button.flat:checked, headerbar button.flat:active, .titlebar:not(headerbar) button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button.flat:checked:focus, .titlebar:not(headerbar) button.flat:checked:focus, headerbar button.flat:checked:hover, .titlebar:not(headerbar) button.flat:checked:hover, headerbar button.flat:active:focus, .titlebar:not(headerbar) button.flat:active:focus, headerbar button.flat:active:hover, .titlebar:not(headerbar) button.flat:active:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } headerbar button:checked:active, .titlebar:not(headerbar) button:checked:active, headerbar button:checked:active:hover, .titlebar:not(headerbar) button:checked:active:hover, headerbar button:checked:active:focus, .titlebar:not(headerbar) button:checked:active:focus, headerbar button:checked:active:hover:focus, .titlebar:not(headerbar) button:checked:active:hover:focus, headerbar button:checked:checked, .titlebar:not(headerbar) button:checked:checked, headerbar button:checked:checked:hover, .titlebar:not(headerbar) button:checked:checked:hover, headerbar button:checked:checked:focus, .titlebar:not(headerbar) button:checked:checked:focus, headerbar button:checked:checked:hover:focus, .titlebar:not(headerbar) button:checked:checked:hover:focus, headerbar button:active:active, .titlebar:not(headerbar) button:active:active, headerbar button:active:active:hover, .titlebar:not(headerbar) button:active:active:hover, headerbar button:active:active:focus, .titlebar:not(headerbar) button:active:active:focus, headerbar button:active:active:hover:focus, .titlebar:not(headerbar) button:active:active:hover:focus, headerbar button:active:checked, .titlebar:not(headerbar) button:active:checked, headerbar button:active:checked:hover, .titlebar:not(headerbar) button:active:checked:hover, headerbar button:active:checked:focus, .titlebar:not(headerbar) button:active:checked:focus, headerbar button:active:checked:hover:focus, .titlebar:not(headerbar) button:active:checked:hover:focus, headerbar button.flat:checked:active, .titlebar:not(headerbar) button.flat:checked:active, headerbar button.flat:checked:active:hover, .titlebar:not(headerbar) button.flat:checked:active:hover, headerbar button.flat:checked:active:focus, .titlebar:not(headerbar) button.flat:checked:active:focus, headerbar button.flat:checked:active:hover:focus, .titlebar:not(headerbar) button.flat:checked:active:hover:focus, headerbar button.flat:checked:checked, .titlebar:not(headerbar) button.flat:checked:checked, headerbar button.flat:checked:checked:hover, .titlebar:not(headerbar) button.flat:checked:checked:hover, headerbar button.flat:checked:checked:focus, .titlebar:not(headerbar) button.flat:checked:checked:focus, headerbar button.flat:checked:checked:hover:focus, .titlebar:not(headerbar) button.flat:checked:checked:hover:focus, headerbar button.flat:active:active, .titlebar:not(headerbar) button.flat:active:active, headerbar button.flat:active:active:hover, .titlebar:not(headerbar) button.flat:active:active:hover, headerbar button.flat:active:active:focus, .titlebar:not(headerbar) button.flat:active:active:focus, headerbar button.flat:active:active:hover:focus, .titlebar:not(headerbar) button.flat:active:active:hover:focus, headerbar button.flat:active:checked, .titlebar:not(headerbar) button.flat:active:checked, headerbar button.flat:active:checked:hover, .titlebar:not(headerbar) button.flat:active:checked:hover, headerbar button.flat:active:checked:focus, .titlebar:not(headerbar) button.flat:active:checked:focus, headerbar button.flat:active:checked:hover:focus, .titlebar:not(headerbar) button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled, headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button.flat:checked:disabled, .titlebar:not(headerbar) button.flat:checked:disabled, headerbar button.flat:active:disabled, .titlebar:not(headerbar) button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } headerbar button:checked:active:disabled, .titlebar:not(headerbar) button:checked:active:disabled, headerbar button:checked:checked:disabled, .titlebar:not(headerbar) button:checked:checked:disabled, headerbar button:active:active:disabled, .titlebar:not(headerbar) button:active:active:disabled, headerbar button:active:checked:disabled, .titlebar:not(headerbar) button:active:checked:disabled, headerbar button.flat:checked:active:disabled, .titlebar:not(headerbar) button.flat:checked:active:disabled, headerbar button.flat:checked:checked:disabled, .titlebar:not(headerbar) button.flat:checked:checked:disabled, headerbar button.flat:active:active:disabled, .titlebar:not(headerbar) button.flat:active:active:disabled, headerbar button.flat:active:checked:disabled, .titlebar:not(headerbar) button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } headerbar button:checked:focus, .titlebar:not(headerbar) button:checked:focus, headerbar button:checked:hover, .titlebar:not(headerbar) button:checked:hover, headerbar button:active:focus, .titlebar:not(headerbar) button:active:focus, headerbar button:active:hover, .titlebar:not(headerbar) button:active:hover, headerbar button.flat:checked:focus, .titlebar:not(headerbar) button.flat:checked:focus, headerbar button.flat:checked:hover, .titlebar:not(headerbar) button.flat:checked:hover, headerbar button.flat:active:focus, .titlebar:not(headerbar) button.flat:active:focus, headerbar button.flat:active:hover, .titlebar:not(headerbar) button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } headerbar button:focus, .titlebar:not(headerbar) button:focus, headerbar button:hover, .titlebar:not(headerbar) button:hover, headerbar button.flat:focus, .titlebar:not(headerbar) button.flat:focus, headerbar button.flat:hover, .titlebar:not(headerbar) button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } headerbar button:disabled:disabled, .titlebar:not(headerbar) button:disabled:disabled, headerbar button.flat:disabled:disabled, .titlebar:not(headerbar) button.flat:disabled:disabled { - background-color: alpha(mix(#30302f,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#32302f,#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#30302f,#ebdbb2,0.5); + color: mix(#32302f,#d5c4a1,0.5); box-shadow: none; } headerbar button:active:disabled, .titlebar:not(headerbar) button:active:disabled, headerbar button:checked:disabled, .titlebar:not(headerbar) button:checked:disabled, headerbar button.flat:active:disabled, .titlebar:not(headerbar) button.flat:active:disabled, headerbar button.flat:checked:disabled, .titlebar:not(headerbar) button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -1129,17 +1122,17 @@ headerbar, .titlebar:not(headerbar) { box-shadow: none; } headerbar button.separator, .titlebar:not(headerbar) button.separator, headerbar button .separator, .titlebar:not(headerbar) button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.9); } + color: rgba(50, 48, 47, 0.9); } headerbar button.separator:disabled, .titlebar:not(headerbar) button.separator:disabled, headerbar button .separator:disabled, .titlebar:not(headerbar) button .separator:disabled { - color: rgba(48, 48, 47, 0.85); } + color: rgba(50, 48, 47, 0.85); } headerbar button.titlebutton + separator.titlebutton, .titlebar:not(headerbar) button.titlebutton + separator.titlebutton { margin-left: 0; - margin-right: 3px; } + margin-right: 0px; } headerbar button.titlebutton, .titlebar:not(headerbar) button.titlebutton { border: 0; background-image: none; background-color: transparent; - color: mix(#ebdbb2,#30302f,0.1); + color: mix(#d5c4a1,#282828,0.1); box-shadow: none; } headerbar button.titlebutton:hover, .titlebar:not(headerbar) button.titlebutton:hover, headerbar button.titlebutton:hover:focus, .titlebar:not(headerbar) button.titlebutton:hover:focus { background-image: none; @@ -1153,34 +1146,34 @@ headerbar, .titlebar:not(headerbar) { box-shadow: none; } headerbar button.titlebutton:backdrop, .titlebar:not(headerbar) button.titlebutton:backdrop { background: none; - color: mix(#ebdbb2,#30302f,0.6); + color: mix(#d5c4a1,#282828,0.6); -gtk-icon-shadow: none; } toolbar { - background-color: #282828; + background-color: #32302f; background-image: none; - border-color: #202020; + border-color: #282626; color: #ebdbb2; } toolbar:focus, toolbar:hover { - border-color: mix(#83a598,#282828,0.3); } + border-color: mix(#83a598,#32302f,0.3); } toolbar:active, toolbar:active:hover, toolbar:active:focus, toolbar:active:hover:focus, toolbar:checked, toolbar:checked:hover, toolbar:checked:focus, toolbar:checked:hover:focus { - border-color: #1c1c1c; } + border-color: #232221; } toolbar:disabled { - border-color: #222222; } + border-color: #2b2928; } toolbar:active:disabled, toolbar:checked:disabled { - border-color: #202020; } + border-color: #282626; } toolbar:disabled { - background-color: #242424; + background-color: #2d2b2a; background-image: none; - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } toolbar .title { font-weight: bold; - padding: 0 6px; } + padding: 0 0px; } toolbar .subtitle { font-size: smaller; - padding: 0 6px; } + padding: 0 0px; } toolbar button { - background-color: #282828; + background-color: #32302f; background-image: none; border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; @@ -1195,12 +1188,12 @@ toolbar { border-color: rgba(218, 188, 112, 0.22); } toolbar button.flat { color: #ebdbb2; - border-color: rgba(40, 40, 40, 0); - background-color: rgba(40, 40, 40, 0); + border-color: rgba(50, 48, 47, 0); + background-color: rgba(50, 48, 47, 0); background-image: none; box-shadow: none; } toolbar button:hover, toolbar button.flat:hover { - background-color: #2a2a2a; + background-color: #353231; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; @@ -1214,7 +1207,7 @@ toolbar { toolbar button:hover:active:disabled, toolbar button:hover:checked:disabled, toolbar button.flat:hover:active:disabled, toolbar button.flat:hover:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } toolbar button:focus, toolbar button.flat:focus { - background-color: #2a2a2a; + background-color: #353231; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; @@ -1228,7 +1221,7 @@ toolbar { toolbar button:focus:active:disabled, toolbar button:focus:checked:disabled, toolbar button.flat:focus:active:disabled, toolbar button.flat:focus:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } toolbar button:focus:hover, toolbar button.flat:focus:hover { - background-color: #2c2c2c; + background-color: #373534; background-image: none; border-color: rgba(218, 188, 112, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } @@ -1244,9 +1237,9 @@ toolbar { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } toolbar button:checked:focus, toolbar button:checked:hover, toolbar button:active:focus, toolbar button:active:hover, toolbar button.flat:checked:focus, toolbar button.flat:checked:hover, toolbar button.flat:active:focus, toolbar button.flat:active:hover { border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } toolbar button:checked:active, toolbar button:checked:active:hover, toolbar button:checked:active:focus, toolbar button:checked:active:hover:focus, toolbar button:checked:checked, toolbar button:checked:checked:hover, toolbar button:checked:checked:focus, toolbar button:checked:checked:hover:focus, toolbar button:active:active, toolbar button:active:active:hover, toolbar button:active:active:focus, toolbar button:active:active:hover:focus, toolbar button:active:checked, toolbar button:active:checked:hover, toolbar button:active:checked:focus, toolbar button:active:checked:hover:focus, toolbar button.flat:checked:active, toolbar button.flat:checked:active:hover, toolbar button.flat:checked:active:focus, toolbar button.flat:checked:active:hover:focus, toolbar button.flat:checked:checked, toolbar button.flat:checked:checked:hover, toolbar button.flat:checked:checked:focus, toolbar button.flat:checked:checked:hover:focus, toolbar button.flat:active:active, toolbar button.flat:active:active:hover, toolbar button.flat:active:active:focus, toolbar button.flat:active:active:hover:focus, toolbar button.flat:active:checked, toolbar button.flat:active:checked:hover, toolbar button.flat:active:checked:focus, toolbar button.flat:active:checked:hover:focus { @@ -1263,11 +1256,11 @@ toolbar { toolbar button:focus, toolbar button:hover, toolbar button.flat:focus, toolbar button.flat:hover { color: #ebdbb2; } toolbar button:disabled:disabled, toolbar button.flat:disabled:disabled { - background-color: alpha(mix(#282828,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#32302f,#ebdbb2,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#282828,#ebdbb2,0.5); + color: mix(#32302f,#ebdbb2,0.5); box-shadow: none; } toolbar button:active:disabled, toolbar button:checked:disabled, toolbar button.flat:active:disabled, toolbar button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -1276,9 +1269,9 @@ toolbar { box-shadow: none; } toolbar button.separator, toolbar button .separator { border: 1px solid currentColor; - color: rgba(40, 40, 40, 0.9); } + color: rgba(50, 48, 47, 0.9); } toolbar button.separator:disabled, toolbar button .separator:disabled { - color: rgba(40, 40, 40, 0.85); } + color: rgba(50, 48, 47, 0.85); } toolbar .linked > button { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(66, 52, 17, 0.22); } toolbar .linked > button:focus, toolbar .linked > button:hover { @@ -1286,7 +1279,7 @@ toolbar { toolbar .linked > button:active, toolbar .linked > button:active:hover, toolbar .linked > button:active:focus, toolbar .linked > button:active:hover:focus, toolbar .linked > button:checked, toolbar .linked > button:checked:hover, toolbar .linked > button:checked:focus, toolbar .linked > button:checked:hover:focus { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), inset 0 1px rgba(66, 52, 17, 0.07), inset 0 -1px rgba(66, 52, 17, 0.05); } toolbar .linked > button:disabled { - box-shadow: inset -1px 0 #202020; } + box-shadow: inset -1px 0 #282626; } toolbar .linked > button:last-child, toolbar .linked > button:only-child { box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } toolbar .linked > button:last-child:hover, toolbar .linked > button:only-child:hover { @@ -1298,28 +1291,28 @@ toolbar { toolbar .linked > button:active:only-child, toolbar .linked > button:active:only-child:focus, toolbar .linked > button:active:only-child:hover, toolbar .linked > button:active:only-child:hover:focus, toolbar .linked > button:checked:only-child, toolbar .linked > button:checked:only-child:focus, toolbar .linked > button:checked:only-child:hover, toolbar .linked > button:checked:only-child:hover:focus { box-shadow: inset 1px 0 rgba(66, 52, 17, 0.06), inset 0 1px rgba(66, 52, 17, 0.07), inset -1px 0 rgba(66, 52, 17, 0.06); } toolbar combobox, toolbar button { - padding: 3px; } + padding: 0px; } toolbar combobox.text-button, toolbar button.text-button { - padding: 3px; } + padding: 0px; } toolbar combobox.image-button, toolbar button.image-button { - padding: 3px; } + padding: 0px; } toolbar separator, toolbar separator:disabled { - color: #181818; + color: #1e1d1c; border-color: currentColor; -GtkWidget-window-dragging: true; } toolbar.inline-toolbar { padding: 1px; border-width: 0 1px 1px; border-style: solid; - border-color: mix(#282828,#ebdbb2,0.08); - background-color: mix(mix(#282828,#ebdbb2,0.08),#282828,0.7); + border-color: mix(#32302f,#ebdbb2,0.18); + background-color: mix(mix(#32302f,#ebdbb2,0.18),#32302f,0.7); background-image: none; } toolbar.inline-toolbar:backdrop { - border-color: mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); - background-color: mix(#282828,mix(#282828,mix(#282828,#ebdbb2,0.08),0.9),0.35); + border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); + background-color: mix(#32302f,mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9),0.35); transition: 200ms ease-out; } toolbar.inline-toolbar button { - background-color: #282828; + background-color: #32302f; background-image: none; border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; @@ -1334,12 +1327,12 @@ toolbar { border-color: rgba(218, 188, 112, 0.22); } toolbar.inline-toolbar button.flat { color: #ebdbb2; - border-color: rgba(40, 40, 40, 0); - background-color: rgba(40, 40, 40, 0); + border-color: rgba(50, 48, 47, 0); + background-color: rgba(50, 48, 47, 0); background-image: none; box-shadow: none; } toolbar.inline-toolbar button:hover, toolbar.inline-toolbar button.flat:hover { - background-color: #2a2a2a; + background-color: #353231; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; @@ -1353,7 +1346,7 @@ toolbar { toolbar.inline-toolbar button:hover:active:disabled, toolbar.inline-toolbar button:hover:checked:disabled, toolbar.inline-toolbar button.flat:hover:active:disabled, toolbar.inline-toolbar button.flat:hover:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } toolbar.inline-toolbar button:focus, toolbar.inline-toolbar button.flat:focus { - background-color: #2a2a2a; + background-color: #353231; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; @@ -1367,7 +1360,7 @@ toolbar { toolbar.inline-toolbar button:focus:active:disabled, toolbar.inline-toolbar button:focus:checked:disabled, toolbar.inline-toolbar button.flat:focus:active:disabled, toolbar.inline-toolbar button.flat:focus:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } toolbar.inline-toolbar button:focus:hover, toolbar.inline-toolbar button.flat:focus:hover { - background-color: #2c2c2c; + background-color: #373534; background-image: none; border-color: rgba(218, 188, 112, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } @@ -1383,9 +1376,9 @@ toolbar { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } toolbar.inline-toolbar button:checked:focus, toolbar.inline-toolbar button:checked:hover, toolbar.inline-toolbar button:active:focus, toolbar.inline-toolbar button:active:hover, toolbar.inline-toolbar button.flat:checked:focus, toolbar.inline-toolbar button.flat:checked:hover, toolbar.inline-toolbar button.flat:active:focus, toolbar.inline-toolbar button.flat:active:hover { border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } toolbar.inline-toolbar button:checked:active, toolbar.inline-toolbar button:checked:active:hover, toolbar.inline-toolbar button:checked:active:focus, toolbar.inline-toolbar button:checked:active:hover:focus, toolbar.inline-toolbar button:checked:checked, toolbar.inline-toolbar button:checked:checked:hover, toolbar.inline-toolbar button:checked:checked:focus, toolbar.inline-toolbar button:checked:checked:hover:focus, toolbar.inline-toolbar button:active:active, toolbar.inline-toolbar button:active:active:hover, toolbar.inline-toolbar button:active:active:focus, toolbar.inline-toolbar button:active:active:hover:focus, toolbar.inline-toolbar button:active:checked, toolbar.inline-toolbar button:active:checked:hover, toolbar.inline-toolbar button:active:checked:focus, toolbar.inline-toolbar button:active:checked:hover:focus, toolbar.inline-toolbar button.flat:checked:active, toolbar.inline-toolbar button.flat:checked:active:hover, toolbar.inline-toolbar button.flat:checked:active:focus, toolbar.inline-toolbar button.flat:checked:active:hover:focus, toolbar.inline-toolbar button.flat:checked:checked, toolbar.inline-toolbar button.flat:checked:checked:hover, toolbar.inline-toolbar button.flat:checked:checked:focus, toolbar.inline-toolbar button.flat:checked:checked:hover:focus, toolbar.inline-toolbar button.flat:active:active, toolbar.inline-toolbar button.flat:active:active:hover, toolbar.inline-toolbar button.flat:active:active:focus, toolbar.inline-toolbar button.flat:active:active:hover:focus, toolbar.inline-toolbar button.flat:active:checked, toolbar.inline-toolbar button.flat:active:checked:hover, toolbar.inline-toolbar button.flat:active:checked:focus, toolbar.inline-toolbar button.flat:active:checked:hover:focus { @@ -1402,11 +1395,11 @@ toolbar { toolbar.inline-toolbar button:focus, toolbar.inline-toolbar button:hover, toolbar.inline-toolbar button.flat:focus, toolbar.inline-toolbar button.flat:hover { color: #ebdbb2; } toolbar.inline-toolbar button:disabled:disabled, toolbar.inline-toolbar button.flat:disabled:disabled { - background-color: alpha(mix(#282828,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#32302f,#ebdbb2,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#282828,#ebdbb2,0.5); + color: mix(#32302f,#ebdbb2,0.5); box-shadow: none; } toolbar.inline-toolbar button:active:disabled, toolbar.inline-toolbar button:checked:disabled, toolbar.inline-toolbar button.flat:active:disabled, toolbar.inline-toolbar button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -1415,9 +1408,9 @@ toolbar { box-shadow: none; } toolbar.inline-toolbar button.separator, toolbar.inline-toolbar button .separator { border: 1px solid currentColor; - color: rgba(40, 40, 40, 0.9); } + color: rgba(50, 48, 47, 0.9); } toolbar.inline-toolbar button.separator:disabled, toolbar.inline-toolbar button .separator:disabled { - color: rgba(40, 40, 40, 0.85); } + color: rgba(50, 48, 47, 0.85); } window.csd > .titlebar:not(headerbar) { padding: 0; @@ -1428,11 +1421,11 @@ window.csd > .titlebar:not(headerbar) { box-shadow: none; } .titlebar:not(headerbar) > separator { - background-color: #2a2a29; } + background-color: #232323; } .background:not(.tiled):not(.maximized) .titlebar:backdrop, .background:not(.tiled):not(.maximized) .titlebar { - border-top-left-radius: 0px; - border-top-right-radius: 0px; } + border-top-left-radius: 4px; + border-top-right-radius: 4px; } .background:not(.csd):not(.ssd):not(.solid-csd) headerbar, .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:not(:last-child), .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:backdrop, .background:not(.csd):not(.ssd):not(.solid-csd) headerbar:backdrop:not(:last-child) { border-radius: 0; @@ -1442,21 +1435,21 @@ window.csd > .titlebar:not(headerbar) { ! Action-bar * ***************/ actionbar > revealer > box { - padding: 3px; - border-top: 1px solid mix(#282828,#ebdbb2,0.08); } + padding: 0px; + border-top: 1px solid mix(#32302f,#ebdbb2,0.18); } actionbar > revealer > box:backdrop { - border-color: mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); } + border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); } /**************************** ! Search and Location bars * *****************************/ searchbar, .location-bar { - background-color: #272727; + background-color: #312f2e; background-image: none; border-width: 0 0 1px; border-style: solid; - border-color: #202020; + border-color: #282626; color: #ebdbb2; } /****************** @@ -1464,11 +1457,11 @@ searchbar, *******************/ .suggested-action, headerbar.selection-mode button.suggested-action, .titlebar:not(headerbar).selection-mode button.suggested-action { - background-color: #4caf50; + background-color: #c3a544; background-image: none; border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.12); } .suggested-action:focus, headerbar.selection-mode button.suggested-action:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:focus, .suggested-action:hover, headerbar.selection-mode button.suggested-action:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:hover { @@ -1491,18 +1484,18 @@ searchbar, .suggested-action.flat, headerbar.selection-mode button.flat.suggested-action, .titlebar:not(headerbar).selection-mode button.flat.suggested-action { color: #ebdbb2; - border-color: rgba(76, 175, 80, 0); - background-color: rgba(76, 175, 80, 0); + border-color: rgba(195, 165, 68, 0); + background-color: rgba(195, 165, 68, 0); background-image: none; box-shadow: none; } .suggested-action:hover, headerbar.selection-mode button.suggested-action:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:hover, .suggested-action.flat:hover, .titlebar:not(headerbar).selection-mode button.flat.suggested-action:hover { - background-color: #53b457; + background-color: #c6aa4e; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } .suggested-action:hover:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:hover:focus, .suggested-action:hover:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:hover:hover, .suggested-action.flat:hover:focus, .suggested-action.flat:hover:hover { @@ -1519,11 +1512,11 @@ searchbar, .suggested-action:focus, headerbar.selection-mode button.suggested-action:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:focus, .suggested-action.flat:focus, .titlebar:not(headerbar).selection-mode button.flat.suggested-action:focus { - background-color: #53b457; + background-color: #c6aa4e; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } .suggested-action:focus:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:focus:focus, .suggested-action:focus:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:focus:hover, .suggested-action.flat:focus:focus, .suggested-action.flat:focus:hover { @@ -1539,10 +1532,10 @@ searchbar, border-color: rgba(218, 188, 112, 0.3); } .suggested-action:focus:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:focus:hover, .suggested-action.flat:focus:hover { - background-color: #5cb860; + background-color: #c9af58; background-image: none; border-color: rgba(218, 188, 112, 0.3); - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.38); } .suggested-action:focus:hover:focus, .suggested-action:focus:hover:hover, .suggested-action.flat:focus:hover:focus, .suggested-action.flat:focus:hover:hover { border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } .suggested-action:focus:hover:active, .suggested-action:focus:hover:active:hover, .suggested-action:focus:hover:active:focus, .suggested-action:focus:hover:active:hover:focus, .suggested-action:focus:hover:checked, .suggested-action:focus:hover:checked:hover, .suggested-action:focus:hover:checked:focus, .suggested-action:focus:hover:checked:hover:focus, .suggested-action.flat:focus:hover:active, .suggested-action.flat:focus:hover:active:hover, .suggested-action.flat:focus:hover:active:focus, .suggested-action.flat:focus:hover:active:hover:focus, .suggested-action.flat:focus:hover:checked, .suggested-action.flat:focus:hover:checked:hover, .suggested-action.flat:focus:hover:checked:focus, .suggested-action.flat:focus:hover:checked:hover:focus { @@ -1559,9 +1552,9 @@ searchbar, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } .suggested-action:checked:focus, .titlebar:not(headerbar).selection-mode button.suggested-action:checked:focus, .suggested-action:checked:hover, .titlebar:not(headerbar).selection-mode button.suggested-action:checked:hover, .suggested-action:active:focus, @@ -1597,11 +1590,11 @@ searchbar, color: #ebdbb2; } .suggested-action:disabled:disabled, .titlebar:not(headerbar).selection-mode button.suggested-action:disabled:disabled, .suggested-action.flat:disabled:disabled { - background-color: alpha(mix(#4caf50,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#c3a544,#ebdbb2,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#4caf50,#ebdbb2,0.5); + color: mix(#c3a544,#ebdbb2,0.5); box-shadow: none; } .suggested-action:active:disabled, .titlebar:not(headerbar).selection-mode button.suggested-action:active:disabled, .suggested-action:checked:disabled, @@ -1611,17 +1604,15 @@ searchbar, color: #ebdbb2; box-shadow: none; } .suggested-action.separator, headerbar.selection-mode button.separator.suggested-action, - .titlebar:not(headerbar).selection-mode button.separator.suggested-action, .suggested-action .separator, headerbar.selection-mode button.suggested-action .separator, - .titlebar:not(headerbar).selection-mode button.suggested-action .separator { + .titlebar:not(headerbar).selection-mode button.separator.suggested-action, .suggested-action .separator, headerbar.selection-mode button.suggested-action .separator, .titlebar:not(headerbar).selection-mode button.suggested-action .separator { border: 1px solid currentColor; - color: rgba(76, 175, 80, 0.9); } + color: rgba(195, 165, 68, 0.9); } .suggested-action.separator:disabled, - .titlebar:not(headerbar).selection-mode button.separator.suggested-action:disabled, .suggested-action .separator:disabled, - .titlebar:not(headerbar).selection-mode button.suggested-action .separator:disabled { - color: rgba(76, 175, 80, 0.85); } + .titlebar:not(headerbar).selection-mode button.separator.suggested-action:disabled, .suggested-action .separator:disabled, .titlebar:not(headerbar).selection-mode button.suggested-action .separator:disabled { + color: rgba(195, 165, 68, 0.85); } .destructive-action { - background-color: #f44336; + background-color: #ff276a; background-image: none; border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; @@ -1636,12 +1627,12 @@ searchbar, border-color: rgba(218, 188, 112, 0.22); } .destructive-action.flat { color: #ebdbb2; - border-color: rgba(244, 67, 54, 0); - background-color: rgba(244, 67, 54, 0); + border-color: rgba(255, 39, 106, 0); + background-color: rgba(255, 39, 106, 0); background-image: none; box-shadow: none; } .destructive-action:hover, .destructive-action.flat:hover { - background-color: #f55044; + background-color: #ff3674; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; @@ -1655,7 +1646,7 @@ searchbar, .destructive-action:hover:active:disabled, .destructive-action:hover:checked:disabled, .destructive-action.flat:hover:active:disabled, .destructive-action.flat:hover:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } .destructive-action:focus, .destructive-action.flat:focus { - background-color: #f55044; + background-color: #ff3674; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; @@ -1669,7 +1660,7 @@ searchbar, .destructive-action:focus:active:disabled, .destructive-action:focus:checked:disabled, .destructive-action.flat:focus:active:disabled, .destructive-action.flat:focus:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } .destructive-action:focus:hover, .destructive-action.flat:focus:hover { - background-color: #f65d52; + background-color: #ff447e; background-image: none; border-color: rgba(218, 188, 112, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.38); } @@ -1685,9 +1676,9 @@ searchbar, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } .destructive-action:checked:focus, .destructive-action:checked:hover, .destructive-action:active:focus, .destructive-action:active:hover, .destructive-action.flat:checked:focus, .destructive-action.flat:checked:hover, .destructive-action.flat:active:focus, .destructive-action.flat:active:hover { border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } .destructive-action:checked:active, .destructive-action:checked:active:hover, .destructive-action:checked:active:focus, .destructive-action:checked:active:hover:focus, .destructive-action:checked:checked, .destructive-action:checked:checked:hover, .destructive-action:checked:checked:focus, .destructive-action:checked:checked:hover:focus, .destructive-action:active:active, .destructive-action:active:active:hover, .destructive-action:active:active:focus, .destructive-action:active:active:hover:focus, .destructive-action:active:checked, .destructive-action:active:checked:hover, .destructive-action:active:checked:focus, .destructive-action:active:checked:hover:focus, .destructive-action.flat:checked:active, .destructive-action.flat:checked:active:hover, .destructive-action.flat:checked:active:focus, .destructive-action.flat:checked:active:hover:focus, .destructive-action.flat:checked:checked, .destructive-action.flat:checked:checked:hover, .destructive-action.flat:checked:checked:focus, .destructive-action.flat:checked:checked:hover:focus, .destructive-action.flat:active:active, .destructive-action.flat:active:active:hover, .destructive-action.flat:active:active:focus, .destructive-action.flat:active:active:hover:focus, .destructive-action.flat:active:checked, .destructive-action.flat:active:checked:hover, .destructive-action.flat:active:checked:focus, .destructive-action.flat:active:checked:hover:focus { @@ -1704,11 +1695,11 @@ searchbar, .destructive-action:focus, .destructive-action:hover, .destructive-action.flat:focus, .destructive-action.flat:hover { color: #ebdbb2; } .destructive-action:disabled:disabled, .destructive-action.flat:disabled:disabled { - background-color: alpha(mix(#f44336,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#ff276a,#ebdbb2,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#f44336,#ebdbb2,0.5); + color: mix(#ff276a,#ebdbb2,0.5); box-shadow: none; } .destructive-action:active:disabled, .destructive-action:checked:disabled, .destructive-action.flat:active:disabled, .destructive-action.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -1717,9 +1708,9 @@ searchbar, box-shadow: none; } .destructive-action.separator, .destructive-action .separator { border: 1px solid currentColor; - color: rgba(244, 67, 54, 0.9); } + color: rgba(255, 39, 106, 0.9); } .destructive-action.separator:disabled, .destructive-action .separator:disabled { - color: rgba(244, 67, 54, 0.85); } + color: rgba(255, 39, 106, 0.85); } /****************** ! Selection mode * @@ -1759,11 +1750,11 @@ headerbar.selection-mode, headerbar.selection-mode .title, .titlebar:not(headerbar).selection-mode .title { font-weight: bold; - padding: 0 6px; } + padding: 0 0px; } headerbar.selection-mode .subtitle, .titlebar:not(headerbar).selection-mode .subtitle { font-size: smaller; - padding: 0 6px; } + padding: 0 0px; } headerbar.selection-mode button, .titlebar:not(headerbar).selection-mode button { background-color: #83a598; @@ -1932,9 +1923,9 @@ headerbar.selection-mode, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } headerbar.selection-mode button:checked:focus, headerbar.selection-mode button:checked:hover, headerbar.selection-mode button:active:focus, headerbar.selection-mode button:active:hover, headerbar.selection-mode button.flat:checked:focus, headerbar.selection-mode button.flat:checked:hover, headerbar.selection-mode button.flat:active:focus, headerbar.selection-mode button.flat:active:hover, .titlebar:not(headerbar).selection-mode button:checked:focus, .titlebar:not(headerbar).selection-mode button:checked:hover, @@ -2100,15 +2091,15 @@ headerbar.selection-mode, headerbar.selection-mode combobox, headerbar.selection-mode button, .titlebar:not(headerbar).selection-mode combobox, .titlebar:not(headerbar).selection-mode button { - padding: 3px; } + padding: 0px; } headerbar.selection-mode combobox.text-button, headerbar.selection-mode button.text-button, .titlebar:not(headerbar).selection-mode combobox.text-button, .titlebar:not(headerbar).selection-mode button.text-button { - padding: 3px; } + padding: 0px; } headerbar.selection-mode combobox.image-button, headerbar.selection-mode button.image-button, .titlebar:not(headerbar).selection-mode combobox.image-button, .titlebar:not(headerbar).selection-mode button.image-button { - padding: 3px; } + padding: 0px; } headerbar.selection-mode separator, headerbar.selection-mode separator:disabled, .titlebar:not(headerbar).selection-mode separator, .titlebar:not(headerbar).selection-mode separator:disabled { @@ -2283,9 +2274,9 @@ headerbar.selection-mode, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } headerbar.selection-mode button:checked:focus, headerbar.selection-mode button:checked:hover, headerbar.selection-mode button:active:focus, headerbar.selection-mode button:active:hover, headerbar.selection-mode button.flat:checked:focus, headerbar.selection-mode button.flat:checked:hover, headerbar.selection-mode button.flat:active:focus, headerbar.selection-mode button.flat:active:hover, .titlebar:not(headerbar).selection-mode button:checked:focus, .titlebar:not(headerbar).selection-mode button:checked:hover, @@ -2420,9 +2411,7 @@ headerbar.selection-mode, -gtk-icon-shadow: none; } headerbar.selection-mode .dim-label, headerbar.selection-mode label.separator, .selection-menu headerbar.selection-mode .dim-label, .selection-menu headerbar.selection-mode label.separator, .titlebar:not(headerbar).selection-mode .dim-label, - .titlebar:not(headerbar).selection-mode label.separator, .selection-menu - .titlebar:not(headerbar).selection-mode .dim-label, .selection-menu - .titlebar:not(headerbar).selection-mode label.separator { + .titlebar:not(headerbar).selection-mode label.separator, .selection-menu .titlebar:not(headerbar).selection-mode .dim-label, .selection-menu .titlebar:not(headerbar).selection-mode label.separator { color: #57786b; } /********** @@ -2433,31 +2422,31 @@ calendar { outline-offset: -1px; color: #ebdbb2; } calendar:selected { - border-radius: 0px; } + border-radius: 4px; } calendar.header { - border-bottom: 1px solid rgba(0, 0, 0, 0.1); + border-bottom: 1px solid rgba(131, 104, 34, 0.1); border-radius: 0; } calendar.header:backdrop { - border-color: rgba(0, 0, 0, 0.1); } + border-color: rgba(131, 104, 34, 0.1); } calendar.button { color: rgba(235, 219, 178, 0.55); } calendar.button:hover { color: #ebdbb2; } calendar.button:backdrop { - color: alpha(mix(#ebdbb2,#282828,0.5),0.55); } + color: alpha(mix(#ebdbb2,#32302f,0.5),0.55); } calendar.button:disabled { - color: alpha(mix(#ebdbb2,#282828,0.5),0.55); } + color: alpha(mix(#ebdbb2,#32302f,0.5),0.55); } calendar:indeterminate, calendar:indeterminate:backdrop { - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } calendar.highlight, calendar.highlight:backdrop { font-size: smaller; color: mix(#83a598,#ebdbb2,0.5); } calendar:backdrop { - color: mix(#30302f,#ebdbb2,0.8); } + color: mix(#32302f,#ebdbb2,0.8); } /* gnome-calendar */ .calendar-view { - background-color: #30302f; + background-color: #32302f; color: #ebdbb2; } /*************** @@ -2467,96 +2456,94 @@ colorswatch:drop(active), colorswatch { border-style: none; } colorswatch.top { - border-top-left-radius: 0.5px; - border-top-right-radius: 0.5px; } + border-top-left-radius: 4.5px; + border-top-right-radius: 4.5px; } colorswatch.top overlay { - border-top-left-radius: 0px; - border-top-right-radius: 0px; } + border-top-left-radius: 4px; + border-top-right-radius: 4px; } colorswatch.bottom { - border-bottom-left-radius: 0.5px; - border-bottom-right-radius: 0.5px; } + border-bottom-left-radius: 4.5px; + border-bottom-right-radius: 4.5px; } colorswatch.bottom overlay { - border-bottom-left-radius: 0px; - border-bottom-right-radius: 0px; } + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; } colorswatch.left, colorswatch:first-child:not(.top) { - border-top-left-radius: 0.5px; - border-bottom-left-radius: 0.5px; } + border-top-left-radius: 4.5px; + border-bottom-left-radius: 4.5px; } colorswatch.left overlay, colorswatch:first-child:not(.top) overlay { - border-top-left-radius: 0px; - border-bottom-left-radius: 0px; } + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; } colorswatch.right, colorswatch:last-child:not(.bottom) { - border-top-right-radius: 0.5px; - border-bottom-right-radius: 0.5px; } + border-top-right-radius: 4.5px; + border-bottom-right-radius: 4.5px; } colorswatch.right overlay, colorswatch:last-child:not(.bottom) overlay { - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; } + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; } colorswatch.dark overlay { color: #ebdbb2; } colorswatch.dark overlay:hover { - border-color: rgba(0, 0, 0, 0.8); } + border-color: rgba(131, 104, 34, 0.8); } colorswatch.dark overlay:backdrop { color: mix(#83a598,#ebdbb2,0.66); } colorswatch.light overlay { color: #ebdbb2; } colorswatch.light overlay:hover { - border-color: rgba(0, 0, 0, 0.5); } + border-color: rgba(131, 104, 34, 0.5); } colorswatch.light overlay:backdrop { - color: mix(#30302f,#ebdbb2,0.8); } + color: mix(#32302f,#ebdbb2,0.8); } colorswatch:drop(active) { box-shadow: none; } colorswatch:drop(active).light overlay { - border-color: #4e9a06; - box-shadow: inset 0 0 0 2px #3d7805, inset 0 0 0 1px #4e9a06; } + border-color: #83a598; + box-shadow: inset 0 0 0 2px #6e9687, inset 0 0 0 1px #83a598; } colorswatch:drop(active).dark overlay { - border-color: #4e9a06; - box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; } + border-color: #83a598; + box-shadow: inset 0 0 0 2px rgba(131, 104, 34, 0.3), inset 0 0 0 1px #83a598; } colorswatch overlay { - border: 1px solid rgba(0, 0, 0, 0.3); } + border: 1px solid rgba(131, 104, 34, 0.3); } colorswatch overlay:hover { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.2); } + box-shadow: inset 0 1px rgba(51, 49, 48, 0.4), inset 0 -1px rgba(131, 104, 34, 0.2); } colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover { - border-color: rgba(0, 0, 0, 0.3); + border-color: rgba(131, 104, 34, 0.3); box-shadow: none; } colorswatch:disabled { opacity: .5; } colorswatch:disabled overlay { - border-color: rgba(0, 0, 0, 0.6); + border-color: rgba(131, 104, 34, 0.6); box-shadow: none; } row:selected colorswatch { box-shadow: 0 0 0 2px #ebdbb2; } colorswatch#add-color-button { - border-radius: 0px 0px 0 0; } + border-radius: 4px 4px 0 0; } colorswatch#add-color-button:only-child { - border-radius: 0px; } + border-radius: 4px; } colorswatch#add-color-button overlay { - background-color: #262626; + background-color: #302e2d; color: #ebdbb2; } colorswatch#add-color-button overlay:hover { - background-color: #242424; } + background-color: #2d2b2a; } colorswatch#add-color-button overlay:backdrop { - background-color: #262626; } + background-color: #302e2d; } colorswatch#editor-color-sample { - border-radius: 0px; } + border-radius: 4px; } colorswatch#editor-color-sample overlay { - border-radius: 0.5px; } + border-radius: 4.5px; } button.color { - padding: 3px; } - button.color colorswatch:only-child { - box-shadow: 0 1px rgba(0, 0, 0, 0.87451); } - button.color colorswatch:only-child, button.color colorswatch:only-child overlay { - border-radius: 0; } + padding: 0px; } + button.color colorswatch:only-child, button.color colorswatch:only-child overlay { + border-radius: 4px; } button.color:disabled colorswatch:only-child, button.color:backdrop colorswatch:only-child, button.color:active colorswatch:only-child, button.color:checked colorswatch:only-child { box-shadow: none; } @@ -2566,11 +2553,11 @@ button.color { filechooser { /* for fallback when header bar not used */ } filechooser .dialog-action-box { - border-top: 1px solid mix(#282828,#ebdbb2,0.08); } + border-top: 1px solid mix(#32302f,#ebdbb2,0.18); } filechooser .dialog-action-box:backdrop { - border-top-color: mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); } + border-top-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); } filechooser #pathbarbox { - border-bottom: 1px solid #282828; } + border-bottom: 1px solid #32302f; } filechooserbutton:drop(active) { box-shadow: none; @@ -2581,13 +2568,13 @@ filechooserbutton:drop(active) { *******************/ list { color: #ebdbb2; - background-color: #30302f; - border-color: mix(#282828,#ebdbb2,0.08); } + background-color: #32302f; + border-color: mix(#32302f,#ebdbb2,0.18); } list:backdrop { - background-color: #30302f; - border-color: mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); } + background-color: #32302f; + border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); } list row { - padding: 3px; } + padding: 0px; } row { transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } @@ -2598,19 +2585,19 @@ row { row.activatable.has-open-popup, row.activatable:hover { background-color: rgba(235, 219, 178, 0.05); } row.activatable:active { - box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); } + box-shadow: inset 0 2px 2px -2px rgba(131, 104, 34, 0.2); } row.activatable:backdrop:hover { background-color: transparent; } row.activatable:selected:active { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } + box-shadow: inset 0 2px 3px -1px rgba(131, 104, 34, 0.5); } row.activatable:selected.has-open-popup, row.activatable:selected:hover { background-color: mix(#83a598,#ebdbb2,0.1); } row.activatable:selected:backdrop { background-color: #83a598; } flowbox flowboxchild { - padding: 3px; - border-radius: 0px; } + padding: 0px; + border-radius: 4px; } flowbox flowboxchild:selected { outline-offset: -2px; } @@ -2626,101 +2613,101 @@ flowbox flowboxchild { infobar { border: 0; } infobar.info, infobar.info:backdrop { - background-color: #03a9f4; + background-color: #a327c0; background-image: none; - border: 1px solid #0287c3; + border: 1px solid #821f9a; caret-color: currentColor; } infobar.info label, infobar.info, infobar.info:backdrop label, infobar.info:backdrop { - color: #fff; } + color: #32302f; } infobar.info button { - background-color: #03a9f4; + background-color: #a327c0; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } infobar.info button:focus, infobar.info button:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } infobar.info button:active, infobar.info button:active:hover, infobar.info button:active:focus, infobar.info button:active:hover:focus, infobar.info button:checked, infobar.info button:checked:hover, infobar.info button:checked:focus, infobar.info button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.info button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.info button:active:disabled, infobar.info button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.info button.flat { - color: #fff; - border-color: rgba(3, 169, 244, 0); - background-color: rgba(3, 169, 244, 0); + color: #32302f; + border-color: rgba(163, 39, 192, 0); + background-color: rgba(163, 39, 192, 0); background-image: none; box-shadow: none; } infobar.info button:hover, infobar.info button.flat:hover { - background-color: #07b0fc; + background-color: #ab29ca; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } infobar.info button:hover:focus, infobar.info button:hover:hover, infobar.info button.flat:hover:focus, infobar.info button.flat:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.info button:hover:active, infobar.info button:hover:active:hover, infobar.info button:hover:active:focus, infobar.info button:hover:active:hover:focus, infobar.info button:hover:checked, infobar.info button:hover:checked:hover, infobar.info button:hover:checked:focus, infobar.info button:hover:checked:hover:focus, infobar.info button.flat:hover:active, infobar.info button.flat:hover:active:hover, infobar.info button.flat:hover:active:focus, infobar.info button.flat:hover:active:hover:focus, infobar.info button.flat:hover:checked, infobar.info button.flat:hover:checked:hover, infobar.info button.flat:hover:checked:focus, infobar.info button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.info button:hover:disabled, infobar.info button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.info button:hover:active:disabled, infobar.info button:hover:checked:disabled, infobar.info button.flat:hover:active:disabled, infobar.info button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.info button:focus, infobar.info button.flat:focus { - background-color: #07b0fc; + background-color: #ab29ca; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } infobar.info button:focus:focus, infobar.info button:focus:hover, infobar.info button.flat:focus:focus, infobar.info button.flat:focus:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.info button:focus:active, infobar.info button:focus:active:hover, infobar.info button:focus:active:focus, infobar.info button:focus:active:hover:focus, infobar.info button:focus:checked, infobar.info button:focus:checked:hover, infobar.info button:focus:checked:focus, infobar.info button:focus:checked:hover:focus, infobar.info button.flat:focus:active, infobar.info button.flat:focus:active:hover, infobar.info button.flat:focus:active:focus, infobar.info button.flat:focus:active:hover:focus, infobar.info button.flat:focus:checked, infobar.info button.flat:focus:checked:hover, infobar.info button.flat:focus:checked:focus, infobar.info button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.info button:focus:disabled, infobar.info button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.info button:focus:active:disabled, infobar.info button:focus:checked:disabled, infobar.info button.flat:focus:active:disabled, infobar.info button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.info button:focus:hover, infobar.info button.flat:focus:hover { - background-color: #14b4fc; + background-color: #b32bd3; background-image: none; - border-color: rgba(204, 204, 204, 0.3); + border-color: rgba(40, 38, 38, 0.4); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } infobar.info button:focus:hover:focus, infobar.info button:focus:hover:hover, infobar.info button.flat:focus:hover:focus, infobar.info button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.info button:focus:hover:active, infobar.info button:focus:hover:active:hover, infobar.info button:focus:hover:active:focus, infobar.info button:focus:hover:active:hover:focus, infobar.info button:focus:hover:checked, infobar.info button:focus:hover:checked:hover, infobar.info button:focus:hover:checked:focus, infobar.info button:focus:hover:checked:hover:focus, infobar.info button.flat:focus:hover:active, infobar.info button.flat:focus:hover:active:hover, infobar.info button.flat:focus:hover:active:focus, infobar.info button.flat:focus:hover:active:hover:focus, infobar.info button.flat:focus:hover:checked, infobar.info button.flat:focus:hover:checked:hover, infobar.info button.flat:focus:hover:checked:focus, infobar.info button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.info button:focus:hover:disabled, infobar.info button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.info button:focus:hover:active:disabled, infobar.info button:focus:hover:checked:disabled, infobar.info button.flat:focus:hover:active:disabled, infobar.info button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.info button:checked, infobar.info button:active, infobar.info button.flat:checked, infobar.info button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } infobar.info button:checked:focus, infobar.info button:checked:hover, infobar.info button:active:focus, infobar.info button:active:hover, infobar.info button.flat:checked:focus, infobar.info button.flat:checked:hover, infobar.info button.flat:active:focus, infobar.info button.flat:active:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } infobar.info button:checked:active, infobar.info button:checked:active:hover, infobar.info button:checked:active:focus, infobar.info button:checked:active:hover:focus, infobar.info button:checked:checked, infobar.info button:checked:checked:hover, infobar.info button:checked:checked:focus, infobar.info button:checked:checked:hover:focus, infobar.info button:active:active, infobar.info button:active:active:hover, infobar.info button:active:active:focus, infobar.info button:active:active:hover:focus, infobar.info button:active:checked, infobar.info button:active:checked:hover, infobar.info button:active:checked:focus, infobar.info button:active:checked:hover:focus, infobar.info button.flat:checked:active, infobar.info button.flat:checked:active:hover, infobar.info button.flat:checked:active:focus, infobar.info button.flat:checked:active:hover:focus, infobar.info button.flat:checked:checked, infobar.info button.flat:checked:checked:hover, infobar.info button.flat:checked:checked:focus, infobar.info button.flat:checked:checked:hover:focus, infobar.info button.flat:active:active, infobar.info button.flat:active:active:hover, infobar.info button.flat:active:active:focus, infobar.info button.flat:active:active:hover:focus, infobar.info button.flat:active:checked, infobar.info button.flat:active:checked:hover, infobar.info button.flat:active:checked:focus, infobar.info button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.info button:checked:disabled, infobar.info button:active:disabled, infobar.info button.flat:checked:disabled, infobar.info button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.info button:checked:active:disabled, infobar.info button:checked:checked:disabled, infobar.info button:active:active:disabled, infobar.info button:active:checked:disabled, infobar.info button.flat:checked:active:disabled, infobar.info button.flat:checked:checked:disabled, infobar.info button.flat:active:active:disabled, infobar.info button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.info button:checked:focus, infobar.info button:checked:hover, infobar.info button:active:focus, infobar.info button:active:hover, infobar.info button.flat:checked:focus, infobar.info button.flat:checked:hover, infobar.info button.flat:active:focus, infobar.info button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } infobar.info button:focus, infobar.info button:hover, infobar.info button.flat:focus, infobar.info button.flat:hover { - color: #fff; } + color: #32302f; } infobar.info button:disabled:disabled, infobar.info button.flat:disabled:disabled { - background-color: alpha(mix(#03a9f4,#fff,0.2),0.4); + background-color: alpha(mix(#a327c0,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#03a9f4,#fff,0.5); + color: mix(#a327c0,#32302f,0.5); box-shadow: none; } infobar.info button:active:disabled, infobar.info button:checked:disabled, infobar.info button.flat:active:disabled, infobar.info button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -2729,105 +2716,105 @@ infobar { box-shadow: none; } infobar.info button.separator, infobar.info button .separator { border: 1px solid currentColor; - color: rgba(3, 169, 244, 0.9); } + color: rgba(163, 39, 192, 0.9); } infobar.info button.separator:disabled, infobar.info button .separator:disabled { - color: rgba(3, 169, 244, 0.85); } + color: rgba(163, 39, 192, 0.85); } infobar.warning, infobar.warning:backdrop { - background-color: #ef6c00; + background-color: #ff7f42; background-image: none; - border: 1px solid #bf5600; + border: 1px solid #ff5402; caret-color: currentColor; } infobar.warning label, infobar.warning, infobar.warning:backdrop label, infobar.warning:backdrop { - color: #fff; } + color: #32302f; } infobar.warning button { - background-color: #ef6c00; + background-color: #ff7f42; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.12); } infobar.warning button:focus, infobar.warning button:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } infobar.warning button:active, infobar.warning button:active:hover, infobar.warning button:active:focus, infobar.warning button:active:hover:focus, infobar.warning button:checked, infobar.warning button:checked:hover, infobar.warning button:checked:focus, infobar.warning button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.warning button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.warning button:active:disabled, infobar.warning button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.warning button.flat { - color: #fff; - border-color: rgba(239, 108, 0, 0); - background-color: rgba(239, 108, 0, 0); + color: #32302f; + border-color: rgba(255, 127, 66, 0); + background-color: rgba(255, 127, 66, 0); background-image: none; box-shadow: none; } infobar.warning button:hover, infobar.warning button.flat:hover { - background-color: #fb7100; + background-color: #ff8a52; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } infobar.warning button:hover:focus, infobar.warning button:hover:hover, infobar.warning button.flat:hover:focus, infobar.warning button.flat:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.warning button:hover:active, infobar.warning button:hover:active:hover, infobar.warning button:hover:active:focus, infobar.warning button:hover:active:hover:focus, infobar.warning button:hover:checked, infobar.warning button:hover:checked:hover, infobar.warning button:hover:checked:focus, infobar.warning button:hover:checked:hover:focus, infobar.warning button.flat:hover:active, infobar.warning button.flat:hover:active:hover, infobar.warning button.flat:hover:active:focus, infobar.warning button.flat:hover:active:hover:focus, infobar.warning button.flat:hover:checked, infobar.warning button.flat:hover:checked:hover, infobar.warning button.flat:hover:checked:focus, infobar.warning button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.warning button:hover:disabled, infobar.warning button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.warning button:hover:active:disabled, infobar.warning button:hover:checked:disabled, infobar.warning button.flat:hover:active:disabled, infobar.warning button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.warning button:focus, infobar.warning button.flat:focus { - background-color: #fb7100; + background-color: #ff8a52; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } infobar.warning button:focus:focus, infobar.warning button:focus:hover, infobar.warning button.flat:focus:focus, infobar.warning button.flat:focus:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.warning button:focus:active, infobar.warning button:focus:active:hover, infobar.warning button:focus:active:focus, infobar.warning button:focus:active:hover:focus, infobar.warning button:focus:checked, infobar.warning button:focus:checked:hover, infobar.warning button:focus:checked:focus, infobar.warning button:focus:checked:hover:focus, infobar.warning button.flat:focus:active, infobar.warning button.flat:focus:active:hover, infobar.warning button.flat:focus:active:focus, infobar.warning button.flat:focus:active:hover:focus, infobar.warning button.flat:focus:checked, infobar.warning button.flat:focus:checked:hover, infobar.warning button.flat:focus:checked:focus, infobar.warning button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.warning button:focus:disabled, infobar.warning button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.warning button:focus:active:disabled, infobar.warning button:focus:checked:disabled, infobar.warning button.flat:focus:active:disabled, infobar.warning button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.warning button:focus:hover, infobar.warning button.flat:focus:hover { - background-color: #ff7808; + background-color: #ff9562; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.38); } infobar.warning button:focus:hover:focus, infobar.warning button:focus:hover:hover, infobar.warning button.flat:focus:hover:focus, infobar.warning button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.warning button:focus:hover:active, infobar.warning button:focus:hover:active:hover, infobar.warning button:focus:hover:active:focus, infobar.warning button:focus:hover:active:hover:focus, infobar.warning button:focus:hover:checked, infobar.warning button:focus:hover:checked:hover, infobar.warning button:focus:hover:checked:focus, infobar.warning button:focus:hover:checked:hover:focus, infobar.warning button.flat:focus:hover:active, infobar.warning button.flat:focus:hover:active:hover, infobar.warning button.flat:focus:hover:active:focus, infobar.warning button.flat:focus:hover:active:hover:focus, infobar.warning button.flat:focus:hover:checked, infobar.warning button.flat:focus:hover:checked:hover, infobar.warning button.flat:focus:hover:checked:focus, infobar.warning button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.warning button:focus:hover:disabled, infobar.warning button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.warning button:focus:hover:active:disabled, infobar.warning button:focus:hover:checked:disabled, infobar.warning button.flat:focus:hover:active:disabled, infobar.warning button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.warning button:checked, infobar.warning button:active, infobar.warning button.flat:checked, infobar.warning button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } infobar.warning button:checked:focus, infobar.warning button:checked:hover, infobar.warning button:active:focus, infobar.warning button:active:hover, infobar.warning button.flat:checked:focus, infobar.warning button.flat:checked:hover, infobar.warning button.flat:active:focus, infobar.warning button.flat:active:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } infobar.warning button:checked:active, infobar.warning button:checked:active:hover, infobar.warning button:checked:active:focus, infobar.warning button:checked:active:hover:focus, infobar.warning button:checked:checked, infobar.warning button:checked:checked:hover, infobar.warning button:checked:checked:focus, infobar.warning button:checked:checked:hover:focus, infobar.warning button:active:active, infobar.warning button:active:active:hover, infobar.warning button:active:active:focus, infobar.warning button:active:active:hover:focus, infobar.warning button:active:checked, infobar.warning button:active:checked:hover, infobar.warning button:active:checked:focus, infobar.warning button:active:checked:hover:focus, infobar.warning button.flat:checked:active, infobar.warning button.flat:checked:active:hover, infobar.warning button.flat:checked:active:focus, infobar.warning button.flat:checked:active:hover:focus, infobar.warning button.flat:checked:checked, infobar.warning button.flat:checked:checked:hover, infobar.warning button.flat:checked:checked:focus, infobar.warning button.flat:checked:checked:hover:focus, infobar.warning button.flat:active:active, infobar.warning button.flat:active:active:hover, infobar.warning button.flat:active:active:focus, infobar.warning button.flat:active:active:hover:focus, infobar.warning button.flat:active:checked, infobar.warning button.flat:active:checked:hover, infobar.warning button.flat:active:checked:focus, infobar.warning button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.warning button:checked:disabled, infobar.warning button:active:disabled, infobar.warning button.flat:checked:disabled, infobar.warning button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.warning button:checked:active:disabled, infobar.warning button:checked:checked:disabled, infobar.warning button:active:active:disabled, infobar.warning button:active:checked:disabled, infobar.warning button.flat:checked:active:disabled, infobar.warning button.flat:checked:checked:disabled, infobar.warning button.flat:active:active:disabled, infobar.warning button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.warning button:checked:focus, infobar.warning button:checked:hover, infobar.warning button:active:focus, infobar.warning button:active:hover, infobar.warning button.flat:checked:focus, infobar.warning button.flat:checked:hover, infobar.warning button.flat:active:focus, infobar.warning button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } infobar.warning button:focus, infobar.warning button:hover, infobar.warning button.flat:focus, infobar.warning button.flat:hover { - color: #fff; } + color: #32302f; } infobar.warning button:disabled:disabled, infobar.warning button.flat:disabled:disabled { - background-color: alpha(mix(#ef6c00,#fff,0.2),0.4); + background-color: alpha(mix(#ff7f42,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#ef6c00,#fff,0.5); + color: mix(#ff7f42,#32302f,0.5); box-shadow: none; } infobar.warning button:active:disabled, infobar.warning button:checked:disabled, infobar.warning button.flat:active:disabled, infobar.warning button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -2836,105 +2823,105 @@ infobar { box-shadow: none; } infobar.warning button.separator, infobar.warning button .separator { border: 1px solid currentColor; - color: rgba(239, 108, 0, 0.9); } + color: rgba(255, 127, 66, 0.9); } infobar.warning button.separator:disabled, infobar.warning button .separator:disabled { - color: rgba(239, 108, 0, 0.85); } + color: rgba(255, 127, 66, 0.85); } infobar.question, infobar.question:backdrop { - background-color: #673ab7; + background-color: #a327c0; background-image: none; - border: 1px solid #522e92; + border: 1px solid #821f9a; caret-color: currentColor; } infobar.question label, infobar.question, infobar.question:backdrop label, infobar.question:backdrop { - color: #fff; } + color: #32302f; } infobar.question button { - background-color: #673ab7; + background-color: #a327c0; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } infobar.question button:focus, infobar.question button:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } infobar.question button:active, infobar.question button:active:hover, infobar.question button:active:focus, infobar.question button:active:hover:focus, infobar.question button:checked, infobar.question button:checked:hover, infobar.question button:checked:focus, infobar.question button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.question button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.question button:active:disabled, infobar.question button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.question button.flat { - color: #fff; - border-color: rgba(103, 58, 183, 0); - background-color: rgba(103, 58, 183, 0); + color: #32302f; + border-color: rgba(163, 39, 192, 0); + background-color: rgba(163, 39, 192, 0); background-image: none; box-shadow: none; } infobar.question button:hover, infobar.question button.flat:hover { - background-color: #6c3dc0; + background-color: #ab29ca; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } infobar.question button:hover:focus, infobar.question button:hover:hover, infobar.question button.flat:hover:focus, infobar.question button.flat:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.question button:hover:active, infobar.question button:hover:active:hover, infobar.question button:hover:active:focus, infobar.question button:hover:active:hover:focus, infobar.question button:hover:checked, infobar.question button:hover:checked:hover, infobar.question button:hover:checked:focus, infobar.question button:hover:checked:hover:focus, infobar.question button.flat:hover:active, infobar.question button.flat:hover:active:hover, infobar.question button.flat:hover:active:focus, infobar.question button.flat:hover:active:hover:focus, infobar.question button.flat:hover:checked, infobar.question button.flat:hover:checked:hover, infobar.question button.flat:hover:checked:focus, infobar.question button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.question button:hover:disabled, infobar.question button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.question button:hover:active:disabled, infobar.question button:hover:checked:disabled, infobar.question button.flat:hover:active:disabled, infobar.question button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.question button:focus, infobar.question button.flat:focus { - background-color: #6c3dc0; + background-color: #ab29ca; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } infobar.question button:focus:focus, infobar.question button:focus:hover, infobar.question button.flat:focus:focus, infobar.question button.flat:focus:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.question button:focus:active, infobar.question button:focus:active:hover, infobar.question button:focus:active:focus, infobar.question button:focus:active:hover:focus, infobar.question button:focus:checked, infobar.question button:focus:checked:hover, infobar.question button:focus:checked:focus, infobar.question button:focus:checked:hover:focus, infobar.question button.flat:focus:active, infobar.question button.flat:focus:active:hover, infobar.question button.flat:focus:active:focus, infobar.question button.flat:focus:active:hover:focus, infobar.question button.flat:focus:checked, infobar.question button.flat:focus:checked:hover, infobar.question button.flat:focus:checked:focus, infobar.question button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.question button:focus:disabled, infobar.question button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.question button:focus:active:disabled, infobar.question button:focus:checked:disabled, infobar.question button.flat:focus:active:disabled, infobar.question button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.question button:focus:hover, infobar.question button.flat:focus:hover { - background-color: #7345c4; + background-color: #b32bd3; background-image: none; - border-color: rgba(204, 204, 204, 0.3); + border-color: rgba(40, 38, 38, 0.4); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } infobar.question button:focus:hover:focus, infobar.question button:focus:hover:hover, infobar.question button.flat:focus:hover:focus, infobar.question button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.question button:focus:hover:active, infobar.question button:focus:hover:active:hover, infobar.question button:focus:hover:active:focus, infobar.question button:focus:hover:active:hover:focus, infobar.question button:focus:hover:checked, infobar.question button:focus:hover:checked:hover, infobar.question button:focus:hover:checked:focus, infobar.question button:focus:hover:checked:hover:focus, infobar.question button.flat:focus:hover:active, infobar.question button.flat:focus:hover:active:hover, infobar.question button.flat:focus:hover:active:focus, infobar.question button.flat:focus:hover:active:hover:focus, infobar.question button.flat:focus:hover:checked, infobar.question button.flat:focus:hover:checked:hover, infobar.question button.flat:focus:hover:checked:focus, infobar.question button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.question button:focus:hover:disabled, infobar.question button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.question button:focus:hover:active:disabled, infobar.question button:focus:hover:checked:disabled, infobar.question button.flat:focus:hover:active:disabled, infobar.question button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.question button:checked, infobar.question button:active, infobar.question button.flat:checked, infobar.question button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } infobar.question button:checked:focus, infobar.question button:checked:hover, infobar.question button:active:focus, infobar.question button:active:hover, infobar.question button.flat:checked:focus, infobar.question button.flat:checked:hover, infobar.question button.flat:active:focus, infobar.question button.flat:active:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } infobar.question button:checked:active, infobar.question button:checked:active:hover, infobar.question button:checked:active:focus, infobar.question button:checked:active:hover:focus, infobar.question button:checked:checked, infobar.question button:checked:checked:hover, infobar.question button:checked:checked:focus, infobar.question button:checked:checked:hover:focus, infobar.question button:active:active, infobar.question button:active:active:hover, infobar.question button:active:active:focus, infobar.question button:active:active:hover:focus, infobar.question button:active:checked, infobar.question button:active:checked:hover, infobar.question button:active:checked:focus, infobar.question button:active:checked:hover:focus, infobar.question button.flat:checked:active, infobar.question button.flat:checked:active:hover, infobar.question button.flat:checked:active:focus, infobar.question button.flat:checked:active:hover:focus, infobar.question button.flat:checked:checked, infobar.question button.flat:checked:checked:hover, infobar.question button.flat:checked:checked:focus, infobar.question button.flat:checked:checked:hover:focus, infobar.question button.flat:active:active, infobar.question button.flat:active:active:hover, infobar.question button.flat:active:active:focus, infobar.question button.flat:active:active:hover:focus, infobar.question button.flat:active:checked, infobar.question button.flat:active:checked:hover, infobar.question button.flat:active:checked:focus, infobar.question button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.question button:checked:disabled, infobar.question button:active:disabled, infobar.question button.flat:checked:disabled, infobar.question button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.question button:checked:active:disabled, infobar.question button:checked:checked:disabled, infobar.question button:active:active:disabled, infobar.question button:active:checked:disabled, infobar.question button.flat:checked:active:disabled, infobar.question button.flat:checked:checked:disabled, infobar.question button.flat:active:active:disabled, infobar.question button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.question button:checked:focus, infobar.question button:checked:hover, infobar.question button:active:focus, infobar.question button:active:hover, infobar.question button.flat:checked:focus, infobar.question button.flat:checked:hover, infobar.question button.flat:active:focus, infobar.question button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } infobar.question button:focus, infobar.question button:hover, infobar.question button.flat:focus, infobar.question button.flat:hover { - color: #fff; } + color: #32302f; } infobar.question button:disabled:disabled, infobar.question button.flat:disabled:disabled { - background-color: alpha(mix(#673ab7,#fff,0.2),0.4); + background-color: alpha(mix(#a327c0,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#673ab7,#fff,0.5); + color: mix(#a327c0,#32302f,0.5); box-shadow: none; } infobar.question button:active:disabled, infobar.question button:checked:disabled, infobar.question button.flat:active:disabled, infobar.question button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -2943,105 +2930,105 @@ infobar { box-shadow: none; } infobar.question button.separator, infobar.question button .separator { border: 1px solid currentColor; - color: rgba(103, 58, 183, 0.9); } + color: rgba(163, 39, 192, 0.9); } infobar.question button.separator:disabled, infobar.question button .separator:disabled { - color: rgba(103, 58, 183, 0.85); } + color: rgba(163, 39, 192, 0.85); } infobar.error, infobar.error:backdrop { - background-color: #f44336; + background-color: #ff276a; background-image: none; - border: 1px solid #e21b0c; + border: 1px solid #eb0049; caret-color: currentColor; } infobar.error label, infobar.error, infobar.error:backdrop label, infobar.error:backdrop { - color: #fff; } + color: #32302f; } infobar.error button { - background-color: #f44336; + background-color: #ff276a; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.12); } infobar.error button:focus, infobar.error button:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } infobar.error button:active, infobar.error button:active:hover, infobar.error button:active:focus, infobar.error button:active:hover:focus, infobar.error button:checked, infobar.error button:checked:hover, infobar.error button:checked:focus, infobar.error button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.error button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.error button:active:disabled, infobar.error button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.error button.flat { - color: #fff; - border-color: rgba(244, 67, 54, 0); - background-color: rgba(244, 67, 54, 0); + color: #32302f; + border-color: rgba(255, 39, 106, 0); + background-color: rgba(255, 39, 106, 0); background-image: none; box-shadow: none; } infobar.error button:hover, infobar.error button.flat:hover { - background-color: #f55044; + background-color: #ff3674; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } infobar.error button:hover:focus, infobar.error button:hover:hover, infobar.error button.flat:hover:focus, infobar.error button.flat:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.error button:hover:active, infobar.error button:hover:active:hover, infobar.error button:hover:active:focus, infobar.error button:hover:active:hover:focus, infobar.error button:hover:checked, infobar.error button:hover:checked:hover, infobar.error button:hover:checked:focus, infobar.error button:hover:checked:hover:focus, infobar.error button.flat:hover:active, infobar.error button.flat:hover:active:hover, infobar.error button.flat:hover:active:focus, infobar.error button.flat:hover:active:hover:focus, infobar.error button.flat:hover:checked, infobar.error button.flat:hover:checked:hover, infobar.error button.flat:hover:checked:focus, infobar.error button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.error button:hover:disabled, infobar.error button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.error button:hover:active:disabled, infobar.error button:hover:checked:disabled, infobar.error button.flat:hover:active:disabled, infobar.error button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.error button:focus, infobar.error button.flat:focus { - background-color: #f55044; + background-color: #ff3674; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } infobar.error button:focus:focus, infobar.error button:focus:hover, infobar.error button.flat:focus:focus, infobar.error button.flat:focus:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.error button:focus:active, infobar.error button:focus:active:hover, infobar.error button:focus:active:focus, infobar.error button:focus:active:hover:focus, infobar.error button:focus:checked, infobar.error button:focus:checked:hover, infobar.error button:focus:checked:focus, infobar.error button:focus:checked:hover:focus, infobar.error button.flat:focus:active, infobar.error button.flat:focus:active:hover, infobar.error button.flat:focus:active:focus, infobar.error button.flat:focus:active:hover:focus, infobar.error button.flat:focus:checked, infobar.error button.flat:focus:checked:hover, infobar.error button.flat:focus:checked:focus, infobar.error button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.error button:focus:disabled, infobar.error button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.error button:focus:active:disabled, infobar.error button:focus:checked:disabled, infobar.error button.flat:focus:active:disabled, infobar.error button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.error button:focus:hover, infobar.error button.flat:focus:hover { - background-color: #f65d52; + background-color: #ff447e; background-image: none; - border-color: rgba(204, 204, 204, 0.3); + border-color: rgba(40, 38, 38, 0.4); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.38); } infobar.error button:focus:hover:focus, infobar.error button:focus:hover:hover, infobar.error button.flat:focus:hover:focus, infobar.error button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } infobar.error button:focus:hover:active, infobar.error button:focus:hover:active:hover, infobar.error button:focus:hover:active:focus, infobar.error button:focus:hover:active:hover:focus, infobar.error button:focus:hover:checked, infobar.error button:focus:hover:checked:hover, infobar.error button:focus:hover:checked:focus, infobar.error button:focus:hover:checked:hover:focus, infobar.error button.flat:focus:hover:active, infobar.error button.flat:focus:hover:active:hover, infobar.error button.flat:focus:hover:active:focus, infobar.error button.flat:focus:hover:active:hover:focus, infobar.error button.flat:focus:hover:checked, infobar.error button.flat:focus:hover:checked:hover, infobar.error button.flat:focus:hover:checked:focus, infobar.error button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } infobar.error button:focus:hover:disabled, infobar.error button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } infobar.error button:focus:hover:active:disabled, infobar.error button:focus:hover:checked:disabled, infobar.error button.flat:focus:hover:active:disabled, infobar.error button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } infobar.error button:checked, infobar.error button:active, infobar.error button.flat:checked, infobar.error button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } infobar.error button:checked:focus, infobar.error button:checked:hover, infobar.error button:active:focus, infobar.error button:active:hover, infobar.error button.flat:checked:focus, infobar.error button.flat:checked:hover, infobar.error button.flat:active:focus, infobar.error button.flat:active:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } infobar.error button:checked:active, infobar.error button:checked:active:hover, infobar.error button:checked:active:focus, infobar.error button:checked:active:hover:focus, infobar.error button:checked:checked, infobar.error button:checked:checked:hover, infobar.error button:checked:checked:focus, infobar.error button:checked:checked:hover:focus, infobar.error button:active:active, infobar.error button:active:active:hover, infobar.error button:active:active:focus, infobar.error button:active:active:hover:focus, infobar.error button:active:checked, infobar.error button:active:checked:hover, infobar.error button:active:checked:focus, infobar.error button:active:checked:hover:focus, infobar.error button.flat:checked:active, infobar.error button.flat:checked:active:hover, infobar.error button.flat:checked:active:focus, infobar.error button.flat:checked:active:hover:focus, infobar.error button.flat:checked:checked, infobar.error button.flat:checked:checked:hover, infobar.error button.flat:checked:checked:focus, infobar.error button.flat:checked:checked:hover:focus, infobar.error button.flat:active:active, infobar.error button.flat:active:active:hover, infobar.error button.flat:active:active:focus, infobar.error button.flat:active:active:hover:focus, infobar.error button.flat:active:checked, infobar.error button.flat:active:checked:hover, infobar.error button.flat:active:checked:focus, infobar.error button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } infobar.error button:checked:disabled, infobar.error button:active:disabled, infobar.error button.flat:checked:disabled, infobar.error button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } infobar.error button:checked:active:disabled, infobar.error button:checked:checked:disabled, infobar.error button:active:active:disabled, infobar.error button:active:checked:disabled, infobar.error button.flat:checked:active:disabled, infobar.error button.flat:checked:checked:disabled, infobar.error button.flat:active:active:disabled, infobar.error button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } infobar.error button:checked:focus, infobar.error button:checked:hover, infobar.error button:active:focus, infobar.error button:active:hover, infobar.error button.flat:checked:focus, infobar.error button.flat:checked:hover, infobar.error button.flat:active:focus, infobar.error button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } infobar.error button:focus, infobar.error button:hover, infobar.error button.flat:focus, infobar.error button.flat:hover { - color: #fff; } + color: #32302f; } infobar.error button:disabled:disabled, infobar.error button.flat:disabled:disabled { - background-color: alpha(mix(#f44336,#fff,0.2),0.4); + background-color: alpha(mix(#ff276a,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#f44336,#fff,0.5); + color: mix(#ff276a,#32302f,0.5); box-shadow: none; } infobar.error button:active:disabled, infobar.error button:checked:disabled, infobar.error button.flat:active:disabled, infobar.error button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -3050,9 +3037,9 @@ infobar { box-shadow: none; } infobar.error button.separator, infobar.error button .separator { border: 1px solid currentColor; - color: rgba(244, 67, 54, 0.9); } + color: rgba(255, 39, 106, 0.9); } infobar.error button.separator:disabled, infobar.error button .separator:disabled { - color: rgba(244, 67, 54, 0.85); } + color: rgba(255, 39, 106, 0.85); } /********* ! Entry * @@ -3064,7 +3051,7 @@ infobar { border-left-width: 0; } .linked:not(.vertical) > entry:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-right-width: 0; border-bottom-right-radius: 0; border-top-right-radius: 0; } @@ -3073,7 +3060,7 @@ infobar { border-right-width: 1px; } .linked:not(.vertical) > entry:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-left-width: 0; border-bottom-left-radius: 0; border-top-left-radius: 0; } @@ -3083,7 +3070,7 @@ infobar { .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > entry:first-child:only-child { border-width: 1px; } .linked:not(.vertical) > entry:only-child { - border-radius: 0px; } + border-radius: 4px; } .linked.vertical > entry { border-width: 1px; @@ -3092,7 +3079,7 @@ infobar { border-bottom-width: 0; } .linked.vertical > entry:first-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-width: 1px; border-bottom-width: 0; border-bottom-left-radius: 0; @@ -3102,7 +3089,7 @@ infobar { border-bottom-width: 1px; } .linked.vertical > entry:last-child { border-width: 1px; - border-radius: 0px; + border-radius: 4px; border-top-width: 0; border-bottom-width: 1px; border-top-left-radius: 0; @@ -3113,14 +3100,13 @@ infobar { .linked.vertical > entry:only-child, .linked.vertical > entry:first-child:only-child { border-width: 1px; } .linked.vertical > entry:only-child { - border-radius: 0px; } + border-radius: 4px; } entry, menuitem entry, popover.background entry, .osd entry, #XfceNotifyWindow entry, #login_window entry { border-width: 1px; border-style: solid; - border-radius: 0px; - border-color: #202020; + border-radius: 4px; transition: border 100ms ease-out; box-shadow: inset 1px 0 rgba(66, 52, 17, 0.1), inset 0 1px rgba(66, 52, 17, 0.12), inset -1px 0 rgba(66, 52, 17, 0.1), inset 0 -1px rgba(66, 52, 17, 0.05); } entry:focus, popover.background entry:focus, @@ -3136,73 +3122,64 @@ entry, menuitem entry, popover.background entry, .osd entry, entry:disabled, popover.background entry:disabled, #XfceNotifyWindow entry:disabled, #login_window entry:disabled { box-shadow: none; } - entry progress, popover.background entry progress, .osd entry progress, - #XfceNotifyWindow entry progress, #login_window entry progress { + entry progress, popover.background entry progress, .osd entry progress, #XfceNotifyWindow entry progress, #login_window entry progress { background-color: #83a598; background-image: none; border-width: 0; - border-radius: 0px; + border-radius: 4px; color: #ebdbb2; } - entry image.left, - #XfceNotifyWindow entry image.left, #login_window entry image.left { - padding-right: 3px; } - entry image.right, - #XfceNotifyWindow entry image.right, #login_window entry image.right { - padding-left: 3px; } + entry image.left, #XfceNotifyWindow entry image.left, #login_window entry image.left { + padding-right: 0px; } + entry image.right, #XfceNotifyWindow entry image.right, #login_window entry image.right { + padding-left: 0px; } entry.warning, popover.background entry.warning, #XfceNotifyWindow entry.warning, #login_window entry.warning { - color: #fff; - border-color: #bf5600; - background-color: mix(#30302f,#ef6c00,0.6); } - entry.warning image, - #XfceNotifyWindow entry.warning image, #login_window entry.warning image { - color: #fff; } + color: #32302f; + border-color: #ff5402; + background-color: mix(#32302f,#ff7f42,0.6); } + entry.warning image, #XfceNotifyWindow entry.warning image, #login_window entry.warning image { + color: #32302f; } entry.warning:focus, #XfceNotifyWindow entry.warning:focus, #login_window entry.warning:focus { - color: #fff; - border-color: mix(#83a598,#ef6c00,0.3); - background-color: #ef6c00; + color: #32302f; + border-color: mix(#83a598,#ff7f42,0.3); + background-color: #ff7f42; box-shadow: none; } - entry.warning selection, - #XfceNotifyWindow entry.warning selection, #login_window entry.warning selection { - background-color: #fff; - color: #ef6c00; } + entry.warning selection, #XfceNotifyWindow entry.warning selection, #login_window entry.warning selection { + background-color: #32302f; + color: #ff7f42; } entry.error, popover.background entry.error, #XfceNotifyWindow entry.error, #login_window entry.error { - color: #fff; - border-color: #e21b0c; - background-color: mix(#30302f,#f44336,0.6); } - entry.error image, - #XfceNotifyWindow entry.error image, #login_window entry.error image { - color: #fff; } + color: #32302f; + border-color: #eb0049; + background-color: mix(#32302f,#ff276a,0.6); } + entry.error image, #XfceNotifyWindow entry.error image, #login_window entry.error image { + color: #32302f; } entry.error:focus, #XfceNotifyWindow entry.error:focus, #login_window entry.error:focus { - color: #fff; - border-color: mix(#83a598,#f44336,0.3); - background-color: #f44336; + color: #32302f; + border-color: mix(#83a598,#ff276a,0.3); + background-color: #ff276a; box-shadow: none; } - entry.error selection, - #XfceNotifyWindow entry.error selection, #login_window entry.error selection { - background-color: #fff; - color: #f44336; } + entry.error selection, #XfceNotifyWindow entry.error selection, #login_window entry.error selection { + background-color: #32302f; + color: #ff276a; } entry.search-missing, popover.background entry.search-missing, #XfceNotifyWindow entry.search-missing, #login_window entry.search-missing { - color: #fff; - border-color: #e21b0c; - background-color: mix(#30302f,#f44336,0.6); } - entry.search-missing image, - #XfceNotifyWindow entry.search-missing image, #login_window entry.search-missing image { - color: #fff; } + color: #32302f; + border-color: #eb0049; + background-color: mix(#32302f,#ff276a,0.6); } + entry.search-missing image, #XfceNotifyWindow entry.search-missing image, #login_window entry.search-missing image { + color: #32302f; } entry.search-missing:focus, #XfceNotifyWindow entry.search-missing:focus, #login_window entry.search-missing:focus { - color: #fff; - border-color: mix(#83a598,#f44336,0.3); - background-color: #f44336; + color: #32302f; + border-color: mix(#83a598,#ff276a,0.3); + background-color: #ff276a; box-shadow: none; } - entry.search-missing selection, - #XfceNotifyWindow entry.search-missing selection, #login_window entry.search-missing selection { - background-color: #fff; - color: #f44336; } + entry.search-missing selection, #XfceNotifyWindow entry.search-missing selection, #login_window entry.search-missing selection { + background-color: #32302f; + color: #ff276a; } /********* ! Menubar @@ -3211,23 +3188,23 @@ menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0; border: 0; - background-color: #30302f; + background-color: #282828; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } menubar > menuitem, .menubar > menuitem { min-height: 16px; - padding: 4.5px 7.5px; + padding: 0px 0px; border: 1px solid transparent; background-color: transparent; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } menubar > menuitem:hover, .menubar > menuitem:hover { - border-color: mix(#30302f,#ebdbb2,0.21); - background-color: mix(#30302f,#ebdbb2,0.21); + border-color: mix(#282828,#d5c4a1,0.21); + background-color: mix(#282828,#d5c4a1,0.21); background-image: none; - color: #f2e7cc; } + color: #ded1b6; } menubar > menuitem *:hover, .menubar > menuitem *:hover { - color: #f2e7cc; } + color: #ded1b6; } /****** ! Menu @@ -3237,9 +3214,9 @@ menu, .context-menu { border: 0; border-radius: 0; - padding: 3px; - background-color: #30302f; - color: #ebdbb2; } + padding: 0px; + background-color: #282828; + color: #d5c4a1; } .csd menu, .csd .menu, .csd .context-menu { @@ -3256,8 +3233,8 @@ menu, .context-menu separator, .csd .context-menu separator { - background-color: #2b2b2a; - margin: 1px 0; } + background-color: #242424; + margin: -2px 0; } menu .separator, .csd menu .separator, .menu .separator, @@ -3266,13 +3243,13 @@ menu, .context-menu .separator, .csd .context-menu .separator { - color: #2b2b2a; } + color: #242424; } menu menuitem, .menu menuitem, .context-menu menuitem { min-height: 16px; min-width: 40px; - padding: 3px; + padding: 0px; border-radius: 0; } menu menuitem:active, menu menuitem:hover, .menu menuitem:active, @@ -3294,7 +3271,7 @@ menu, .menu menuitem *:disabled, .context-menu menuitem:disabled, .context-menu menuitem *:disabled { - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#d5c4a1,#282828,0.5); } menu menuitem arrow, .menu menuitem arrow, .context-menu menuitem arrow { @@ -3359,30 +3336,30 @@ menu, menu menuitem calendar, .menu menuitem calendar, .context-menu menuitem calendar { - color: #ebdbb2; } + color: #d5c4a1; } menu menuitem calendar.header, .menu menuitem calendar.header, .context-menu menuitem calendar.header { - border-bottom: 1px solid #2b2b2a; + border-bottom: 1px solid #242424; border-radius: 0; } menu menuitem calendar.header:backdrop, .menu menuitem calendar.header:backdrop, .context-menu menuitem calendar.header:backdrop { - border-color: #2b2b2a; } + border-color: #242424; } menu menuitem calendar.button, .menu menuitem calendar.button, .context-menu menuitem calendar.button { - color: rgba(235, 219, 178, 0.55); } + color: rgba(213, 196, 161, 0.55); } menu menuitem calendar.button:hover, .menu menuitem calendar.button:hover, .context-menu menuitem calendar.button:hover { - color: #ebdbb2; } + color: #d5c4a1; } menu menuitem calendar:indeterminate, menu menuitem calendar:indeterminate:backdrop, .menu menuitem calendar:indeterminate, .menu menuitem calendar:indeterminate:backdrop, .context-menu menuitem calendar:indeterminate, .context-menu menuitem calendar:indeterminate:backdrop { - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#d5c4a1,#282828,0.5); } menu menuitem label:dir(rtl), menu menuitem label:dir(ltr), .menu menuitem label:dir(rtl), .menu menuitem label:dir(ltr), @@ -3394,29 +3371,29 @@ menu, .context-menu > arrow { min-height: 16px; min-width: 16px; - padding: 3px; - background-color: #30302f; + padding: 0px; + background-color: #282828; border-radius: 0; } menu > arrow.top, .menu > arrow.top, .context-menu > arrow.top { margin-top: -6px; - border-bottom: 1px solid mix(#ebdbb2,#30302f,0.1); + border-bottom: 1px solid mix(#ebdbb2,#32302f,0.1); -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } menu > arrow.bottom, .menu > arrow.bottom, .context-menu > arrow.bottom { margin-bottom: -6px; - border-top: 1px solid mix(#ebdbb2,#30302f,0.1); + border-top: 1px solid mix(#ebdbb2,#32302f,0.1); -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } menu > arrow:hover, .menu > arrow:hover, .context-menu > arrow:hover { - background-color: mix(#ebdbb2,#30302f,0.1); } + background-color: mix(#ebdbb2,#32302f,0.1); } menu > arrow:backdrop, .menu > arrow:backdrop, .context-menu > arrow:backdrop { - background-color: #30302f; } + background-color: #32302f; } menu > arrow:disabled, .menu > arrow:disabled, .context-menu > arrow:disabled { @@ -3431,11 +3408,11 @@ menu, font-family: monospace; } menuitem accelerator { - color: rgba(235, 219, 178, 0.6); } + color: rgba(213, 196, 161, 0.6); } menuitem accelerator:hover { color: rgba(235, 219, 178, 0.8); } menuitem accelerator:disabled { - color: alpha(mix(#ebdbb2,#30302f,0.5),0.4); } + color: alpha(mix(#d5c4a1,#282828,0.5),0.4); } menuitem check, menuitem radio { min-height: 16px; @@ -3446,216 +3423,216 @@ menuitem check, menuitem radio { margin-left: 7px; } menuitem window decoration { - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.2); } + box-shadow: 0 2px 3px rgba(131, 104, 34, 0.2); } menuitem entry { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); - padding: 3px; - color: #ebdbb2; + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); + padding: 0px; + color: #d5c4a1; caret-color: #282828; -gtk-secondary-caret-color: #282828; } menuitem entry:focus, menuitem entry:hover { - border-color: mix(#83a598,mix(#30302f,#ebdbb2,0.2),0.3); } + border-color: mix(#83a598,mix(#282828,#d5c4a1,0.2),0.3); } menuitem entry:active, menuitem entry:active:hover, menuitem entry:active:focus, menuitem entry:active:hover:focus, menuitem entry:checked, menuitem entry:checked:hover, menuitem entry:checked:focus, menuitem entry:checked:hover:focus { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.7); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.7); } menuitem entry:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.85); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.85); } menuitem entry:active:disabled, menuitem entry:checked:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); } menuitem entry:focus, menuitem entry:active { - border-color: mix(#83a598,mix(#282828,#ebdbb2,0.08),0.3); } + border-color: mix(#83a598,mix(#32302f,#ebdbb2,0.18),0.3); } menuitem entry:disabled { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#282828,#d5c4a1,0.5); } menuitem entry:disabled:focus, menuitem entry:disabled:hover { - border-color: mix(#83a598,alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.3); } + border-color: mix(#83a598,alpha(mix(#282828,#d5c4a1,0.2),0.4),0.3); } menuitem entry:disabled:active, menuitem entry:disabled:active:hover, menuitem entry:disabled:active:focus, menuitem entry:disabled:active:hover:focus, menuitem entry:disabled:checked, menuitem entry:disabled:checked:hover, menuitem entry:disabled:checked:focus, menuitem entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.7); } menuitem entry:disabled:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.85); } menuitem entry:disabled:active:disabled, menuitem entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); } /********* ! Popover **********/ popover.background { - padding: 0px; - border-radius: 0px; + padding: -3px; + border-radius: 4px; background-clip: border-box; - background-color: #30302f; + background-color: #282828; background-image: none; - color: #ebdbb2; - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16); } + color: #d5c4a1; + box-shadow: 0 3px 6px rgba(131, 104, 34, 0.16); } .csd popover.background, popover.background { /*@include border($menu_bg_color);*/ - border-color: rgba(218, 188, 112, 0.5); + border-color: rgba(190, 164, 109, 0.5); border-width: 1px; border-style: solid; } .csd popover.background:focus, .csd popover.background:hover, popover.background:focus, popover.background:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.5),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.5),0.3); } .csd popover.background:active, .csd popover.background:active:hover, .csd popover.background:active:focus, .csd popover.background:active:hover:focus, .csd popover.background:checked, .csd popover.background:checked:hover, .csd popover.background:checked:focus, .csd popover.background:checked:hover:focus, popover.background:active, popover.background:active:hover, popover.background:active:focus, popover.background:active:hover:focus, popover.background:checked, popover.background:checked:hover, popover.background:checked:focus, popover.background:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.5); } + border-color: rgba(178, 147, 83, 0.5); } .csd popover.background:disabled, popover.background:disabled { - border-color: rgba(222, 196, 129, 0.5); } + border-color: rgba(196, 172, 122, 0.5); } .csd popover.background:active:disabled, .csd popover.background:checked:disabled, popover.background:active:disabled, popover.background:checked:disabled { - border-color: rgba(218, 188, 112, 0.5); } + border-color: rgba(190, 164, 109, 0.5); } popover.background:backdrop { box-shadow: none; } popover.background treeview.view:hover, popover.background treeview.view:selected, popover.background treeview.view:selected:focus, popover.background treeview.view:backdrop:selected, popover.background treeview.view:backdrop:selected:focus { border-top-color: #83a598; } popover.background treeview.view, popover.background treeview.view:backdrop { - border-top-color: #3a3a38; } + border-top-color: #303030; } popover.background view:hover, popover.background .view:hover, popover.background iconview:hover, popover.background list:hover { background-image: none; background-color: #83a598; color: #ebdbb2; } popover.background view, popover.background view:backdrop, popover.background .view, popover.background iconview, popover.background .view:backdrop, popover.background iconview:backdrop, popover.background list, popover.background list:backdrop { - background-color: #3e3e3d; + background-color: #343434; background-image: none; - color: #ebdbb2; - border-color: #262626; } + color: #d5c4a1; + border-color: #202020; } popover.background list row, popover.background list row .button { background-color: transparent; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } popover.background list row:focus, popover.background list row:hover, popover.background list row:active, popover.background list row .button:focus, popover.background list row .button:hover, popover.background list row .button:active { background-image: none; background-color: #83a598; color: #ebdbb2; } popover.background .frame { - border-color: #262626; - border-radius: 0px; } + border-color: #202020; + border-radius: 4px; } popover.background entry { - background-color: #30302f; + background-color: #32302f; background-image: none; - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); - padding: 3px; + border-color: shade(mix(#32302f,#ebdbb2,0.2),0.8); + padding: 0px; color: #ebdbb2; caret-color: #282828; -gtk-secondary-caret-color: #282828; } popover.background entry:focus, popover.background entry:hover { - border-color: mix(#83a598,mix(#30302f,#ebdbb2,0.2),0.3); } + border-color: mix(#83a598,mix(#32302f,#ebdbb2,0.2),0.3); } popover.background entry:active, popover.background entry:active:hover, popover.background entry:active:focus, popover.background entry:active:hover:focus, popover.background entry:checked, popover.background entry:checked:hover, popover.background entry:checked:focus, popover.background entry:checked:hover:focus { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.7); } + border-color: shade(mix(#32302f,#ebdbb2,0.2),0.7); } popover.background entry:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.85); } + border-color: shade(mix(#32302f,#ebdbb2,0.2),0.85); } popover.background entry:active:disabled, popover.background entry:checked:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); } + border-color: shade(mix(#32302f,#ebdbb2,0.2),0.8); } popover.background entry:focus, popover.background entry:active { - border-color: mix(#83a598,mix(#282828,#ebdbb2,0.08),0.3); } + border-color: mix(#83a598,mix(#32302f,#ebdbb2,0.18),0.3); } popover.background entry:disabled { - background-color: #2b2b2a; + background-color: #2d2b2a; background-image: none; - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } popover.background entry:disabled:focus, popover.background entry:disabled:hover { - border-color: mix(#83a598,alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.3); } + border-color: mix(#83a598,alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.3); } popover.background entry:disabled:active, popover.background entry:disabled:active:hover, popover.background entry:disabled:active:focus, popover.background entry:disabled:active:hover:focus, popover.background entry:disabled:checked, popover.background entry:disabled:checked:hover, popover.background entry:disabled:checked:focus, popover.background entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.7); } popover.background entry:disabled:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.85); } popover.background entry:disabled:active:disabled, popover.background entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#32302f,#ebdbb2,0.2),0.4),0.8); } popover.background button { - background-color: #30302f; + background-color: #32302f; background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } popover.background button:focus, popover.background button:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } popover.background button:active, popover.background button:active:hover, popover.background button:active:focus, popover.background button:active:hover:focus, popover.background button:checked, popover.background button:checked:hover, popover.background button:checked:focus, popover.background button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } popover.background button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } popover.background button:active:disabled, popover.background button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } popover.background button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(50, 48, 47, 0); + background-color: rgba(50, 48, 47, 0); background-image: none; box-shadow: none; } popover.background button:hover, popover.background button.flat:hover { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } popover.background button:hover:focus, popover.background button:hover:hover, popover.background button.flat:hover:focus, popover.background button.flat:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } popover.background button:hover:active, popover.background button:hover:active:hover, popover.background button:hover:active:focus, popover.background button:hover:active:hover:focus, popover.background button:hover:checked, popover.background button:hover:checked:hover, popover.background button:hover:checked:focus, popover.background button:hover:checked:hover:focus, popover.background button.flat:hover:active, popover.background button.flat:hover:active:hover, popover.background button.flat:hover:active:focus, popover.background button.flat:hover:active:hover:focus, popover.background button.flat:hover:checked, popover.background button.flat:hover:checked:hover, popover.background button.flat:hover:checked:focus, popover.background button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } popover.background button:hover:disabled, popover.background button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } popover.background button:hover:active:disabled, popover.background button:hover:checked:disabled, popover.background button.flat:hover:active:disabled, popover.background button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } popover.background button:focus, popover.background button.flat:focus { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } popover.background button:focus:focus, popover.background button:focus:hover, popover.background button.flat:focus:focus, popover.background button.flat:focus:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } popover.background button:focus:active, popover.background button:focus:active:hover, popover.background button:focus:active:focus, popover.background button:focus:active:hover:focus, popover.background button:focus:checked, popover.background button:focus:checked:hover, popover.background button:focus:checked:focus, popover.background button:focus:checked:hover:focus, popover.background button.flat:focus:active, popover.background button.flat:focus:active:hover, popover.background button.flat:focus:active:focus, popover.background button.flat:focus:active:hover:focus, popover.background button.flat:focus:checked, popover.background button.flat:focus:checked:hover, popover.background button.flat:focus:checked:focus, popover.background button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } popover.background button:focus:disabled, popover.background button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } popover.background button:focus:active:disabled, popover.background button:focus:checked:disabled, popover.background button.flat:focus:active:disabled, popover.background button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } popover.background button:focus:hover, popover.background button.flat:focus:hover { - background-color: #353534; + background-color: #373534; background-image: none; - border-color: rgba(218, 188, 112, 0.3); + border-color: rgba(190, 164, 109, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } popover.background button:focus:hover:focus, popover.background button:focus:hover:hover, popover.background button.flat:focus:hover:focus, popover.background button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } popover.background button:focus:hover:active, popover.background button:focus:hover:active:hover, popover.background button:focus:hover:active:focus, popover.background button:focus:hover:active:hover:focus, popover.background button:focus:hover:checked, popover.background button:focus:hover:checked:hover, popover.background button:focus:hover:checked:focus, popover.background button:focus:hover:checked:hover:focus, popover.background button.flat:focus:hover:active, popover.background button.flat:focus:hover:active:hover, popover.background button.flat:focus:hover:active:focus, popover.background button.flat:focus:hover:active:hover:focus, popover.background button.flat:focus:hover:checked, popover.background button.flat:focus:hover:checked:hover, popover.background button.flat:focus:hover:checked:focus, popover.background button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } popover.background button:focus:hover:disabled, popover.background button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } popover.background button:focus:hover:active:disabled, popover.background button:focus:hover:checked:disabled, popover.background button.flat:focus:hover:active:disabled, popover.background button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } popover.background button:checked, popover.background button:active, popover.background button.flat:checked, popover.background button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } popover.background button:checked:focus, popover.background button:checked:hover, popover.background button:active:focus, popover.background button:active:hover, popover.background button.flat:checked:focus, popover.background button.flat:checked:hover, popover.background button.flat:active:focus, popover.background button.flat:active:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } popover.background button:checked:active, popover.background button:checked:active:hover, popover.background button:checked:active:focus, popover.background button:checked:active:hover:focus, popover.background button:checked:checked, popover.background button:checked:checked:hover, popover.background button:checked:checked:focus, popover.background button:checked:checked:hover:focus, popover.background button:active:active, popover.background button:active:active:hover, popover.background button:active:active:focus, popover.background button:active:active:hover:focus, popover.background button:active:checked, popover.background button:active:checked:hover, popover.background button:active:checked:focus, popover.background button:active:checked:hover:focus, popover.background button.flat:checked:active, popover.background button.flat:checked:active:hover, popover.background button.flat:checked:active:focus, popover.background button.flat:checked:active:hover:focus, popover.background button.flat:checked:checked, popover.background button.flat:checked:checked:hover, popover.background button.flat:checked:checked:focus, popover.background button.flat:checked:checked:hover:focus, popover.background button.flat:active:active, popover.background button.flat:active:active:hover, popover.background button.flat:active:active:focus, popover.background button.flat:active:active:hover:focus, popover.background button.flat:active:checked, popover.background button.flat:active:checked:hover, popover.background button.flat:active:checked:focus, popover.background button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } popover.background button:checked:disabled, popover.background button:active:disabled, popover.background button.flat:checked:disabled, popover.background button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } popover.background button:checked:active:disabled, popover.background button:checked:checked:disabled, popover.background button:active:active:disabled, popover.background button:active:checked:disabled, popover.background button.flat:checked:active:disabled, popover.background button.flat:checked:checked:disabled, popover.background button.flat:active:active:disabled, popover.background button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } popover.background button:checked:focus, popover.background button:checked:hover, popover.background button:active:focus, popover.background button:active:hover, popover.background button.flat:checked:focus, popover.background button.flat:checked:hover, popover.background button.flat:active:focus, popover.background button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } popover.background button:focus, popover.background button:hover, popover.background button.flat:focus, popover.background button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } popover.background button:disabled:disabled, popover.background button.flat:disabled:disabled { - background-color: alpha(mix(#30302f,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#32302f,#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#30302f,#ebdbb2,0.5); + color: mix(#32302f,#d5c4a1,0.5); box-shadow: none; } popover.background button:active:disabled, popover.background button:checked:disabled, popover.background button.flat:active:disabled, popover.background button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -3664,9 +3641,9 @@ popover.background { box-shadow: none; } popover.background button.separator, popover.background button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.9); } + color: rgba(50, 48, 47, 0.9); } popover.background button.separator:disabled, popover.background button .separator:disabled { - color: rgba(48, 48, 47, 0.85); } + color: rgba(50, 48, 47, 0.85); } popover.background .linked > button { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(66, 52, 17, 0.22); } popover.background .linked > button:focus, popover.background .linked > button:hover { @@ -3674,7 +3651,7 @@ popover.background { popover.background .linked > button:active, popover.background .linked > button:active:hover, popover.background .linked > button:active:focus, popover.background .linked > button:active:hover:focus, popover.background .linked > button:checked, popover.background .linked > button:checked:hover, popover.background .linked > button:checked:focus, popover.background .linked > button:checked:hover:focus { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), inset 0 1px rgba(66, 52, 17, 0.07), inset 0 -1px rgba(66, 52, 17, 0.05); } popover.background .linked > button:disabled { - box-shadow: inset -1px 0 #262626; } + box-shadow: inset -1px 0 #282626; } popover.background .linked > button:last-child, popover.background .linked > button:only-child { box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } popover.background .linked > button:last-child:hover, popover.background .linked > button:only-child:hover { @@ -3691,7 +3668,7 @@ popover.background { modelbutton.flat, menuitem.button.flat { - padding: 3px 5px; + padding: 0px 2px; outline-color: transparent; transition: none; } modelbutton.flat:hover, @@ -3731,10 +3708,10 @@ menuitem.button.flat { .tooltip.background, .tooltip.background.csd, tooltip.background, tooltip.background.csd { - background-color: #282828; + background-color: #32302f; background-clip: padding-box; - border: 1px solid #202020; - border-radius: 0px; + border: 1px solid #282626; + border-radius: 4px; color: #ebdbb2; } .tooltip *, @@ -3748,123 +3725,125 @@ tooltip * { messagedialog, .message-dialog, .prompt { -GtkDialog-content-area-border: 0; -GtkDialog-action-area-border: 0; - -GtkDialog-button-spacing: 3px; + -GtkDialog-button-spacing: 0px; margin: 0; padding: 0; } + messagedialog .dialog-action-box, .message-dialog .dialog-action-box, .prompt .dialog-action-box { + margin: 0px; } printdialog paper { color: #ebdbb2; - border: 1px solid mix(#282828,#ebdbb2,0.08); - background: #fff; + border: 1px solid mix(#32302f,#ebdbb2,0.18); + background: #333130; padding: 0; } printdialog paper:backdrop { - color: mix(#ebdbb2,#282828,0.5); - border-color: mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); } + color: mix(#ebdbb2,#32302f,0.5); + border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); } printdialog .dialog-action-box { - margin: 6px; } + margin: 0px; } /********************* ! App notifications * **********************/ frame.app-notification { border-style: solid; - border-color: rgba(38, 38, 38, 0.8); + border-color: rgba(32, 32, 32, 0.8); border-width: 0 1px 1px; - border-radius: 0 0 0px 0px; - padding: 6px; - background-color: rgba(48, 48, 47, 0.8); + border-radius: 0 0 4px 4px; + padding: 0px; + background-color: rgba(40, 40, 40, 0.8); background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } frame.app-notification button { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } frame.app-notification button:focus, frame.app-notification button:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } frame.app-notification button:active, frame.app-notification button:active:hover, frame.app-notification button:active:focus, frame.app-notification button:active:hover:focus, frame.app-notification button:checked, frame.app-notification button:checked:hover, frame.app-notification button:checked:focus, frame.app-notification button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } frame.app-notification button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } frame.app-notification button:active:disabled, frame.app-notification button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } frame.app-notification button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } frame.app-notification button:hover, frame.app-notification button.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } frame.app-notification button:hover:focus, frame.app-notification button:hover:hover, frame.app-notification button.flat:hover:focus, frame.app-notification button.flat:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } frame.app-notification button:hover:active, frame.app-notification button:hover:active:hover, frame.app-notification button:hover:active:focus, frame.app-notification button:hover:active:hover:focus, frame.app-notification button:hover:checked, frame.app-notification button:hover:checked:hover, frame.app-notification button:hover:checked:focus, frame.app-notification button:hover:checked:hover:focus, frame.app-notification button.flat:hover:active, frame.app-notification button.flat:hover:active:hover, frame.app-notification button.flat:hover:active:focus, frame.app-notification button.flat:hover:active:hover:focus, frame.app-notification button.flat:hover:checked, frame.app-notification button.flat:hover:checked:hover, frame.app-notification button.flat:hover:checked:focus, frame.app-notification button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } frame.app-notification button:hover:disabled, frame.app-notification button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } frame.app-notification button:hover:active:disabled, frame.app-notification button:hover:checked:disabled, frame.app-notification button.flat:hover:active:disabled, frame.app-notification button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } frame.app-notification button:focus, frame.app-notification button.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } frame.app-notification button:focus:focus, frame.app-notification button:focus:hover, frame.app-notification button.flat:focus:focus, frame.app-notification button.flat:focus:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } frame.app-notification button:focus:active, frame.app-notification button:focus:active:hover, frame.app-notification button:focus:active:focus, frame.app-notification button:focus:active:hover:focus, frame.app-notification button:focus:checked, frame.app-notification button:focus:checked:hover, frame.app-notification button:focus:checked:focus, frame.app-notification button:focus:checked:hover:focus, frame.app-notification button.flat:focus:active, frame.app-notification button.flat:focus:active:hover, frame.app-notification button.flat:focus:active:focus, frame.app-notification button.flat:focus:active:hover:focus, frame.app-notification button.flat:focus:checked, frame.app-notification button.flat:focus:checked:hover, frame.app-notification button.flat:focus:checked:focus, frame.app-notification button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } frame.app-notification button:focus:disabled, frame.app-notification button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } frame.app-notification button:focus:active:disabled, frame.app-notification button:focus:checked:disabled, frame.app-notification button.flat:focus:active:disabled, frame.app-notification button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } frame.app-notification button:focus:hover, frame.app-notification button.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); + border-color: rgba(190, 164, 109, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } frame.app-notification button:focus:hover:focus, frame.app-notification button:focus:hover:hover, frame.app-notification button.flat:focus:hover:focus, frame.app-notification button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } frame.app-notification button:focus:hover:active, frame.app-notification button:focus:hover:active:hover, frame.app-notification button:focus:hover:active:focus, frame.app-notification button:focus:hover:active:hover:focus, frame.app-notification button:focus:hover:checked, frame.app-notification button:focus:hover:checked:hover, frame.app-notification button:focus:hover:checked:focus, frame.app-notification button:focus:hover:checked:hover:focus, frame.app-notification button.flat:focus:hover:active, frame.app-notification button.flat:focus:hover:active:hover, frame.app-notification button.flat:focus:hover:active:focus, frame.app-notification button.flat:focus:hover:active:hover:focus, frame.app-notification button.flat:focus:hover:checked, frame.app-notification button.flat:focus:hover:checked:hover, frame.app-notification button.flat:focus:hover:checked:focus, frame.app-notification button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } frame.app-notification button:focus:hover:disabled, frame.app-notification button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } frame.app-notification button:focus:hover:active:disabled, frame.app-notification button:focus:hover:checked:disabled, frame.app-notification button.flat:focus:hover:active:disabled, frame.app-notification button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } frame.app-notification button:checked, frame.app-notification button:active, frame.app-notification button.flat:checked, frame.app-notification button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } frame.app-notification button:checked:focus, frame.app-notification button:checked:hover, frame.app-notification button:active:focus, frame.app-notification button:active:hover, frame.app-notification button.flat:checked:focus, frame.app-notification button.flat:checked:hover, frame.app-notification button.flat:active:focus, frame.app-notification button.flat:active:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } frame.app-notification button:checked:active, frame.app-notification button:checked:active:hover, frame.app-notification button:checked:active:focus, frame.app-notification button:checked:active:hover:focus, frame.app-notification button:checked:checked, frame.app-notification button:checked:checked:hover, frame.app-notification button:checked:checked:focus, frame.app-notification button:checked:checked:hover:focus, frame.app-notification button:active:active, frame.app-notification button:active:active:hover, frame.app-notification button:active:active:focus, frame.app-notification button:active:active:hover:focus, frame.app-notification button:active:checked, frame.app-notification button:active:checked:hover, frame.app-notification button:active:checked:focus, frame.app-notification button:active:checked:hover:focus, frame.app-notification button.flat:checked:active, frame.app-notification button.flat:checked:active:hover, frame.app-notification button.flat:checked:active:focus, frame.app-notification button.flat:checked:active:hover:focus, frame.app-notification button.flat:checked:checked, frame.app-notification button.flat:checked:checked:hover, frame.app-notification button.flat:checked:checked:focus, frame.app-notification button.flat:checked:checked:hover:focus, frame.app-notification button.flat:active:active, frame.app-notification button.flat:active:active:hover, frame.app-notification button.flat:active:active:focus, frame.app-notification button.flat:active:active:hover:focus, frame.app-notification button.flat:active:checked, frame.app-notification button.flat:active:checked:hover, frame.app-notification button.flat:active:checked:focus, frame.app-notification button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } frame.app-notification button:checked:disabled, frame.app-notification button:active:disabled, frame.app-notification button.flat:checked:disabled, frame.app-notification button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } frame.app-notification button:checked:active:disabled, frame.app-notification button:checked:checked:disabled, frame.app-notification button:active:active:disabled, frame.app-notification button:active:checked:disabled, frame.app-notification button.flat:checked:active:disabled, frame.app-notification button.flat:checked:checked:disabled, frame.app-notification button.flat:active:active:disabled, frame.app-notification button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } frame.app-notification button:checked:focus, frame.app-notification button:checked:hover, frame.app-notification button:active:focus, frame.app-notification button:active:hover, frame.app-notification button.flat:checked:focus, frame.app-notification button.flat:checked:hover, frame.app-notification button.flat:active:focus, frame.app-notification button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } frame.app-notification button:focus, frame.app-notification button:hover, frame.app-notification button.flat:focus, frame.app-notification button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } frame.app-notification button:disabled:disabled, frame.app-notification button.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } frame.app-notification button:active:disabled, frame.app-notification button:checked:disabled, frame.app-notification button.flat:active:disabled, frame.app-notification button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -3873,9 +3852,9 @@ frame.app-notification { box-shadow: none; } frame.app-notification button.separator, frame.app-notification button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } frame.app-notification button.separator:disabled, frame.app-notification button .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } frame.app-notification border { border: 0; } @@ -3907,10 +3886,10 @@ expander arrow { ! Floating bar * *****************/ .floating-bar { - background-color: #282828; + background-color: #32302f; background-image: none; - border: 1px solid #202020; - border-radius: 0px; + border: 1px solid #282626; + border-radius: 4px; color: #ebdbb2; } .floating-bar.top { border-top-width: 0; @@ -3937,10 +3916,10 @@ expander arrow { ! Touch text selections * **************************/ GtkBubbleWindow { - border-radius: 0px; + border-radius: 4px; background-clip: border-box; } GtkBubbleWindow.osd.background { - background-color: rgba(48, 48, 47, 0.8); } + background-color: rgba(40, 40, 40, 0.8); } GtkBubbleWindow .toolbar { background-color: transparent; } @@ -3948,20 +3927,20 @@ GtkBubbleWindow { ! Font-viewer * ****************/ SushiFontWidget { - padding: 3px 6px; } + padding: 0px 0px; } /************* ! Gucharmap * **************/ GucharmapChartable { - background-color: #30302f; + background-color: #32302f; color: #ebdbb2; } /************* ! Evolution * **************/ EPreviewPane .entry { - background-color: #30302f; + background-color: #32302f; color: #ebdbb2; } /******************* @@ -3970,8 +3949,8 @@ EPreviewPane .entry { entry.entry.pin-entry { font-style: normal; font-size: 50px; - padding-left: 15px; - padding-right: 15px; } + padding-left: 0px; + padding-right: 0px; } label.pin-label { font-style: normal; @@ -3984,19 +3963,19 @@ label.pin-label { min-width: 20px; min-height: 24px; margin-top: 2px; - padding-bottom: 1.5px; - padding-left: 3px; - padding-right: 3px; + padding-bottom: 0px; + padding-left: 0px; + padding-right: 0px; color: #ebdbb2; - background-color: #30302f; + background-color: #32302f; border: 1px solid; - border-color: mix(mix(#282828,#ebdbb2,0.08),#282828,0.5); - border-radius: 0px; - box-shadow: inset 0 -3px mix(#30302f,#282828,0.2); + border-color: mix(mix(#32302f,#ebdbb2,0.18),#32302f,0.5); + border-radius: 4px; + box-shadow: inset 0 -3px mix(#32302f,#32302f,0.2); font-size: smaller; } .keycap:backdrop { - background-color: #30302f; - color: mix(#ebdbb2,#282828,0.5); + background-color: #32302f; + color: mix(#ebdbb2,#32302f,0.5); transition: 200ms ease-out; } /***************** @@ -4013,8 +3992,7 @@ stackswitcher button.circular, stackswitcher button.nautilus-circular-button.ima /******************* ! Selected Items * ********************/ -entry selection, menuitem entry selection, popover.background entry selection, .osd entry selection, -#XfceNotifyWindow entry selection, #login_window entry selection, calendar:selected, row:selected, flowbox flowboxchild:selected, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, modelbutton.flat:selected arrow, +entry selection, menuitem entry selection, popover.background entry selection, .osd entry selection, #XfceNotifyWindow entry selection, #login_window entry selection, calendar:selected, row:selected, flowbox flowboxchild:selected, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, modelbutton.flat:selected arrow, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, @@ -4022,10 +4000,9 @@ menuitem.button.flat:selected arrow, .view:selected:focus, iconview:selected:foc textview text:selected:focus, .view text:selected, iconview text:selected, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, -textview text selection, treeview.view:selected:focus, treeview.view:selected, .cs-category-view:selected:focus, .cs-category-view:selected, .cs-category-view .view:selected:focus, .cs-category-view iconview:selected:focus, .cs-category-view .view:selected, .cs-category-view iconview:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected, .nemo-window .sidebar .nemo-places-sidebar .view:selected:focus, .nemo-window .sidebar .nemo-places-sidebar iconview:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:selected { +textview text selection, treeview.view:selected:focus, treeview.view:selected, .cs-category-view:selected:focus, .cs-category-view:selected, .cs-category-view .view:selected:focus, .cs-category-view iconview:selected:focus, .cs-category-view .view:selected, .cs-category-view iconview:selected, .nemo-window .sidebar .nemo-places-sidebar .view:selected:focus, .nemo-window .sidebar .nemo-places-sidebar iconview:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected { background-color: #83a598; } - row:selected label, label:selected, entry selection, menuitem entry selection, popover.background entry selection, .osd entry selection, - #XfceNotifyWindow entry selection, #login_window entry selection, calendar:selected, row:selected, flowbox flowboxchild:selected, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, modelbutton.flat:selected arrow, + row:selected label, label:selected, entry selection, menuitem entry selection, popover.background entry selection, .osd entry selection, #XfceNotifyWindow entry selection, #login_window entry selection, calendar:selected, row:selected, flowbox flowboxchild:selected, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, modelbutton.flat:selected arrow, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, @@ -4033,38 +4010,35 @@ textview text selection, treeview.view:selected:focus, treeview.view:selected, . textview text:selected:focus, .view text:selected, iconview text:selected, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, - textview text selection, treeview.view:selected:focus, treeview.view:selected, .cs-category-view:selected:focus, .cs-category-view:selected, .cs-category-view .view:selected:focus, .cs-category-view iconview:selected:focus, .cs-category-view .view:selected, .cs-category-view iconview:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected, .nemo-window .sidebar .nemo-places-sidebar .view:selected:focus, .nemo-window .sidebar .nemo-places-sidebar iconview:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:selected { + textview text selection, treeview.view:selected:focus, treeview.view:selected, .cs-category-view:selected:focus, .cs-category-view:selected, .cs-category-view .view:selected:focus, .cs-category-view iconview:selected:focus, .cs-category-view .view:selected, .cs-category-view iconview:selected, .nemo-window .sidebar .nemo-places-sidebar .view:selected:focus, .nemo-window .sidebar .nemo-places-sidebar iconview:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:selected { color: #ebdbb2; outline-color: rgba(235, 219, 178, 0.3); } - row:selected label:disabled, label:disabled:selected, label:disabled selection, entry selection:disabled, - #XfceNotifyWindow entry selection:disabled, #login_window entry selection:disabled, calendar:disabled:selected, row:disabled:selected, flowbox flowboxchild:disabled:selected, modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, modelbutton.flat:selected arrow:disabled, + row:selected label:disabled, label:disabled:selected, label:disabled selection, entry selection:disabled, #XfceNotifyWindow entry selection:disabled, #login_window entry selection:disabled, calendar:disabled:selected, row:disabled:selected, flowbox flowboxchild:disabled:selected, modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, modelbutton.flat:selected arrow:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:active arrow:disabled, menuitem.button.flat:disabled:selected, menuitem.button.flat:selected arrow:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus, textview text:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, - textview text selection:disabled, .cs-category-view:disabled:selected, .cs-category-view iconview:disabled:selected:focus, .cs-category-view iconview:disabled:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:disabled:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:disabled:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:disabled:selected { + textview text selection:disabled, .cs-category-view:disabled:selected, .cs-category-view iconview:disabled:selected:focus, .cs-category-view iconview:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:disabled:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:disabled:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:disabled:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:disabled:selected { color: mix(#ebdbb2,#83a598,0.5); } - row:selected label:backdrop, label:backdrop:selected, label:backdrop selection, entry selection:backdrop, - #XfceNotifyWindow entry selection:backdrop, #login_window entry selection:backdrop, calendar:backdrop:selected, row:backdrop:selected, flowbox flowboxchild:backdrop:selected, modelbutton.flat:backdrop:active, modelbutton.flat:active arrow:backdrop, modelbutton.flat:backdrop:selected, modelbutton.flat:selected arrow:backdrop, + row:selected label:backdrop, label:backdrop:selected, label:backdrop selection, entry selection:backdrop, #XfceNotifyWindow entry selection:backdrop, #login_window entry selection:backdrop, calendar:backdrop:selected, row:backdrop:selected, flowbox flowboxchild:backdrop:selected, modelbutton.flat:backdrop:active, modelbutton.flat:active arrow:backdrop, modelbutton.flat:backdrop:selected, modelbutton.flat:selected arrow:backdrop, menuitem.button.flat:backdrop:active, menuitem.button.flat:active arrow:backdrop, menuitem.button.flat:backdrop:selected, menuitem.button.flat:selected arrow:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview text:backdrop:selected:focus, textview text:backdrop:selected:focus, .view text:backdrop:selected, iconview text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, - textview text selection:backdrop, .cs-category-view:backdrop:selected, .cs-category-view iconview:backdrop:selected:focus, .cs-category-view iconview:backdrop:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:backdrop:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:selected { + textview text selection:backdrop, .cs-category-view:backdrop:selected, .cs-category-view iconview:backdrop:selected:focus, .cs-category-view iconview:backdrop:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:selected:focus, .nemo-window .sidebar .nemo-places-sidebar .view:backdrop:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:selected:focus, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:selected { background-color: #83a598; color: mix(#83a598,#ebdbb2,0.66); } - row:selected label:backdrop:disabled, label:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, entry selection:backdrop:disabled, - #XfceNotifyWindow entry selection:backdrop:disabled, #login_window entry selection:backdrop:disabled, calendar:backdrop:disabled:selected, row:backdrop:disabled:selected, flowbox flowboxchild:backdrop:disabled:selected, modelbutton.flat:backdrop:disabled:active, modelbutton.flat:active arrow:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, modelbutton.flat:selected arrow:backdrop:disabled, + row:selected label:backdrop:disabled, label:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, entry selection:backdrop:disabled, #XfceNotifyWindow entry selection:backdrop:disabled, #login_window entry selection:backdrop:disabled, calendar:backdrop:disabled:selected, row:backdrop:disabled:selected, flowbox flowboxchild:backdrop:disabled:selected, modelbutton.flat:backdrop:disabled:active, modelbutton.flat:active arrow:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, modelbutton.flat:selected arrow:backdrop:disabled, menuitem.button.flat:backdrop:disabled:active, menuitem.button.flat:active arrow:backdrop:disabled, menuitem.button.flat:backdrop:disabled:selected, menuitem.button.flat:selected arrow:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, - textview text selection:backdrop:disabled, .cs-category-view:backdrop:disabled:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar .view:backdrop:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:disabled:selected { + textview text selection:backdrop:disabled, .cs-category-view:backdrop:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar .view:backdrop:disabled:selected, .nemo-window .sidebar .nemo-places-sidebar iconview:backdrop:disabled:selected, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop:disabled:selected { color: mix(mix(#83a598,#ebdbb2,0.66),#83a598,0.3); } /********* @@ -4079,7 +4053,7 @@ textview text selection, treeview.view:selected:focus, treeview.view:selected, . notebook { padding: 0; } notebook.frame { - border: 1px solid mix(#282828,#ebdbb2,0.08); } + border: 1px solid mix(#32302f,#ebdbb2,0.18); } notebook.frame > header { margin: -1px; } notebook.frame > header.top { @@ -4097,78 +4071,18 @@ notebook { padding-top: 0; padding-bottom: 0; } notebook > stack:not(:only-child) { - background-color: #282828; } + background-color: #32302f; } notebook > header { - padding: 3px; - background-color: #282828; } + padding: 0px; + background-color: #32302f; } notebook > header.top { - box-shadow: inset 0 -1px mix(#282828,#ebdbb2,0.08); } + box-shadow: inset 0 -1px mix(#32302f,#ebdbb2,0.18); } notebook > header.bottom { - box-shadow: inset 0 1px mix(#282828,#ebdbb2,0.08); } + box-shadow: inset 0 1px mix(#32302f,#ebdbb2,0.18); } notebook > header.right { - box-shadow: inset 1px 0 mix(#282828,#ebdbb2,0.08); } + box-shadow: inset 1px 0 mix(#32302f,#ebdbb2,0.18); } notebook > header.left { - box-shadow: inset -1px 0 mix(#282828,#ebdbb2,0.08); } - notebook > header.top { - padding-bottom: 0; } - notebook > header.top > tabs > tab { - padding: 3px 11px; - min-width: 20px; - min-height: 20px; - outline-offset: -4px; - border: 1px solid transparent; - border-bottom: none; - border-top-width: 3px; - border-radius: 1px 1px 0 0; } - notebook > header.top > tabs > tab:checked { - border-top-color: #83a598; } - notebook > header.top > tabs > tab + tab { - margin-left: -1px; } - notebook > header.bottom { - padding-top: 0; } - notebook > header.bottom > tabs > tab { - padding: 3px 11px; - min-width: 20px; - min-height: 20px; - outline-offset: -4px; - border: 1px solid transparent; - border-top: none; - border-bottom-width: 3px; - border-radius: 0 0 1px 1px; } - notebook > header.bottom > tabs > tab:checked { - border-bottom-color: #83a598; } - notebook > header.bottom > tabs > tab + tab { - margin-left: -1px; } - notebook > header.right { - padding-left: 0; } - notebook > header.right > tabs > tab { - padding: 3px 11px; - min-width: 20px; - min-height: 20px; - outline-offset: -4px; - border: 1px solid transparent; - border-left: none; - border-right-width: 3px; - border-radius: 0 1px 1px 0; } - notebook > header.right > tabs > tab:checked { - border-right-color: #83a598; } - notebook > header.right > tabs > tab + tab { - margin-top: -1px; } - notebook > header.left { - padding-right: 0; } - notebook > header.left > tabs > tab { - padding: 3px 11px; - min-width: 20px; - min-height: 20px; - outline-offset: -4px; - border: 1px solid transparent; - border-right: none; - border-left-width: 3px; - border-radius: 1px 0 0 1px; } - notebook > header.left > tabs > tab:checked { - border-left-color: #83a598; } - notebook > header.left > tabs > tab + tab { - margin-top: -1px; } + box-shadow: inset -1px 0 mix(#32302f,#ebdbb2,0.18); } notebook > header.top > tabs > arrow.up, notebook > header.bottom > tabs > arrow.up { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } notebook > header.top > tabs > arrow.up:last-child, notebook > header.bottom > tabs > arrow.up:last-child { @@ -4186,41 +4100,138 @@ notebook { notebook > header.left > tabs > arrow.down:first-child, notebook > header.right > tabs > arrow.down:first-child { margin-bottom: 2px; } notebook > header > tabs > arrow { - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } notebook > header > tabs > arrow:hover { - color: mix(#ebdbb2,mix(#ebdbb2,#282828,0.5),0.5); } + color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.5),0.5); } notebook > header > tabs > arrow:active { color: #ebdbb2; } notebook > header > tabs > arrow:disabled { - color: alpha(mix(#ebdbb2,#282828,0.5),0.3); } - notebook > header.top > tabs > tab:hover:not(:checked) { - box-shadow: inset 0 -1px mix(#282828,#ebdbb2,0.08); } - notebook > header.bottom > tabs > tab:hover:not(:checked) { - box-shadow: inset 0 1px mix(#282828,#ebdbb2,0.08); } - notebook > header.left > tabs > tab:hover:not(:checked) { - box-shadow: inset -1px 0 mix(#282828,#ebdbb2,0.08); } - notebook > header.right > tabs > tab:hover:not(:checked) { - box-shadow: inset 1px 0 mix(#282828,#ebdbb2,0.08); } + color: alpha(mix(#ebdbb2,#32302f,0.5),0.3); } notebook > header > tabs > tab { + background-color: alpha(mix(#32302f,#ebdbb2,0.1),0.7); + background-image: none; + border-color: mix(mix(#32302f,#ebdbb2,0.18),mix(#ebdbb2,#32302f,0.5),0.15); color: rgba(235, 219, 178, 0.8); - background-color: alpha(mix(#282828,#ebdbb2,0.1),0.7); } + padding: 0px 8px; + min-width: 20px; + min-height: 20px; + outline-offset: -4px; + border-width: 1px; + border-style: solid; } notebook > header > tabs > tab:hover:not(:checked) { - color: mix(#ebdbb2,mix(#ebdbb2,#282828,0.5),0.5); - background-color: rgba(48, 48, 47, 0.5); - border-color: mix(#282828,#ebdbb2,0.08); } - notebook > header > tabs > tab:checked { - border-color: mix(#282828,#ebdbb2,0.08); - color: #ebdbb2; - background-color: #282828; } + background-color: mix(#32302f,#ebdbb2,0.12); + background-image: none; + border-color: mix(mix(#32302f,#ebdbb2,0.18),#83a598,0.3); + color: mix(#ebdbb2,mix(#ebdbb2,#32302f,0.5),0.5); } + notebook > header > tabs > tab:checked, notebook > header > tabs > tab:checked:hover { + background: #32302f; + border-color: mix(#32302f,#ebdbb2,0.18); + color: #ebdbb2; } notebook > header > tabs > tab button.flat { min-height: 22px; - min-width: 16px; + min-width: 22px; padding: 0; - color: mix(#282828,#ebdbb2,0.35); } + color: mix(#32302f,#ebdbb2,0.35); } notebook > header > tabs > tab button.flat:hover { - color: #ff4d4d; } + color: #ff749f; } notebook > header > tabs > tab button.flat:active, notebook > header > tabs > tab button.flat:active:hover { color: #83a598; } + notebook > header.top > tabs > tab:hover:not(:checked) { + box-shadow: inset 0 -1px mix(#32302f,#ebdbb2,0.18); } + notebook > header.bottom > tabs > tab:hover:not(:checked) { + box-shadow: inset 0 1px mix(#32302f,#ebdbb2,0.18); } + notebook > header.left > tabs > tab:hover:not(:checked) { + box-shadow: inset -1px 0 mix(#32302f,#ebdbb2,0.18); } + notebook > header.right > tabs > tab:hover:not(:checked) { + box-shadow: inset 1px 0 mix(#32302f,#ebdbb2,0.18); } + notebook > header.top { + padding-bottom: 0; } + notebook > header.top > tabs > tab { + border-bottom: none; + padding-left: 8px; + padding-right: 8px; + -gtk-outline-radius: 0; + margin-top: 4px; } + notebook > header.top > tabs > tab + tab { + margin-left: -1px; } + notebook > header.top > tabs > tab:first-child { + border-radius: 4px 0 0; + -gtk-outline-radius: 4px 0 0; } + notebook > header.top > tabs > tab:last-child { + border-radius: 0 4px 0 0; + -gtk-outline-radius: 0 4px 0 0; } + notebook > header.top > tabs > tab:checked { + border-top-width: 3px; + border-top-color: #83a598; + margin-top: 0; + -gtk-outline-radius: 4px; + border-radius: 4px 4px 0 0; } + notebook > header.bottom { + padding-top: 0; } + notebook > header.bottom > tabs > tab { + border-top: none; + padding-left: 8px; + padding-right: 8px; + -gtk-outline-radius: 0; + margin-bottom: 4px; } + notebook > header.bottom > tabs > tab + tab { + margin-left: -1px; } + notebook > header.bottom > tabs > tab:first-child { + border-radius: 0 0 0 4px; + -gtk-outline-radius: 0 0 0 4px; } + notebook > header.bottom > tabs > tab:last-child { + border-radius: 0 0 4px; + -gtk-outline-radius: 0 0 4px; } + notebook > header.bottom > tabs > tab:checked { + border-bottom-width: 3px; + border-bottom-color: #83a598; + margin-bottom: 0; + -gtk-outline-radius: 4px; + border-radius: 0 0 4px 4px; } + notebook > header.right { + padding-left: 0; } + notebook > header.right > tabs > tab { + border-left: none; + padding-left: 8px; + padding-right: 8px; + -gtk-outline-radius: 0; + margin-right: 4px; } + notebook > header.right > tabs > tab + tab { + margin-top: -1px; } + notebook > header.right > tabs > tab:first-child { + border-radius: 0 4px 0 0; + -gtk-outline-radius: 0 4px 0 0; } + notebook > header.right > tabs > tab:last-child { + border-radius: 0 0 4px; + -gtk-outline-radius: 0 0 4px; } + notebook > header.right > tabs > tab:checked { + border-right-width: 3px; + border-right-color: #83a598; + margin-right: 0; + -gtk-outline-radius: 4px; + border-radius: 0 4px 4px 0; } + notebook > header.left { + padding-right: 0; } + notebook > header.left > tabs > tab { + border-right: none; + padding-left: 8px; + padding-right: 8px; + -gtk-outline-radius: 0; + margin-left: 4px; } + notebook > header.left > tabs > tab + tab { + margin-top: -1px; } + notebook > header.left > tabs > tab:first-child { + border-radius: 4px 0 0; + -gtk-outline-radius: 4px 0 0; } + notebook > header.left > tabs > tab:last-child { + border-radius: 0 0 0 4px; + -gtk-outline-radius: 0 0 0 4px; } + notebook > header.left > tabs > tab:checked { + border-left-width: 3px; + border-left-color: #83a598; + margin-left: 0; + -gtk-outline-radius: 4px; + border-radius: 4px 0 0 4px; } /********* ! Buttons @@ -4235,7 +4246,7 @@ overlay.osd { background-color: transparent; } colorchooser .popover.osd { - border-radius: 0px; } + border-radius: 4px; } button.color .osd colorswatch:only-child { box-shadow: none; } @@ -4245,15 +4256,15 @@ button.color .osd colorswatch:only-child { button.osd, #XfceNotifyWindow button { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } button.osd:focus, button.osd:hover, #XfceNotifyWindow button:focus, #XfceNotifyWindow button:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } button.osd:active, button.osd:active:hover, button.osd:active:focus, button.osd:active:hover:focus, button.osd:checked, button.osd:checked:hover, button.osd:checked:focus, button.osd:checked:hover:focus, #XfceNotifyWindow button:active, #XfceNotifyWindow button:active:hover, @@ -4263,35 +4274,35 @@ button.osd, #XfceNotifyWindow button:checked:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } button.osd:disabled, #XfceNotifyWindow button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } button.osd:active:disabled, button.osd:checked:disabled, #XfceNotifyWindow button:active:disabled, #XfceNotifyWindow button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } button.osd.flat, #XfceNotifyWindow button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } button.osd:hover, button.osd.flat:hover, #XfceNotifyWindow button:hover, #XfceNotifyWindow button.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } button.osd:hover:focus, button.osd:hover:hover, button.osd.flat:hover:focus, button.osd.flat:hover:hover, #XfceNotifyWindow button:hover:focus, #XfceNotifyWindow button:hover:hover, #XfceNotifyWindow button.flat:hover:focus, #XfceNotifyWindow button.flat:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } button.osd:hover:active, button.osd:hover:active:hover, button.osd:hover:active:focus, button.osd:hover:active:hover:focus, button.osd:hover:checked, button.osd:hover:checked:hover, button.osd:hover:checked:focus, button.osd:hover:checked:hover:focus, button.osd.flat:hover:active, button.osd.flat:hover:active:hover, button.osd.flat:hover:active:focus, button.osd.flat:hover:active:hover:focus, button.osd.flat:hover:checked, button.osd.flat:hover:checked:hover, button.osd.flat:hover:checked:focus, button.osd.flat:hover:checked:hover:focus, #XfceNotifyWindow button:hover:active, #XfceNotifyWindow button:hover:active:hover, @@ -4309,31 +4320,31 @@ button.osd, #XfceNotifyWindow button.flat:hover:checked:hover, #XfceNotifyWindow button.flat:hover:checked:focus, #XfceNotifyWindow button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } button.osd:hover:disabled, button.osd.flat:hover:disabled, #XfceNotifyWindow button:hover:disabled, #XfceNotifyWindow button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } button.osd:hover:active:disabled, button.osd:hover:checked:disabled, button.osd.flat:hover:active:disabled, button.osd.flat:hover:checked:disabled, #XfceNotifyWindow button:hover:active:disabled, #XfceNotifyWindow button:hover:checked:disabled, #XfceNotifyWindow button.flat:hover:active:disabled, #XfceNotifyWindow button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } button.osd:focus, button.osd.flat:focus, #XfceNotifyWindow button:focus, #XfceNotifyWindow button.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } button.osd:focus:focus, button.osd:focus:hover, button.osd.flat:focus:focus, button.osd.flat:focus:hover, #XfceNotifyWindow button:focus:focus, #XfceNotifyWindow button:focus:hover, #XfceNotifyWindow button.flat:focus:focus, #XfceNotifyWindow button.flat:focus:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } button.osd:focus:active, button.osd:focus:active:hover, button.osd:focus:active:focus, button.osd:focus:active:hover:focus, button.osd:focus:checked, button.osd:focus:checked:hover, button.osd:focus:checked:focus, button.osd:focus:checked:hover:focus, button.osd.flat:focus:active, button.osd.flat:focus:active:hover, button.osd.flat:focus:active:focus, button.osd.flat:focus:active:hover:focus, button.osd.flat:focus:checked, button.osd.flat:focus:checked:hover, button.osd.flat:focus:checked:focus, button.osd.flat:focus:checked:hover:focus, #XfceNotifyWindow button:focus:active, #XfceNotifyWindow button:focus:active:hover, @@ -4351,30 +4362,30 @@ button.osd, #XfceNotifyWindow button.flat:focus:checked:hover, #XfceNotifyWindow button.flat:focus:checked:focus, #XfceNotifyWindow button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } button.osd:focus:disabled, button.osd.flat:focus:disabled, #XfceNotifyWindow button:focus:disabled, #XfceNotifyWindow button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } button.osd:focus:active:disabled, button.osd:focus:checked:disabled, button.osd.flat:focus:active:disabled, button.osd.flat:focus:checked:disabled, #XfceNotifyWindow button:focus:active:disabled, #XfceNotifyWindow button:focus:checked:disabled, #XfceNotifyWindow button.flat:focus:active:disabled, #XfceNotifyWindow button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } button.osd:focus:hover, button.osd.flat:focus:hover, #XfceNotifyWindow button:focus:hover, #XfceNotifyWindow button.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); + border-color: rgba(190, 164, 109, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } button.osd:focus:hover:focus, button.osd:focus:hover:hover, button.osd.flat:focus:hover:focus, button.osd.flat:focus:hover:hover, #XfceNotifyWindow button:focus:hover:focus, #XfceNotifyWindow button:focus:hover:hover, #XfceNotifyWindow button.flat:focus:hover:focus, #XfceNotifyWindow button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } button.osd:focus:hover:active, button.osd:focus:hover:active:hover, button.osd:focus:hover:active:focus, button.osd:focus:hover:active:hover:focus, button.osd:focus:hover:checked, button.osd:focus:hover:checked:hover, button.osd:focus:hover:checked:focus, button.osd:focus:hover:checked:hover:focus, button.osd.flat:focus:hover:active, button.osd.flat:focus:hover:active:hover, button.osd.flat:focus:hover:active:focus, button.osd.flat:focus:hover:active:hover:focus, button.osd.flat:focus:hover:checked, button.osd.flat:focus:hover:checked:hover, button.osd.flat:focus:hover:checked:focus, button.osd.flat:focus:hover:checked:hover:focus, #XfceNotifyWindow button:focus:hover:active, #XfceNotifyWindow button:focus:hover:active:hover, @@ -4392,17 +4403,17 @@ button.osd, #XfceNotifyWindow button.flat:focus:hover:checked:hover, #XfceNotifyWindow button.flat:focus:hover:checked:focus, #XfceNotifyWindow button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } button.osd:focus:hover:disabled, button.osd.flat:focus:hover:disabled, #XfceNotifyWindow button:focus:hover:disabled, #XfceNotifyWindow button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } button.osd:focus:hover:active:disabled, button.osd:focus:hover:checked:disabled, button.osd.flat:focus:hover:active:disabled, button.osd.flat:focus:hover:checked:disabled, #XfceNotifyWindow button:focus:hover:active:disabled, #XfceNotifyWindow button:focus:hover:checked:disabled, #XfceNotifyWindow button.flat:focus:hover:active:disabled, #XfceNotifyWindow button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } button.osd:checked, button.osd:active, button.osd.flat:checked, button.osd.flat:active, #XfceNotifyWindow button:checked, #XfceNotifyWindow button:active, @@ -4411,9 +4422,9 @@ button.osd, /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } button.osd:checked:focus, button.osd:checked:hover, button.osd:active:focus, button.osd:active:hover, button.osd.flat:checked:focus, button.osd.flat:checked:hover, button.osd.flat:active:focus, button.osd.flat:active:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover, @@ -4423,7 +4434,7 @@ button.osd, #XfceNotifyWindow button.flat:checked:hover, #XfceNotifyWindow button.flat:active:focus, #XfceNotifyWindow button.flat:active:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } button.osd:checked:active, button.osd:checked:active:hover, button.osd:checked:active:focus, button.osd:checked:active:hover:focus, button.osd:checked:checked, button.osd:checked:checked:hover, button.osd:checked:checked:focus, button.osd:checked:checked:hover:focus, button.osd:active:active, button.osd:active:active:hover, button.osd:active:active:focus, button.osd:active:active:hover:focus, button.osd:active:checked, button.osd:active:checked:hover, button.osd:active:checked:focus, button.osd:active:checked:hover:focus, button.osd.flat:checked:active, button.osd.flat:checked:active:hover, button.osd.flat:checked:active:focus, button.osd.flat:checked:active:hover:focus, button.osd.flat:checked:checked, button.osd.flat:checked:checked:hover, button.osd.flat:checked:checked:focus, button.osd.flat:checked:checked:hover:focus, button.osd.flat:active:active, button.osd.flat:active:active:hover, button.osd.flat:active:active:focus, button.osd.flat:active:active:hover:focus, button.osd.flat:active:checked, button.osd.flat:active:checked:hover, button.osd.flat:active:checked:focus, button.osd.flat:active:checked:hover:focus, #XfceNotifyWindow button:checked:active, #XfceNotifyWindow button:checked:active:hover, @@ -4457,13 +4468,13 @@ button.osd, #XfceNotifyWindow button.flat:active:checked:hover, #XfceNotifyWindow button.flat:active:checked:focus, #XfceNotifyWindow button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } button.osd:checked:disabled, button.osd:active:disabled, button.osd.flat:checked:disabled, button.osd.flat:active:disabled, #XfceNotifyWindow button:checked:disabled, #XfceNotifyWindow button:active:disabled, #XfceNotifyWindow button.flat:checked:disabled, #XfceNotifyWindow button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } button.osd:checked:active:disabled, button.osd:checked:checked:disabled, button.osd:active:active:disabled, button.osd:active:checked:disabled, button.osd.flat:checked:active:disabled, button.osd.flat:checked:checked:disabled, button.osd.flat:active:active:disabled, button.osd.flat:active:checked:disabled, #XfceNotifyWindow button:checked:active:disabled, #XfceNotifyWindow button:checked:checked:disabled, @@ -4473,7 +4484,7 @@ button.osd, #XfceNotifyWindow button.flat:checked:checked:disabled, #XfceNotifyWindow button.flat:active:active:disabled, #XfceNotifyWindow button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } button.osd:checked:focus, button.osd:checked:hover, button.osd:active:focus, button.osd:active:hover, button.osd.flat:checked:focus, button.osd.flat:checked:hover, button.osd.flat:active:focus, button.osd.flat:active:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover, @@ -4492,15 +4503,15 @@ button.osd, #XfceNotifyWindow button:hover, #XfceNotifyWindow button.flat:focus, #XfceNotifyWindow button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } button.osd:disabled:disabled, button.osd.flat:disabled:disabled, #XfceNotifyWindow button:disabled:disabled, #XfceNotifyWindow button.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } button.osd:active:disabled, button.osd:checked:disabled, button.osd.flat:active:disabled, button.osd.flat:checked:disabled, #XfceNotifyWindow button:active:disabled, @@ -4515,11 +4526,11 @@ button.osd, #XfceNotifyWindow button.separator, #XfceNotifyWindow button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } button.osd.separator:disabled, button.osd .separator:disabled, #XfceNotifyWindow button.separator:disabled, #XfceNotifyWindow button .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } button.osd.image-button, #XfceNotifyWindow button.image-button { padding: 0; @@ -4528,14 +4539,14 @@ button.osd, toolbar.osd { -GtkToolbar-button-relief: normal; - padding: 3px; - border: 1px solid rgba(38, 38, 38, 0.8); - border-radius: 0px; - background-color: rgba(48, 48, 47, 0.8); + padding: 0px; + border: 1px solid rgba(32, 32, 32, 0.8); + border-radius: 4px; + background-color: rgba(40, 40, 40, 0.8); background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } toolbar.osd separator { - color: rgba(43, 43, 42, 0.8); } + color: rgba(36, 36, 36, 0.8); } toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom { border-radius: 0; } @@ -4556,29 +4567,29 @@ progressbar.osd { .osd, #XfceNotifyWindow { - background-color: rgba(48, 48, 47, 0.8); - color: #ebdbb2; + background-color: rgba(40, 40, 40, 0.8); + color: #d5c4a1; /* used by gnome-settings-daemon's media-keys OSD */ /* used by Documents */ } .osd.background, #XfceNotifyWindow.background { - background-color: rgba(48, 48, 47, 0.6); - color: #ebdbb2; } + background-color: rgba(40, 40, 40, 0.6); + color: #d5c4a1; } .osd .frame, #XfceNotifyWindow .frame { background-clip: border-box; background-origin: border-box; } .osd button, #XfceNotifyWindow button { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } .osd button:focus, .osd button:hover, #XfceNotifyWindow button:focus, #XfceNotifyWindow button:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } .osd button:active, .osd button:active:hover, .osd button:active:focus, .osd button:active:hover:focus, .osd button:checked, .osd button:checked:hover, .osd button:checked:focus, .osd button:checked:hover:focus, #XfceNotifyWindow button:active, #XfceNotifyWindow button:active:hover, @@ -4588,35 +4599,35 @@ progressbar.osd { #XfceNotifyWindow button:checked:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd button:disabled, #XfceNotifyWindow button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd button:active:disabled, .osd button:checked:disabled, #XfceNotifyWindow button:active:disabled, #XfceNotifyWindow button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd button.flat, #XfceNotifyWindow button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } .osd button:hover, .osd button.flat:hover, #XfceNotifyWindow button:hover, #XfceNotifyWindow button.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } .osd button:hover:focus, .osd button:hover:hover, .osd button.flat:hover:focus, .osd button.flat:hover:hover, #XfceNotifyWindow button:hover:focus, #XfceNotifyWindow button:hover:hover, #XfceNotifyWindow button.flat:hover:focus, #XfceNotifyWindow button.flat:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } .osd button:hover:active, .osd button:hover:active:hover, .osd button:hover:active:focus, .osd button:hover:active:hover:focus, .osd button:hover:checked, .osd button:hover:checked:hover, .osd button:hover:checked:focus, .osd button:hover:checked:hover:focus, .osd button.flat:hover:active, .osd button.flat:hover:active:hover, .osd button.flat:hover:active:focus, .osd button.flat:hover:active:hover:focus, .osd button.flat:hover:checked, .osd button.flat:hover:checked:hover, .osd button.flat:hover:checked:focus, .osd button.flat:hover:checked:hover:focus, #XfceNotifyWindow button:hover:active, #XfceNotifyWindow button:hover:active:hover, @@ -4634,31 +4645,31 @@ progressbar.osd { #XfceNotifyWindow button.flat:hover:checked:hover, #XfceNotifyWindow button.flat:hover:checked:focus, #XfceNotifyWindow button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd button:hover:disabled, .osd button.flat:hover:disabled, #XfceNotifyWindow button:hover:disabled, #XfceNotifyWindow button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd button:hover:active:disabled, .osd button:hover:checked:disabled, .osd button.flat:hover:active:disabled, .osd button.flat:hover:checked:disabled, #XfceNotifyWindow button:hover:active:disabled, #XfceNotifyWindow button:hover:checked:disabled, #XfceNotifyWindow button.flat:hover:active:disabled, #XfceNotifyWindow button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd button:focus, .osd button.flat:focus, #XfceNotifyWindow button:focus, #XfceNotifyWindow button.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } .osd button:focus:focus, .osd button:focus:hover, .osd button.flat:focus:focus, .osd button.flat:focus:hover, #XfceNotifyWindow button:focus:focus, #XfceNotifyWindow button:focus:hover, #XfceNotifyWindow button.flat:focus:focus, #XfceNotifyWindow button.flat:focus:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } .osd button:focus:active, .osd button:focus:active:hover, .osd button:focus:active:focus, .osd button:focus:active:hover:focus, .osd button:focus:checked, .osd button:focus:checked:hover, .osd button:focus:checked:focus, .osd button:focus:checked:hover:focus, .osd button.flat:focus:active, .osd button.flat:focus:active:hover, .osd button.flat:focus:active:focus, .osd button.flat:focus:active:hover:focus, .osd button.flat:focus:checked, .osd button.flat:focus:checked:hover, .osd button.flat:focus:checked:focus, .osd button.flat:focus:checked:hover:focus, #XfceNotifyWindow button:focus:active, #XfceNotifyWindow button:focus:active:hover, @@ -4676,30 +4687,30 @@ progressbar.osd { #XfceNotifyWindow button.flat:focus:checked:hover, #XfceNotifyWindow button.flat:focus:checked:focus, #XfceNotifyWindow button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd button:focus:disabled, .osd button.flat:focus:disabled, #XfceNotifyWindow button:focus:disabled, #XfceNotifyWindow button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd button:focus:active:disabled, .osd button:focus:checked:disabled, .osd button.flat:focus:active:disabled, .osd button.flat:focus:checked:disabled, #XfceNotifyWindow button:focus:active:disabled, #XfceNotifyWindow button:focus:checked:disabled, #XfceNotifyWindow button.flat:focus:active:disabled, #XfceNotifyWindow button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd button:focus:hover, .osd button.flat:focus:hover, #XfceNotifyWindow button:focus:hover, #XfceNotifyWindow button.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); + border-color: rgba(190, 164, 109, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } .osd button:focus:hover:focus, .osd button:focus:hover:hover, .osd button.flat:focus:hover:focus, .osd button.flat:focus:hover:hover, #XfceNotifyWindow button:focus:hover:focus, #XfceNotifyWindow button:focus:hover:hover, #XfceNotifyWindow button.flat:focus:hover:focus, #XfceNotifyWindow button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } .osd button:focus:hover:active, .osd button:focus:hover:active:hover, .osd button:focus:hover:active:focus, .osd button:focus:hover:active:hover:focus, .osd button:focus:hover:checked, .osd button:focus:hover:checked:hover, .osd button:focus:hover:checked:focus, .osd button:focus:hover:checked:hover:focus, .osd button.flat:focus:hover:active, .osd button.flat:focus:hover:active:hover, .osd button.flat:focus:hover:active:focus, .osd button.flat:focus:hover:active:hover:focus, .osd button.flat:focus:hover:checked, .osd button.flat:focus:hover:checked:hover, .osd button.flat:focus:hover:checked:focus, .osd button.flat:focus:hover:checked:hover:focus, #XfceNotifyWindow button:focus:hover:active, #XfceNotifyWindow button:focus:hover:active:hover, @@ -4717,17 +4728,17 @@ progressbar.osd { #XfceNotifyWindow button.flat:focus:hover:checked:hover, #XfceNotifyWindow button.flat:focus:hover:checked:focus, #XfceNotifyWindow button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd button:focus:hover:disabled, .osd button.flat:focus:hover:disabled, #XfceNotifyWindow button:focus:hover:disabled, #XfceNotifyWindow button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd button:focus:hover:active:disabled, .osd button:focus:hover:checked:disabled, .osd button.flat:focus:hover:active:disabled, .osd button.flat:focus:hover:checked:disabled, #XfceNotifyWindow button:focus:hover:active:disabled, #XfceNotifyWindow button:focus:hover:checked:disabled, #XfceNotifyWindow button.flat:focus:hover:active:disabled, #XfceNotifyWindow button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd button:checked, .osd button:active, .osd button.flat:checked, .osd button.flat:active, #XfceNotifyWindow button:checked, #XfceNotifyWindow button:active, @@ -4736,9 +4747,9 @@ progressbar.osd { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } .osd button:checked:focus, .osd button:checked:hover, .osd button:active:focus, .osd button:active:hover, .osd button.flat:checked:focus, .osd button.flat:checked:hover, .osd button.flat:active:focus, .osd button.flat:active:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover, @@ -4748,7 +4759,7 @@ progressbar.osd { #XfceNotifyWindow button.flat:checked:hover, #XfceNotifyWindow button.flat:active:focus, #XfceNotifyWindow button.flat:active:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } .osd button:checked:active, .osd button:checked:active:hover, .osd button:checked:active:focus, .osd button:checked:active:hover:focus, .osd button:checked:checked, .osd button:checked:checked:hover, .osd button:checked:checked:focus, .osd button:checked:checked:hover:focus, .osd button:active:active, .osd button:active:active:hover, .osd button:active:active:focus, .osd button:active:active:hover:focus, .osd button:active:checked, .osd button:active:checked:hover, .osd button:active:checked:focus, .osd button:active:checked:hover:focus, .osd button.flat:checked:active, .osd button.flat:checked:active:hover, .osd button.flat:checked:active:focus, .osd button.flat:checked:active:hover:focus, .osd button.flat:checked:checked, .osd button.flat:checked:checked:hover, .osd button.flat:checked:checked:focus, .osd button.flat:checked:checked:hover:focus, .osd button.flat:active:active, .osd button.flat:active:active:hover, .osd button.flat:active:active:focus, .osd button.flat:active:active:hover:focus, .osd button.flat:active:checked, .osd button.flat:active:checked:hover, .osd button.flat:active:checked:focus, .osd button.flat:active:checked:hover:focus, #XfceNotifyWindow button:checked:active, #XfceNotifyWindow button:checked:active:hover, @@ -4782,13 +4793,13 @@ progressbar.osd { #XfceNotifyWindow button.flat:active:checked:hover, #XfceNotifyWindow button.flat:active:checked:focus, #XfceNotifyWindow button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd button:checked:disabled, .osd button:active:disabled, .osd button.flat:checked:disabled, .osd button.flat:active:disabled, #XfceNotifyWindow button:checked:disabled, #XfceNotifyWindow button:active:disabled, #XfceNotifyWindow button.flat:checked:disabled, #XfceNotifyWindow button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd button:checked:active:disabled, .osd button:checked:checked:disabled, .osd button:active:active:disabled, .osd button:active:checked:disabled, .osd button.flat:checked:active:disabled, .osd button.flat:checked:checked:disabled, .osd button.flat:active:active:disabled, .osd button.flat:active:checked:disabled, #XfceNotifyWindow button:checked:active:disabled, #XfceNotifyWindow button:checked:checked:disabled, @@ -4798,7 +4809,7 @@ progressbar.osd { #XfceNotifyWindow button.flat:checked:checked:disabled, #XfceNotifyWindow button.flat:active:active:disabled, #XfceNotifyWindow button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd button:checked:focus, .osd button:checked:hover, .osd button:active:focus, .osd button:active:hover, .osd button.flat:checked:focus, .osd button.flat:checked:hover, .osd button.flat:active:focus, .osd button.flat:active:hover, #XfceNotifyWindow button:checked:focus, #XfceNotifyWindow button:checked:hover, @@ -4817,15 +4828,15 @@ progressbar.osd { #XfceNotifyWindow button:hover, #XfceNotifyWindow button.flat:focus, #XfceNotifyWindow button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } .osd button:disabled:disabled, .osd button.flat:disabled:disabled, #XfceNotifyWindow button:disabled:disabled, #XfceNotifyWindow button.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } .osd button:active:disabled, .osd button:checked:disabled, .osd button.flat:active:disabled, .osd button.flat:checked:disabled, #XfceNotifyWindow button:active:disabled, @@ -4840,24 +4851,24 @@ progressbar.osd { #XfceNotifyWindow button.separator, #XfceNotifyWindow button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } .osd button.separator:disabled, .osd button .separator:disabled, #XfceNotifyWindow button.separator:disabled, #XfceNotifyWindow button .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } .osd entry, #XfceNotifyWindow entry { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); - padding: 3px; - color: #ebdbb2; + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); + padding: 0px; + color: #d5c4a1; caret-color: #282828; -gtk-secondary-caret-color: #282828; } .osd entry:focus, .osd entry:hover, #XfceNotifyWindow entry:focus, #XfceNotifyWindow entry:hover { - border-color: mix(#83a598,mix(#30302f,#ebdbb2,0.2),0.3); } + border-color: mix(#83a598,mix(#282828,#d5c4a1,0.2),0.3); } .osd entry:active, .osd entry:active:hover, .osd entry:active:focus, .osd entry:active:hover:focus, .osd entry:checked, .osd entry:checked:hover, .osd entry:checked:focus, .osd entry:checked:hover:focus, #XfceNotifyWindow entry:active, #XfceNotifyWindow entry:active:hover, @@ -4867,31 +4878,31 @@ progressbar.osd { #XfceNotifyWindow entry:checked:hover, #XfceNotifyWindow entry:checked:focus, #XfceNotifyWindow entry:checked:hover:focus { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.7); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.7); } .osd entry:disabled, #XfceNotifyWindow entry:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.85); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.85); } .osd entry:active:disabled, .osd entry:checked:disabled, #XfceNotifyWindow entry:active:disabled, #XfceNotifyWindow entry:checked:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); } .osd entry:focus, .osd entry:active, #XfceNotifyWindow entry:focus, #XfceNotifyWindow entry:active { - border-color: mix(#83a598,rgba(41, 41, 40, 0.8),0.3); } + border-color: mix(#83a598,rgba(34, 34, 34, 0.8),0.3); } .osd entry:disabled, #XfceNotifyWindow entry:disabled { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#282828,#d5c4a1,0.5); } .osd entry:disabled:focus, .osd entry:disabled:hover, #XfceNotifyWindow entry:disabled:focus, #XfceNotifyWindow entry:disabled:hover { - border-color: mix(#83a598,alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.3); } + border-color: mix(#83a598,alpha(mix(#282828,#d5c4a1,0.2),0.4),0.3); } .osd entry:disabled:active, .osd entry:disabled:active:hover, .osd entry:disabled:active:focus, .osd entry:disabled:active:hover:focus, .osd entry:disabled:checked, .osd entry:disabled:checked:hover, .osd entry:disabled:checked:focus, .osd entry:disabled:checked:hover:focus, #XfceNotifyWindow entry:disabled:active, #XfceNotifyWindow entry:disabled:active:hover, @@ -4901,31 +4912,31 @@ progressbar.osd { #XfceNotifyWindow entry:disabled:checked:hover, #XfceNotifyWindow entry:disabled:checked:focus, #XfceNotifyWindow entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.7); } .osd entry:disabled:disabled, #XfceNotifyWindow entry:disabled:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.85); } .osd entry:disabled:active:disabled, .osd entry:disabled:checked:disabled, #XfceNotifyWindow entry:disabled:active:disabled, #XfceNotifyWindow entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); } .osd trough, .osd.trough, #XfceNotifyWindow trough, #XfceNotifyWindow.trough { - background-color: rgba(235, 219, 178, 0.3); } + background-color: rgba(213, 196, 161, 0.3); } .osd progressbar, .osd.progressbar, #XfceNotifyWindow progressbar, #XfceNotifyWindow.progressbar { - background-color: #ebdbb2; } + background-color: #d5c4a1; } .osd scale slider, #XfceNotifyWindow scale slider { - background-color: rgba(52, 52, 51, 0.8); + background-color: rgba(43, 43, 43, 0.8); background-image: none; - border-color: rgba(38, 38, 38, 0.8); } + border-color: rgba(32, 32, 32, 0.8); } .osd scale slider:focus, .osd scale slider:hover, #XfceNotifyWindow scale slider:focus, #XfceNotifyWindow scale slider:hover { - border-color: mix(#83a598,rgba(48, 48, 47, 0.8),0.3); } + border-color: mix(#83a598,rgba(40, 40, 40, 0.8),0.3); } .osd scale slider:active, .osd scale slider:active:hover, .osd scale slider:active:focus, .osd scale slider:active:hover:focus, .osd scale slider:checked, .osd scale slider:checked:hover, .osd scale slider:checked:focus, .osd scale slider:checked:hover:focus, #XfceNotifyWindow scale slider:active, #XfceNotifyWindow scale slider:active:hover, @@ -4935,22 +4946,22 @@ progressbar.osd { #XfceNotifyWindow scale slider:checked:hover, #XfceNotifyWindow scale slider:checked:focus, #XfceNotifyWindow scale slider:checked:hover:focus { - border-color: rgba(34, 34, 33, 0.8); } + border-color: rgba(28, 28, 28, 0.8); } .osd scale slider:disabled, #XfceNotifyWindow scale slider:disabled { - border-color: rgba(41, 41, 40, 0.8); } + border-color: rgba(34, 34, 34, 0.8); } .osd scale slider:active:disabled, .osd scale slider:checked:disabled, #XfceNotifyWindow scale slider:active:disabled, #XfceNotifyWindow scale slider:checked:disabled { - border-color: rgba(38, 38, 38, 0.8); } + border-color: rgba(32, 32, 32, 0.8); } .osd scale slider:disabled, #XfceNotifyWindow scale slider:disabled { - background-color: rgba(43, 43, 42, 0.8); + background-color: rgba(36, 36, 36, 0.8); background-image: none; } .osd scale trough, #XfceNotifyWindow scale trough { - border-color: rgba(38, 38, 38, 0.8); - background-color: rgba(52, 52, 51, 0.8); + border-color: rgba(32, 32, 32, 0.8); + background-color: rgba(43, 43, 43, 0.8); background-image: none; } .osd scale trough.highlight, #XfceNotifyWindow scale trough.highlight { @@ -4960,12 +4971,12 @@ progressbar.osd { .osd scale trough:disabled, .osd scale trough.highlight:disabled, #XfceNotifyWindow scale trough:disabled, #XfceNotifyWindow scale trough.highlight:disabled { - border-color: rgba(41, 41, 40, 0.8); - background-color: rgba(43, 43, 42, 0.8); + border-color: rgba(34, 34, 34, 0.8); + background-color: rgba(36, 36, 36, 0.8); background-image: none; } .osd scale trough, #XfceNotifyWindow scale trough { - background-color: rgba(66, 66, 65, 0.8); } + background-color: rgba(58, 58, 58, 0.8); } .osd scale trough highlight, #XfceNotifyWindow scale trough highlight { background-color: #83a598; } @@ -4988,19 +4999,19 @@ progressbar.osd { #XfceNotifyWindow .view, #XfceNotifyWindow iconview, #XfceNotifyWindow view { - background-color: rgba(48, 48, 47, 0.8); } + background-color: rgba(40, 40, 40, 0.8); } .osd scrollbar trough, #XfceNotifyWindow scrollbar trough { - background-color: rgba(48, 48, 47, 0.8); } + background-color: rgba(40, 40, 40, 0.8); } .osd scrollbar slider, #XfceNotifyWindow scrollbar slider { - border: 1px solid mix(rgba(42, 42, 41, 0.8),#ebdbb2,0.21); + border: 1px solid mix(rgba(35, 35, 35, 0.8),#d5c4a1,0.21); border-radius: 0; - background-color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.21); } + background-color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.21); } .osd scrollbar slider:hover, #XfceNotifyWindow scrollbar slider:hover { - border-color: mix(rgba(42, 42, 41, 0.8),#ebdbb2,0.31); - background-color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.31); } + border-color: mix(rgba(35, 35, 35, 0.8),#d5c4a1,0.31); + background-color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.31); } .osd scrollbar slider:active, #XfceNotifyWindow scrollbar slider:active { border-color: #72998a; @@ -5009,17 +5020,17 @@ progressbar.osd { #XfceNotifyWindow iconview.cell:selected, #XfceNotifyWindow iconview.cell:selected:focus { background-color: transparent; - border: 3px solid mix(rgba(42, 42, 41, 0.8),#ebdbb2,0.21); - border-radius: 0px; + border: 3px solid mix(rgba(35, 35, 35, 0.8),#d5c4a1,0.21); + border-radius: 4px; outline-color: transparent; } .osd .page-thumbnail, #XfceNotifyWindow .page-thumbnail { - border: 1px solid rgba(43, 43, 42, 0.8); + border: 1px solid rgba(36, 36, 36, 0.8); /* when there's no pixbuf yet */ - background-color: rgba(48, 48, 47, 0.8); } + background-color: rgba(40, 40, 40, 0.8); } .osd popover.background, #XfceNotifyWindow popover.background { - box-shadow: 0 2px 7px 3px rgba(0, 0, 0, 0.5); } + box-shadow: 0 2px 7px 3px rgba(131, 104, 34, 0.5); } .osd popover.background > toolbar button, #XfceNotifyWindow popover.background > toolbar button { border-radius: 0; @@ -5028,16 +5039,16 @@ progressbar.osd { background-image: none; } .osd spinbutton:not(.vertical), #XfceNotifyWindow spinbutton:not(.vertical) { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: #262626; + border-color: #202020; padding: 0; - color: #ebdbb2; - caret-color: #ebdbb2; } + color: #d5c4a1; + caret-color: #d5c4a1; } .osd spinbutton:not(.vertical):focus, .osd spinbutton:not(.vertical):hover, #XfceNotifyWindow spinbutton:not(.vertical):focus, #XfceNotifyWindow spinbutton:not(.vertical):hover { - border-color: mix(#83a598,#30302f,0.3); } + border-color: mix(#83a598,#282828,0.3); } .osd spinbutton:not(.vertical):active, .osd spinbutton:not(.vertical):active:hover, .osd spinbutton:not(.vertical):active:focus, .osd spinbutton:not(.vertical):active:hover:focus, .osd spinbutton:not(.vertical):checked, .osd spinbutton:not(.vertical):checked:hover, .osd spinbutton:not(.vertical):checked:focus, .osd spinbutton:not(.vertical):checked:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical):active, #XfceNotifyWindow spinbutton:not(.vertical):active:hover, @@ -5047,39 +5058,39 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical):checked:hover, #XfceNotifyWindow spinbutton:not(.vertical):checked:focus, #XfceNotifyWindow spinbutton:not(.vertical):checked:hover:focus { - border-color: #222221; } + border-color: #1c1c1c; } .osd spinbutton:not(.vertical):disabled, #XfceNotifyWindow spinbutton:not(.vertical):disabled { - border-color: #292928; } + border-color: #222222; } .osd spinbutton:not(.vertical):active:disabled, .osd spinbutton:not(.vertical):checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical):active:disabled, #XfceNotifyWindow spinbutton:not(.vertical):checked:disabled { - border-color: #262626; } + border-color: #202020; } .osd spinbutton:not(.vertical):focus, .osd spinbutton:not(.vertical):active, #XfceNotifyWindow spinbutton:not(.vertical):focus, #XfceNotifyWindow spinbutton:not(.vertical):active { - border-color: mix(#83a598,rgba(41, 41, 40, 0.8),0.3); } + border-color: mix(#83a598,rgba(34, 34, 34, 0.8),0.3); } .osd spinbutton:not(.vertical):disabled, #XfceNotifyWindow spinbutton:not(.vertical):disabled { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#282828,#d5c4a1,0.5); } .osd spinbutton:not(.vertical) button, #XfceNotifyWindow spinbutton:not(.vertical) button { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); border-radius: 0; - border-color: rgba(41, 41, 40, 0.5); + border-color: rgba(34, 34, 34, 0.5); border-style: none none none solid; background-image: none; box-shadow: none; } .osd spinbutton:not(.vertical) button:focus, .osd spinbutton:not(.vertical) button:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } .osd spinbutton:not(.vertical) button:active, .osd spinbutton:not(.vertical) button:active:hover, .osd spinbutton:not(.vertical) button:active:focus, .osd spinbutton:not(.vertical) button:active:hover:focus, .osd spinbutton:not(.vertical) button:checked, .osd spinbutton:not(.vertical) button:checked:hover, .osd spinbutton:not(.vertical) button:checked:focus, .osd spinbutton:not(.vertical) button:checked:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:active, #XfceNotifyWindow spinbutton:not(.vertical) button:active:hover, @@ -5089,35 +5100,35 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd spinbutton:not(.vertical) button:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd spinbutton:not(.vertical) button:active:disabled, .osd spinbutton:not(.vertical) button:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd spinbutton:not(.vertical) button.flat, #XfceNotifyWindow spinbutton:not(.vertical) button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } .osd spinbutton:not(.vertical) button:hover, .osd spinbutton:not(.vertical) button.flat:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } .osd spinbutton:not(.vertical) button:hover:focus, .osd spinbutton:not(.vertical) button:hover:hover, .osd spinbutton:not(.vertical) button.flat:hover:focus, .osd spinbutton:not(.vertical) button.flat:hover:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } .osd spinbutton:not(.vertical) button:hover:active, .osd spinbutton:not(.vertical) button:hover:active:hover, .osd spinbutton:not(.vertical) button:hover:active:focus, .osd spinbutton:not(.vertical) button:hover:active:hover:focus, .osd spinbutton:not(.vertical) button:hover:checked, .osd spinbutton:not(.vertical) button:hover:checked:hover, .osd spinbutton:not(.vertical) button:hover:checked:focus, .osd spinbutton:not(.vertical) button:hover:checked:hover:focus, .osd spinbutton:not(.vertical) button.flat:hover:active, .osd spinbutton:not(.vertical) button.flat:hover:active:hover, .osd spinbutton:not(.vertical) button.flat:hover:active:focus, .osd spinbutton:not(.vertical) button.flat:hover:active:hover:focus, .osd spinbutton:not(.vertical) button.flat:hover:checked, .osd spinbutton:not(.vertical) button.flat:hover:checked:hover, .osd spinbutton:not(.vertical) button.flat:hover:checked:focus, .osd spinbutton:not(.vertical) button.flat:hover:checked:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:active, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:active:hover, @@ -5135,31 +5146,31 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton:not(.vertical) button:hover:disabled, .osd spinbutton:not(.vertical) button.flat:hover:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton:not(.vertical) button:hover:active:disabled, .osd spinbutton:not(.vertical) button:hover:checked:disabled, .osd spinbutton:not(.vertical) button.flat:hover:active:disabled, .osd spinbutton:not(.vertical) button.flat:hover:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:hover:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton:not(.vertical) button:focus, .osd spinbutton:not(.vertical) button.flat:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } .osd spinbutton:not(.vertical) button:focus:focus, .osd spinbutton:not(.vertical) button:focus:hover, .osd spinbutton:not(.vertical) button.flat:focus:focus, .osd spinbutton:not(.vertical) button.flat:focus:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } .osd spinbutton:not(.vertical) button:focus:active, .osd spinbutton:not(.vertical) button:focus:active:hover, .osd spinbutton:not(.vertical) button:focus:active:focus, .osd spinbutton:not(.vertical) button:focus:active:hover:focus, .osd spinbutton:not(.vertical) button:focus:checked, .osd spinbutton:not(.vertical) button:focus:checked:hover, .osd spinbutton:not(.vertical) button:focus:checked:focus, .osd spinbutton:not(.vertical) button:focus:checked:hover:focus, .osd spinbutton:not(.vertical) button.flat:focus:active, .osd spinbutton:not(.vertical) button.flat:focus:active:hover, .osd spinbutton:not(.vertical) button.flat:focus:active:focus, .osd spinbutton:not(.vertical) button.flat:focus:active:hover:focus, .osd spinbutton:not(.vertical) button.flat:focus:checked, .osd spinbutton:not(.vertical) button.flat:focus:checked:hover, .osd spinbutton:not(.vertical) button.flat:focus:checked:focus, .osd spinbutton:not(.vertical) button.flat:focus:checked:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:active, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:active:hover, @@ -5177,30 +5188,30 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton:not(.vertical) button:focus:disabled, .osd spinbutton:not(.vertical) button.flat:focus:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton:not(.vertical) button:focus:active:disabled, .osd spinbutton:not(.vertical) button:focus:checked:disabled, .osd spinbutton:not(.vertical) button.flat:focus:active:disabled, .osd spinbutton:not(.vertical) button.flat:focus:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton:not(.vertical) button:focus:hover, .osd spinbutton:not(.vertical) button.flat:focus:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); + border-color: rgba(190, 164, 109, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } .osd spinbutton:not(.vertical) button:focus:hover:focus, .osd spinbutton:not(.vertical) button:focus:hover:hover, .osd spinbutton:not(.vertical) button.flat:focus:hover:focus, .osd spinbutton:not(.vertical) button.flat:focus:hover:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } .osd spinbutton:not(.vertical) button:focus:hover:active, .osd spinbutton:not(.vertical) button:focus:hover:active:hover, .osd spinbutton:not(.vertical) button:focus:hover:active:focus, .osd spinbutton:not(.vertical) button:focus:hover:active:hover:focus, .osd spinbutton:not(.vertical) button:focus:hover:checked, .osd spinbutton:not(.vertical) button:focus:hover:checked:hover, .osd spinbutton:not(.vertical) button:focus:hover:checked:focus, .osd spinbutton:not(.vertical) button:focus:hover:checked:hover:focus, .osd spinbutton:not(.vertical) button.flat:focus:hover:active, .osd spinbutton:not(.vertical) button.flat:focus:hover:active:hover, .osd spinbutton:not(.vertical) button.flat:focus:hover:active:focus, .osd spinbutton:not(.vertical) button.flat:focus:hover:active:hover:focus, .osd spinbutton:not(.vertical) button.flat:focus:hover:checked, .osd spinbutton:not(.vertical) button.flat:focus:hover:checked:hover, .osd spinbutton:not(.vertical) button.flat:focus:hover:checked:focus, .osd spinbutton:not(.vertical) button.flat:focus:hover:checked:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:active, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:active:hover, @@ -5218,17 +5229,17 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton:not(.vertical) button:focus:hover:disabled, .osd spinbutton:not(.vertical) button.flat:focus:hover:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton:not(.vertical) button:focus:hover:active:disabled, .osd spinbutton:not(.vertical) button:focus:hover:checked:disabled, .osd spinbutton:not(.vertical) button.flat:focus:hover:active:disabled, .osd spinbutton:not(.vertical) button.flat:focus:hover:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:focus:hover:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton:not(.vertical) button:checked, .osd spinbutton:not(.vertical) button:active, .osd spinbutton:not(.vertical) button.flat:checked, .osd spinbutton:not(.vertical) button.flat:active, #XfceNotifyWindow spinbutton:not(.vertical) button:checked, #XfceNotifyWindow spinbutton:not(.vertical) button:active, @@ -5237,9 +5248,9 @@ progressbar.osd { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } .osd spinbutton:not(.vertical) button:checked:focus, .osd spinbutton:not(.vertical) button:checked:hover, .osd spinbutton:not(.vertical) button:active:focus, .osd spinbutton:not(.vertical) button:active:hover, .osd spinbutton:not(.vertical) button.flat:checked:focus, .osd spinbutton:not(.vertical) button.flat:checked:hover, .osd spinbutton:not(.vertical) button.flat:active:focus, .osd spinbutton:not(.vertical) button.flat:active:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:hover, @@ -5249,7 +5260,7 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } .osd spinbutton:not(.vertical) button:checked:active, .osd spinbutton:not(.vertical) button:checked:active:hover, .osd spinbutton:not(.vertical) button:checked:active:focus, .osd spinbutton:not(.vertical) button:checked:active:hover:focus, .osd spinbutton:not(.vertical) button:checked:checked, .osd spinbutton:not(.vertical) button:checked:checked:hover, .osd spinbutton:not(.vertical) button:checked:checked:focus, .osd spinbutton:not(.vertical) button:checked:checked:hover:focus, .osd spinbutton:not(.vertical) button:active:active, .osd spinbutton:not(.vertical) button:active:active:hover, .osd spinbutton:not(.vertical) button:active:active:focus, .osd spinbutton:not(.vertical) button:active:active:hover:focus, .osd spinbutton:not(.vertical) button:active:checked, .osd spinbutton:not(.vertical) button:active:checked:hover, .osd spinbutton:not(.vertical) button:active:checked:focus, .osd spinbutton:not(.vertical) button:active:checked:hover:focus, .osd spinbutton:not(.vertical) button.flat:checked:active, .osd spinbutton:not(.vertical) button.flat:checked:active:hover, .osd spinbutton:not(.vertical) button.flat:checked:active:focus, .osd spinbutton:not(.vertical) button.flat:checked:active:hover:focus, .osd spinbutton:not(.vertical) button.flat:checked:checked, .osd spinbutton:not(.vertical) button.flat:checked:checked:hover, .osd spinbutton:not(.vertical) button.flat:checked:checked:focus, .osd spinbutton:not(.vertical) button.flat:checked:checked:hover:focus, .osd spinbutton:not(.vertical) button.flat:active:active, .osd spinbutton:not(.vertical) button.flat:active:active:hover, .osd spinbutton:not(.vertical) button.flat:active:active:focus, .osd spinbutton:not(.vertical) button.flat:active:active:hover:focus, .osd spinbutton:not(.vertical) button.flat:active:checked, .osd spinbutton:not(.vertical) button.flat:active:checked:hover, .osd spinbutton:not(.vertical) button.flat:active:checked:focus, .osd spinbutton:not(.vertical) button.flat:active:checked:hover:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:active, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:active:hover, @@ -5283,13 +5294,13 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:checked:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd spinbutton:not(.vertical) button:checked:disabled, .osd spinbutton:not(.vertical) button:active:disabled, .osd spinbutton:not(.vertical) button.flat:checked:disabled, .osd spinbutton:not(.vertical) button.flat:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd spinbutton:not(.vertical) button:checked:active:disabled, .osd spinbutton:not(.vertical) button:checked:checked:disabled, .osd spinbutton:not(.vertical) button:active:active:disabled, .osd spinbutton:not(.vertical) button:active:checked:disabled, .osd spinbutton:not(.vertical) button.flat:checked:active:disabled, .osd spinbutton:not(.vertical) button.flat:checked:checked:disabled, .osd spinbutton:not(.vertical) button.flat:active:active:disabled, .osd spinbutton:not(.vertical) button.flat:active:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:checked:disabled, @@ -5299,7 +5310,7 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.flat:checked:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:active:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd spinbutton:not(.vertical) button:checked:focus, .osd spinbutton:not(.vertical) button:checked:hover, .osd spinbutton:not(.vertical) button:active:focus, .osd spinbutton:not(.vertical) button:active:hover, .osd spinbutton:not(.vertical) button.flat:checked:focus, .osd spinbutton:not(.vertical) button.flat:checked:hover, .osd spinbutton:not(.vertical) button.flat:active:focus, .osd spinbutton:not(.vertical) button.flat:active:hover, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:focus, #XfceNotifyWindow spinbutton:not(.vertical) button:checked:hover, @@ -5318,15 +5329,15 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button:hover, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:focus, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } .osd spinbutton:not(.vertical) button:disabled:disabled, .osd spinbutton:not(.vertical) button.flat:disabled:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:disabled:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } .osd spinbutton:not(.vertical) button:active:disabled, .osd spinbutton:not(.vertical) button:checked:disabled, .osd spinbutton:not(.vertical) button.flat:active:disabled, .osd spinbutton:not(.vertical) button.flat:checked:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:active:disabled, @@ -5341,11 +5352,11 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button.separator, #XfceNotifyWindow spinbutton:not(.vertical) button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } .osd spinbutton:not(.vertical) button.separator:disabled, .osd spinbutton:not(.vertical) button .separator:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button.separator:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } .osd spinbutton:not(.vertical) button:dir(rtl), #XfceNotifyWindow spinbutton:not(.vertical) button:dir(rtl) { border-style: none solid none none; } @@ -5353,40 +5364,40 @@ progressbar.osd { #XfceNotifyWindow spinbutton:not(.vertical) button:active, #XfceNotifyWindow spinbutton:not(.vertical) button:checked, #XfceNotifyWindow spinbutton:not(.vertical) button:hover { - color: #ebdbb2; } + color: #d5c4a1; } .osd spinbutton:not(.vertical) button:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:disabled { - color: alpha(mix(#ebdbb2,#30302f,0.6),0.8); } + color: alpha(mix(#d5c4a1,#282828,0.6),0.8); } .osd spinbutton:not(.vertical) button:backdrop, #XfceNotifyWindow spinbutton:not(.vertical) button:backdrop { - color: mix(#30302f,mix(#ebdbb2,#282828,0.5),0.9); } + color: mix(#32302f,mix(#ebdbb2,#32302f,0.5),0.9); } .osd spinbutton:not(.vertical) button:active, #XfceNotifyWindow spinbutton:not(.vertical) button:active { - box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } + box-shadow: inset 0 2px 3px -1px rgba(131, 104, 34, 0.2); } .osd spinbutton:not(.vertical) button:backdrop:disabled, #XfceNotifyWindow spinbutton:not(.vertical) button:backdrop:disabled { - color: rgba(2, 2, 2, 0.8); + color: rgba(11, 10, 10, 0.8); border-style: none none none solid; } .osd spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl), #XfceNotifyWindow spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } .osd spinbutton:not(.vertical) button:dir(rtl):first-child, #XfceNotifyWindow spinbutton:not(.vertical) button:dir(rtl):first-child { - border-radius: 0px 0 0 0px; } + border-radius: 4px 0 0 4px; } .osd spinbutton:not(.vertical) button:dir(ltr):last-child, #XfceNotifyWindow spinbutton:not(.vertical) button:dir(ltr):last-child { - border-radius: 0 0px 0px 0; } + border-radius: 0 4px 4px 0; } .osd spinbutton.vertical button:first-child, #XfceNotifyWindow spinbutton.vertical button:first-child { - background-color: rgba(48, 48, 47, 0.8); + background-color: rgba(40, 40, 40, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } .osd spinbutton.vertical button:first-child:focus, .osd spinbutton.vertical button:first-child:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } .osd spinbutton.vertical button:first-child:active, .osd spinbutton.vertical button:first-child:active:hover, .osd spinbutton.vertical button:first-child:active:focus, .osd spinbutton.vertical button:first-child:active:hover:focus, .osd spinbutton.vertical button:first-child:checked, .osd spinbutton.vertical button:first-child:checked:hover, .osd spinbutton.vertical button:first-child:checked:focus, .osd spinbutton.vertical button:first-child:checked:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:active, #XfceNotifyWindow spinbutton.vertical button:first-child:active:hover, @@ -5396,35 +5407,35 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd spinbutton.vertical button:first-child:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd spinbutton.vertical button:first-child:active:disabled, .osd spinbutton.vertical button:first-child:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd spinbutton.vertical button:first-child.flat, #XfceNotifyWindow spinbutton.vertical button:first-child.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(40, 40, 40, 0); + background-color: rgba(40, 40, 40, 0); background-image: none; box-shadow: none; } .osd spinbutton.vertical button:first-child:hover, .osd spinbutton.vertical button:first-child.flat:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } .osd spinbutton.vertical button:first-child:hover:focus, .osd spinbutton.vertical button:first-child:hover:hover, .osd spinbutton.vertical button:first-child.flat:hover:focus, .osd spinbutton.vertical button:first-child.flat:hover:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } .osd spinbutton.vertical button:first-child:hover:active, .osd spinbutton.vertical button:first-child:hover:active:hover, .osd spinbutton.vertical button:first-child:hover:active:focus, .osd spinbutton.vertical button:first-child:hover:active:hover:focus, .osd spinbutton.vertical button:first-child:hover:checked, .osd spinbutton.vertical button:first-child:hover:checked:hover, .osd spinbutton.vertical button:first-child:hover:checked:focus, .osd spinbutton.vertical button:first-child:hover:checked:hover:focus, .osd spinbutton.vertical button:first-child.flat:hover:active, .osd spinbutton.vertical button:first-child.flat:hover:active:hover, .osd spinbutton.vertical button:first-child.flat:hover:active:focus, .osd spinbutton.vertical button:first-child.flat:hover:active:hover:focus, .osd spinbutton.vertical button:first-child.flat:hover:checked, .osd spinbutton.vertical button:first-child.flat:hover:checked:hover, .osd spinbutton.vertical button:first-child.flat:hover:checked:focus, .osd spinbutton.vertical button:first-child.flat:hover:checked:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:active, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:active:hover, @@ -5442,31 +5453,31 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton.vertical button:first-child:hover:disabled, .osd spinbutton.vertical button:first-child.flat:hover:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton.vertical button:first-child:hover:active:disabled, .osd spinbutton.vertical button:first-child:hover:checked:disabled, .osd spinbutton.vertical button:first-child.flat:hover:active:disabled, .osd spinbutton.vertical button:first-child.flat:hover:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:hover:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton.vertical button:first-child:focus, .osd spinbutton.vertical button:first-child.flat:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus { - background-color: rgba(50, 50, 49, 0.8); + background-color: rgba(42, 42, 42, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } .osd spinbutton.vertical button:first-child:focus:focus, .osd spinbutton.vertical button:first-child:focus:hover, .osd spinbutton.vertical button:first-child.flat:focus:focus, .osd spinbutton.vertical button:first-child.flat:focus:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } .osd spinbutton.vertical button:first-child:focus:active, .osd spinbutton.vertical button:first-child:focus:active:hover, .osd spinbutton.vertical button:first-child:focus:active:focus, .osd spinbutton.vertical button:first-child:focus:active:hover:focus, .osd spinbutton.vertical button:first-child:focus:checked, .osd spinbutton.vertical button:first-child:focus:checked:hover, .osd spinbutton.vertical button:first-child:focus:checked:focus, .osd spinbutton.vertical button:first-child:focus:checked:hover:focus, .osd spinbutton.vertical button:first-child.flat:focus:active, .osd spinbutton.vertical button:first-child.flat:focus:active:hover, .osd spinbutton.vertical button:first-child.flat:focus:active:focus, .osd spinbutton.vertical button:first-child.flat:focus:active:hover:focus, .osd spinbutton.vertical button:first-child.flat:focus:checked, .osd spinbutton.vertical button:first-child.flat:focus:checked:hover, .osd spinbutton.vertical button:first-child.flat:focus:checked:focus, .osd spinbutton.vertical button:first-child.flat:focus:checked:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:active, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:active:hover, @@ -5484,30 +5495,30 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton.vertical button:first-child:focus:disabled, .osd spinbutton.vertical button:first-child.flat:focus:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton.vertical button:first-child:focus:active:disabled, .osd spinbutton.vertical button:first-child:focus:checked:disabled, .osd spinbutton.vertical button:first-child.flat:focus:active:disabled, .osd spinbutton.vertical button:first-child.flat:focus:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton.vertical button:first-child:focus:hover, .osd spinbutton.vertical button:first-child.flat:focus:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover { - background-color: rgba(53, 53, 52, 0.8); + background-color: rgba(44, 44, 44, 0.8); background-image: none; - border-color: rgba(218, 188, 112, 0.3); + border-color: rgba(190, 164, 109, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } .osd spinbutton.vertical button:first-child:focus:hover:focus, .osd spinbutton.vertical button:first-child:focus:hover:hover, .osd spinbutton.vertical button:first-child.flat:focus:hover:focus, .osd spinbutton.vertical button:first-child.flat:focus:hover:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } .osd spinbutton.vertical button:first-child:focus:hover:active, .osd spinbutton.vertical button:first-child:focus:hover:active:hover, .osd spinbutton.vertical button:first-child:focus:hover:active:focus, .osd spinbutton.vertical button:first-child:focus:hover:active:hover:focus, .osd spinbutton.vertical button:first-child:focus:hover:checked, .osd spinbutton.vertical button:first-child:focus:hover:checked:hover, .osd spinbutton.vertical button:first-child:focus:hover:checked:focus, .osd spinbutton.vertical button:first-child:focus:hover:checked:hover:focus, .osd spinbutton.vertical button:first-child.flat:focus:hover:active, .osd spinbutton.vertical button:first-child.flat:focus:hover:active:hover, .osd spinbutton.vertical button:first-child.flat:focus:hover:active:focus, .osd spinbutton.vertical button:first-child.flat:focus:hover:active:hover:focus, .osd spinbutton.vertical button:first-child.flat:focus:hover:checked, .osd spinbutton.vertical button:first-child.flat:focus:hover:checked:hover, .osd spinbutton.vertical button:first-child.flat:focus:hover:checked:focus, .osd spinbutton.vertical button:first-child.flat:focus:hover:checked:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:active, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:active:hover, @@ -5525,17 +5536,17 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } .osd spinbutton.vertical button:first-child:focus:hover:disabled, .osd spinbutton.vertical button:first-child.flat:focus:hover:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } .osd spinbutton.vertical button:first-child:focus:hover:active:disabled, .osd spinbutton.vertical button:first-child:focus:hover:checked:disabled, .osd spinbutton.vertical button:first-child.flat:focus:hover:active:disabled, .osd spinbutton.vertical button:first-child.flat:focus:hover:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:focus:hover:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } .osd spinbutton.vertical button:first-child:checked, .osd spinbutton.vertical button:first-child:active, .osd spinbutton.vertical button:first-child.flat:checked, .osd spinbutton.vertical button:first-child.flat:active, #XfceNotifyWindow spinbutton.vertical button:first-child:checked, #XfceNotifyWindow spinbutton.vertical button:first-child:active, @@ -5544,9 +5555,9 @@ progressbar.osd { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } .osd spinbutton.vertical button:first-child:checked:focus, .osd spinbutton.vertical button:first-child:checked:hover, .osd spinbutton.vertical button:first-child:active:focus, .osd spinbutton.vertical button:first-child:active:hover, .osd spinbutton.vertical button:first-child.flat:checked:focus, .osd spinbutton.vertical button:first-child.flat:checked:hover, .osd spinbutton.vertical button:first-child.flat:active:focus, .osd spinbutton.vertical button:first-child.flat:active:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:hover, @@ -5556,7 +5567,7 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } .osd spinbutton.vertical button:first-child:checked:active, .osd spinbutton.vertical button:first-child:checked:active:hover, .osd spinbutton.vertical button:first-child:checked:active:focus, .osd spinbutton.vertical button:first-child:checked:active:hover:focus, .osd spinbutton.vertical button:first-child:checked:checked, .osd spinbutton.vertical button:first-child:checked:checked:hover, .osd spinbutton.vertical button:first-child:checked:checked:focus, .osd spinbutton.vertical button:first-child:checked:checked:hover:focus, .osd spinbutton.vertical button:first-child:active:active, .osd spinbutton.vertical button:first-child:active:active:hover, .osd spinbutton.vertical button:first-child:active:active:focus, .osd spinbutton.vertical button:first-child:active:active:hover:focus, .osd spinbutton.vertical button:first-child:active:checked, .osd spinbutton.vertical button:first-child:active:checked:hover, .osd spinbutton.vertical button:first-child:active:checked:focus, .osd spinbutton.vertical button:first-child:active:checked:hover:focus, .osd spinbutton.vertical button:first-child.flat:checked:active, .osd spinbutton.vertical button:first-child.flat:checked:active:hover, .osd spinbutton.vertical button:first-child.flat:checked:active:focus, .osd spinbutton.vertical button:first-child.flat:checked:active:hover:focus, .osd spinbutton.vertical button:first-child.flat:checked:checked, .osd spinbutton.vertical button:first-child.flat:checked:checked:hover, .osd spinbutton.vertical button:first-child.flat:checked:checked:focus, .osd spinbutton.vertical button:first-child.flat:checked:checked:hover:focus, .osd spinbutton.vertical button:first-child.flat:active:active, .osd spinbutton.vertical button:first-child.flat:active:active:hover, .osd spinbutton.vertical button:first-child.flat:active:active:focus, .osd spinbutton.vertical button:first-child.flat:active:active:hover:focus, .osd spinbutton.vertical button:first-child.flat:active:checked, .osd spinbutton.vertical button:first-child.flat:active:checked:hover, .osd spinbutton.vertical button:first-child.flat:active:checked:focus, .osd spinbutton.vertical button:first-child.flat:active:checked:hover:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:active, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:active:hover, @@ -5590,13 +5601,13 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:checked:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } .osd spinbutton.vertical button:first-child:checked:disabled, .osd spinbutton.vertical button:first-child:active:disabled, .osd spinbutton.vertical button:first-child.flat:checked:disabled, .osd spinbutton.vertical button:first-child.flat:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } .osd spinbutton.vertical button:first-child:checked:active:disabled, .osd spinbutton.vertical button:first-child:checked:checked:disabled, .osd spinbutton.vertical button:first-child:active:active:disabled, .osd spinbutton.vertical button:first-child:active:checked:disabled, .osd spinbutton.vertical button:first-child.flat:checked:active:disabled, .osd spinbutton.vertical button:first-child.flat:checked:checked:disabled, .osd spinbutton.vertical button:first-child.flat:active:active:disabled, .osd spinbutton.vertical button:first-child.flat:active:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:checked:disabled, @@ -5606,7 +5617,7 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.flat:checked:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:active:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } .osd spinbutton.vertical button:first-child:checked:focus, .osd spinbutton.vertical button:first-child:checked:hover, .osd spinbutton.vertical button:first-child:active:focus, .osd spinbutton.vertical button:first-child:active:hover, .osd spinbutton.vertical button:first-child.flat:checked:focus, .osd spinbutton.vertical button:first-child.flat:checked:hover, .osd spinbutton.vertical button:first-child.flat:active:focus, .osd spinbutton.vertical button:first-child.flat:active:hover, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:focus, #XfceNotifyWindow spinbutton.vertical button:first-child:checked:hover, @@ -5625,15 +5636,15 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child:hover, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:focus, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } .osd spinbutton.vertical button:first-child:disabled:disabled, .osd spinbutton.vertical button:first-child.flat:disabled:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:disabled:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.flat:disabled:disabled { - background-color: alpha(mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.2),0.4); + background-color: alpha(mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(rgba(48, 48, 47, 0.8),#ebdbb2,0.5); + color: mix(rgba(40, 40, 40, 0.8),#d5c4a1,0.5); box-shadow: none; } .osd spinbutton.vertical button:first-child:active:disabled, .osd spinbutton.vertical button:first-child:checked:disabled, .osd spinbutton.vertical button:first-child.flat:active:disabled, .osd spinbutton.vertical button:first-child.flat:checked:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child:active:disabled, @@ -5648,11 +5659,11 @@ progressbar.osd { #XfceNotifyWindow spinbutton.vertical button:first-child.separator, #XfceNotifyWindow spinbutton.vertical button:first-child .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.7); } + color: rgba(40, 40, 40, 0.7); } .osd spinbutton.vertical button:first-child.separator:disabled, .osd spinbutton.vertical button:first-child .separator:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child.separator:disabled, #XfceNotifyWindow spinbutton.vertical button:first-child .separator:disabled { - color: rgba(48, 48, 47, 0.65); } + color: rgba(40, 40, 40, 0.65); } scrolledwindow viewport.frame { border-style: none; } @@ -5779,13 +5790,13 @@ scrolledwindow undershoot.right { scrolledwindow junction { border-color: transparent; - border-image: linear-gradient(to bottom, mix(#282828,#ebdbb2,0.08) 1px, transparent 1px) 0 0 0 1/0 1px stretch; - background-color: #1b1b1b; } + border-image: linear-gradient(to bottom, mix(#32302f,#ebdbb2,0.18) 1px, transparent 1px) 0 0 0 1/0 1px stretch; + background-color: #252323; } scrolledwindow junction:dir(rtl) { border-image-slice: 0 1 0 0; } scrolledwindow junction:backdrop { - border-image-source: linear-gradient(to bottom, mix(#282828,mix(#282828,#ebdbb2,0.08),0.9) 1px, transparent 1px); - background-color: #202020; + border-image-source: linear-gradient(to bottom, mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9) 1px, transparent 1px); + background-color: #2a2828; transition: 200ms ease-out; } /***************** @@ -5793,7 +5804,7 @@ scrolledwindow junction { ******************/ progressbar { padding: 0; - border-radius: 0px; + border-radius: 4px; font-size: smaller; color: rgba(235, 219, 178, 0.6); } progressbar.horizontal trough, @@ -5803,26 +5814,26 @@ progressbar { progressbar.vertical progress { min-width: 6px; } progressbar trough { - border: 1px solid mix(#282828,#ebdbb2,0.17); - background-color: #2b2b2b; + border: 1px solid mix(#32302f,#ebdbb2,0.17); + background-color: #363433; background-image: none; - border-radius: 0px; } + border-radius: 4px; } progressbar progress { background-color: #83a598; background-image: none; border-radius: 0; } progressbar progress.left { - border-top-left-radius: 0px; - border-bottom-left-radius: 0px; } + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; } progressbar progress.right { - border-top-right-radius: 0px; - border-bottom-right-radius: 0px; } + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; } progressbar progress.bottom { - border-bottom-left-radius: 0px; - border-bottom-right-radius: 0px; } + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; } progressbar progress.top { - border-top-left-radius: 0px; - border-top-right-radius: 0px; } + border-top-left-radius: 4px; + border-top-right-radius: 4px; } levelbar.horizontal block { min-width: 34px; @@ -5836,10 +5847,9 @@ levelbar:backdrop { transition: 200ms ease-out; } levelbar trough { - background-color: #2b2b2b; - background-image: none; - border: 1px solid mix(#282828,#ebdbb2,0.17); - border-radius: 0px; + background-color: #363433; + border: 1px solid mix(#32302f,#ebdbb2,0.17); + border-radius: 4px; padding: 2px; } levelbar.horizontal.discrete block { @@ -5854,14 +5864,13 @@ levelbar.vertical.discrete block { levelbar block { background-color: #83a598; - background-image: none; border-color: transparent; - border-radius: 0px; } + border-radius: 4px; } levelbar block.low { - background-color: #ef6c00; + background-color: #ff7f42; border-color: transparent; } levelbar block.high, levelbar block:not(.empty) { - background-color: #4caf50; + background-color: #c3a544; border-color: transparent; } levelbar block.full { background-color: #64897b; @@ -5874,7 +5883,7 @@ levelbar block { scale { min-height: 10px; min-width: 10px; - padding: 3px; } + padding: 0px; } scale.horizontal trough { padding: 0 3px; } scale.horizontal highlight, scale.horizontal fill { @@ -5900,13 +5909,13 @@ scale { outline-offset: 2px; -gtk-outline-radius: 4.5px; border-radius: 2.5px; - background-color: mix(#282828,#ebdbb2,0.2); } + background-color: mix(#32302f,#ebdbb2,0.2); } scale trough:disabled { - background-color: mix(#282828,#ebdbb2,0.1); } + background-color: mix(#32302f,#ebdbb2,0.1); } menuitem:hover scale trough, row:selected scale trough, infobar scale trough { - background-color: rgba(0, 0, 0, 0.2); } + background-color: rgba(131, 104, 34, 0.2); } menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { @@ -5918,7 +5927,7 @@ scale { menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { - background-color: rgba(0, 0, 0, 0.1); } + background-color: rgba(131, 104, 34, 0.1); } scale highlight { border-radius: 2.5px; background-color: #83a598; } @@ -5942,7 +5951,7 @@ scale { background-color: #83a598; border-color: #83a598; } scale slider:disabled { - background-color: mix(#32302f,#282828,0.55); + background-color: mix(#32302f,#32302f,0.55); border-color: rgba(235, 219, 178, 0); } menuitem:hover scale slider, row:selected scale slider, @@ -6010,7 +6019,7 @@ scale { scale.color highlight, scale.color fill { margin: 0; } scale.color.horizontal { - padding: 0 0 6px 0; } + padding: 0 0 6px; } scale.color.horizontal trough { border-top-left-radius: 0; border-top-right-radius: 0; } @@ -6038,36 +6047,36 @@ scale { ! Scrollbar ************/ scrollbar { - background-color: #1b1b1b; + background-color: #252323; transition: 300ms ease-out; } * { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } scrollbar.top { - border-bottom: 1px solid mix(#282828,#ebdbb2,0.08); } + border-bottom: 1px solid mix(#32302f,#ebdbb2,0.18); } scrollbar.bottom { - border-top: 1px solid mix(#282828,#ebdbb2,0.08); } + border-top: 1px solid mix(#32302f,#ebdbb2,0.18); } scrollbar.left { - border-right: 1px solid mix(#282828,#ebdbb2,0.08); } + border-right: 1px solid mix(#32302f,#ebdbb2,0.18); } scrollbar.right { - border-left: 1px solid mix(#282828,#ebdbb2,0.08); } + border-left: 1px solid mix(#32302f,#ebdbb2,0.18); } scrollbar:backdrop { - background-color: #202020; - border-color: mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); + background-color: #2a2828; + border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); transition: 400ms ease-in; } scrollbar slider { min-width: 7px; min-height: 7px; border: 1px solid transparent; - border-radius: 0px; + border-radius: 4px; background-clip: padding-box; - background-color: mix(#282828,#ebdbb2,0.5); } + background-color: mix(#32302f,#ebdbb2,0.5); } scrollbar slider:hover { - background-color: mix(#282828,#ebdbb2,0.7); } + background-color: mix(#32302f,#ebdbb2,0.7); } scrollbar slider:hover:active { background-color: #749a8c; } scrollbar slider:backdrop { - background-color: mix(mix(#ebdbb2,#282828,0.5),#282828,0.4); } + background-color: mix(mix(#ebdbb2,#32302f,0.5),#32302f,0.4); } scrollbar slider:disabled { background-color: transparent; } scrollbar.horizontal slider { @@ -6086,7 +6095,7 @@ scrollbar { min-width: 4px; min-height: 4px; background-color: #ebdbb2; - border: 1px solid #fff; } + border: 1px solid #333130; } scrollbar.overlay-indicator:not(.dragging):not(.hovering) button { min-width: 4px; min-height: 4px; @@ -6106,44 +6115,44 @@ scrollbar { padding: 0; border: 0; border-radius: 0; - border-color: mix(#282828,#ebdbb2,0.08); + border-color: mix(#32302f,#ebdbb2,0.18); background-color: transparent; box-shadow: none; - color: mix(#282828,#ebdbb2,0.5); } + color: mix(#32302f,#ebdbb2,0.5); } scrollbar button:hover { - color: mix(#282828,#ebdbb2,0.7); } + color: mix(#32302f,#ebdbb2,0.7); } scrollbar button:active, scrollbar button:checked { color: #749a8c; } scrollbar button:backdrop { - color: mix(mix(#ebdbb2,#282828,0.5),#282828,0.4); } + color: mix(mix(#ebdbb2,#32302f,0.5),#32302f,0.4); } scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); - border-top: 1px solid mix(#282828,#ebdbb2,0.08); } + border-top: 1px solid mix(#32302f,#ebdbb2,0.18); } scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); - border-bottom: 1px solid mix(#282828,#ebdbb2,0.08); } + border-bottom: 1px solid mix(#32302f,#ebdbb2,0.18); } scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - border-left: 1px solid mix(#282828,#ebdbb2,0.08); } + border-left: 1px solid mix(#32302f,#ebdbb2,0.18); } scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); - border-right: 1px solid mix(#282828,#ebdbb2,0.08); } + border-right: 1px solid mix(#32302f,#ebdbb2,0.18); } /********* ! Sidebar **********/ .sidebar { border-style: none; - background-color: mix(#282828,#30302f,0.5); } + background-color: mix(#32302f,#32302f,0.5); } stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) { - border-right: 1px solid mix(#282828,#ebdbb2,0.08); + border-right: 1px solid mix(#32302f,#ebdbb2,0.18); border-left-style: none; } stacksidebar.sidebar:dir(rtl) list .sidebar:dir(rtl), stacksidebar.sidebar.right list .sidebar:dir(rtl), .sidebar.right { - border-left: 1px solid mix(#282828,#ebdbb2,0.08); + border-left: 1px solid mix(#32302f,#ebdbb2,0.18); border-right-style: none; } .sidebar:backdrop { - background-color: mix(#282828,#30302f,0.5); - border-color: mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); + background-color: mix(#32302f,#32302f,0.5); + border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); transition: 200ms ease-out; } .sidebar .frame, .sidebar frame { border-width: 0; } @@ -6153,10 +6162,10 @@ scrollbar { border-style: none; } stacksidebar row { - padding: 6px 3px; } + padding: 0px 0px; } stacksidebar row > label { - padding-left: 3px; - padding-right: 3px; } + padding-left: 0px; + padding-right: 0px; } stacksidebar row.needs-attention > label { background-size: 6px 6px, 0 0; } @@ -6167,25 +6176,25 @@ placessidebar row { min-height: 32px; padding: 0; } placessidebar row > revealer { - padding: 0 6px; } + padding: 0 0px; } placessidebar row:selected { color: #ebdbb2; } placessidebar row:disabled { - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } placessidebar row:backdrop { - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } placessidebar row:backdrop:selected { color: mix(#83a598,#ebdbb2,0.66); } placessidebar row:backdrop:disabled { - color: #020202; } + color: #0b0a0a; } placessidebar row image.sidebar-icon { opacity: 0.7; } placessidebar row image.sidebar-icon:dir(ltr) { - padding-right: 8px; - padding-left: 3px; } + padding-right: 2px; + padding-left: 0px; } placessidebar row image.sidebar-icon:dir(rtl) { - padding-left: 8px; - padding-right: 3px; } + padding-left: 2px; + padding-right: 0px; } placessidebar row label.sidebar-label:dir(ltr) { padding-right: 2px; } placessidebar row label.sidebar-label:dir(rtl) { @@ -6205,16 +6214,16 @@ placessidebar row { placessidebar row.sidebar-placeholder-row { padding: 0 8px; min-height: 2px; - background-image: image(#4e9a06); + background-image: image(#83a598); background-clip: content-box; } placessidebar row.sidebar-new-bookmark-row { color: #83a598; } placessidebar row:drop(active):not(:disabled) { - color: #4e9a06; - box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; } + color: #83a598; + box-shadow: inset 0 1px #83a598, inset 0 -1px #83a598; } placessidebar row:drop(active):not(:disabled):selected { color: #ebdbb2; - background-color: #4e9a06; } + background-color: #83a598; } /****** ! Paned @@ -6225,22 +6234,22 @@ paned > separator { -gtk-icon-source: none; border-style: none; background-color: transparent; - background-image: image(#242424); + background-image: image(#2d2b2a); background-size: 1px 1px; background-position: center center; } paned > separator:selected { background-image: image(#83a598); } paned > separator:backdrop { - background-image: image(mix(#282828,mix(#282828,#ebdbb2,0.08),0.9)); } + background-image: image(mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9)); } paned > separator.wide { min-width: 5px; min-height: 5px; - background-color: #282828; - background-image: image(#202020), image(#202020); + background-color: #32302f; + background-image: image(#282626), image(#282626); background-size: 1px 1px, 1px 1px; } paned > separator.wide:backdrop { - background-color: #282828; - background-image: image(mix(#282828,mix(#282828,#ebdbb2,0.08),0.9)), image(mix(#282828,mix(#282828,#ebdbb2,0.08),0.9)); } + background-color: #32302f; + background-image: image(mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9)), image(mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9)); } paned.horizontal > separator { background-repeat: repeat-y; @@ -6263,7 +6272,7 @@ paned.vertical > separator { background-position: bottom, top; } paned.titlebar > separator { - background-image: image(#2b2b2a); } + background-image: image(#242424); } /******************* ! Spinner animation @@ -6291,70 +6300,70 @@ radio { -gtk-icon-source: url("../assets/radio-unchecked.svg"); min-width: 16px; min-height: 16px; - margin-right: 3px; } + margin-right: 0px; } radio:disabled { - -gtk-icon-source: url("../assets/radio-unchecked-disabled.svg"); } + -gtk-icon-source: url("../assets/radio-unchecked-insensitive.svg"); } radio:checked, radio:active { -gtk-icon-source: url("../assets/radio-checked.svg"); } radio:checked:disabled, radio:active:disabled { - -gtk-icon-source: url("../assets/radio-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/radio-checked-insensitive.svg"); } radio:indeterminate { -gtk-icon-source: url("../assets/radio-mixed.svg"); } radio:indeterminate:disabled { - -gtk-icon-source: url("../assets/radio-mixed-disabled.svg"); } + -gtk-icon-source: url("../assets/radio-mixed-insensitive.svg"); } menuitem radio, modelbutton radio { -gtk-icon-source: url("../assets/menuitem-radio-unchecked.svg"); } menuitem radio:disabled, modelbutton radio:disabled { - -gtk-icon-source: url("../assets/menuitem-radio-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-radio-checked-insensitive.svg"); } menuitem radio:checked, menuitem radio:active, modelbutton radio:checked, modelbutton radio:active { -gtk-icon-source: url("../assets/menuitem-radio-checked.svg"); } menuitem radio:checked:hover, menuitem radio:active:hover, modelbutton radio:checked:hover, modelbutton radio:active:hover { -gtk-icon-source: url("../assets/menuitem-radio-checked-hover.svg"); } menuitem radio:checked:disabled, menuitem radio:active:disabled, modelbutton radio:checked:disabled, modelbutton radio:active:disabled { - -gtk-icon-source: url("../assets/menuitem-radio-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-radio-checked-insensitive.svg"); } menuitem radio:indeterminate, modelbutton radio:indeterminate { -gtk-icon-source: url("../assets/menuitem-radio-mixed.svg"); } menuitem radio:indeterminate:hover, modelbutton radio:indeterminate:hover { -gtk-icon-source: url("../assets/menuitem-radio-mixed-hover.svg"); } menuitem radio:indeterminate:disabled, modelbutton radio:indeterminate:disabled { - -gtk-icon-source: url("../assets/menuitem-radio-mixed-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-radio-mixed-insensitive.svg"); } check { background-image: none; -gtk-icon-source: url("../assets/checkbox-unchecked.svg"); min-width: 16px; min-height: 16px; - margin-right: 3px; } + margin-right: 0px; } check:disabled { - -gtk-icon-source: url("../assets/checkbox-unchecked-disabled.svg"); } + -gtk-icon-source: url("../assets/checkbox-unchecked-insensitive.svg"); } check:checked, check:active { -gtk-icon-source: url("../assets/checkbox-checked.svg"); } check:checked:disabled, check:active:disabled { - -gtk-icon-source: url("../assets/checkbox-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/checkbox-checked-insensitive.svg"); } check:indeterminate { -gtk-icon-source: url("../assets/checkbox-mixed.svg"); } check:indeterminate:disabled { - -gtk-icon-source: url("../assets/checkbox-mixed-disabled.svg"); } + -gtk-icon-source: url("../assets/checkbox-mixed-insensitive.svg"); } menuitem check, modelbutton check { -gtk-icon-source: url("../assets/menuitem-checkbox-unchecked.svg"); } menuitem check:disabled, modelbutton check:disabled { - -gtk-icon-source: url("../assets/menuitem-checkbox-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-checkbox-checked-insensitive.svg"); } menuitem check:checked, menuitem check:active, modelbutton check:checked, modelbutton check:active { -gtk-icon-source: url("../assets/menuitem-checkbox-checked.svg"); } menuitem check:checked:hover, menuitem check:active:hover, modelbutton check:checked:hover, modelbutton check:active:hover { -gtk-icon-source: url("../assets/menuitem-checkbox-checked-hover.svg"); } menuitem check:checked:disabled, menuitem check:active:disabled, modelbutton check:checked:disabled, modelbutton check:active:disabled { - -gtk-icon-source: url("../assets/menuitem-checkbox-checked-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-checkbox-checked-insensitive.svg"); } menuitem check:indeterminate, modelbutton check:indeterminate { -gtk-icon-source: url("../assets/menuitem-checkbox-mixed.svg"); } menuitem check:indeterminate:hover, modelbutton check:indeterminate:hover { -gtk-icon-source: url("../assets/menuitem-checkbox-mixed-hover.svg"); } menuitem check:indeterminate:disabled, modelbutton check:indeterminate:disabled { - -gtk-icon-source: url("../assets/menuitem-checkbox-mixed-disabled.svg"); } + -gtk-icon-source: url("../assets/menuitem-checkbox-mixed-insensitive.svg"); } radio:dir(rtl), check:dir(rtl) { margin-right: 0; - margin-left: 3px; } + margin-left: 0px; } .view.content-view.check:not(list), iconview.content-view.check:not(list) { -gtk-icon-shadow: none; @@ -6400,45 +6409,45 @@ radio:dir(rtl), check:dir(rtl) { ! Switch *********/ switch { - border-radius: 0px; - padding: 2px; - border: none; + border-radius: 4px; + padding: -1px; + border: 0; outline: none; transition: background-color .3s linear; min-width: 88px; min-height: 24px; - background-color: mix(#282828,#30302f,0.3); + background-color: mix(#32302f,#32302f,0.3); color: #ebdbb2; box-shadow: inset 1px -1px 0 rgba(66, 52, 17, 0.06), inset -1px 1px 0 rgba(66, 52, 17, 0.06); } switch slider { - background-color: mix(#ebdbb2,#282828,0.5); - transition: all 0.3s ease-in; + background-color: mix(#ebdbb2,#32302f,0.5); + transition: all .3s ease-in; box-shadow: 0 1px 2px 0 rgba(66, 52, 17, 0.07), 1px 0 2px 0 rgba(66, 52, 17, 0.07); - border-radius: 0px; } + border-radius: 4px; } switch:checked { background-color: #83a598; background-image: none; border-color: #83a598; - color: #30302f; } + color: #32302f; } switch:checked slider { - background-color: #fff; + background-color: #333130; box-shadow: 0 1px 3px 0 rgba(66, 52, 17, 0.1); } switch:disabled { - background-color: mix(#282828,#30302f,0.5); + background-color: mix(#32302f,#32302f,0.5); background-image: none; - border-color: #282828; - color: #282828; + border-color: #32302f; + color: #32302f; box-shadow: none; } switch:disabled slider { - background-color: #282828; } + background-color: #32302f; } list row:selected switch { - background-color: #282828; - color: mix(#282828,#30302f,0.5); } + background-color: #32302f; + color: mix(#32302f,#32302f,0.5); } list row:selected switch slider { - background-color: mix(mix(#282828,#30302f,0.5),#30302f,0.4); } + background-color: mix(mix(#32302f,#32302f,0.5),#32302f,0.4); } list row:selected switch:checked { color: #83a598; - background-color: mix(#ebdbb2,#282828,0.5); } + background-color: mix(#ebdbb2,#32302f,0.5); } list row:selected switch:checked slider { background-color: #83a598; } @@ -6459,15 +6468,15 @@ switch { iconview text, textview text { color: #ebdbb2; - background-color: #30302f; + background-color: #32302f; caret-color: #282828; -gtk-secondary-caret-color: #282828; } .view:backdrop, iconview:backdrop, .view text:backdrop, iconview text:backdrop, textview text:backdrop { - color: mix(#30302f,#ebdbb2,0.8); - background-color: #30302f; } + color: mix(#32302f,#ebdbb2,0.8); + background-color: #32302f; } .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview text:selected:focus, @@ -6475,10 +6484,10 @@ textview text { .view text:selected, iconview text:selected, textview text:selected { - border-radius: 0px; } + border-radius: 4px; } textview border { - background-color: mix(#282828,#30302f,0.5); } + background-color: mix(#32302f,#32302f,0.5); } /************ ! Treeview @@ -6491,64 +6500,64 @@ treeview.view rubberband { background-color: rgba(131, 165, 152, 0.2); } treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { - background-color: #30302f; + background-color: #32302f; transition-property: color, background; } treeview entry.flat, treeview entry { border-radius: 0; background-image: none; - background-color: #30302f; } + background-color: #32302f; } treeview entry.flat:focus, treeview entry:focus { border-color: #83a598; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { - padding: 1px 4px; + padding: -2px 1px; border-radius: 0; background-image: none; text-shadow: none; border-style: none solid solid none; - border-color: #282828; } + border-color: #32302f; } treeview.view header button:disabled { - border-color: #282828; + border-color: #32302f; background-image: none; } treeview.view header button:backdrop { - border-color: #282828; + border-color: #32302f; border-style: none solid solid none; - color: mix(mix(#ebdbb2,#282828,0.5),#282828,0.5); + color: mix(mix(#ebdbb2,#32302f,0.5),#32302f,0.5); background-image: none; - background-color: #30302f; } + background-color: #32302f; } treeview.view header button:backdrop:disabled { - border-color: #282828; + border-color: #32302f; background-image: none; } treeview.view { -GtkTreeView-grid-line-width: 1; - -GtkTreeView-grid-line-pattern: ''; + -GtkTreeView-grid-line-pattern: ""; -GtkTreeView-tree-line-width: 1; - -GtkTreeView-tree-line-pattern: ''; - border-left-color: mix(#ebdbb2,#30302f,0.5); - border-top-color: #282828; } + -GtkTreeView-tree-line-pattern: ""; + border-left-color: mix(#ebdbb2,#32302f,0.5); + border-top-color: #32302f; } treeview.view:selected:focus, treeview.view:selected { border-radius: 0; } treeview.view:selected:backdrop, treeview.view:selected { border-left-color: mix(#ebdbb2,#83a598,0.5); border-top-color: rgba(235, 219, 178, 0.1); } treeview.view:disabled { - color: mix(#ebdbb2,#282828,0.5); } + color: mix(#ebdbb2,#32302f,0.5); } treeview.view:disabled:selected { color: mix(#ebdbb2,#83a598,0.4); } treeview.view:disabled:selected:backdrop { color: mix(mix(#83a598,#ebdbb2,0.66),#83a598,0.3); } treeview.view:disabled:backdrop { - color: #020202; } + color: #0b0a0a; } treeview.view.separator { min-height: 2px; - color: #282828; } + color: #32302f; } treeview.view.separator:backdrop { - color: rgba(40, 40, 40, 0.1); } + color: rgba(50, 48, 47, 0.1); } treeview.view:backdrop { - border-left-color: mix(mix(#ebdbb2,#282828,0.5),#282828,0.5); - border-top: #282828; } + border-left-color: mix(mix(#ebdbb2,#32302f,0.5),#32302f,0.5); + border-top: #32302f; } treeview.view:drop(active) { border-style: solid none; border-width: 1px; @@ -6559,7 +6568,7 @@ treeview.view { border-bottom-style: none; } treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: mix(#30302f,#ebdbb2,0.7); } + color: mix(#32302f,#ebdbb2,0.7); } treeview.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } treeview.view.expander:hover { @@ -6573,10 +6582,10 @@ treeview.view { treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } treeview.view.expander:backdrop { - color: mix(#30302f,mix(#ebdbb2,#282828,0.5),0.7); } + color: mix(#32302f,mix(#ebdbb2,#32302f,0.5),0.7); } treeview.view.progressbar { - color: #30302f; - border-radius: 0px; + color: #32302f; + border-radius: 4px; border: 1px solid mix(#83a598,#ebdbb2,0.3); background-color: #83a598; } treeview.view.progressbar:selected { @@ -6586,36 +6595,36 @@ treeview.view { box-shadow: none; background-color: #83a598; background-image: none; - border-radius: 0px; } + border-radius: 4px; } treeview.view.progressbar:selected:focus:backdrop, treeview.view.progressbar:selected:backdrop { color: mix(#83a598,#ebdbb2,0.66); border-color: mix(#83a598,#ebdbb2,0.3); - background-color: mix(#30302f,#83a598,0.9); } + background-color: mix(#32302f,#83a598,0.9); } treeview.view.progressbar:disabled { - background-color: #282828; + background-color: #32302f; background-image: none; - border-color: #222222; } + border-color: #2b2928; } treeview.view.progressbar:backdrop { - color: #30302f; + color: #32302f; background-image: none; box-shadow: none; } treeview.view.trough { background-color: rgba(235, 219, 178, 0.1); - border-radius: 0px; } + border-radius: 4px; } treeview.view.trough:selected:focus, treeview.view.trough:selected { background-color: rgba(235, 219, 178, 0.3); border-width: 1px 0; border-style: solid; border-color: #83a598; - border-radius: 0px; } + border-radius: 4px; } treeview.view header button { - color: mix(#ebdbb2,#30302f,0.5); - background-color: #30302f; + color: mix(#ebdbb2,#32302f,0.5); + background-color: #32302f; font-weight: bold; text-shadow: none; box-shadow: none; } treeview.view header button:hover { - color: mix(mix(#ebdbb2,#30302f,0.5),#ebdbb2,0.5); + color: mix(mix(#ebdbb2,#32302f,0.5),#ebdbb2,0.5); box-shadow: none; transition: none; } treeview.view header button:active { @@ -6632,10 +6641,10 @@ treeview.view { transition: none; background-image: none; background-color: #83a598; - color: #30302f; + color: #32302f; border-radius: 0; border-style: none; - box-shadow: inset 0 0 0 1px #30302f; + box-shadow: inset 0 0 0 1px #32302f; text-shadow: none; } treeview.view acceleditor > label { background-color: #83a598; } @@ -6644,7 +6653,7 @@ treeview.view { ! Separator ************/ separator { - background: rgba(0, 0, 0, 0.1); + background: rgba(131, 104, 34, 0.1); min-width: 1px; min-height: 1px; } @@ -6652,11 +6661,17 @@ separator { ! Frames * ***********/ frame > border, .frame { - border: 1px solid mix(#282828,#ebdbb2,0.08); } + border: 1px solid mix(#32302f,#ebdbb2,0.18); } frame > border.flat, .frame.flat { border-style: none; } frame > border:backdrop, .frame:backdrop { - border-color: mix(#282828,mix(#282828,#ebdbb2,0.08),0.9); } + border-color: mix(#32302f,mix(#32302f,#ebdbb2,0.18),0.9); } + +frame.border-inset > border, +frame.border-outset > border, +frame.border-groove > border, +frame.border-ridge > border { + border: 1px solid alpha(mix(#32302f,#ebdbb2,0.18),0.3902); } /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ scrolledwindow viewport.frame { @@ -6684,12 +6699,14 @@ placesview > actionbar > revealer > box > label { ! Window frame ***************/ decoration { - border-radius: 0px 0px 0 0; + border-radius: 4px 4px 0 0; + box-shadow: 0 3px 9px 1px rgba(131, 104, 34, 0.7), 0 0 0 1px #282828; /* this is used for the resize cursor area */ - border-width: 1px; + border-width: 0px; border-style: solid; border-color: #282828; } decoration:backdrop { + box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(131, 104, 34, 0.4), 0 0 0 1px #282828; border-color: #282828; transition: 200ms ease-out; } .maximized decoration, .fullscreen decoration, .tiled decoration { @@ -6697,19 +6714,19 @@ decoration { .popup decoration { box-shadow: none; } .ssd decoration { - box-shadow: 0 0 0 1px #32302f; } + box-shadow: 0 0 0 1px #282828; } .solid-csd decoration { border-radius: 0; box-shadow: none; } .csd.popup decoration { border-radius: 0; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } + box-shadow: 0 1px 2px rgba(131, 104, 34, 0.2), 0 0 0 1px rgba(40, 40, 40, 0.13); } tooltip.csd decoration { - border-radius: 0px; + border-radius: 4px; box-shadow: none; } messagedialog.csd decoration { - border-radius: 0px; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } + border-radius: 4px; + box-shadow: 0 1px 2px rgba(131, 104, 34, 0.2), 0 0 0 1px rgba(40, 40, 40, 0.13); } /*********************** ! Fallback mode panel * @@ -6724,9 +6741,9 @@ panel-applet > menubar menuitem, panel-applet > menubar:backdrop menuitem, panel-toplevel .gnome-panel-menu-bar menuitem, panel-toplevel .gnome-panel-menu-bar:backdrop menuitem, wnck-pager, wnck-tasklist, .mate-panel-menu-bar, .xfce4-panel, UnityPanelWidget, .unity-panel { - background-color: #30302f; + background-color: #282828; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } clock-box menuitem label, clock-box:backdrop menuitem label, panel-applet > menubar menuitem label, @@ -6737,7 +6754,7 @@ panel-toplevel .gnome-panel-menu-bar:backdrop menuitem label, gp-calendar-window #clock-applet-button label, #showdesktop-button label { font-weight: normal; - color: #ebdbb2; } + color: #d5c4a1; } #clock-applet-button, #clock-applet-button:backdrop, panel-applet button, panel-applet button:backdrop, .xfce4-panel button, #login_window, #shutdown_dialog, #restart_dialog { border-width: 0 1px; @@ -6745,28 +6762,28 @@ panel-toplevel .gnome-panel-menu-bar:backdrop menuitem label, gp-calendar-window border-color: transparent; background-color: transparent; background-image: none; - color: #ebdbb2; } + color: #d5c4a1; } #clock-applet-button:hover, panel-applet button:hover, .xfce4-panel button:hover, #login_window:hover, #shutdown_dialog:hover, #restart_dialog:hover { - background-color: mix(#30302f,#ebdbb2,0.11); + background-color: mix(#282828,#d5c4a1,0.11); background-image: none; - border-color: mix(#30302f,#ebdbb2,0.11); - color: #f2e7cc; } + border-color: mix(#282828,#d5c4a1,0.11); + color: #ded1b6; } #clock-applet-button:active, panel-applet button:active, .xfce4-panel button:active, #login_window:active, #shutdown_dialog:active, #restart_dialog:active, #clock-applet-button:checked, panel-applet button:checked, .xfce4-panel button:checked, #login_window:checked, #shutdown_dialog:checked, #restart_dialog:checked { - background-color: mix(#30302f,#ebdbb2,0.21); + background-color: mix(#282828,#d5c4a1,0.21); background-image: none; - border-color: mix(#30302f,#ebdbb2,0.21); - color: #f2e7cc; } + border-color: mix(#282828,#d5c4a1,0.21); + color: #ded1b6; } #clock-applet-button:active:hover, panel-applet button:active:hover, .xfce4-panel button:active:hover, #login_window:active:hover, #shutdown_dialog:active:hover, #restart_dialog:active:hover, #clock-applet-button:checked:hover, panel-applet button:checked:hover, .xfce4-panel button:checked:hover, #login_window:checked:hover, #shutdown_dialog:checked:hover, #restart_dialog:checked:hover { - background-color: mix(#30302f,#ebdbb2,0.31); + background-color: mix(#282828,#d5c4a1,0.31); background-image: none; - border-color: mix(#30302f,#ebdbb2,0.31); } + border-color: mix(#282828,#d5c4a1,0.31); } panel-plug, panel-toplevel.background { padding: 0; } .gp-text-color { - color: #000; } + color: #836822; } panel-applet { border: 0; } @@ -6788,7 +6805,7 @@ panel-toplevel .gnome-panel-menu-bar:backdrop menuitem { #PanelApplet label, .mate-panel-menu-bar menubar > menuitem { - color: #ebdbb2; } + color: #d5c4a1; } PanelSeparator, MatePanelAppletFrameDBus { border-width: 0; @@ -6807,7 +6824,7 @@ PanelSeparator, MatePanelAppletFrameDBus { border-style: solid; border-radius: 0; border-width: 1px; - color: #ebdbb2; + color: #d5c4a1; text-shadow: none; box-shadow: none; padding: 2px; } @@ -6825,11 +6842,11 @@ PanelSeparator, MatePanelAppletFrameDBus { #PanelApplet button.flat.toggle:checked, #PanelApplet button.flat.toggle:checked:hover { background-image: none; - background-color: darker(#30302f); + background-color: darker(#282828); border-color: transparent; border-radius: 0; border-width: 1px; - color: lighter(#ebdbb2); + color: lighter(#d5c4a1); text-shadow: none; padding: 2px; } @@ -6838,7 +6855,7 @@ PanelSeparator, MatePanelAppletFrameDBus { #PanelApplet button.toggle:hover, #PanelApplet button.flat.toggle:hover { background-image: none; - background-color: #3e3e3d; + background-color: #343434; border-color: transparent; border-radius: 0; border-width: 1px; @@ -6859,10 +6876,10 @@ PanelSeparator, MatePanelAppletFrameDBus { ! Gnome clocks * *****************/ .clocks-analog-frame.trough { - color: mix(#ebdbb2,#282828,0.85); } + color: mix(#ebdbb2,#32302f,0.85); } .clocks-analog-frame.progress { - color: mix(#282828,#83a598,0.5); } + color: mix(#32302f,#83a598,0.5); } .clocks-analog-frame.progress-fast { color: #57786b; } @@ -6876,15 +6893,19 @@ workbench.csd > stack.titlebar:not(headerbar) { border: 0; box-shadow: none; } workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child { - border-radius: 0px 0px 0 0; } + border-radius: 4px 4px 0 0; } -/************************ - ! Unity-Control-Center * -*************************/ -.background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame { - border: 0 none transparent; } - .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:backdrop, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop { - background-color: transparent; } +/**************** + ! Geary * +*****************/ +.geary-expanded .geary-message-summary { + background-color: #302e2d; } + +.geary-folder-popover-list-row { + border-color: #303030; + box-shadow: None; } + .geary-folder-popover-list-row > label { + color: #32302f; } /*********************** ! Unity Greeter * @@ -6895,27 +6916,27 @@ workbench.csd > stack.titlebar:not(headerbar) { .lightdm.button, .lightdm-combo.combobox-entry .button, .lightdm-combo .cell, .lightdm-combo .button, .lightdm-combo .entry { background-image: none; - background-color: rgba(0, 0, 0, 0.3); - border-color: rgba(255, 255, 255, 0.9); - border-radius: 1px; - padding: 3px; - color: #fff; } + background-color: rgba(131, 104, 34, 0.3); + border-color: rgba(51, 49, 48, 0.9); + border-radius: 9px; + padding: 0px; + color: #333130; } .lightdm.menu { background-image: none; - background-color: rgba(0, 0, 0, 0.6); - border-color: rgba(255, 255, 255, 0.2); - border-radius: 0px; + background-color: rgba(131, 104, 34, 0.6); + border-color: rgba(51, 49, 48, 0.2); + border-radius: 8px; padding: 1px; - color: #fff; } + color: #333130; } .lightdm.menu .menuitem *, .lightdm.menu .menuitem.check:active, .lightdm.menu .menuitem.radio:active { - color: #fff; } + color: #333130; } .lightdm.menubar *, .lightdm.menubar.menuitem { - padding: 0px; } + padding: -3px; } .lightdm.option-button { - padding: 3px; + padding: 0px; background: none; border: 0; } @@ -6923,24 +6944,24 @@ workbench.csd > stack.titlebar:not(headerbar) { background: none; border-width: 0; } .lightdm.toggle-button.selected { - background-color: rgba(0, 0, 0, 0.3); - border-color: rgba(255, 255, 255, 0.3); + background-color: rgba(131, 104, 34, 0.3); + border-color: rgba(51, 49, 48, 0.3); border-width: 1px; } .lightdm.toggle-button.selected:hover { - background-color: rgba(255, 255, 255, 0.3); } + background-color: rgba(51, 49, 48, 0.3); } .lightdm.button:hover { - background-color: rgba(255, 255, 255, 0.3); - border-color: rgba(255, 255, 255, 0.6); + background-color: rgba(51, 49, 48, 0.3); + border-color: rgba(51, 49, 48, 0.6); text-shadow: none; } .lightdm.entry, .lightdm.button:active, .lightdm.button:active:focus, .lightdm.button:focus { background-image: none; - background-color: rgba(0, 0, 0, 0.3); - border-color: rgba(255, 255, 255, 0.6); - border-radius: 1px; - padding: 5px; - color: #fff; + background-color: rgba(131, 104, 34, 0.3); + border-color: rgba(51, 49, 48, 0.6); + border-radius: 9px; + padding: 2px; + color: #333130; text-shadow: none; } .lightdm.entry:hover, .lightdm.entry:active, .lightdm.entry:active:focus { @@ -6952,19 +6973,19 @@ workbench.csd > stack.titlebar:not(headerbar) { animation: dashentry_spinner 1s infinite linear; } .lightdm.entry:focus { - border-color: rgba(255, 255, 255, 0.6); + border-color: rgba(51, 49, 48, 0.6); border-width: 1px; border-style: solid; - color: #fff; } + color: #333130; } .lightdm.entry:selected { - background-color: rgba(255, 255, 255, 0.2); } + background-color: rgba(51, 49, 48, 0.2); } .lightdm-combo.menu { - background-color: #343433; + background-color: #2b2b2b; border-radius: 0; padding: 0; - color: #fff; } + color: #333130; } /********* ! Gedit * @@ -6973,17 +6994,17 @@ GeditWindow .pane-separator { border-width: 0 1px 0 0; border-style: solid; } GeditWindow .pane-separator, GeditWindow .pane-separator:hover { - border-color: #242424; - background-color: #282828; } + border-color: #2d2b2a; + background-color: #32302f; } .gedit-document-panel { - background-color: #282828; - color: mix(#ebdbb2,#282828,0.1); } + background-color: #32302f; + color: mix(#ebdbb2,#32302f,0.1); } .gedit-document-panel list row { - padding: 3px; } + padding: 0px; } .gedit-document-panel list row button { padding: 1px; - border-radius: 0px; + border-radius: 4px; border-style: solid; border-color: transparent; border-width: 1px; @@ -6992,31 +7013,31 @@ GeditWindow .pane-separator { color: transparent; -gtk-icon-shadow: none; } .gedit-document-panel .prelight-row button { - border-color: rgba(0, 0, 0, 0.1); - color: rgba(255, 255, 255, 0.8); } + border-color: rgba(131, 104, 34, 0.1); + color: rgba(51, 49, 48, 0.8); } .gedit-document-panel .prelight-row button:active { - border-color: rgba(0, 0, 0, 0.2); - background-color: rgba(0, 0, 0, 0.08); - color: #fff; } + border-color: rgba(131, 104, 34, 0.2); + background-color: rgba(131, 104, 34, 0.08); + color: #333130; } .gedit-document-panel list row button:hover, .gedit-document-panel .prelight-row button:hover { - border-color: rgba(0, 0, 0, 0.1); - color: #fff; } + border-color: rgba(131, 104, 34, 0.1); + color: #333130; } .gedit-document-panel-group-row, .gedit-document-panel-group-row:hover { - border-top: 1px solid #242424; - background-color: #282828; } + border-top: 1px solid #2d2b2a; + background-color: #32302f; } .gedit-document-panel-document-row:hover { - background-color: #2a2a2a; } + background-color: #353231; } .gedit-document-panel-dragged-row { - border: 1px solid rgba(0, 0, 0, 0.1); - background-color: rgba(0, 0, 0, 0.5); - color: #fff; } + border: 1px solid rgba(131, 104, 34, 0.1); + background-color: rgba(131, 104, 34, 0.5); + color: #333130; } .gedit-document-panel-placeholder-row { border: 0; - background-color: rgba(0, 0, 0, 0.08); + background-color: rgba(131, 104, 34, 0.08); transition: all 200ms ease-in; } statusbar GeditSmallButton, GeditStatusMenuButton { @@ -7028,33 +7049,33 @@ statusbar GeditSmallButton, GeditStatusMenuButton { border-radius: 0; padding: 1px 6px 2px 4px; } statusbar GeditSmallButton button:hover, statusbar GeditSmallButton button:active, statusbar GeditSmallButton button:active:hover, GeditStatusMenuButton button:hover, GeditStatusMenuButton button:active, GeditStatusMenuButton button:active:hover { - border-color: #202020; } + border-color: #282626; } statusbar GeditSmallButton button:active, GeditStatusMenuButton button:active { - background-color: #262626; + background-color: #302e2d; color: #ebdbb2; } GeditViewFrame .gedit-search-slider { - padding: 3px; - border-radius: 0 0 0px 0px; + padding: 0px; + border-radius: 0 0 4px 4px; border-width: 0 1px 1px; border-style: solid; - border-color: #262626; - background-color: #30302f; } + border-color: #282626; + background-color: #32302f; } GeditViewFrame .gedit-search-slider .not-found { - background-color: #f44336; + background-color: #ff276a; background-image: none; - color: #fff; } + color: #32302f; } GeditFileBrowserWidget .toolbar { - padding: 1.5px; + padding: 0px; border-top: 0; - background-color: #282828; + background-color: #32302f; background-image: none; } .gedit-search-entry-occurrences-tag { - margin: 1.5px; - padding: 1.5px; - color: mix(#ebdbb2,#30302f,0.5); } + margin: 0px; + padding: 0px; + color: mix(#ebdbb2,#32302f,0.5); } .gedit-bottom-panel-paned, .gedit-side-panel-paned, @@ -7062,14 +7083,14 @@ paned.titlebar { margin-right: 0; } .gedit-bottom-panel-paned notebook { - border-top: none; } + border-top: 0; } /************ ! Nautilus * *************/ .nautilus-desktop, .nautilus-desktop:backdrop, .nautilus-desktop *, .nautilus-desktop *:backdrop { - color: #fff; - text-shadow: 1px 1px #000; } + color: #333130; + text-shadow: 1px 1px #836822; } .nautilus-desktop:active, .nautilus-desktop:backdrop:active, .nautilus-desktop *:active, .nautilus-desktop *:backdrop:active { color: #ebdbb2; } .nautilus-desktop:selected, .nautilus-desktop:backdrop:selected, .nautilus-desktop *:selected, .nautilus-desktop *:backdrop:selected { @@ -7080,7 +7101,7 @@ paned.titlebar { .nautilus-window toolbar { border-width: 0 0 1px; border-style: solid; - border-color: #202020; } + border-color: #282626; } .nautilus-window .sidebar { border: 0; } @@ -7088,7 +7109,7 @@ paned.titlebar { border: 0; } .nautilus-window notebook { - background-color: #30302f; + background-color: #32302f; border: 0; } .nautilus-window notebook frame { border: 0; } @@ -7096,9 +7117,9 @@ paned.titlebar { .nautilus-window .searchbar-container { margin-top: -1px; } .nautilus-window .searchbar-container searchbar { - padding-top: 0px; - padding-bottom: 1px; - border-bottom: 1px solid mix(#282828,#ebdbb2,0.08); } + padding-top: -3px; + padding-bottom: -2px; + border-bottom: 1px solid mix(#32302f,#ebdbb2,0.18); } .disk-space-display { border-style: solid; @@ -7110,15 +7131,15 @@ paned.titlebar { background-color: rgba(131, 165, 152, 0.8); border-color: rgba(114, 153, 138, 0.8); } .disk-space-display.free { - background-color: #262626; - border-color: #222222; } + background-color: #302e2d; + border-color: #2b2928; } .conflict-row.activatable, .conflict-row.activatable:active { - color: #fff; - background-color: #f44336; } + color: #32302f; + background-color: #ff276a; } .conflict-row.activatable:hover { - background-color: #f65d52; } + background-color: #ff447e; } .conflict-row.activatable:selected { color: #ebdbb2; @@ -7128,8 +7149,8 @@ paned.titlebar { ! Nemo * *********/ .nemo-desktop, .nemo-desktop:backdrop, .nemo-desktop *, .nemo-desktop *:backdrop { - color: #fff; - text-shadow: 1px 1px #000; } + color: #333130; + text-shadow: 1px 1px #836822; } .nemo-desktop:active, .nemo-desktop:backdrop:active, .nemo-desktop *:active, .nemo-desktop *:backdrop:active { color: #ebdbb2; } .nemo-desktop:selected, .nemo-desktop:backdrop:selected, .nemo-desktop *:selected, .nemo-desktop *:backdrop:selected { @@ -7142,10 +7163,10 @@ paned.titlebar { .nemo-window toolbar { border-width: 0 0 1px; border-style: solid; - border-color: #202020; + border-color: #282626; /* Path Bar */ } .nemo-window toolbar button { - background-color: #282828; + background-color: #32302f; background-image: none; border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; @@ -7160,12 +7181,12 @@ paned.titlebar { border-color: rgba(218, 188, 112, 0.22); } .nemo-window toolbar button.flat { color: #ebdbb2; - border-color: rgba(40, 40, 40, 0); - background-color: rgba(40, 40, 40, 0); + border-color: rgba(50, 48, 47, 0); + background-color: rgba(50, 48, 47, 0); background-image: none; box-shadow: none; } .nemo-window toolbar button:hover, .nemo-window toolbar button.flat:hover { - background-color: #2a2a2a; + background-color: #353231; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; @@ -7179,7 +7200,7 @@ paned.titlebar { .nemo-window toolbar button:hover:active:disabled, .nemo-window toolbar button:hover:checked:disabled, .nemo-window toolbar button.flat:hover:active:disabled, .nemo-window toolbar button.flat:hover:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } .nemo-window toolbar button:focus, .nemo-window toolbar button.flat:focus { - background-color: #2a2a2a; + background-color: #353231; background-image: none; border-color: rgba(218, 188, 112, 0.3); color: #ebdbb2; @@ -7193,7 +7214,7 @@ paned.titlebar { .nemo-window toolbar button:focus:active:disabled, .nemo-window toolbar button:focus:checked:disabled, .nemo-window toolbar button.flat:focus:active:disabled, .nemo-window toolbar button.flat:focus:checked:disabled { border-color: rgba(218, 188, 112, 0.3); } .nemo-window toolbar button:focus:hover, .nemo-window toolbar button.flat:focus:hover { - background-color: #2c2c2c; + background-color: #373534; background-image: none; border-color: rgba(218, 188, 112, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } @@ -7209,9 +7230,9 @@ paned.titlebar { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(218, 188, 112, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); } .nemo-window toolbar button:checked:focus, .nemo-window toolbar button:checked:hover, .nemo-window toolbar button:active:focus, .nemo-window toolbar button:active:hover, .nemo-window toolbar button.flat:checked:focus, .nemo-window toolbar button.flat:checked:hover, .nemo-window toolbar button.flat:active:focus, .nemo-window toolbar button.flat:active:hover { border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } .nemo-window toolbar button:checked:active, .nemo-window toolbar button:checked:active:hover, .nemo-window toolbar button:checked:active:focus, .nemo-window toolbar button:checked:active:hover:focus, .nemo-window toolbar button:checked:checked, .nemo-window toolbar button:checked:checked:hover, .nemo-window toolbar button:checked:checked:focus, .nemo-window toolbar button:checked:checked:hover:focus, .nemo-window toolbar button:active:active, .nemo-window toolbar button:active:active:hover, .nemo-window toolbar button:active:active:focus, .nemo-window toolbar button:active:active:hover:focus, .nemo-window toolbar button:active:checked, .nemo-window toolbar button:active:checked:hover, .nemo-window toolbar button:active:checked:focus, .nemo-window toolbar button:active:checked:hover:focus, .nemo-window toolbar button.flat:checked:active, .nemo-window toolbar button.flat:checked:active:hover, .nemo-window toolbar button.flat:checked:active:focus, .nemo-window toolbar button.flat:checked:active:hover:focus, .nemo-window toolbar button.flat:checked:checked, .nemo-window toolbar button.flat:checked:checked:hover, .nemo-window toolbar button.flat:checked:checked:focus, .nemo-window toolbar button.flat:checked:checked:hover:focus, .nemo-window toolbar button.flat:active:active, .nemo-window toolbar button.flat:active:active:hover, .nemo-window toolbar button.flat:active:active:focus, .nemo-window toolbar button.flat:active:active:hover:focus, .nemo-window toolbar button.flat:active:checked, .nemo-window toolbar button.flat:active:checked:hover, .nemo-window toolbar button.flat:active:checked:focus, .nemo-window toolbar button.flat:active:checked:hover:focus { @@ -7228,11 +7249,11 @@ paned.titlebar { .nemo-window toolbar button:focus, .nemo-window toolbar button:hover, .nemo-window toolbar button.flat:focus, .nemo-window toolbar button.flat:hover { color: #ebdbb2; } .nemo-window toolbar button:disabled:disabled, .nemo-window toolbar button.flat:disabled:disabled { - background-color: alpha(mix(#282828,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#32302f,#ebdbb2,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#282828,#ebdbb2,0.5); + color: mix(#32302f,#ebdbb2,0.5); box-shadow: none; } .nemo-window toolbar button:active:disabled, .nemo-window toolbar button:checked:disabled, .nemo-window toolbar button.flat:active:disabled, .nemo-window toolbar button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -7241,9 +7262,9 @@ paned.titlebar { box-shadow: none; } .nemo-window toolbar button.separator, .nemo-window toolbar button .separator { border: 1px solid currentColor; - color: rgba(40, 40, 40, 0.9); } + color: rgba(50, 48, 47, 0.9); } .nemo-window toolbar button.separator:disabled, .nemo-window toolbar button .separator:disabled { - color: rgba(40, 40, 40, 0.85); } + color: rgba(50, 48, 47, 0.85); } .nemo-window toolbar .linked > button { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(66, 52, 17, 0.22); } .nemo-window toolbar .linked > button:focus, .nemo-window toolbar .linked > button:hover { @@ -7251,7 +7272,7 @@ paned.titlebar { .nemo-window toolbar .linked > button:active, .nemo-window toolbar .linked > button:active:hover, .nemo-window toolbar .linked > button:active:focus, .nemo-window toolbar .linked > button:active:hover:focus, .nemo-window toolbar .linked > button:checked, .nemo-window toolbar .linked > button:checked:hover, .nemo-window toolbar .linked > button:checked:focus, .nemo-window toolbar .linked > button:checked:hover:focus { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), inset 0 1px rgba(66, 52, 17, 0.07), inset 0 -1px rgba(66, 52, 17, 0.05); } .nemo-window toolbar .linked > button:disabled { - box-shadow: inset -1px 0 #202020; } + box-shadow: inset -1px 0 #282626; } .nemo-window toolbar .linked > button:last-child, .nemo-window toolbar .linked > button:only-child { box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } .nemo-window toolbar .linked > button:last-child:hover, .nemo-window toolbar .linked > button:only-child:hover { @@ -7263,28 +7284,28 @@ paned.titlebar { .nemo-window toolbar .linked > button:active:only-child, .nemo-window toolbar .linked > button:active:only-child:focus, .nemo-window toolbar .linked > button:active:only-child:hover, .nemo-window toolbar .linked > button:active:only-child:hover:focus, .nemo-window toolbar .linked > button:checked:only-child, .nemo-window toolbar .linked > button:checked:only-child:focus, .nemo-window toolbar .linked > button:checked:only-child:hover, .nemo-window toolbar .linked > button:checked:only-child:hover:focus { box-shadow: inset 1px 0 rgba(66, 52, 17, 0.06), inset 0 1px rgba(66, 52, 17, 0.07), inset -1px 0 rgba(66, 52, 17, 0.06); } .nemo-window toolbar separator, .nemo-window toolbar separator:disabled { - color: #242424; + color: #2d2b2a; border-color: currentColor; -GtkWidget-window-dragging: true; } .nemo-window toolbar.primary-toolbar button.image-button { - padding: 0 8px; } + padding: 0 5px; } .nemo-window toolbar combobox, .nemo-window toolbar button { - padding: 3px; } + padding: 0px; } .nemo-window toolbar combobox.text-button, .nemo-window toolbar button.text-button { - padding: 3px; } + padding: 0px; } .nemo-window toolbar combobox.image-button, .nemo-window toolbar button.image-button { - padding: 3px; } + padding: 0px; } .nemo-window toolbar toolitem stack { margin-left: 15px; } .nemo-window toolbar toolitem stack widget button { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), 0 1px 2px -1px rgba(66, 52, 17, 0.22); - -NemoPathbarButton-border-radius: 0px; } + -NemoPathbarButton-border-radius: 4px; } .nemo-window toolbar toolitem stack widget button:focus, .nemo-window toolbar toolitem stack widget button:hover { box-shadow: inset -1px 0 mix(#83a598,rgba(0, 0, 0, 0.22),0.3), 0 1px 2px -1px rgba(66, 52, 17, 0.42); } .nemo-window toolbar toolitem stack widget button:active, .nemo-window toolbar toolitem stack widget button:active:hover, .nemo-window toolbar toolitem stack widget button:active:focus, .nemo-window toolbar toolitem stack widget button:active:hover:focus, .nemo-window toolbar toolitem stack widget button:checked, .nemo-window toolbar toolitem stack widget button:checked:hover, .nemo-window toolbar toolitem stack widget button:checked:focus, .nemo-window toolbar toolitem stack widget button:checked:hover:focus { box-shadow: inset -1px 0 rgba(0, 0, 0, 0.22), inset 0 1px rgba(66, 52, 17, 0.07), inset 0 -1px rgba(66, 52, 17, 0.05); } .nemo-window toolbar toolitem stack widget button:disabled { - box-shadow: inset -1px 0 #202020; } + box-shadow: inset -1px 0 #282626; } .nemo-window toolbar toolitem stack widget button:last-child, .nemo-window toolbar toolitem stack widget button:only-child { box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } .nemo-window toolbar toolitem stack widget button:last-child:hover, .nemo-window toolbar toolitem stack widget button:only-child:hover { @@ -7298,7 +7319,7 @@ paned.titlebar { .nemo-window grid > widget:last-child button { min-height: 16px; min-width: 16px; - padding: 2px 4px; } + padding: -1px -2px; } .nemo-window grid > widget:last-child button:first-child { margin-left: 20px; } .nemo-window grid > widget:last-child button:first-child + button { @@ -7314,12 +7335,12 @@ paned.titlebar { .nemo-window .sidebar .frame { border: 0; } .nemo-window .sidebar image { - padding-left: 3px; - padding-right: 3px; } + padding-left: 0px; + padding-right: 0px; } .nemo-window .sidebar .nemo-places-sidebar, .nemo-window .sidebar .nemo-places-sidebar .view, .nemo-window .sidebar .nemo-places-sidebar iconview { - background-color: mix(#282828,#30302f,0.5); } + background-color: mix(#32302f,#32302f,0.5); } .nemo-window .sidebar .nemo-places-sidebar .view, .nemo-window .sidebar .nemo-places-sidebar iconview { - -NemoPlacesTreeView-disk-full-bg-color: #202020; + -NemoPlacesTreeView-disk-full-bg-color: #282626; -NemoPlacesTreeView-disk-full-fg-color: #83a598; -NemoPlacesTreeView-disk-full-bar-width: 2px; -NemoPlacesTreeView-disk-full-bar-radius: 1px; @@ -7329,22 +7350,22 @@ paned.titlebar { -NemoPlacesTreeView-disk-full-bg-color: #ebdbb2; -NemoPlacesTreeView-disk-full-fg-color: #a5beb4; } .nemo-window .sidebar + separator + box .primary-toolbar { - background-color: #272727; + background-color: #312f2e; background-image: none; - padding-top: 0px; - padding-bottom: 0px; - border-bottom: 1px solid mix(#282828,#ebdbb2,0.08); } + padding-top: -3px; + padding-bottom: -3px; + border-bottom: 1px solid mix(#32302f,#ebdbb2,0.18); } .nemo-window .sidebar + separator + box .primary-toolbar button:nth-child(2) { - border-right: none; + border-right: 0; border-top-right-radius: 0; border-bottom-right-radius: 0; } .nemo-window .sidebar + separator + box .primary-toolbar button:nth-child(3) { margin-left: -6px; - border-left: none; + border-left: 0; border-top-left-radius: 0; border-bottom-left-radius: 0; } .nemo-window .sidebar + separator + box .primary-toolbar button.flat { - background-color: #303030; + background-color: #32302f; background-image: none; border-color: rgba(0, 0, 0, 0.22); color: #ebdbb2; @@ -7359,7 +7380,7 @@ paned.titlebar { .nemo-window .sidebar + separator + box .primary-toolbar button.flat:active:disabled, .nemo-window .sidebar + separator + box .primary-toolbar button.flat:checked:disabled { border-color: rgba(0, 0, 0, 0.22); } .nemo-window notebook { - background-color: #30302f; + background-color: #32302f; border-width: 0; } .nemo-window notebook tabs { border: 0; } @@ -7371,9 +7392,9 @@ paned.titlebar { ! Synaptic * *************/ GtkWindow > GtkVBox > .dock, GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar { - background-color: #282828; + background-color: #32302f; background-image: none; - padding: 3px; + padding: 0px; border: 0; color: #ebdbb2; } @@ -7388,7 +7409,7 @@ GtkWindow > GtkVBox > .dock, GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar padding: 0; border: 0; background-image: none; - background-color: #30302f; + background-color: #32302f; color: #ebdbb2; } .xfce4-panel { @@ -7418,175 +7439,183 @@ UnityDecoration { -UnityDecoration-title-fade: 35px; -UnityDecoration-title-alignment: 0; } UnityDecoration .top { - border: 1px solid #32302f; + border: 1px solid #282828; border-bottom: 0; - border-radius: 0px 0px 0 0; - padding: 1px 6px 0 6px; - background-color: #30302f; - color: mix(#ebdbb2,#30302f,0.1); + border-radius: 4px 4px 0 0; + padding: 1px 3px 0; + background-color: #282828; + color: mix(#d5c4a1,#282828,0.1); text-shadow: none; } UnityDecoration .top:hover { border-radius: 0; - border-color: mix(#30302f,#ebdbb2,0.21); - background-color: mix(#30302f,#ebdbb2,0.21); + border-color: mix(#282828,#d5c4a1,0.21); + background-color: mix(#282828,#d5c4a1,0.21); background-image: none; - color: #f2e7cc; } + color: #ded1b6; } UnityDecoration .top:backdrop { border: 1px solid #282828; - color: mix(#ebdbb2,#30302f,0.4); } + color: mix(#d5c4a1,#282828,0.4); } UnityDecoration .left, UnityDecoration .right, UnityDecoration .bottom { - background-color: #30302f; } + background-color: #282828; } UnityDecoration .left:backdrop, UnityDecoration .right:backdrop, UnityDecoration .bottom:backdrop { - background-color: mix(#222221,#ebdbb2,0.21); } + background-color: mix(#1c1c1c,#d5c4a1,0.21); } UnityPanelWidget, .unity-panel { border: 0; } .unity-panel.menuitem, .unity-panel .menuitem { border-width: 0 1px; - color: #ebdbb2; } + color: #d5c4a1; } .unity-panel.menuitem:hover, .unity-panel.menuitem *:hover, .unity-panel .menuitem:hover, .unity-panel .menuitem *:hover { - border-color: mix(#30302f,#ebdbb2,0.21); - background-color: mix(#30302f,#ebdbb2,0.21); + border-color: mix(#282828,#d5c4a1,0.21); + background-color: mix(#282828,#d5c4a1,0.21); background-image: none; - color: #f2e7cc; } + color: #ded1b6; } SheetStyleDialog.unity-force-quit { - background-color: #282828; } + background-color: #32302f; } + +/************************ + ! Unity-Control-Center * +*************************/ +.background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame { + border: 0 none transparent; } + .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview.view:backdrop, .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical iconview:backdrop { + background-color: transparent; } /*********************** ! LightDM GTK Greeter * ***********************/ #panel_window { - background-color: #30302f; + background-color: #282828; background-image: none; - color: #fff; + color: #d5c4a1; font-weight: bold; - text-shadow: 0 1px rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: 0 1px rgba(0, 0, 0, 0.5); } + text-shadow: 0 1px rgba(131, 104, 34, 0.5); + -gtk-icon-shadow: 0 1px rgba(131, 104, 34, 0.5); } #panel_window menubar { - padding-left: 3px; } + padding-left: 0px; } #panel_window menubar, #panel_window menubar > menuitem { background-color: transparent; background-image: none; border-style: none; - color: #fff; - text-shadow: 0 1px rgba(0, 0, 0, 0.5); - -gtk-icon-shadow: 0 1px rgba(0, 0, 0, 0.5); } + color: #d5c4a1; + text-shadow: 0 1px rgba(131, 104, 34, 0.5); + -gtk-icon-shadow: 0 1px rgba(131, 104, 34, 0.5); } #panel_window menubar:hover, #panel_window menubar > menuitem:hover { - background-color: rgba(255, 255, 255, 0.2); + background-color: rgba(213, 196, 161, 0.2); background-image: none; - color: #fff; } + color: #d5c4a1; } #panel_window menubar *:hover, #panel_window menubar > menuitem *:hover { - color: #fff; } + color: #d5c4a1; } #panel_window menubar:disabled, #panel_window menubar > menuitem:disabled { - color: rgba(255, 255, 255, 0.7); } + color: rgba(213, 196, 161, 0.7); } #panel_window menubar menu > menuitem { font-weight: normal; } #content_frame { - padding-bottom: 9px; } + padding-bottom: 0px; } #login_window, #shutdown_dialog, #restart_dialog { border-style: none; - border-radius: 0px; - background-color: #30302f; - color: #ebdbb2; + border-radius: 4px; + background-color: #282828; + color: #d5c4a1; /* draw border using box-shadow */ - box-shadow: inset 1px 0 mix(#222221,#ebdbb2,0.21), inset -1px 0 mix(#222221,#ebdbb2,0.21), inset 0 1px mix(#222221,#ebdbb2,0.21), inset 0 -1px mix(#222221,#ebdbb2,0.21); } + box-shadow: inset 1px 0 mix(#1c1c1c,#d5c4a1,0.21), inset -1px 0 mix(#1c1c1c,#d5c4a1,0.21), inset 0 1px mix(#1c1c1c,#d5c4a1,0.21), inset 0 -1px mix(#1c1c1c,#d5c4a1,0.21); } #login_window menu { border-radius: 0; } #login_window button { - background-color: #30302f; + background-color: #32302f; background-image: none; - border-color: rgba(218, 188, 112, 0.22); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.22); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } #login_window button:focus, #login_window button:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } #login_window button:active, #login_window button:active:hover, #login_window button:active:focus, #login_window button:active:hover:focus, #login_window button:checked, #login_window button:checked:hover, #login_window button:checked:focus, #login_window button:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } #login_window button:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } #login_window button:active:disabled, #login_window button:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } #login_window button.flat { - color: #ebdbb2; - border-color: rgba(48, 48, 47, 0); - background-color: rgba(48, 48, 47, 0); + color: #d5c4a1; + border-color: rgba(50, 48, 47, 0); + background-color: rgba(50, 48, 47, 0); background-image: none; box-shadow: none; } #login_window button:hover, #login_window button.flat:hover { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } #login_window button:hover:focus, #login_window button:hover:hover, #login_window button.flat:hover:focus, #login_window button.flat:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } #login_window button:hover:active, #login_window button:hover:active:hover, #login_window button:hover:active:focus, #login_window button:hover:active:hover:focus, #login_window button:hover:checked, #login_window button:hover:checked:hover, #login_window button:hover:checked:focus, #login_window button:hover:checked:hover:focus, #login_window button.flat:hover:active, #login_window button.flat:hover:active:hover, #login_window button.flat:hover:active:focus, #login_window button.flat:hover:active:hover:focus, #login_window button.flat:hover:checked, #login_window button.flat:hover:checked:hover, #login_window button.flat:hover:checked:focus, #login_window button.flat:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } #login_window button:hover:disabled, #login_window button.flat:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } #login_window button:hover:active:disabled, #login_window button:hover:checked:disabled, #login_window button.flat:hover:active:disabled, #login_window button.flat:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } #login_window button:focus, #login_window button.flat:focus { - background-color: #323231; + background-color: #353231; background-image: none; - border-color: rgba(218, 188, 112, 0.3); - color: #ebdbb2; + border-color: rgba(190, 164, 109, 0.3); + color: #d5c4a1; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } #login_window button:focus:focus, #login_window button:focus:hover, #login_window button.flat:focus:focus, #login_window button.flat:focus:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } #login_window button:focus:active, #login_window button:focus:active:hover, #login_window button:focus:active:focus, #login_window button:focus:active:hover:focus, #login_window button:focus:checked, #login_window button:focus:checked:hover, #login_window button:focus:checked:focus, #login_window button:focus:checked:hover:focus, #login_window button.flat:focus:active, #login_window button.flat:focus:active:hover, #login_window button.flat:focus:active:focus, #login_window button.flat:focus:active:hover:focus, #login_window button.flat:focus:checked, #login_window button.flat:focus:checked:hover, #login_window button.flat:focus:checked:focus, #login_window button.flat:focus:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } #login_window button:focus:disabled, #login_window button.flat:focus:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } #login_window button:focus:active:disabled, #login_window button:focus:checked:disabled, #login_window button.flat:focus:active:disabled, #login_window button.flat:focus:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } #login_window button:focus:hover, #login_window button.flat:focus:hover { - background-color: #353534; + background-color: #373534; background-image: none; - border-color: rgba(218, 188, 112, 0.3); + border-color: rgba(190, 164, 109, 0.3); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } #login_window button:focus:hover:focus, #login_window button:focus:hover:hover, #login_window button.flat:focus:hover:focus, #login_window button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.3),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.3),0.3); } #login_window button:focus:hover:active, #login_window button:focus:hover:active:hover, #login_window button:focus:hover:active:focus, #login_window button:focus:hover:active:hover:focus, #login_window button:focus:hover:checked, #login_window button:focus:hover:checked:hover, #login_window button:focus:hover:checked:focus, #login_window button:focus:hover:checked:hover:focus, #login_window button.flat:focus:hover:active, #login_window button.flat:focus:hover:active:hover, #login_window button.flat:focus:hover:active:focus, #login_window button.flat:focus:hover:active:hover:focus, #login_window button.flat:focus:hover:checked, #login_window button.flat:focus:hover:checked:hover, #login_window button.flat:focus:hover:checked:focus, #login_window button.flat:focus:hover:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.3); } + border-color: rgba(178, 147, 83, 0.3); } #login_window button:focus:hover:disabled, #login_window button.flat:focus:hover:disabled { - border-color: rgba(222, 196, 129, 0.3); } + border-color: rgba(196, 172, 122, 0.3); } #login_window button:focus:hover:active:disabled, #login_window button:focus:hover:checked:disabled, #login_window button.flat:focus:hover:active:disabled, #login_window button.flat:focus:hover:checked:disabled { - border-color: rgba(218, 188, 112, 0.3); } + border-color: rgba(190, 164, 109, 0.3); } #login_window button:checked, #login_window button:active, #login_window button.flat:checked, #login_window button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(190, 164, 109, 0.22); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(235, 219, 178, 0.06), inset 0 1px rgba(235, 219, 178, 0.07), inset -1px 0 rgba(235, 219, 178, 0.06), inset 0 -1px rgba(235, 219, 178, 0.05); - border-color: rgba(218, 188, 112, 0.22); } + box-shadow: inset 1px 0 rgba(213, 196, 161, 0.06), inset 0 1px rgba(213, 196, 161, 0.07), inset -1px 0 rgba(213, 196, 161, 0.06), inset 0 -1px rgba(213, 196, 161, 0.05); } #login_window button:checked:focus, #login_window button:checked:hover, #login_window button:active:focus, #login_window button:active:hover, #login_window button.flat:checked:focus, #login_window button.flat:checked:hover, #login_window button.flat:active:focus, #login_window button.flat:active:hover { - border-color: mix(#83a598,rgba(235, 219, 178, 0.22),0.3); } + border-color: mix(#83a598,rgba(213, 196, 161, 0.22),0.3); } #login_window button:checked:active, #login_window button:checked:active:hover, #login_window button:checked:active:focus, #login_window button:checked:active:hover:focus, #login_window button:checked:checked, #login_window button:checked:checked:hover, #login_window button:checked:checked:focus, #login_window button:checked:checked:hover:focus, #login_window button:active:active, #login_window button:active:active:hover, #login_window button:active:active:focus, #login_window button:active:active:hover:focus, #login_window button:active:checked, #login_window button:active:checked:hover, #login_window button:active:checked:focus, #login_window button:active:checked:hover:focus, #login_window button.flat:checked:active, #login_window button.flat:checked:active:hover, #login_window button.flat:checked:active:focus, #login_window button.flat:checked:active:hover:focus, #login_window button.flat:checked:checked, #login_window button.flat:checked:checked:hover, #login_window button.flat:checked:checked:focus, #login_window button.flat:checked:checked:hover:focus, #login_window button.flat:active:active, #login_window button.flat:active:active:hover, #login_window button.flat:active:active:focus, #login_window button.flat:active:active:hover:focus, #login_window button.flat:active:checked, #login_window button.flat:active:checked:hover, #login_window button.flat:active:checked:focus, #login_window button.flat:active:checked:hover:focus { - border-color: rgba(209, 173, 80, 0.22); } + border-color: rgba(178, 147, 83, 0.22); } #login_window button:checked:disabled, #login_window button:active:disabled, #login_window button.flat:checked:disabled, #login_window button.flat:active:disabled { - border-color: rgba(222, 196, 129, 0.22); } + border-color: rgba(196, 172, 122, 0.22); } #login_window button:checked:active:disabled, #login_window button:checked:checked:disabled, #login_window button:active:active:disabled, #login_window button:active:checked:disabled, #login_window button.flat:checked:active:disabled, #login_window button.flat:checked:checked:disabled, #login_window button.flat:active:active:disabled, #login_window button.flat:active:checked:disabled { - border-color: rgba(218, 188, 112, 0.22); } + border-color: rgba(190, 164, 109, 0.22); } #login_window button:checked:focus, #login_window button:checked:hover, #login_window button:active:focus, #login_window button:active:hover, #login_window button.flat:checked:focus, #login_window button.flat:checked:hover, #login_window button.flat:active:focus, #login_window button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } #login_window button:focus, #login_window button:hover, #login_window button.flat:focus, #login_window button.flat:hover { - color: #ebdbb2; } + color: #d5c4a1; } #login_window button:disabled:disabled, #login_window button.flat:disabled:disabled { - background-color: alpha(mix(#30302f,#ebdbb2,0.2),0.4); + background-color: alpha(mix(#32302f,#d5c4a1,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#30302f,#ebdbb2,0.5); + color: mix(#32302f,#d5c4a1,0.5); box-shadow: none; } #login_window button:active:disabled, #login_window button:checked:disabled, #login_window button.flat:active:disabled, #login_window button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -7595,164 +7624,164 @@ SheetStyleDialog.unity-force-quit { box-shadow: none; } #login_window button.separator, #login_window button .separator { border: 1px solid currentColor; - color: rgba(48, 48, 47, 0.9); } + color: rgba(50, 48, 47, 0.9); } #login_window button.separator:disabled, #login_window button .separator:disabled { - color: rgba(48, 48, 47, 0.85); } + color: rgba(50, 48, 47, 0.85); } #login_window entry { - background-color: #30302f; + background-color: #282828; background-image: none; - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); - padding: 3px; - color: #ebdbb2; + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); + padding: 0px; + color: #d5c4a1; caret-color: #282828; -gtk-secondary-caret-color: #282828; } #login_window entry:focus, #login_window entry:hover { - border-color: mix(#83a598,mix(#30302f,#ebdbb2,0.2),0.3); } + border-color: mix(#83a598,mix(#282828,#d5c4a1,0.2),0.3); } #login_window entry:active, #login_window entry:active:hover, #login_window entry:active:focus, #login_window entry:active:hover:focus, #login_window entry:checked, #login_window entry:checked:hover, #login_window entry:checked:focus, #login_window entry:checked:hover:focus { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.7); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.7); } #login_window entry:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.85); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.85); } #login_window entry:active:disabled, #login_window entry:checked:disabled { - border-color: shade(mix(#30302f,#ebdbb2,0.2),0.8); } + border-color: shade(mix(#282828,#d5c4a1,0.2),0.8); } #login_window entry:focus, #login_window entry:active { - border-color: mix(#83a598,mix(#282828,#ebdbb2,0.08),0.3); } + border-color: mix(#83a598,mix(#32302f,#ebdbb2,0.18),0.3); } #login_window entry:disabled { - background-color: #2b2b2a; + background-color: #242424; background-image: none; - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); - /*@include border(mix($bg, $fg, .20));*/ + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); + /*@include border(mix($bg, $fg, .2));*/ /*border-color: alpha(mix($bg, $fg, .15), .8);*/ /*opacity: .8;*/ - color: mix(#30302f,#ebdbb2,0.5); } + color: mix(#282828,#d5c4a1,0.5); } #login_window entry:disabled:focus, #login_window entry:disabled:hover { - border-color: mix(#83a598,alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.3); } + border-color: mix(#83a598,alpha(mix(#282828,#d5c4a1,0.2),0.4),0.3); } #login_window entry:disabled:active, #login_window entry:disabled:active:hover, #login_window entry:disabled:active:focus, #login_window entry:disabled:active:hover:focus, #login_window entry:disabled:checked, #login_window entry:disabled:checked:hover, #login_window entry:disabled:checked:focus, #login_window entry:disabled:checked:hover:focus { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.7); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.7); } #login_window entry:disabled:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.85); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.85); } #login_window entry:disabled:active:disabled, #login_window entry:disabled:checked:disabled { - border-color: shade(alpha(mix(#30302f,#ebdbb2,0.2),0.4),0.8); } + border-color: shade(alpha(mix(#282828,#d5c4a1,0.2),0.4),0.8); } #user_combobox { - color: #ebdbb2; + color: #d5c4a1; font-size: 18px; } #user_combobox menu { font-weight: normal; } #user_combobox arrow { - color: mix(#ebdbb2,#30302f,0.5); } + color: mix(#d5c4a1,#282828,0.5); } #user_image { - border-radius: 0px; + border-radius: 4px; /* draw border using box-shadow */ - box-shadow: inset 1px 0 #222221, inset -1px 0 #222221, inset 0 1px #222221, inset 0 -1px #222221; } + box-shadow: inset 1px 0 #1c1c1c, inset -1px 0 #1c1c1c, inset 0 1px #1c1c1c, inset 0 -1px #1c1c1c; } #user_image_border { - border-radius: 0px; - background-color: #2b2b2a; + border-radius: 4px; + background-color: #242424; background-image: none; box-shadow: inset 1px 0 rgba(66, 52, 17, 0.07), inset 0 1px rgba(66, 52, 17, 0.08), inset -1px 0 rgba(66, 52, 17, 0.07), inset 0 -1px rgba(66, 52, 17, 0.05); } #buttonbox_frame { - padding-top: 6px; + padding-top: 0px; padding-bottom: 0; border-style: none; - border-bottom-left-radius: 0px; - border-bottom-right-radius: 0px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; background-color: transparent; background-image: none; box-shadow: none; } /* shutdown button */ #shutdown_button button { - background-color: #f44336; + background-color: #ff276a; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.12); } #shutdown_button button:focus, #shutdown_button button:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } #shutdown_button button:active, #shutdown_button button:active:hover, #shutdown_button button:active:focus, #shutdown_button button:active:hover:focus, #shutdown_button button:checked, #shutdown_button button:checked:hover, #shutdown_button button:checked:focus, #shutdown_button button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } #shutdown_button button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } #shutdown_button button:active:disabled, #shutdown_button button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } #shutdown_button button.flat { - color: #fff; - border-color: rgba(244, 67, 54, 0); - background-color: rgba(244, 67, 54, 0); + color: #32302f; + border-color: rgba(255, 39, 106, 0); + background-color: rgba(255, 39, 106, 0); background-image: none; box-shadow: none; } #shutdown_button button:hover, #shutdown_button button.flat:hover { - background-color: #f55044; + background-color: #ff3674; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } #shutdown_button button:hover:focus, #shutdown_button button:hover:hover, #shutdown_button button.flat:hover:focus, #shutdown_button button.flat:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } #shutdown_button button:hover:active, #shutdown_button button:hover:active:hover, #shutdown_button button:hover:active:focus, #shutdown_button button:hover:active:hover:focus, #shutdown_button button:hover:checked, #shutdown_button button:hover:checked:hover, #shutdown_button button:hover:checked:focus, #shutdown_button button:hover:checked:hover:focus, #shutdown_button button.flat:hover:active, #shutdown_button button.flat:hover:active:hover, #shutdown_button button.flat:hover:active:focus, #shutdown_button button.flat:hover:active:hover:focus, #shutdown_button button.flat:hover:checked, #shutdown_button button.flat:hover:checked:hover, #shutdown_button button.flat:hover:checked:focus, #shutdown_button button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #shutdown_button button:hover:disabled, #shutdown_button button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #shutdown_button button:hover:active:disabled, #shutdown_button button:hover:checked:disabled, #shutdown_button button.flat:hover:active:disabled, #shutdown_button button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #shutdown_button button:focus, #shutdown_button button.flat:focus { - background-color: #f55044; + background-color: #ff3674; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } #shutdown_button button:focus:focus, #shutdown_button button:focus:hover, #shutdown_button button.flat:focus:focus, #shutdown_button button.flat:focus:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } #shutdown_button button:focus:active, #shutdown_button button:focus:active:hover, #shutdown_button button:focus:active:focus, #shutdown_button button:focus:active:hover:focus, #shutdown_button button:focus:checked, #shutdown_button button:focus:checked:hover, #shutdown_button button:focus:checked:focus, #shutdown_button button:focus:checked:hover:focus, #shutdown_button button.flat:focus:active, #shutdown_button button.flat:focus:active:hover, #shutdown_button button.flat:focus:active:focus, #shutdown_button button.flat:focus:active:hover:focus, #shutdown_button button.flat:focus:checked, #shutdown_button button.flat:focus:checked:hover, #shutdown_button button.flat:focus:checked:focus, #shutdown_button button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #shutdown_button button:focus:disabled, #shutdown_button button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #shutdown_button button:focus:active:disabled, #shutdown_button button:focus:checked:disabled, #shutdown_button button.flat:focus:active:disabled, #shutdown_button button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #shutdown_button button:focus:hover, #shutdown_button button.flat:focus:hover { - background-color: #f65d52; + background-color: #ff447e; background-image: none; - border-color: rgba(204, 204, 204, 0.3); + border-color: rgba(40, 38, 38, 0.4); box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.38); } #shutdown_button button:focus:hover:focus, #shutdown_button button:focus:hover:hover, #shutdown_button button.flat:focus:hover:focus, #shutdown_button button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } #shutdown_button button:focus:hover:active, #shutdown_button button:focus:hover:active:hover, #shutdown_button button:focus:hover:active:focus, #shutdown_button button:focus:hover:active:hover:focus, #shutdown_button button:focus:hover:checked, #shutdown_button button:focus:hover:checked:hover, #shutdown_button button:focus:hover:checked:focus, #shutdown_button button:focus:hover:checked:hover:focus, #shutdown_button button.flat:focus:hover:active, #shutdown_button button.flat:focus:hover:active:hover, #shutdown_button button.flat:focus:hover:active:focus, #shutdown_button button.flat:focus:hover:active:hover:focus, #shutdown_button button.flat:focus:hover:checked, #shutdown_button button.flat:focus:hover:checked:hover, #shutdown_button button.flat:focus:hover:checked:focus, #shutdown_button button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #shutdown_button button:focus:hover:disabled, #shutdown_button button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #shutdown_button button:focus:hover:active:disabled, #shutdown_button button:focus:hover:checked:disabled, #shutdown_button button.flat:focus:hover:active:disabled, #shutdown_button button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #shutdown_button button:checked, #shutdown_button button:active, #shutdown_button button.flat:checked, #shutdown_button button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } #shutdown_button button:checked:focus, #shutdown_button button:checked:hover, #shutdown_button button:active:focus, #shutdown_button button:active:hover, #shutdown_button button.flat:checked:focus, #shutdown_button button.flat:checked:hover, #shutdown_button button.flat:active:focus, #shutdown_button button.flat:active:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } #shutdown_button button:checked:active, #shutdown_button button:checked:active:hover, #shutdown_button button:checked:active:focus, #shutdown_button button:checked:active:hover:focus, #shutdown_button button:checked:checked, #shutdown_button button:checked:checked:hover, #shutdown_button button:checked:checked:focus, #shutdown_button button:checked:checked:hover:focus, #shutdown_button button:active:active, #shutdown_button button:active:active:hover, #shutdown_button button:active:active:focus, #shutdown_button button:active:active:hover:focus, #shutdown_button button:active:checked, #shutdown_button button:active:checked:hover, #shutdown_button button:active:checked:focus, #shutdown_button button:active:checked:hover:focus, #shutdown_button button.flat:checked:active, #shutdown_button button.flat:checked:active:hover, #shutdown_button button.flat:checked:active:focus, #shutdown_button button.flat:checked:active:hover:focus, #shutdown_button button.flat:checked:checked, #shutdown_button button.flat:checked:checked:hover, #shutdown_button button.flat:checked:checked:focus, #shutdown_button button.flat:checked:checked:hover:focus, #shutdown_button button.flat:active:active, #shutdown_button button.flat:active:active:hover, #shutdown_button button.flat:active:active:focus, #shutdown_button button.flat:active:active:hover:focus, #shutdown_button button.flat:active:checked, #shutdown_button button.flat:active:checked:hover, #shutdown_button button.flat:active:checked:focus, #shutdown_button button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } #shutdown_button button:checked:disabled, #shutdown_button button:active:disabled, #shutdown_button button.flat:checked:disabled, #shutdown_button button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } #shutdown_button button:checked:active:disabled, #shutdown_button button:checked:checked:disabled, #shutdown_button button:active:active:disabled, #shutdown_button button:active:checked:disabled, #shutdown_button button.flat:checked:active:disabled, #shutdown_button button.flat:checked:checked:disabled, #shutdown_button button.flat:active:active:disabled, #shutdown_button button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } #shutdown_button button:checked:focus, #shutdown_button button:checked:hover, #shutdown_button button:active:focus, #shutdown_button button:active:hover, #shutdown_button button.flat:checked:focus, #shutdown_button button.flat:checked:hover, #shutdown_button button.flat:active:focus, #shutdown_button button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } #shutdown_button button:focus, #shutdown_button button:hover, #shutdown_button button.flat:focus, #shutdown_button button.flat:hover { - color: #fff; } + color: #32302f; } #shutdown_button button:disabled:disabled, #shutdown_button button.flat:disabled:disabled { - background-color: alpha(mix(#f44336,#fff,0.2),0.4); + background-color: alpha(mix(#ff276a,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#f44336,#fff,0.5); + color: mix(#ff276a,#32302f,0.5); box-shadow: none; } #shutdown_button button:active:disabled, #shutdown_button button:checked:disabled, #shutdown_button button.flat:active:disabled, #shutdown_button button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -7761,100 +7790,100 @@ SheetStyleDialog.unity-force-quit { box-shadow: none; } #shutdown_button button.separator, #shutdown_button button .separator { border: 1px solid currentColor; - color: rgba(244, 67, 54, 0.9); } + color: rgba(255, 39, 106, 0.9); } #shutdown_button button.separator:disabled, #shutdown_button button .separator:disabled { - color: rgba(244, 67, 54, 0.85); } + color: rgba(255, 39, 106, 0.85); } /* restart button */ #restart_button button { - background-color: #ef6c00; + background-color: #ff7f42; background-image: none; - border-color: rgba(204, 204, 204, 0.22); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } + border-color: rgba(40, 38, 38, 0.32); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.12); } #restart_button button:focus, #restart_button button:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } #restart_button button:active, #restart_button button:active:hover, #restart_button button:active:focus, #restart_button button:active:hover:focus, #restart_button button:checked, #restart_button button:checked:hover, #restart_button button:checked:focus, #restart_button button:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } #restart_button button:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } #restart_button button:active:disabled, #restart_button button:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } #restart_button button.flat { - color: #fff; - border-color: rgba(239, 108, 0, 0); - background-color: rgba(239, 108, 0, 0); + color: #32302f; + border-color: rgba(255, 127, 66, 0); + background-color: rgba(255, 127, 66, 0); background-image: none; box-shadow: none; } #restart_button button:hover, #restart_button button.flat:hover { - background-color: #fb7100; + background-color: #ff8a52; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.22); } #restart_button button:hover:focus, #restart_button button:hover:hover, #restart_button button.flat:hover:focus, #restart_button button.flat:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } #restart_button button:hover:active, #restart_button button:hover:active:hover, #restart_button button:hover:active:focus, #restart_button button:hover:active:hover:focus, #restart_button button:hover:checked, #restart_button button:hover:checked:hover, #restart_button button:hover:checked:focus, #restart_button button:hover:checked:hover:focus, #restart_button button.flat:hover:active, #restart_button button.flat:hover:active:hover, #restart_button button.flat:hover:active:focus, #restart_button button.flat:hover:active:hover:focus, #restart_button button.flat:hover:checked, #restart_button button.flat:hover:checked:hover, #restart_button button.flat:hover:checked:focus, #restart_button button.flat:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #restart_button button:hover:disabled, #restart_button button.flat:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #restart_button button:hover:active:disabled, #restart_button button:hover:checked:disabled, #restart_button button.flat:hover:active:disabled, #restart_button button.flat:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #restart_button button:focus, #restart_button button.flat:focus { - background-color: #fb7100; + background-color: #ff8a52; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - color: #fff; - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.42); } + border-color: rgba(40, 38, 38, 0.4); + color: #32302f; + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.32); } #restart_button button:focus:focus, #restart_button button:focus:hover, #restart_button button.flat:focus:focus, #restart_button button.flat:focus:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } #restart_button button:focus:active, #restart_button button:focus:active:hover, #restart_button button:focus:active:focus, #restart_button button:focus:active:hover:focus, #restart_button button:focus:checked, #restart_button button:focus:checked:hover, #restart_button button:focus:checked:focus, #restart_button button:focus:checked:hover:focus, #restart_button button.flat:focus:active, #restart_button button.flat:focus:active:hover, #restart_button button.flat:focus:active:focus, #restart_button button.flat:focus:active:hover:focus, #restart_button button.flat:focus:checked, #restart_button button.flat:focus:checked:hover, #restart_button button.flat:focus:checked:focus, #restart_button button.flat:focus:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #restart_button button:focus:disabled, #restart_button button.flat:focus:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #restart_button button:focus:active:disabled, #restart_button button:focus:checked:disabled, #restart_button button.flat:focus:active:disabled, #restart_button button.flat:focus:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #restart_button button:focus:hover, #restart_button button.flat:focus:hover { - background-color: #ff7808; + background-color: #ff9562; background-image: none; - border-color: rgba(204, 204, 204, 0.3); - box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.48); } + border-color: rgba(40, 38, 38, 0.4); + box-shadow: 0 1px 2px -1px rgba(66, 52, 17, 0.38); } #restart_button button:focus:hover:focus, #restart_button button:focus:hover:hover, #restart_button button.flat:focus:hover:focus, #restart_button button.flat:focus:hover:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.3),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.4),0.3); } #restart_button button:focus:hover:active, #restart_button button:focus:hover:active:hover, #restart_button button:focus:hover:active:focus, #restart_button button:focus:hover:active:hover:focus, #restart_button button:focus:hover:checked, #restart_button button:focus:hover:checked:hover, #restart_button button:focus:hover:checked:focus, #restart_button button:focus:hover:checked:hover:focus, #restart_button button.flat:focus:hover:active, #restart_button button.flat:focus:hover:active:hover, #restart_button button.flat:focus:hover:active:focus, #restart_button button.flat:focus:hover:active:hover:focus, #restart_button button.flat:focus:hover:checked, #restart_button button.flat:focus:hover:checked:hover, #restart_button button.flat:focus:hover:checked:focus, #restart_button button.flat:focus:hover:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.3); } + border-color: rgba(35, 34, 33, 0.4); } #restart_button button:focus:hover:disabled, #restart_button button.flat:focus:hover:disabled { - border-color: rgba(217, 217, 217, 0.3); } + border-color: rgba(43, 41, 40, 0.4); } #restart_button button:focus:hover:active:disabled, #restart_button button:focus:hover:checked:disabled, #restart_button button.flat:focus:hover:active:disabled, #restart_button button.flat:focus:hover:checked:disabled { - border-color: rgba(204, 204, 204, 0.3); } + border-color: rgba(40, 38, 38, 0.4); } #restart_button button:checked, #restart_button button:active, #restart_button button.flat:checked, #restart_button button.flat:active { /*@include linear-gradient(shade($bg, .7), to top);*/ background-color: #83a598; background-image: none; + border-color: rgba(40, 38, 38, 0.32); color: #ebdbb2; - box-shadow: inset 1px 0 rgba(255, 255, 255, 0.06), inset 0 1px rgba(255, 255, 255, 0.07), inset -1px 0 rgba(255, 255, 255, 0.06), inset 0 -1px rgba(255, 255, 255, 0.05); - border-color: rgba(204, 204, 204, 0.22); } + box-shadow: inset 1px 0 rgba(50, 48, 47, 0.06), inset 0 1px rgba(50, 48, 47, 0.07), inset -1px 0 rgba(50, 48, 47, 0.06), inset 0 -1px rgba(50, 48, 47, 0.05); } #restart_button button:checked:focus, #restart_button button:checked:hover, #restart_button button:active:focus, #restart_button button:active:hover, #restart_button button.flat:checked:focus, #restart_button button.flat:checked:hover, #restart_button button.flat:active:focus, #restart_button button.flat:active:hover { - border-color: mix(#83a598,rgba(255, 255, 255, 0.22),0.3); } + border-color: mix(#83a598,rgba(50, 48, 47, 0.32),0.3); } #restart_button button:checked:active, #restart_button button:checked:active:hover, #restart_button button:checked:active:focus, #restart_button button:checked:active:hover:focus, #restart_button button:checked:checked, #restart_button button:checked:checked:hover, #restart_button button:checked:checked:focus, #restart_button button:checked:checked:hover:focus, #restart_button button:active:active, #restart_button button:active:active:hover, #restart_button button:active:active:focus, #restart_button button:active:active:hover:focus, #restart_button button:active:checked, #restart_button button:active:checked:hover, #restart_button button:active:checked:focus, #restart_button button:active:checked:hover:focus, #restart_button button.flat:checked:active, #restart_button button.flat:checked:active:hover, #restart_button button.flat:checked:active:focus, #restart_button button.flat:checked:active:hover:focus, #restart_button button.flat:checked:checked, #restart_button button.flat:checked:checked:hover, #restart_button button.flat:checked:checked:focus, #restart_button button.flat:checked:checked:hover:focus, #restart_button button.flat:active:active, #restart_button button.flat:active:active:hover, #restart_button button.flat:active:active:focus, #restart_button button.flat:active:active:hover:focus, #restart_button button.flat:active:checked, #restart_button button.flat:active:checked:hover, #restart_button button.flat:active:checked:focus, #restart_button button.flat:active:checked:hover:focus { - border-color: rgba(179, 179, 179, 0.22); } + border-color: rgba(35, 34, 33, 0.32); } #restart_button button:checked:disabled, #restart_button button:active:disabled, #restart_button button.flat:checked:disabled, #restart_button button.flat:active:disabled { - border-color: rgba(217, 217, 217, 0.22); } + border-color: rgba(43, 41, 40, 0.32); } #restart_button button:checked:active:disabled, #restart_button button:checked:checked:disabled, #restart_button button:active:active:disabled, #restart_button button:active:checked:disabled, #restart_button button.flat:checked:active:disabled, #restart_button button.flat:checked:checked:disabled, #restart_button button.flat:active:active:disabled, #restart_button button.flat:active:checked:disabled { - border-color: rgba(204, 204, 204, 0.22); } + border-color: rgba(40, 38, 38, 0.32); } #restart_button button:checked:focus, #restart_button button:checked:hover, #restart_button button:active:focus, #restart_button button:active:hover, #restart_button button.flat:checked:focus, #restart_button button.flat:checked:hover, #restart_button button.flat:active:focus, #restart_button button.flat:active:hover { /*@include linear-gradient(shade($bg, .65), to top);*/ background-color: #8cab9f; background-image: none; color: #ebdbb2; } #restart_button button:focus, #restart_button button:hover, #restart_button button.flat:focus, #restart_button button.flat:hover { - color: #fff; } + color: #32302f; } #restart_button button:disabled:disabled, #restart_button button.flat:disabled:disabled { - background-color: alpha(mix(#ef6c00,#fff,0.2),0.4); + background-color: alpha(mix(#ff7f42,#32302f,0.2),0.4); background-image: none; /*border: 1px solid alpha($bg, .2);*/ opacity: .4; - color: mix(#ef6c00,#fff,0.5); + color: mix(#ff7f42,#32302f,0.5); box-shadow: none; } #restart_button button:active:disabled, #restart_button button:checked:disabled, #restart_button button.flat:active:disabled, #restart_button button.flat:checked:disabled { background-color: rgba(131, 165, 152, 0.6); @@ -7863,9 +7892,9 @@ SheetStyleDialog.unity-force-quit { box-shadow: none; } #restart_button button.separator, #restart_button button .separator { border: 1px solid currentColor; - color: rgba(239, 108, 0, 0.9); } + color: rgba(255, 127, 66, 0.9); } #restart_button button.separator:disabled, #restart_button button .separator:disabled { - color: rgba(239, 108, 0, 0.85); } + color: rgba(255, 127, 66, 0.85); } /* password warning */ #greeter_infobar { @@ -7875,17 +7904,17 @@ SheetStyleDialog.unity-force-quit { ! Genome Terminal * ***********************/ VteTerminal { - background-color: #30302f; - color: #ebdbb2; } + background-color: #282828; + color: #d5c4a1; } terminal-window junction, terminal-window scrollbar trough { - background-color: #30302f; - border-color: #262626; } + background-color: #282828; + border-color: #202020; } terminal-window scrollbar.vertical slider { - background-color: mix(#30302f,#ebdbb2,0.2); } + background-color: mix(#282828,#d5c4a1,0.2); } terminal-window scrollbar.vertical slider:hover { - background-color: mix(#30302f,#ebdbb2,0.3); } + background-color: mix(#282828,#d5c4a1,0.3); } terminal-window scrollbar.vertical slider:hover:active { background-color: #83a598; } terminal-window scrollbar.vertical slider:disabled { @@ -7898,13 +7927,13 @@ terminal-window scrollbar.vertical slider { background-color: transparent; } .raven { - background-color: rgba(40, 40, 40, 0.93); } + background-color: rgba(50, 48, 47, 0.93); } .raven .raven-header { - background-color: #282828; - border: solid mix(#282828,#ebdbb2,0.08); + background-color: #32302f; + border: solid mix(#32302f,#ebdbb2,0.18); border-width: 1px 0; } .raven .raven-background { - background-color: rgba(40, 40, 40, 0.93); } + background-color: rgba(50, 48, 47, 0.93); } .raven-mpris { - background-color: rgba(40, 40, 40, 0.7); } + background-color: rgba(50, 48, 47, 0.7); } diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/gtk-dark.css b/.themes/oomox-gruvbox/gtk-3.20/gtk-dark.css similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.20/gtk-dark.css rename to .themes/oomox-gruvbox/gtk-3.20/gtk-dark.css diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/gtk.css b/.themes/oomox-gruvbox/gtk-3.20/gtk.css similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.20/gtk.css rename to .themes/oomox-gruvbox/gtk-3.20/gtk.css diff --git a/.themes/oomox-gruvbox/gtk-3.20/gtk.gresource b/.themes/oomox-gruvbox/gtk-3.20/gtk.gresource new file mode 100644 index 00000000..39215fa0 Binary files /dev/null and b/.themes/oomox-gruvbox/gtk-3.20/gtk.gresource differ diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/gtk.gresource.xml b/.themes/oomox-gruvbox/gtk-3.20/gtk.gresource.xml similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.20/gtk.gresource.xml rename to .themes/oomox-gruvbox/gtk-3.20/gtk.gresource.xml diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/thumbnail.png b/.themes/oomox-gruvbox/gtk-3.20/thumbnail.png similarity index 100% rename from .themes/oomox-numix-gruvbox/gtk-3.20/thumbnail.png rename to .themes/oomox-gruvbox/gtk-3.20/thumbnail.png diff --git a/.themes/oomox-numix-gruvbox/index.theme b/.themes/oomox-gruvbox/index.theme similarity index 66% rename from .themes/oomox-numix-gruvbox/index.theme rename to .themes/oomox-gruvbox/index.theme index 0916adbb..0db3b709 100644 --- a/.themes/oomox-numix-gruvbox/index.theme +++ b/.themes/oomox-gruvbox/index.theme @@ -1,11 +1,11 @@ [Desktop Entry] Type=X-GNOME-Metatheme -Name=oomox-numix-gruvbox +Name=oomox-gruvbox Comment=A partially sexual act; when a female (of any species; mostly humanoids) rubs the ears/lobes of a male Ferengi, creating sensual emotions and chemical reactions in the male (and sometimes in the female). Encoding=UTF-8 [X-GNOME-Metatheme] -Name=oomox-numix-gruvbox -GtkTheme=oomox-numix-gruvbox -IconTheme=oomox-numix-gruvbox -MetacityTheme=oomox-numix-gruvbox +Name=oomox-gruvbox +GtkTheme=oomox-gruvbox +IconTheme=oomox-gruvbox +MetacityTheme=oomox-gruvbox diff --git a/.themes/oomox-numix-gruvbox/metacity-1/metacity-theme-2.xml b/.themes/oomox-gruvbox/metacity-1/metacity-theme-2.xml similarity index 99% rename from .themes/oomox-numix-gruvbox/metacity-1/metacity-theme-2.xml rename to .themes/oomox-gruvbox/metacity-1/metacity-theme-2.xml index 4acf43bc..ad3c7d92 100644 --- a/.themes/oomox-numix-gruvbox/metacity-1/metacity-theme-2.xml +++ b/.themes/oomox-gruvbox/metacity-1/metacity-theme-2.xml @@ -1,7 +1,7 @@ - oomox-numix-gruvbox + oomox-gruvbox Satyajit Sahoo GPL-3.0+ 11 December 2013 @@ -9,15 +9,15 @@ - - + + - - - + + + - + diff --git a/.themes/oomox-numix-gruvbox/metacity-1/metacity-theme-3.xml b/.themes/oomox-gruvbox/metacity-1/metacity-theme-3.xml similarity index 100% rename from .themes/oomox-numix-gruvbox/metacity-1/metacity-theme-3.xml rename to .themes/oomox-gruvbox/metacity-1/metacity-theme-3.xml diff --git a/.themes/oomox-numix-gruvbox/metacity-1/thumbnail.png b/.themes/oomox-gruvbox/metacity-1/thumbnail.png similarity index 100% rename from .themes/oomox-numix-gruvbox/metacity-1/thumbnail.png rename to .themes/oomox-gruvbox/metacity-1/thumbnail.png diff --git a/.themes/oomox-numix-gruvbox/openbox-3/close.xbm b/.themes/oomox-gruvbox/openbox-3/close.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/close.xbm rename to .themes/oomox-gruvbox/openbox-3/close.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/close_hover.xbm b/.themes/oomox-gruvbox/openbox-3/close_hover.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/close_hover.xbm rename to .themes/oomox-gruvbox/openbox-3/close_hover.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/desk.xbm b/.themes/oomox-gruvbox/openbox-3/desk.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/desk.xbm rename to .themes/oomox-gruvbox/openbox-3/desk.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/desk_toggled.xbm b/.themes/oomox-gruvbox/openbox-3/desk_toggled.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/desk_toggled.xbm rename to .themes/oomox-gruvbox/openbox-3/desk_toggled.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/iconify.xbm b/.themes/oomox-gruvbox/openbox-3/iconify.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/iconify.xbm rename to .themes/oomox-gruvbox/openbox-3/iconify.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/iconify_hover.xbm b/.themes/oomox-gruvbox/openbox-3/iconify_hover.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/iconify_hover.xbm rename to .themes/oomox-gruvbox/openbox-3/iconify_hover.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/max.xbm b/.themes/oomox-gruvbox/openbox-3/max.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/max.xbm rename to .themes/oomox-gruvbox/openbox-3/max.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/max_toggled.xbm b/.themes/oomox-gruvbox/openbox-3/max_toggled.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/max_toggled.xbm rename to .themes/oomox-gruvbox/openbox-3/max_toggled.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/shade.xbm b/.themes/oomox-gruvbox/openbox-3/shade.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/shade.xbm rename to .themes/oomox-gruvbox/openbox-3/shade.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/shade_toggled.xbm b/.themes/oomox-gruvbox/openbox-3/shade_toggled.xbm similarity index 100% rename from .themes/oomox-numix-gruvbox/openbox-3/shade_toggled.xbm rename to .themes/oomox-gruvbox/openbox-3/shade_toggled.xbm diff --git a/.themes/oomox-numix-gruvbox/openbox-3/themerc b/.themes/oomox-gruvbox/openbox-3/themerc similarity index 62% rename from .themes/oomox-numix-gruvbox/openbox-3/themerc rename to .themes/oomox-gruvbox/openbox-3/themerc index e84b8891..a626ce4b 100644 --- a/.themes/oomox-numix-gruvbox/openbox-3/themerc +++ b/.themes/oomox-gruvbox/openbox-3/themerc @@ -9,60 +9,60 @@ menu.border.color: #ebdbb2 menu.title.bg: Solid Flat -menu.title.bg.color: #30302f +menu.title.bg.color: #282828 menu.title.bg.shadow: 0 -menu.title.text.color: #ebdbb2 +menu.title.text.color: #d5c4a1 menu.title.text.justify: Center menu.items.bg: Solid Flat -menu.items.bg.color: #30302f -menu.items.text.color: #ebdbb2 -menu.items.disabled.text.color: #bcb091 +menu.items.bg.color: #282828 +menu.items.text.color: #d5c4a1 +menu.items.disabled.text.color: #a99d82 menu.items.active.bg: Solid Flat menu.items.active.bg.color: #83a598 -menu.items.active.text.color: #ebdbb2 +menu.items.active.text.color: #d5c4a1 -menu.separator.color: #bcb091 +menu.separator.color: #a99d82 menu.separator.width: 1 menu.separator.padding.width: 2 menu.separator.padding.height: 4 # Window focused -window.active.title.separator.color: #30302f +window.active.title.separator.color: #282828 # Active window -window.active.border.color: #32302f +window.active.border.color: #282828 window.active.title.bg: flat solid -window.active.title.bg.color: #30302f -window.active.title.separator.color: #30302f +window.active.title.bg.color: #282828 +window.active.title.separator.color: #282828 window.active.text.justify: center window.active.label.bg: parentrelative -window.active.label.text.color: #ebdbb2 +window.active.label.text.color: #d5c4a1 window.active.handle.bg: flat solid -window.active.handle.bg.color: #30302f +window.active.handle.bg.color: #282828 window.active.grip.bg: flat solid -window.active.grip.bg.color: #30302f +window.active.grip.bg.color: #282828 window.active.button.unpressed.bg: flat solid -window.active.button.unpressed.bg.color: #30302f -window.active.button.unpressed.image.color: #ebdbb2 +window.active.button.unpressed.bg.color: #282828 +window.active.button.unpressed.image.color: #d5c4a1 window.active.button.pressed.bg: flat solid window.active.button.pressed.bg.color: #83a598 window.active.button.pressed.image.color: #ebdbb2 window.active.button.disabled.bg: flat solid -window.active.button.disabled.bg.color: #30302f -window.active.button.disabled.image.color: #bcb091 +window.active.button.disabled.bg.color: #282828 +window.active.button.disabled.image.color: #a99d82 window.active.button.hover.bg: flat solid -window.active.button.hover.bg.color: #30302f +window.active.button.hover.bg.color: #282828 window.active.button.hover.image.color: #83a598 #window.active.button.toggled.bg: #83a598 @@ -72,33 +72,33 @@ window.active.button.hover.image.color: #83a598 window.inactive.border.color: #282828 window.inactive.title.bg: flat solid -window.inactive.title.bg.color: #30302f -window.inactive.title.separator.color: #30302f +window.inactive.title.bg.color: #282828 +window.inactive.title.separator.color: #282828 window.inactive.text.justify: center window.inactive.label.bg: parentrelative -window.inactive.label.text.color: #bcb091 +window.inactive.label.text.color: #a99d82 window.inactive.handle.bg: flat solid -window.inactive.handle.bg.color: #30302f +window.inactive.handle.bg.color: #282828 window.inactive.grip.bg: flat solid -window.inactive.grip.bg.color: #30302f +window.inactive.grip.bg.color: #282828 window.inactive.button.unpressed.bg: flat solid -window.inactive.button.unpressed.bg.color: #30302f -window.inactive.button.unpressed.image.color: #bcb091 +window.inactive.button.unpressed.bg.color: #282828 +window.inactive.button.unpressed.image.color: #a99d82 window.inactive.button.pressed.bg: flat solid window.inactive.button.pressed.bg.color: #83a598 window.inactive.button.pressed.image.color: #ebdbb2 window.inactive.button.disabled.bg: flat solid -window.inactive.button.disabled.bg.color: #bcb091 -window.inactive.button.disabled.image.color: #30302f +window.inactive.button.disabled.bg.color: #a99d82 +window.inactive.button.disabled.image.color: #282828 window.inactive.button.hover.bg: flat solid -window.inactive.button.hover.bg.color: #30302f +window.inactive.button.hover.bg.color: #282828 window.inactive.button.hover.image.color: #83a598 @@ -107,25 +107,25 @@ osd.border.width: 1 osd.border.color: #83a598 osd.bg: flat solid -osd.bg.color: #30302f +osd.bg.color: #282828 osd.label.bg: flat solid -osd.label.bg.color: #30302f -osd.label.text.color: #ebdbb2 +osd.label.bg.color: #282828 +osd.label.text.color: #d5c4a1 # OSD osd.bg: Solid Flat -osd.bg.color: #30302f +osd.bg.color: #282828 osd.bg.shadow: 0 osd.border.width: 2 osd.hilight.bg: Solid Flat osd.hilight.bg.color: #83a598 osd.unhilight.bg: flat solid -osd.unhilight.bg.color: #282828 +osd.unhilight.bg.color: #32302f osd.button.unpressed.bg: flat border -osd.button.unpressed.bg.color: #30302f -#osd.button.unpressed.*.border.color: #ebdbb2 +osd.button.unpressed.bg.color: #32302f +#osd.button.unpressed.*.border.color: #d5c4a1 osd.button.pressed.bg: flat border osd.button.pressed.bg.color: #83a598 @@ -133,7 +133,7 @@ osd.button.pressed.bg.color: #83a598 osd.button.focused.bg: flat solid border osd.button.focused.bg.color: #ebdbb2 -#osd.button.focused.*.border.color: #282828 +#osd.button.focused.*.border.color: #32302f osd.button.focused.box.color: #83a598 @@ -146,9 +146,9 @@ menu.title.text.font:shadow=n # Everything else -border.width: 3 +border.width: 0 padding.width: 8 -padding.height: 3 +padding.height: 0 window.handle.width: 0 window.client.padding.width: 0 window.label.text.justify: center diff --git a/.themes/oomox-numix-gruvbox/unity/close.svg b/.themes/oomox-gruvbox/unity/close.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/unity/close.svg rename to .themes/oomox-gruvbox/unity/close.svg index a60c5ae2..7172a1c6 100644 --- a/.themes/oomox-numix-gruvbox/unity/close.svg +++ b/.themes/oomox-gruvbox/unity/close.svg @@ -1 +1 @@ - + diff --git a/.themes/oomox-numix-gruvbox/unity/close_dash.svg b/.themes/oomox-gruvbox/unity/close_dash.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/close_dash.svg rename to .themes/oomox-gruvbox/unity/close_dash.svg diff --git a/.themes/oomox-numix-gruvbox/unity/close_dash_disabled.svg b/.themes/oomox-gruvbox/unity/close_dash_disabled.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/close_dash_disabled.svg rename to .themes/oomox-gruvbox/unity/close_dash_disabled.svg diff --git a/.themes/oomox-numix-gruvbox/unity/close_dash_prelight.svg b/.themes/oomox-gruvbox/unity/close_dash_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/close_dash_prelight.svg rename to .themes/oomox-gruvbox/unity/close_dash_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/close_dash_pressed.svg b/.themes/oomox-gruvbox/unity/close_dash_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/close_dash_pressed.svg rename to .themes/oomox-gruvbox/unity/close_dash_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/close_focused_normal.svg b/.themes/oomox-gruvbox/unity/close_focused_normal.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/close_focused_normal.svg rename to .themes/oomox-gruvbox/unity/close_focused_normal.svg diff --git a/.themes/oomox-numix-gruvbox/unity/close_focused_prelight.svg b/.themes/oomox-gruvbox/unity/close_focused_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/close_focused_prelight.svg rename to .themes/oomox-gruvbox/unity/close_focused_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/close_focused_pressed.svg b/.themes/oomox-gruvbox/unity/close_focused_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/close_focused_pressed.svg rename to .themes/oomox-gruvbox/unity/close_focused_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/close_unfocused.svg b/.themes/oomox-gruvbox/unity/close_unfocused.svg similarity index 91% rename from .themes/oomox-numix-gruvbox/unity/close_unfocused.svg rename to .themes/oomox-gruvbox/unity/close_unfocused.svg index 2babfe8c..6acdc6ca 100644 --- a/.themes/oomox-numix-gruvbox/unity/close_unfocused.svg +++ b/.themes/oomox-gruvbox/unity/close_unfocused.svg @@ -1 +1 @@ - + diff --git a/.themes/oomox-numix-gruvbox/unity/close_unfocused_prelight.svg b/.themes/oomox-gruvbox/unity/close_unfocused_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/close_unfocused_prelight.svg rename to .themes/oomox-gruvbox/unity/close_unfocused_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/close_unfocused_pressed.svg b/.themes/oomox-gruvbox/unity/close_unfocused_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/close_unfocused_pressed.svg rename to .themes/oomox-gruvbox/unity/close_unfocused_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_arrow_ltr_19.svg b/.themes/oomox-gruvbox/unity/launcher_arrow_ltr_19.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_arrow_ltr_19.svg rename to .themes/oomox-gruvbox/unity/launcher_arrow_ltr_19.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_arrow_ltr_37.svg b/.themes/oomox-gruvbox/unity/launcher_arrow_ltr_37.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_arrow_ltr_37.svg rename to .themes/oomox-gruvbox/unity/launcher_arrow_ltr_37.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_arrow_outline_ltr_19.svg b/.themes/oomox-gruvbox/unity/launcher_arrow_outline_ltr_19.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_arrow_outline_ltr_19.svg rename to .themes/oomox-gruvbox/unity/launcher_arrow_outline_ltr_19.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_arrow_outline_ltr_37.svg b/.themes/oomox-gruvbox/unity/launcher_arrow_outline_ltr_37.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_arrow_outline_ltr_37.svg rename to .themes/oomox-gruvbox/unity/launcher_arrow_outline_ltr_37.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_arrow_outline_rtl_19.svg b/.themes/oomox-gruvbox/unity/launcher_arrow_outline_rtl_19.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_arrow_outline_rtl_19.svg rename to .themes/oomox-gruvbox/unity/launcher_arrow_outline_rtl_19.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_arrow_outline_rtl_37.svg b/.themes/oomox-gruvbox/unity/launcher_arrow_outline_rtl_37.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_arrow_outline_rtl_37.svg rename to .themes/oomox-gruvbox/unity/launcher_arrow_outline_rtl_37.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_arrow_rtl_19.svg b/.themes/oomox-gruvbox/unity/launcher_arrow_rtl_19.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_arrow_rtl_19.svg rename to .themes/oomox-gruvbox/unity/launcher_arrow_rtl_19.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_arrow_rtl_37.svg b/.themes/oomox-gruvbox/unity/launcher_arrow_rtl_37.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_arrow_rtl_37.svg rename to .themes/oomox-gruvbox/unity/launcher_arrow_rtl_37.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_back_150.svg b/.themes/oomox-gruvbox/unity/launcher_icon_back_150.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_back_150.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_back_150.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_back_54.svg b/.themes/oomox-gruvbox/unity/launcher_icon_back_54.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_back_54.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_back_54.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_edge_150.svg b/.themes/oomox-gruvbox/unity/launcher_icon_edge_150.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_edge_150.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_edge_150.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_edge_54.svg b/.themes/oomox-gruvbox/unity/launcher_icon_edge_54.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_edge_54.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_edge_54.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_glow_200.svg b/.themes/oomox-gruvbox/unity/launcher_icon_glow_200.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_glow_200.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_glow_200.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_glow_62.svg b/.themes/oomox-gruvbox/unity/launcher_icon_glow_62.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_glow_62.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_glow_62.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_selected_back_150.svg b/.themes/oomox-gruvbox/unity/launcher_icon_selected_back_150.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_selected_back_150.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_selected_back_150.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_selected_back_54.svg b/.themes/oomox-gruvbox/unity/launcher_icon_selected_back_54.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_selected_back_54.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_selected_back_54.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_shadow_200.svg b/.themes/oomox-gruvbox/unity/launcher_icon_shadow_200.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_shadow_200.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_shadow_200.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_shadow_62.svg b/.themes/oomox-gruvbox/unity/launcher_icon_shadow_62.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_shadow_62.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_shadow_62.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_shine_150.svg b/.themes/oomox-gruvbox/unity/launcher_icon_shine_150.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_shine_150.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_shine_150.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_icon_shine_54.svg b/.themes/oomox-gruvbox/unity/launcher_icon_shine_54.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_icon_shine_54.svg rename to .themes/oomox-gruvbox/unity/launcher_icon_shine_54.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_pip_ltr_19.svg b/.themes/oomox-gruvbox/unity/launcher_pip_ltr_19.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_pip_ltr_19.svg rename to .themes/oomox-gruvbox/unity/launcher_pip_ltr_19.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_pip_ltr_37.svg b/.themes/oomox-gruvbox/unity/launcher_pip_ltr_37.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_pip_ltr_37.svg rename to .themes/oomox-gruvbox/unity/launcher_pip_ltr_37.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_pip_rtl_19.svg b/.themes/oomox-gruvbox/unity/launcher_pip_rtl_19.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_pip_rtl_19.svg rename to .themes/oomox-gruvbox/unity/launcher_pip_rtl_19.svg diff --git a/.themes/oomox-numix-gruvbox/unity/launcher_pip_rtl_37.svg b/.themes/oomox-gruvbox/unity/launcher_pip_rtl_37.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/launcher_pip_rtl_37.svg rename to .themes/oomox-gruvbox/unity/launcher_pip_rtl_37.svg diff --git a/.themes/oomox-numix-gruvbox/unity/maximize.svg b/.themes/oomox-gruvbox/unity/maximize.svg similarity index 77% rename from .themes/oomox-numix-gruvbox/unity/maximize.svg rename to .themes/oomox-gruvbox/unity/maximize.svg index 77365ee1..f574a258 100644 --- a/.themes/oomox-numix-gruvbox/unity/maximize.svg +++ b/.themes/oomox-gruvbox/unity/maximize.svg @@ -1 +1 @@ - + diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_dash.svg b/.themes/oomox-gruvbox/unity/maximize_dash.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/maximize_dash.svg rename to .themes/oomox-gruvbox/unity/maximize_dash.svg diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_dash_disabled.svg b/.themes/oomox-gruvbox/unity/maximize_dash_disabled.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/maximize_dash_disabled.svg rename to .themes/oomox-gruvbox/unity/maximize_dash_disabled.svg diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_dash_prelight.svg b/.themes/oomox-gruvbox/unity/maximize_dash_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/maximize_dash_prelight.svg rename to .themes/oomox-gruvbox/unity/maximize_dash_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_dash_pressed.svg b/.themes/oomox-gruvbox/unity/maximize_dash_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/maximize_dash_pressed.svg rename to .themes/oomox-gruvbox/unity/maximize_dash_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_focused_normal.svg b/.themes/oomox-gruvbox/unity/maximize_focused_normal.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/maximize_focused_normal.svg rename to .themes/oomox-gruvbox/unity/maximize_focused_normal.svg diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_focused_prelight.svg b/.themes/oomox-gruvbox/unity/maximize_focused_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/maximize_focused_prelight.svg rename to .themes/oomox-gruvbox/unity/maximize_focused_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_focused_pressed.svg b/.themes/oomox-gruvbox/unity/maximize_focused_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/maximize_focused_pressed.svg rename to .themes/oomox-gruvbox/unity/maximize_focused_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_unfocused.svg b/.themes/oomox-gruvbox/unity/maximize_unfocused.svg similarity index 77% rename from .themes/oomox-numix-gruvbox/unity/maximize_unfocused.svg rename to .themes/oomox-gruvbox/unity/maximize_unfocused.svg index 3b307cd2..adae1610 100644 --- a/.themes/oomox-numix-gruvbox/unity/maximize_unfocused.svg +++ b/.themes/oomox-gruvbox/unity/maximize_unfocused.svg @@ -1 +1 @@ - + diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_unfocused_prelight.svg b/.themes/oomox-gruvbox/unity/maximize_unfocused_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/maximize_unfocused_prelight.svg rename to .themes/oomox-gruvbox/unity/maximize_unfocused_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/maximize_unfocused_pressed.svg b/.themes/oomox-gruvbox/unity/maximize_unfocused_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/maximize_unfocused_pressed.svg rename to .themes/oomox-gruvbox/unity/maximize_unfocused_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimize.svg b/.themes/oomox-gruvbox/unity/minimize.svg similarity index 77% rename from .themes/oomox-numix-gruvbox/unity/minimize.svg rename to .themes/oomox-gruvbox/unity/minimize.svg index bcf5f050..f0a4efe7 100644 --- a/.themes/oomox-numix-gruvbox/unity/minimize.svg +++ b/.themes/oomox-gruvbox/unity/minimize.svg @@ -1 +1 @@ - + diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_dash.svg b/.themes/oomox-gruvbox/unity/minimize_dash.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/minimize_dash.svg rename to .themes/oomox-gruvbox/unity/minimize_dash.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_dash_disabled.svg b/.themes/oomox-gruvbox/unity/minimize_dash_disabled.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/minimize_dash_disabled.svg rename to .themes/oomox-gruvbox/unity/minimize_dash_disabled.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_dash_prelight.svg b/.themes/oomox-gruvbox/unity/minimize_dash_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/minimize_dash_prelight.svg rename to .themes/oomox-gruvbox/unity/minimize_dash_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_dash_pressed.svg b/.themes/oomox-gruvbox/unity/minimize_dash_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/minimize_dash_pressed.svg rename to .themes/oomox-gruvbox/unity/minimize_dash_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_focused_normal.svg b/.themes/oomox-gruvbox/unity/minimize_focused_normal.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/minimize_focused_normal.svg rename to .themes/oomox-gruvbox/unity/minimize_focused_normal.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_focused_prelight.svg b/.themes/oomox-gruvbox/unity/minimize_focused_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/minimize_focused_prelight.svg rename to .themes/oomox-gruvbox/unity/minimize_focused_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_focused_pressed.svg b/.themes/oomox-gruvbox/unity/minimize_focused_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/minimize_focused_pressed.svg rename to .themes/oomox-gruvbox/unity/minimize_focused_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_unfocused.svg b/.themes/oomox-gruvbox/unity/minimize_unfocused.svg similarity index 77% rename from .themes/oomox-numix-gruvbox/unity/minimize_unfocused.svg rename to .themes/oomox-gruvbox/unity/minimize_unfocused.svg index c4a6788b..41cd9ed9 100644 --- a/.themes/oomox-numix-gruvbox/unity/minimize_unfocused.svg +++ b/.themes/oomox-gruvbox/unity/minimize_unfocused.svg @@ -1 +1 @@ - + diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_unfocused_prelight.svg b/.themes/oomox-gruvbox/unity/minimize_unfocused_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/minimize_unfocused_prelight.svg rename to .themes/oomox-gruvbox/unity/minimize_unfocused_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimize_unfocused_pressed.svg b/.themes/oomox-gruvbox/unity/minimize_unfocused_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/minimize_unfocused_pressed.svg rename to .themes/oomox-gruvbox/unity/minimize_unfocused_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/minimized.svg b/.themes/oomox-gruvbox/unity/minimized.svg similarity index 77% rename from .themes/oomox-numix-gruvbox/unity/minimized.svg rename to .themes/oomox-gruvbox/unity/minimized.svg index bcf5f050..f0a4efe7 100644 --- a/.themes/oomox-numix-gruvbox/unity/minimized.svg +++ b/.themes/oomox-gruvbox/unity/minimized.svg @@ -1 +1 @@ - + diff --git a/.themes/oomox-numix-gruvbox/unity/modes/launcher_bfb-flat.png b/.themes/oomox-gruvbox/unity/modes/launcher_bfb-flat.png similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/modes/launcher_bfb-flat.png rename to .themes/oomox-gruvbox/unity/modes/launcher_bfb-flat.png diff --git a/.themes/oomox-numix-gruvbox/unity/modes/launcher_bfb_ns.png b/.themes/oomox-gruvbox/unity/modes/launcher_bfb_ns.png similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/modes/launcher_bfb_ns.png rename to .themes/oomox-gruvbox/unity/modes/launcher_bfb_ns.png diff --git a/.themes/oomox-numix-gruvbox/unity/modes/ubuntu-square.svg b/.themes/oomox-gruvbox/unity/modes/ubuntu-square.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/modes/ubuntu-square.svg rename to .themes/oomox-gruvbox/unity/modes/ubuntu-square.svg diff --git a/.themes/oomox-numix-gruvbox/unity/progress_bar_fill.svg b/.themes/oomox-gruvbox/unity/progress_bar_fill.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/progress_bar_fill.svg rename to .themes/oomox-gruvbox/unity/progress_bar_fill.svg diff --git a/.themes/oomox-numix-gruvbox/unity/progress_bar_trough.svg b/.themes/oomox-gruvbox/unity/progress_bar_trough.svg similarity index 97% rename from .themes/oomox-numix-gruvbox/unity/progress_bar_trough.svg rename to .themes/oomox-gruvbox/unity/progress_bar_trough.svg index 75c7ba33..dfd891fc 100644 --- a/.themes/oomox-numix-gruvbox/unity/progress_bar_trough.svg +++ b/.themes/oomox-gruvbox/unity/progress_bar_trough.svg @@ -29,7 +29,7 @@ id="defs16" /> diff --git a/.themes/oomox-numix-gruvbox/unity/sheet_style_close_focused.svg b/.themes/oomox-gruvbox/unity/sheet_style_close_focused.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/sheet_style_close_focused.svg rename to .themes/oomox-gruvbox/unity/sheet_style_close_focused.svg diff --git a/.themes/oomox-numix-gruvbox/unity/sheet_style_close_focused_prelight.svg b/.themes/oomox-gruvbox/unity/sheet_style_close_focused_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/sheet_style_close_focused_prelight.svg rename to .themes/oomox-gruvbox/unity/sheet_style_close_focused_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/sheet_style_close_focused_pressed.svg b/.themes/oomox-gruvbox/unity/sheet_style_close_focused_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/sheet_style_close_focused_pressed.svg rename to .themes/oomox-gruvbox/unity/sheet_style_close_focused_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize.svg b/.themes/oomox-gruvbox/unity/unmaximize.svg similarity index 75% rename from .themes/oomox-numix-gruvbox/unity/unmaximize.svg rename to .themes/oomox-gruvbox/unity/unmaximize.svg index 3f160de7..1130a95c 100644 --- a/.themes/oomox-numix-gruvbox/unity/unmaximize.svg +++ b/.themes/oomox-gruvbox/unity/unmaximize.svg @@ -1 +1 @@ - + diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_dash.svg b/.themes/oomox-gruvbox/unity/unmaximize_dash.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_dash.svg rename to .themes/oomox-gruvbox/unity/unmaximize_dash.svg diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_dash_disabled.svg b/.themes/oomox-gruvbox/unity/unmaximize_dash_disabled.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_dash_disabled.svg rename to .themes/oomox-gruvbox/unity/unmaximize_dash_disabled.svg diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_dash_prelight.svg b/.themes/oomox-gruvbox/unity/unmaximize_dash_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_dash_prelight.svg rename to .themes/oomox-gruvbox/unity/unmaximize_dash_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_dash_pressed.svg b/.themes/oomox-gruvbox/unity/unmaximize_dash_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_dash_pressed.svg rename to .themes/oomox-gruvbox/unity/unmaximize_dash_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_focused_normal.svg b/.themes/oomox-gruvbox/unity/unmaximize_focused_normal.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_focused_normal.svg rename to .themes/oomox-gruvbox/unity/unmaximize_focused_normal.svg diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_focused_prelight.svg b/.themes/oomox-gruvbox/unity/unmaximize_focused_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_focused_prelight.svg rename to .themes/oomox-gruvbox/unity/unmaximize_focused_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_focused_pressed.svg b/.themes/oomox-gruvbox/unity/unmaximize_focused_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_focused_pressed.svg rename to .themes/oomox-gruvbox/unity/unmaximize_focused_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_unfocused.svg b/.themes/oomox-gruvbox/unity/unmaximize_unfocused.svg similarity index 75% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_unfocused.svg rename to .themes/oomox-gruvbox/unity/unmaximize_unfocused.svg index a29307c2..2b714cf3 100644 --- a/.themes/oomox-numix-gruvbox/unity/unmaximize_unfocused.svg +++ b/.themes/oomox-gruvbox/unity/unmaximize_unfocused.svg @@ -1 +1 @@ - + diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_unfocused_prelight.svg b/.themes/oomox-gruvbox/unity/unmaximize_unfocused_prelight.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_unfocused_prelight.svg rename to .themes/oomox-gruvbox/unity/unmaximize_unfocused_prelight.svg diff --git a/.themes/oomox-numix-gruvbox/unity/unmaximize_unfocused_pressed.svg b/.themes/oomox-gruvbox/unity/unmaximize_unfocused_pressed.svg similarity index 100% rename from .themes/oomox-numix-gruvbox/unity/unmaximize_unfocused_pressed.svg rename to .themes/oomox-gruvbox/unity/unmaximize_unfocused_pressed.svg diff --git a/.themes/oomox-numix-gruvbox/xfwm4/bottom-active.xpm b/.themes/oomox-gruvbox/xfwm4/bottom-active.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/bottom-active.xpm rename to .themes/oomox-gruvbox/xfwm4/bottom-active.xpm index c29f0208..ab63c5f8 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/bottom-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/bottom-active.xpm @@ -2,5 +2,5 @@ static char * bottom_active_xpm[] = { "8 1 2 1", " c None", -". c #ebdbb2", +". c #282828", "........"}; diff --git a/.themes/oomox-numix-gruvbox/xfwm4/bottom-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/bottom-inactive.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/bottom-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/bottom-inactive.xpm index 9da1b03c..6a5d1db8 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/bottom-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/bottom-inactive.xpm @@ -2,5 +2,5 @@ static char * bottom_inactive_xpm[] = { "8 1 2 1", " c None", -". c #ebdbb2", +". c #282828", "........"}; diff --git a/.themes/oomox-numix-gruvbox/xfwm4/bottom-left-active.xpm b/.themes/oomox-gruvbox/xfwm4/bottom-left-active.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/bottom-left-active.xpm rename to .themes/oomox-gruvbox/xfwm4/bottom-left-active.xpm index a3b8ef72..82a0d9a2 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/bottom-left-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/bottom-left-active.xpm @@ -2,5 +2,5 @@ static char * bottom_left_active_xpm[] = { "1 1 2 1", " c None", -". c #ebdbb2", +". c #282828", "."}; diff --git a/.themes/oomox-numix-gruvbox/xfwm4/bottom-left-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/bottom-left-inactive.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/bottom-left-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/bottom-left-inactive.xpm index 93d65921..a60ebfb0 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/bottom-left-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/bottom-left-inactive.xpm @@ -2,5 +2,5 @@ static char * bottom_left_inactive_xpm[] = { "1 1 2 1", " c None", -". c #ebdbb2", +". c #282828", "."}; diff --git a/.themes/oomox-numix-gruvbox/xfwm4/bottom-right-active.xpm b/.themes/oomox-gruvbox/xfwm4/bottom-right-active.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/bottom-right-active.xpm rename to .themes/oomox-gruvbox/xfwm4/bottom-right-active.xpm index 8ef6d328..8331cf5f 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/bottom-right-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/bottom-right-active.xpm @@ -2,5 +2,5 @@ static char * bottom_right_active_xpm[] = { "1 1 2 1", " c None", -". c #ebdbb2", +". c #282828", "."}; diff --git a/.themes/oomox-numix-gruvbox/xfwm4/bottom-right-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/bottom-right-inactive.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/bottom-right-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/bottom-right-inactive.xpm index 282f0c85..8400b551 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/bottom-right-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/bottom-right-inactive.xpm @@ -2,5 +2,5 @@ static char * bottom_right_inactive_xpm[] = { "1 1 2 1", " c None", -". c #ebdbb2", +". c #282828", "."}; diff --git a/.themes/oomox-numix-gruvbox/xfwm4/close-active.xpm b/.themes/oomox-gruvbox/xfwm4/close-active.xpm similarity index 94% rename from .themes/oomox-numix-gruvbox/xfwm4/close-active.xpm rename to .themes/oomox-gruvbox/xfwm4/close-active.xpm index 245319c9..579766b4 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/close-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/close-active.xpm @@ -2,9 +2,9 @@ static char * close_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", -"+ c #30302f", -"@ c #30302f", +". c #282828", +"+ c #d5c4a1", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/close-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/close-inactive.xpm similarity index 94% rename from .themes/oomox-numix-gruvbox/xfwm4/close-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/close-inactive.xpm index 245319c9..579766b4 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/close-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/close-inactive.xpm @@ -2,9 +2,9 @@ static char * close_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", -"+ c #30302f", -"@ c #30302f", +". c #282828", +"+ c #d5c4a1", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/close-prelight.xpm b/.themes/oomox-gruvbox/xfwm4/close-prelight.xpm similarity index 96% rename from .themes/oomox-numix-gruvbox/xfwm4/close-prelight.xpm rename to .themes/oomox-gruvbox/xfwm4/close-prelight.xpm index 982544c7..e35563e5 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/close-prelight.xpm +++ b/.themes/oomox-gruvbox/xfwm4/close-prelight.xpm @@ -2,9 +2,9 @@ static char * close_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -"@ c #30302f", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/close-pressed.xpm b/.themes/oomox-gruvbox/xfwm4/close-pressed.xpm similarity index 96% rename from .themes/oomox-numix-gruvbox/xfwm4/close-pressed.xpm rename to .themes/oomox-gruvbox/xfwm4/close-pressed.xpm index 982544c7..e35563e5 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/close-pressed.xpm +++ b/.themes/oomox-gruvbox/xfwm4/close-pressed.xpm @@ -2,9 +2,9 @@ static char * close_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -"@ c #30302f", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/hide-active.xpm b/.themes/oomox-gruvbox/xfwm4/hide-active.xpm similarity index 94% rename from .themes/oomox-numix-gruvbox/xfwm4/hide-active.xpm rename to .themes/oomox-gruvbox/xfwm4/hide-active.xpm index 771c1132..a58ac50e 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/hide-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/hide-active.xpm @@ -2,9 +2,9 @@ static char * hide_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", -"+ c #ebdbb2", -"@ c #30302f", +". c #282828", +"+ c #d5c4a1", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/hide-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/hide-inactive.xpm similarity index 94% rename from .themes/oomox-numix-gruvbox/xfwm4/hide-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/hide-inactive.xpm index fb4dc6cb..984aba2f 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/hide-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/hide-inactive.xpm @@ -2,9 +2,9 @@ static char * hide_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", -"+ c #282828", -"@ c #30302f", +". c #282828", +"+ c #a99d82", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/hide-prelight.xpm b/.themes/oomox-gruvbox/xfwm4/hide-prelight.xpm similarity index 96% rename from .themes/oomox-numix-gruvbox/xfwm4/hide-prelight.xpm rename to .themes/oomox-gruvbox/xfwm4/hide-prelight.xpm index f393d864..6cd9ad80 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/hide-prelight.xpm +++ b/.themes/oomox-gruvbox/xfwm4/hide-prelight.xpm @@ -2,9 +2,9 @@ static char * hide_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -"@ c #30302f", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/hide-pressed.xpm b/.themes/oomox-gruvbox/xfwm4/hide-pressed.xpm similarity index 96% rename from .themes/oomox-numix-gruvbox/xfwm4/hide-pressed.xpm rename to .themes/oomox-gruvbox/xfwm4/hide-pressed.xpm index f393d864..6cd9ad80 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/hide-pressed.xpm +++ b/.themes/oomox-gruvbox/xfwm4/hide-pressed.xpm @@ -2,9 +2,9 @@ static char * hide_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -"@ c #30302f", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/left-active.xpm b/.themes/oomox-gruvbox/xfwm4/left-active.xpm similarity index 92% rename from .themes/oomox-numix-gruvbox/xfwm4/left-active.xpm rename to .themes/oomox-gruvbox/xfwm4/left-active.xpm index 2e7c9496..3580792d 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/left-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/left-active.xpm @@ -2,7 +2,7 @@ static char * left_active_xpm[] = { "1 21 2 1", " c None", -". c #ebdbb2", +". c #282828", ".", ".", ".", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/left-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/left-inactive.xpm similarity index 92% rename from .themes/oomox-numix-gruvbox/xfwm4/left-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/left-inactive.xpm index ab90db63..ab19a2ac 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/left-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/left-inactive.xpm @@ -2,7 +2,7 @@ static char * left_inactive_xpm[] = { "1 21 2 1", " c None", -". c #ebdbb2", +". c #282828", ".", ".", ".", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-active.xpm b/.themes/oomox-gruvbox/xfwm4/maximize-active.xpm similarity index 94% rename from .themes/oomox-numix-gruvbox/xfwm4/maximize-active.xpm rename to .themes/oomox-gruvbox/xfwm4/maximize-active.xpm index 4cd1234c..181c28f7 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/maximize-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/maximize-active.xpm @@ -2,9 +2,9 @@ static char * maximize_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", -"+ c #ebdbb2", -"@ c #30302f", +". c #282828", +"+ c #d5c4a1", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/maximize-inactive.xpm similarity index 94% rename from .themes/oomox-numix-gruvbox/xfwm4/maximize-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/maximize-inactive.xpm index fd1916a7..1df9ab8f 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/maximize-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/maximize-inactive.xpm @@ -2,9 +2,9 @@ static char * maximize_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", -"+ c #282828", -"@ c #30302f", +". c #282828", +"+ c #a99d82", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-prelight.xpm b/.themes/oomox-gruvbox/xfwm4/maximize-prelight.xpm similarity index 96% rename from .themes/oomox-numix-gruvbox/xfwm4/maximize-prelight.xpm rename to .themes/oomox-gruvbox/xfwm4/maximize-prelight.xpm index 875ee7ed..c625f141 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/maximize-prelight.xpm +++ b/.themes/oomox-gruvbox/xfwm4/maximize-prelight.xpm @@ -2,9 +2,9 @@ static char * maximize_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -"@ c #30302f", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-pressed.xpm b/.themes/oomox-gruvbox/xfwm4/maximize-pressed.xpm similarity index 96% rename from .themes/oomox-numix-gruvbox/xfwm4/maximize-pressed.xpm rename to .themes/oomox-gruvbox/xfwm4/maximize-pressed.xpm index 875ee7ed..c625f141 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/maximize-pressed.xpm +++ b/.themes/oomox-gruvbox/xfwm4/maximize-pressed.xpm @@ -2,9 +2,9 @@ static char * maximize_prelight_xpm[] = { "24 26 4 1", " c None", -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -"@ c #30302f", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-active.xpm b/.themes/oomox-gruvbox/xfwm4/maximize-toggled-active.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-active.xpm rename to .themes/oomox-gruvbox/xfwm4/maximize-toggled-active.xpm index b1ae384e..f656532d 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/maximize-toggled-active.xpm @@ -2,15 +2,10 @@ static char * maximize_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #ebdbb2", -======= -". c #444444", -"+ c #eeeeee", -"@ c #484848", +". c #282828", +"+ c #d5c4a1", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/maximize-toggled-inactive.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/maximize-toggled-inactive.xpm index 89933a5b..93f8cd7b 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/maximize-toggled-inactive.xpm @@ -2,15 +2,10 @@ static char * maximize_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #282828", -======= -". c #444444", -"+ c #888888", -"@ c #393939", +". c #282828", +"+ c #a99d82", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-prelight.xpm b/.themes/oomox-gruvbox/xfwm4/maximize-toggled-prelight.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-prelight.xpm rename to .themes/oomox-gruvbox/xfwm4/maximize-toggled-prelight.xpm index 929057ac..e9595065 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-prelight.xpm +++ b/.themes/oomox-gruvbox/xfwm4/maximize-toggled-prelight.xpm @@ -2,15 +2,10 @@ static char * maximize_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-pressed.xpm b/.themes/oomox-gruvbox/xfwm4/maximize-toggled-pressed.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-pressed.xpm rename to .themes/oomox-gruvbox/xfwm4/maximize-toggled-pressed.xpm index 929057ac..e9595065 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-pressed.xpm +++ b/.themes/oomox-gruvbox/xfwm4/maximize-toggled-pressed.xpm @@ -2,15 +2,10 @@ static char * maximize_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/menu-active.xpm b/.themes/oomox-gruvbox/xfwm4/menu-active.xpm similarity index 83% rename from .themes/oomox-numix-gruvbox/xfwm4/menu-active.xpm rename to .themes/oomox-gruvbox/xfwm4/menu-active.xpm index 2e91b015..8f41371c 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/menu-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/menu-active.xpm @@ -2,11 +2,7 @@ static char * menu_active_xpm[] = { "24 16 2 1", " c None", -<<<<<<< HEAD -". c #30302f", -======= -". c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/menu-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/menu-inactive.xpm similarity index 83% rename from .themes/oomox-numix-gruvbox/xfwm4/menu-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/menu-inactive.xpm index 672266ef..ebd2784f 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/menu-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/menu-inactive.xpm @@ -2,11 +2,7 @@ static char * menu_inactive_xpm[] = { "24 16 2 1", " c None", -<<<<<<< HEAD -". c #30302f", -======= -". c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/menu-prelight.xpm b/.themes/oomox-gruvbox/xfwm4/menu-prelight.xpm similarity index 83% rename from .themes/oomox-numix-gruvbox/xfwm4/menu-prelight.xpm rename to .themes/oomox-gruvbox/xfwm4/menu-prelight.xpm index 8b06ab7d..ab297582 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/menu-prelight.xpm +++ b/.themes/oomox-gruvbox/xfwm4/menu-prelight.xpm @@ -2,11 +2,7 @@ static char * menu_prelight_xpm[] = { "24 16 2 1", " c None", -<<<<<<< HEAD -". c #30302f", -======= -". c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/menu-pressed.xpm b/.themes/oomox-gruvbox/xfwm4/menu-pressed.xpm similarity index 83% rename from .themes/oomox-numix-gruvbox/xfwm4/menu-pressed.xpm rename to .themes/oomox-gruvbox/xfwm4/menu-pressed.xpm index d7aef8d3..bedad430 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/menu-pressed.xpm +++ b/.themes/oomox-gruvbox/xfwm4/menu-pressed.xpm @@ -2,11 +2,7 @@ static char * menu_pressed_xpm[] = { "24 16 2 1", " c None", -<<<<<<< HEAD -". c #30302f", -======= -". c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/right-active.xpm b/.themes/oomox-gruvbox/xfwm4/right-active.xpm similarity index 92% rename from .themes/oomox-numix-gruvbox/xfwm4/right-active.xpm rename to .themes/oomox-gruvbox/xfwm4/right-active.xpm index d4d7ca61..d93c421d 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/right-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/right-active.xpm @@ -2,7 +2,7 @@ static char * right_active_xpm[] = { "1 21 2 1", " c None", -". c #ebdbb2", +". c #282828", ".", ".", ".", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/right-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/right-inactive.xpm similarity index 92% rename from .themes/oomox-numix-gruvbox/xfwm4/right-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/right-inactive.xpm index 50337232..3650b2bd 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/right-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/right-inactive.xpm @@ -2,7 +2,7 @@ static char * right_inactive_xpm[] = { "1 21 2 1", " c None", -". c #ebdbb2", +". c #282828", ".", ".", ".", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-active.xpm b/.themes/oomox-gruvbox/xfwm4/shade-active.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/shade-active.xpm rename to .themes/oomox-gruvbox/xfwm4/shade-active.xpm index 47ddc4c6..da6587d1 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/shade-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/shade-active.xpm @@ -2,15 +2,10 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #ebdbb2", -======= -". c #444444", -"+ c #eeeeee", -"@ c #484848", +". c #282828", +"+ c #d5c4a1", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/shade-inactive.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/shade-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/shade-inactive.xpm index 5df96825..e6744bc5 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/shade-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/shade-inactive.xpm @@ -2,15 +2,10 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #282828", -======= -". c #444444", -"+ c #888888", -"@ c #393939", +". c #282828", +"+ c #a99d82", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-prelight.xpm b/.themes/oomox-gruvbox/xfwm4/shade-prelight.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/shade-prelight.xpm rename to .themes/oomox-gruvbox/xfwm4/shade-prelight.xpm index 7305245a..7c530ede 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/shade-prelight.xpm +++ b/.themes/oomox-gruvbox/xfwm4/shade-prelight.xpm @@ -2,15 +2,10 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-pressed.xpm b/.themes/oomox-gruvbox/xfwm4/shade-pressed.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/shade-pressed.xpm rename to .themes/oomox-gruvbox/xfwm4/shade-pressed.xpm index 7305245a..7c530ede 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/shade-pressed.xpm +++ b/.themes/oomox-gruvbox/xfwm4/shade-pressed.xpm @@ -2,15 +2,10 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-active.xpm b/.themes/oomox-gruvbox/xfwm4/shade-toggled-active.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/shade-toggled-active.xpm rename to .themes/oomox-gruvbox/xfwm4/shade-toggled-active.xpm index 023420bb..026f8f0c 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/shade-toggled-active.xpm @@ -2,15 +2,10 @@ static char * shade_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #ebdbb2", -======= -". c #444444", -"+ c #eeeeee", -"@ c #484848", +". c #282828", +"+ c #d5c4a1", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/shade-toggled-inactive.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/shade-toggled-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/shade-toggled-inactive.xpm index a8a537f3..11e26a92 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/shade-toggled-inactive.xpm @@ -2,15 +2,9 @@ static char * shade_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #282828", -======= -". c #444444", -"+ c #888888", -"@ c #393939", +". c #282828", +"+ c #a99d82", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-prelight.xpm b/.themes/oomox-gruvbox/xfwm4/shade-toggled-prelight.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/shade-toggled-prelight.xpm rename to .themes/oomox-gruvbox/xfwm4/shade-toggled-prelight.xpm index e58b86ea..db2ea15e 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-prelight.xpm +++ b/.themes/oomox-gruvbox/xfwm4/shade-toggled-prelight.xpm @@ -2,15 +2,10 @@ static char * shade_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-pressed.xpm b/.themes/oomox-gruvbox/xfwm4/shade-toggled-pressed.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/shade-toggled-pressed.xpm rename to .themes/oomox-gruvbox/xfwm4/shade-toggled-pressed.xpm index e58b86ea..db2ea15e 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-pressed.xpm +++ b/.themes/oomox-gruvbox/xfwm4/shade-toggled-pressed.xpm @@ -2,15 +2,10 @@ static char * shade_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-active.xpm b/.themes/oomox-gruvbox/xfwm4/stick-active.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/stick-active.xpm rename to .themes/oomox-gruvbox/xfwm4/stick-active.xpm index f4b68520..b114e8e3 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/stick-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/stick-active.xpm @@ -2,15 +2,9 @@ static char * stick_active_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #ebdbb2", -======= -". c #444444", -"+ c #eeeeee", -"@ c #484848", +". c #282828", +"+ c #d5c4a1", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/stick-inactive.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/stick-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/stick-inactive.xpm index 6f45fd8d..bc1cbfd6 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/stick-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/stick-inactive.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #282828", -======= -". c #444444", -"+ c #888888", -"@ c #393939", +". c #282828", +"+ c #a99d82", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-prelight.xpm b/.themes/oomox-gruvbox/xfwm4/stick-prelight.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/stick-prelight.xpm rename to .themes/oomox-gruvbox/xfwm4/stick-prelight.xpm index 9ff16c7e..9580085b 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/stick-prelight.xpm +++ b/.themes/oomox-gruvbox/xfwm4/stick-prelight.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-pressed.xpm b/.themes/oomox-gruvbox/xfwm4/stick-pressed.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/stick-pressed.xpm rename to .themes/oomox-gruvbox/xfwm4/stick-pressed.xpm index 9ff16c7e..9580085b 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/stick-pressed.xpm +++ b/.themes/oomox-gruvbox/xfwm4/stick-pressed.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-active.xpm b/.themes/oomox-gruvbox/xfwm4/stick-toggled-active.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/stick-toggled-active.xpm rename to .themes/oomox-gruvbox/xfwm4/stick-toggled-active.xpm index b52d14f5..d4eaf8b0 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/stick-toggled-active.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_active_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #ebdbb2", -======= -". c #444444", -"+ c #eeeeee", -"@ c #484848", +". c #282828", +"+ c #d5c4a1", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/stick-toggled-inactive.xpm similarity index 84% rename from .themes/oomox-numix-gruvbox/xfwm4/stick-toggled-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/stick-toggled-inactive.xpm index edb6c9f7..d1ccbbea 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/stick-toggled-inactive.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", -"+ c #282828", -======= -". c #444444", -"+ c #888888", -"@ c #393939", +". c #282828", +"+ c #a99d82", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-prelight.xpm b/.themes/oomox-gruvbox/xfwm4/stick-toggled-prelight.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/stick-toggled-prelight.xpm rename to .themes/oomox-gruvbox/xfwm4/stick-toggled-prelight.xpm index 8a8531c6..5e9c01c7 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-prelight.xpm +++ b/.themes/oomox-gruvbox/xfwm4/stick-toggled-prelight.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-pressed.xpm b/.themes/oomox-gruvbox/xfwm4/stick-toggled-pressed.xpm similarity index 85% rename from .themes/oomox-numix-gruvbox/xfwm4/stick-toggled-pressed.xpm rename to .themes/oomox-gruvbox/xfwm4/stick-toggled-pressed.xpm index 8a8531c6..5e9c01c7 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-pressed.xpm +++ b/.themes/oomox-gruvbox/xfwm4/stick-toggled-pressed.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #30302f", +". c #282828", "+ c #83a598 s active_color_1", -======= -". c #444444", -"+ c #f0544c s active_color_1", -"@ c #484848", +"@ c #282828", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/themerc b/.themes/oomox-gruvbox/xfwm4/themerc similarity index 89% rename from .themes/oomox-numix-gruvbox/xfwm4/themerc rename to .themes/oomox-gruvbox/xfwm4/themerc index 3a7458d2..c060fe17 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/themerc +++ b/.themes/oomox-gruvbox/xfwm4/themerc @@ -2,8 +2,8 @@ # Author: Satyajit Sahoo # License: GPL-3.0+ -active_text_color=#ebdbb2 -inactive_text_color=#282828 +active_text_color=#d5c4a1 +inactive_text_color=#a99d82 button_offset=3 button_spacing=0 show_app_icon=true diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-1-active.xpm b/.themes/oomox-gruvbox/xfwm4/title-1-active.xpm similarity index 63% rename from .themes/oomox-numix-gruvbox/xfwm4/title-1-active.xpm rename to .themes/oomox-gruvbox/xfwm4/title-1-active.xpm index ca1baf65..72bf153b 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-1-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-1-active.xpm @@ -2,13 +2,8 @@ static char * title_1_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #484848", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-1-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/title-1-inactive.xpm similarity index 64% rename from .themes/oomox-numix-gruvbox/xfwm4/title-1-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/title-1-inactive.xpm index c98e7a4c..95b5b070 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-1-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-1-inactive.xpm @@ -2,13 +2,8 @@ static char * title_1_inactive_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #393939", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-2-active.xpm b/.themes/oomox-gruvbox/xfwm4/title-2-active.xpm similarity index 63% rename from .themes/oomox-numix-gruvbox/xfwm4/title-2-active.xpm rename to .themes/oomox-gruvbox/xfwm4/title-2-active.xpm index 3b5d7edc..93a020d0 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-2-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-2-active.xpm @@ -2,13 +2,8 @@ static char * title_2_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #484848", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-2-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/title-2-inactive.xpm similarity index 64% rename from .themes/oomox-numix-gruvbox/xfwm4/title-2-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/title-2-inactive.xpm index 8195662d..ae58454b 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-2-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-2-inactive.xpm @@ -2,13 +2,8 @@ static char * title_2_inactive_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #393939", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-3-active.xpm b/.themes/oomox-gruvbox/xfwm4/title-3-active.xpm similarity index 63% rename from .themes/oomox-numix-gruvbox/xfwm4/title-3-active.xpm rename to .themes/oomox-gruvbox/xfwm4/title-3-active.xpm index 0b394739..b4fbcb87 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-3-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-3-active.xpm @@ -2,13 +2,8 @@ static char * title_3_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #484848", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-3-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/title-3-inactive.xpm similarity index 64% rename from .themes/oomox-numix-gruvbox/xfwm4/title-3-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/title-3-inactive.xpm index aec7c697..6351aa3d 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-3-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-3-inactive.xpm @@ -2,13 +2,8 @@ static char * title_3_inactive_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #393939", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-4-active.xpm b/.themes/oomox-gruvbox/xfwm4/title-4-active.xpm similarity index 63% rename from .themes/oomox-numix-gruvbox/xfwm4/title-4-active.xpm rename to .themes/oomox-gruvbox/xfwm4/title-4-active.xpm index 62a40a89..bae2fadd 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-4-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-4-active.xpm @@ -2,13 +2,8 @@ static char * title_4_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #484848", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-4-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/title-4-inactive.xpm similarity index 64% rename from .themes/oomox-numix-gruvbox/xfwm4/title-4-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/title-4-inactive.xpm index 1683a0b7..f7425807 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-4-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-4-inactive.xpm @@ -2,13 +2,8 @@ static char * title_4_inactive_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #393939", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-5-active.xpm b/.themes/oomox-gruvbox/xfwm4/title-5-active.xpm similarity index 63% rename from .themes/oomox-numix-gruvbox/xfwm4/title-5-active.xpm rename to .themes/oomox-gruvbox/xfwm4/title-5-active.xpm index a638cd82..8585d5db 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-5-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-5-active.xpm @@ -2,13 +2,8 @@ static char * title_5_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #484848", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/title-5-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/title-5-inactive.xpm similarity index 64% rename from .themes/oomox-numix-gruvbox/xfwm4/title-5-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/title-5-inactive.xpm index 7a16c0fb..5c71d8f6 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/title-5-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/title-5-inactive.xpm @@ -2,13 +2,8 @@ static char * title_5_inactive_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -======= -". c #393939", -"+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", "..", "++", "++", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/top-left-active.xpm b/.themes/oomox-gruvbox/xfwm4/top-left-active.xpm similarity index 59% rename from .themes/oomox-numix-gruvbox/xfwm4/top-left-active.xpm rename to .themes/oomox-gruvbox/xfwm4/top-left-active.xpm index e19b8ef9..445e8670 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/top-left-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/top-left-active.xpm @@ -2,15 +2,9 @@ static char * top_left_active_xpm[] = { "2 26 4 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #ebdbb2", -"@ c #30302f", -======= -". c #484848", -"+ c #343434", -"@ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", +"@ c #282828", " .", ".+", ".@", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/top-left-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/top-left-inactive.xpm similarity index 59% rename from .themes/oomox-numix-gruvbox/xfwm4/top-left-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/top-left-inactive.xpm index 609d4eb8..35f53319 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/top-left-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/top-left-inactive.xpm @@ -2,15 +2,9 @@ static char * top_left_inactive_xpm[] = { "2 26 4 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -"@ c #30302f", -======= -". c #393939", -"+ c #303030", -"@ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", +"@ c #282828", " .", ".+", ".@", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/top-right-active.xpm b/.themes/oomox-gruvbox/xfwm4/top-right-active.xpm similarity index 59% rename from .themes/oomox-numix-gruvbox/xfwm4/top-right-active.xpm rename to .themes/oomox-gruvbox/xfwm4/top-right-active.xpm index ea745af7..c8754136 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/top-right-active.xpm +++ b/.themes/oomox-gruvbox/xfwm4/top-right-active.xpm @@ -2,15 +2,9 @@ static char * top_right_active_xpm[] = { "2 26 4 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #ebdbb2", -"@ c #30302f", -======= -". c #484848", -"+ c #343434", -"@ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", +"@ c #282828", ". ", "+.", "@.", diff --git a/.themes/oomox-numix-gruvbox/xfwm4/top-right-inactive.xpm b/.themes/oomox-gruvbox/xfwm4/top-right-inactive.xpm similarity index 59% rename from .themes/oomox-numix-gruvbox/xfwm4/top-right-inactive.xpm rename to .themes/oomox-gruvbox/xfwm4/top-right-inactive.xpm index 48eb4efe..6b0df39c 100644 --- a/.themes/oomox-numix-gruvbox/xfwm4/top-right-inactive.xpm +++ b/.themes/oomox-gruvbox/xfwm4/top-right-inactive.xpm @@ -2,15 +2,9 @@ static char * top_right_inactive_xpm[] = { "2 26 4 1", " c None", -<<<<<<< HEAD -". c #ebdbb2", -"+ c #30302f", -"@ c #30302f", -======= -". c #393939", -"+ c #303030", -"@ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d +". c #282828", +"+ c #282828", +"@ c #282828", ". ", "+.", "@.", diff --git a/.themes/oomox-numix-gruvbox/Makefile b/.themes/oomox-numix-gruvbox/Makefile deleted file mode 100755 index 0ac52476..00000000 --- a/.themes/oomox-numix-gruvbox/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -SASS=sassc -SASSFLAGS= -I -GLIB_COMPILE_RESOURCES=glib-compile-resources -RES_DIR=gtk-3.0 -SCSS_DIR=$(RES_DIR)/scss -DIST_DIR=$(RES_DIR)/dist -RES_DIR320=gtk-3.20 -SCSS_DIR320=$(RES_DIR320)/scss -DIST_DIR320=$(RES_DIR320)/dist -INSTALL_DIR=$(DESTDIR)/usr/share/themes/Numix -ROOT_DIR=${PWD} -UTILS=scripts/utils.sh - -gtk3: clean gresource_gtk3 -gtk320: clean gresource_gtk320 -all: clean gresource - -css_gtk3: - mkdir -p $(DIST_DIR) - $(SASS) $(SASSFLAGS) "$(SCSS_DIR)" "$(SCSS_DIR)/gtk.scss" "$(DIST_DIR)/gtk.css" -ifneq ("$(wildcard $(SCSS_DIR)/gtk-dark.scss)","") - $(SASS) $(SASSFLAGS) "$(SCSS_DIR)" "$(SCSS_DIR)/gtk-dark.scss" "$(DIST_DIR)/gtk-dark.css" -else - cp "$(DIST_DIR)/gtk.css" "$(DIST_DIR)/gtk-dark.css" -endif -css_gtk320: - mkdir -p $(DIST_DIR320) - $(SASS) $(SASSFLAGS) "$(SCSS_DIR320)" "$(SCSS_DIR320)/gtk.scss" "$(DIST_DIR320)/gtk.css" -ifneq ("$(wildcard $(SCSS_DIR320)/gtk-dark.scss)","") - $(SASS) $(SASSFLAGS) "$(SCSS_DIR320)" "$(SCSS_DIR320)/gtk-dark.scss" "$(DIST_DIR320)/gtk-dark.css" -else - cp "$(DIST_DIR320)/gtk.css" "$(DIST_DIR320)/gtk-dark.css" -endif -css: css_gtk3 css_gtk320 - -gresource_gtk3: css_gtk3 - $(GLIB_COMPILE_RESOURCES) --sourcedir="$(RES_DIR)" "$(RES_DIR)/gtk.gresource.xml" -gresource_gtk320: css_gtk320 - $(GLIB_COMPILE_RESOURCES) --sourcedir="$(RES_DIR320)" "$(RES_DIR320)/gtk.gresource.xml" -gresource: gresource_gtk3 gresource_gtk320 - -watch: clean - while true; do \ - make gresource; \ - inotifywait @gtk.gresource -qr -e modify -e create -e delete "$(RES_DIR)"; \ - done - -clean: - rm -rf "$(DIST_DIR)" - rm -f "$(RES_DIR)/gtk.gresource" - rm -rf "$(DIST_DIR320)" - rm -f "$(RES_DIR320)/gtk.gresource" - rm -rf "$(ROOT_DIR)/dist" - -install: all - $(UTILS) install "$(INSTALL_DIR)" - -uninstall: - rm -rf "$(INSTALL_DIR)" - -changes: - $(UTILS) changes - -zip: all - mkdir "$(ROOT_DIR)/dist" - $(UTILS) install "$(ROOT_DIR)/dist/$$(basename '$(INSTALL_DIR)')" - cd "$(ROOT_DIR)/dist" && zip --symlinks -rq "$$(basename '$(INSTALL_DIR)')" "$$(basename '$(INSTALL_DIR)')" - - -.PHONY: all -.PHONY: css -.PHONY: watch -.PHONY: gresource -.PHONY: clean -.PHONY: install -.PHONY: uninstall -.PHONY: changes - -.DEFAULT_GOAL := all - -# vim: set ts=4 sw=4 tw=0 noet : diff --git a/.themes/oomox-numix-gruvbox/gtk-2.0/gtkrc.hidpi b/.themes/oomox-numix-gruvbox/gtk-2.0/gtkrc.hidpi deleted file mode 100644 index ab0b2b4f..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-2.0/gtkrc.hidpi +++ /dev/null @@ -1,927 +0,0 @@ -# Oomox GTK Theme (Numix Fork) - -gtk-color-scheme = -"base_color:#30302f\nbg_color:#282828\ntooltip_bg_color:#282828\nselected_bg_color:#83a598\ntext_color:#ebdbb2\nfg_color:#ebdbb2\ntooltip_fg_color:#ebdbb2\nselected_fg_color:#ebdbb2\nmenubar_bg_color:#30302f\nmenubar_fg_color:#ebdbb2\ntoolbar_bg_color:#282828\ntoolbar_fg_color:#ebdbb2\nmenu_bg_color:#30302f\nmenu_fg_color:#ebdbb2\npanel_bg_color:#282828\npanel_fg_color:#ebdbb2\nlink_color:#83a598\nbtn_bg_color:#32302f\nbtn_fg_color:#ebdbb2\ntitlebar_bg_color:#30302f\ntitlebar_fg_color:#ebdbb2\n" -# Default Style - -style "murrine-default" { - GtkArrow::arrow-scaling= 0.6 - - GtkButton::child-displacement-x = 0 - GtkButton::child-displacement-y = 0 - - GtkButton::default-border = { 0, 0, 0, 0 } - - GtkButtonBox::child-min-height = 52 - - GtkCheckButton::indicator-size = 30 - - # The following line hints to gecko (and possibly other appliations) - # that the entry should be drawn transparently on the canvas. - # Without this, gecko will fill in the background of the entry. - GtkEntry::honors-transparent-bg-hint = 1 - GtkEntry::state-hint = 0 - - GtkExpander::expander-size = 30 - - GtkImage::x-ayatana-indicator-dynamic = 1 - - GtkMenu::horizontal-padding = 2 - GtkMenu::vertical-padding = 2 - - GtkMenuBar::internal-padding = 1 - GtkMenuBar::window-dragging = 1 - - GtkMenuItem::arrow-scaling= 0.5 - - GtkPaned::handle-size = 1 - - GtkProgressBar::min-horizontal-bar-height = 14 - GtkProgressBar::min-vertical-bar-width = 14 - - GtkRange::trough-border = 0 - GtkRange::slider-width = 24 - GtkRange::stepper-size = 24 - GtkRange::stepper_spacing = 0 - GtkRange::trough-under-steppers = 1 - - GtkScale::slider-length = 30 - GtkScale::slider-width = 30 - GtkScale::trough-side-details = 1 - - GtkScrollbar::activate-slider = 1 - GtkScrollbar::has-backward-stepper = 0 - GtkScrollbar::has-forward-stepper = 0 - GtkScrollbar::has-secondary-backward-stepper = 0 - GtkScrollbar::has-secondary-forward-stepper = 0 - GtkScrollbar::min-slider-length = 160 - GtkScrollbar::slider-width = 24 - GtkScrollbar::trough-border = 0 - - GtkScrolledWindow::scrollbar-spacing = 0 - GtkScrolledWindow::scrollbars-within-bevel = 1 - - GtkSeparatorMenuItem::horizontal-padding = 0 - - GtkToolbar::internal-padding = 0 - - GtkTreeView::expander-size = 22 - GtkTreeView::vertical-separator = 0 - - GtkWidget::focus-line-width = 2 - # The following line prevents the Firefox tabs - # from jumping a few pixels when you create a new tab - GtkWidget::focus-padding = 0 - - GtkWidget::wide-separators = 1 - GtkWidget::separator-width = 2 - GtkWidget::separator-height = 2 - - GtkWindow::resize-grip-height = 2 - GtkWindow::resize-grip-width = 2 - - WnckTasklist::fade-overlay-rect = 0 - - GnomeHRef::link_color = @link_color - GtkHTML::link-color = @link_color - GtkIMHtmlr::hyperlink-color = @link_color - GtkIMHtml::hyperlink-color = @link_color - GtkWidget::link-color = @link_color - GtkWidget::visited-link-color = @text_color - - GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified - GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified - - xthickness = 2 - ythickness = 2 - - fg[NORMAL] = @fg_color - fg[PRELIGHT] = @fg_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @fg_color - fg[INSENSITIVE] = mix (0.5, @bg_color, @fg_color) - - bg[NORMAL] = @bg_color - bg[PRELIGHT] = shade (1.02, @bg_color) - bg[SELECTED] = @selected_bg_color - bg[ACTIVE] = shade (0.9, @bg_color) - bg[INSENSITIVE] = @bg_color - - base[NORMAL] = @base_color - base[PRELIGHT] = shade (0.95, @base_color) - base[SELECTED] = @selected_bg_color - base[ACTIVE] = @selected_bg_color - base[INSENSITIVE] = shade (0.85, @base_color) - - text[NORMAL] = @text_color - text[PRELIGHT] = @text_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @selected_fg_color - text[INSENSITIVE] = mix (0.5, @base_color, @text_color) - - engine "murrine" { - animation = FALSE - arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows - border_shades = { 1.0, 1.0 } # gradient to draw on border - border_colors = { mix(0.2, @fg_color, @bg_color), mix(0.2, @fg_color, @bg_color) } - colorize_scrollbar = FALSE - comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow - contrast = 0.8 # overal contrast with borders - focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow - glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight - glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides - glow_shade = 1.0 # amount of glow - gradient_shades = { 1.0, 1.0, 1.0, 1.0 } # gradient to draw on widgets - highlight_shade = 1.0 # amount of highlight - lightborder_shade = 1.0 # amount of inset light border - lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides - listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised - listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line - menubaritemstyle = 0 # 0 = menuitem look, 1 = button look - menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped - menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped - menustyle = 0 # 0 = none, 1 = vertical striped - progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped - reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient - roundness = 0# roundness of widgets - scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles - sliderstyle = 0 # 0 = none, 1 = handles - stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles - toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient - } -} - -style "murrine-wide" { - xthickness = 6 - ythickness = 6 -} - -style "murrine-wider" { - xthickness = 4 - ythickness = 8 -} - -style "murrine-thin" { - xthickness = 1 - ythickness = 1 -} - -# Notebook - -style "clearlooks-notebook-bg" { - bg[NORMAL] = @bg_color - bg[ACTIVE] = shade (0.80, @bg_color) -} - -style "clearlooks-notebook" = "clearlooks-notebook-bg" { - xthickness = 8 - ythickness = 4 - - engine "clearlooks" { - radius = 0.1 - } -} - -# Various Standard Widgets - -style "murrine-button" = "murrine-wider" { - bg[NORMAL] = @btn_bg_color - bg[PRELIGHT] = shade (1.04, @btn_bg_color) - bg[SELECTED] = shade (0.7, @btn_bg_color) - bg[ACTIVE] = shade (0.95, @btn_bg_color) - bg[INSENSITIVE] = shade (0.75, @btn_bg_color) - - engine "murrine" { - border_colors = { mix(0.4, @btn_fg_color, @btn_bg_color), mix(0.4, @btn_fg_color, @btn_bg_color) } - roundness = 0 - } -} - -style "murrine-buttonlabel" { - fg[NORMAL] = @btn_fg_color - fg[PRELIGHT] = @btn_fg_color - fg[SELECTED] = @btn_fg_color - fg[ACTIVE] = @btn_fg_color - fg[INSENSITIVE] = @btn_fg_color - - engine "murrine" { - } -} - -style "murrine-scrollbar" { - bg[NORMAL] = mix (0.21, @fg_color, @bg_color) - bg[PRELIGHT] = mix (0.31, @fg_color, @bg_color) - bg[ACTIVE] = @selected_bg_color - - engine "murrine" { - roundness = 0 - contrast = 0.0 - border_shades = { 0.9, 0.9 } - trough_shades = { 0.97, 0.97 } - trough_border_shades = { 1.0, 1.0 } - } -} - -style "murrine-overlay-scrollbar" { - bg[ACTIVE] = shade (0.8, @bg_color) - bg[INSENSITIVE] = shade (0.97, @bg_color) - - base[SELECTED] = shade (0.6, @bg_color) - base[INSENSITIVE] = shade (0.85, @bg_color) -} - -style "murrine-scale" = "murrine-thin" { - bg[NORMAL] = @btn_bg_color - bg[ACTIVE] = @bg_color - bg[SELECTED] = @selected_bg_color - bg[INSENSITIVE] = shade (0.95, @btn_bg_color) - - engine "murrine" { - roundness = 25 - gradient_shades = { 1.08, 1.08, 1.08, 1.08 } - border_shades = { 0.5, 0.5 } - trough_shades = { 1.08, 1.08 } - trough_border_shades = { 0.8, 0.8 } - } -} - -style "murrine-progressbar" = "murrine-thin" { - bg[NORMAL] = @bg_color - bg[ACTIVE] = shade (1.08, @bg_color) - - fg[PRELIGHT] = @selected_fg_color - - engine "murrine" { - roundness = 0 - border_shades = { 1.2, 1.2 } - trough_border_shades = { 0.8, 0.8 } - } -} - -style "murrine-treeview-header" = "murrine-button" { - #bg[NORMAL] = @base_color - bg[NORMAL] = mix(0.12, @bg_color, @base_color) - bg[PRELIGHT] = shade (1.04, @base_color) - bg[SELECTED] = shade (0.7, @base_color) - bg[ACTIVE] = shade (0.95, @base_color) - fg[INSENSITIVE] = mix(0.20, @bg_color, @base_color) - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[SELECTED] = @text_color - fg[ACTIVE] = @text_color - fg[INSENSITIVE] = mix(0.20, @bg_color, @text_color) - engine "murrine" { - roundness = 0 - } -} - -style "murrine-treeview" { - engine "murrine" { - roundness = 0 - } -} - -style "murrine-frame" = "murrine-wide" { - bg[NORMAL] = mix(0.08, @fg_color, @bg_color) -} - -style "murrine-frame-title" { - fg[NORMAL] = lighter (@fg_color) -} - -style "murrine-tooltips" { - xthickness = 10 - ythickness = 10 - - bg[NORMAL] = @tooltip_bg_color - bg[SELECTED] = @tooltip_bg_color - - fg[NORMAL] = @tooltip_fg_color - - engine "murrine" { - textstyle = 0 - roundness = 0 - rgba = FALSE - } -} - -style "murrine-spinbutton" = "murrine-button" { - engine "murrine" { - } -} - -style "clearlooks-radiocheck" = "murrine-default" { - bg[SELECTED] = @base_color - bg[PRELIGHT] = @bg_color - - text[NORMAL] = @selected_bg_color - text[PRELIGHT] = @selected_bg_color - - engine "clearlooks" { - radius = 0.0 - } -} - -style "clearlooks-base-radiocheck" = "clearlooks-radiocheck" { - bg[PRELIGHT] = @base_color -} - -style "murrine-entry" = "murrine-wider" { - engine "murrine" { - #border_shades = { 1.15, 1.15 } - border_colors = { mix(0.4, @text_color, @base_color), mix(0.4, @text_color, @base_color) } - roundness = 0 - } -} - -style "metacity-frame" = "murrine-default" { - bg[SELECTED] = @selected_bg_color -} - -style "murrine-statusbar" { } -style "murrine-comboboxentry" = "murrine-entry" { } -style "murrine-hscale" = "murrine-scale" { } -style "murrine-vscale" = "murrine-scale" { } -style "murrine-hscrollbar" = "murrine-scrollbar" { } -style "murrine-vscrollbar" = "murrine-scrollbar" { } - -# Menus - -style "murrine-menu" = "murrine-thin" { - bg[NORMAL] = @menu_bg_color - bg[PRELIGHT] = @selected_bg_color - bg[SELECTED] = @selected_bg_color - bg[ACTIVE] = @menu_bg_color - bg[INSENSITIVE] = @menu_bg_color - - fg[NORMAL] = @menu_fg_color - fg[PRELIGHT] = @selected_fg_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color) - - text[NORMAL] = @menu_fg_color - text[PRELIGHT] = @selected_fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @selected_fg_color - text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color) - - engine "murrine" { - roundness = 0 - } -} - -style "murrine-menu-item" = "murrine-wider" { - bg[PRELIGHT] = @selected_bg_color - bg[SELECTED] = @selected_bg_color - bg[ACTIVE] = @selected_bg_color - - fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text - fg[PRELIGHT] = @selected_fg_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color) - - engine "murrine" { - textstyle = 0 - border_shades = { 1.2, 1.2 } - } -} - -style "murrine-separator-menu-item" = "murrine-thin" { } - -style "murrine-menubar" { - bg[NORMAL] = @menubar_bg_color - bg[PRELIGHT] = mix (0.21, @menubar_fg_color, @menubar_bg_color) - bg[SELECTED] = mix (0.21, @menubar_fg_color, @menubar_bg_color) - bg[ACTIVE] = shade (0.9, @menubar_bg_color) - bg[INSENSITIVE] = @menubar_bg_color - - fg[NORMAL] = @menubar_fg_color - fg[PRELIGHT] = shade (1.08, @menubar_fg_color) - fg[SELECTED] = shade (1.08, @menubar_fg_color) - fg[ACTIVE] = @menubar_fg_color - fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color) - - engine "murrine" { - roundness = 0 - } -} - -style "murrine-menubaritem" { - bg[NORMAL] = @menubar_bg_color - bg[PRELIGHT] = mix (0.21, @menubar_fg_color, @menubar_bg_color) - bg[SELECTED] = mix (0.21, @menubar_fg_color, @menubar_bg_color) - bg[ACTIVE] = shade (0.9, @menubar_bg_color) - bg[INSENSITIVE] = @menubar_bg_color - - fg[NORMAL] = @menubar_fg_color - fg[PRELIGHT] = shade (1.08, @menubar_fg_color) - fg[SELECTED] = shade (1.08, @menubar_fg_color) - fg[ACTIVE] = @menubar_fg_color - fg[INSENSITIVE] = mix (0.5, @menubar_bg_color, @menubar_fg_color) - - engine "murrine" { - roundness = 0 - } -} - -# Toolbars - -style "murrine-toolbar" = "murrine-thin" { - bg[NORMAL] = @toolbar_bg_color - bg[PRELIGHT] = shade (1.02, @toolbar_bg_color) - bg[SELECTED] = @selected_bg_color - bg[ACTIVE] = shade (0.9, @toolbar_bg_color) - bg[INSENSITIVE] = @toolbar_bg_color - - fg[NORMAL] = @toolbar_fg_color - fg[PRELIGHT] = @toolbar_fg_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @toolbar_fg_color - fg[INSENSITIVE] = mix (0.5, @toolbar_bg_color, @toolbar_fg_color) - - engine "murrine" { - } -} - -style "murrine-toolbutton" = "murrine-button" { - bg[NORMAL] = shade (1.08, @toolbar_bg_color) - bg[PRELIGHT] = shade (1.10, @toolbar_bg_color) - bg[SELECTED] = @selected_bg_color - bg[ACTIVE] = shade (0.95, @toolbar_bg_color) - bg[INSENSITIVE] = shade (0.85, @toolbar_bg_color) - - fg[NORMAL] = @toolbar_fg_color - fg[PRELIGHT] = @toolbar_fg_color - fg[SELECTED] = @selected_fg_color - fg[ACTIVE] = @toolbar_fg_color - fg[INSENSITIVE] = mix (0.5, @toolbar_bg_color, @toolbar_fg_color) - - engine "murrine" { - } -} - -class "GtkToolbar" style "murrine-toolbar" -class "GtkHandleBox" style "murrine-toolbar" -widget_class "*Toolbar*.*Separator*" style "murrine-toolbar" - -# Panels - -style "murrine-panel" = "murrine-thin" { - xthickness = 2 - - bg[NORMAL] = @panel_bg_color - bg[PRELIGHT] = mix (0.21, @panel_fg_color, @panel_bg_color) - bg[SELECTED] = mix (0.21, @panel_fg_color, @panel_bg_color) - bg[ACTIVE] = shade (0.8, @panel_bg_color) - bg[INSENSITIVE] = @panel_bg_color - - fg[NORMAL] = @panel_fg_color - fg[PRELIGHT] = shade (1.08, @panel_fg_color) - fg[SELECTED] = shade (1.08, @panel_fg_color) - fg[ACTIVE] = @panel_fg_color - fg[INSENSITIVE] = mix (0.5, @panel_bg_color, @panel_fg_color) - - base[NORMAL] = @panel_bg_color - base[PRELIGHT] = mix (0.21, @panel_fg_color, @panel_bg_color) - base[SELECTED] = mix (0.21, @panel_fg_color, @panel_bg_color) - base[ACTIVE] = shade (0.9, @panel_bg_color) - base[INSENSITIVE] = @panel_bg_color - - text[NORMAL] = @panel_fg_color - text[PRELIGHT] = shade (1.08, @panel_fg_color) - text[SELECTED] = shade (1.08, @panel_fg_color) - text[ACTIVE] = @panel_fg_color - text[INSENSITIVE] = mix (0.5, @panel_bg_color, @panel_fg_color) - - engine "murrine" { - roundness = 0 - contrast = 0.0 - } -} - -widget "*PanelWidget*" style "murrine-panel" -widget "*PanelApplet*" style "murrine-panel" -widget "*fast-user-switch*" style "murrine-panel" -widget "*CPUFreq*Applet*" style "murrine-panel" -widget "*indicator-applet*" style "murrine-panel" -class "PanelApp*" style "murrine-panel" -class "PanelToplevel*" style "murrine-panel" -widget_class "*PanelToplevel*" style "murrine-panel" -widget_class "*notif*" style "murrine-panel" -widget_class "*Notif*" style "murrine-panel" -widget_class "*Tray*" style "murrine-panel" -widget_class "*tray*" style "murrine-panel" -widget_class "*computertemp*" style "murrine-panel" -widget_class "*Applet*Tomboy*" style "murrine-panel" -widget_class "*Applet*Netstatus*" style "murrine-panel" -widget "*gdm-user-switch-menubar*" style "murrine-panel" - -# LXPanel (code based on Lubuntu-default theme's gtkrc file) -widget "*.tclock.*" style "murrine-panel" -widget "*.taskbar.*" style "murrine-panel" -widget_class "*GtkBgbox*" style "murrine-panel" - -style "bold-panel-item" { - font_name = "Bold" - - engine "murrine" { - roundness = 0 - } -} - -widget "*Panel*MenuBar*" style "bold-panel-item" -widget "*gimmie*" style "bold-panel-item" - -# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug -# class "*Panel*" style "murrine-panel" # Disabled to fix bug - -# XFCE Styles - -style "workspace-switcher" = "murrine-panel" { - bg[ACTIVE] = @selected_bg_color - bg[SELECTED] = @selected_bg_color -} - -style "xfce-header" { - bg[NORMAL] = shade (0.9, @bg_color) - base[NORMAL] = shade (1.18, @bg_color) -} - -style "xfdesktop-windowlist" { - bg[NORMAL] = @base_color - fg[INSENSITIVE] = shade (0.95, @base_color) - text[INSENSITIVE] = shade (0.95, @base_color) -} - -style "xfdesktop-icon-view" { - XfdesktopIconView::label-alpha = 0 - XfdesktopIconView::selected-label-alpha = 60 - XfdesktopIconView::shadow-x-offset = 0 - XfdesktopIconView::shadow-y-offset = 1 - XfdesktopIconView::selected-shadow-x-offset = 0 - XfdesktopIconView::selected-shadow-y-offset = 1 - XfdesktopIconView::shadow-color = "#000000" - XfdesktopIconView::selected-shadow-color = "#000000" - XfdesktopIconView::shadow-blur-radius = 2 - XfdesktopIconView::cell-spacing = 2 - XfdesktopIconView::cell-padding = 6 - XfdesktopIconView::cell-text-width-proportion = 1.9 - - fg[NORMAL] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - -} - -style "xfwm-tabwin" { - Xfwm4TabwinWidget::border-width = 1 - Xfwm4TabwinWidget::border-alpha = 1.0 - Xfwm4TabwinWidget::icon-size = 64 - Xfwm4TabwinWidget::alpha = 1.0 - Xfwm4TabwinWidget::border-radius = 2 - - bg[NORMAL] = @menu_bg_color - bg[SELECTED] = @menu_bg_color - - fg[NORMAL] = @menu_fg_color - - engine "murrine" { - contrast = 0.0 - border_shades = { 0.9, 0.9 } - } -} - -style "xfwm-tabwin-button" { - font_name = "bold" - - bg[SELECTED] = @selected_bg_color -} - -style "xfsm-logout" { - bg[NORMAL] = @menu_bg_color - bg[ACTIVE] = @menu_bg_color - bg[PRELIGHT] = shade (1.1, @menu_bg_color) - bg[SELECTED] = shade (0.5, @menu_bg_color) - bg[INSENSITIVE] = shade (1.3, @menu_bg_color) - - fg[NORMAL] = @menu_fg_color - fg[PRELIGHT] = @menu_fg_color - - text[NORMAL] = @menu_fg_color - - engine "murrine" { - } -} - -style "xfsm-logout-button" { - bg[NORMAL] = shade (1.2, @menu_bg_color) - bg[PRELIGHT] = shade (1.4, @menu_bg_color) - - engine "murrine" { - } -} - -widget "*Pager*" style "workspace-switcher" - -widget "*Xfce*Panel*" style "murrine-panel" -class "*Xfce*Panel*" style "murrine-panel" - -# Thunar Styles - -style "sidepane" { - base[NORMAL] = @bg_color - base[INSENSITIVE] = mix (0.4, shade (1.35, @selected_bg_color), shade (0.9, @base_color)) - bg[NORMAL] = @bg_color - text[NORMAL] = mix (0.9, @fg_color, @bg_color) -} - -widget_class "*ThunarShortcutsView*" style "sidepane" -widget_class "*ThunarTreeView*" style "sidepane" -widget_class "*ThunarLocationEntry*" style "murrine-entry" - -style "whiskermenu" { - bg[NORMAL] = @menu_bg_color - bg[ACTIVE] = mix (0.21, @menubar_fg_color, @menubar_bg_color) - bg[PRELIGHT] = @selected_bg_color - - fg[NORMAL] = @menu_fg_color - fg[ACTIVE] = @menu_fg_color - fg[PRELIGHT] = @menu_fg_color -} - -style "whiskermenu-scrollbar" = "murrine-scrollbar" { - bg[NORMAL] = mix (0.21, @fg_color, @bg_color) - bg[PRELIGHT] = mix (0.31, @fg_color, @bg_color) - bg[ACTIVE] = @selected_bg_color - - engine "murrine" { - trough_shades = { 4.97, 4.97 } - trough_border_shades = { 5.0, 5.0 } - } -} - -widget "whiskermenu-window*" style "whiskermenu" -widget "*whisker*GtkVScrollbar" style "whiskermenu-scrollbar" - -# Gtk2 Open-File Dialog - -widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane" -widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.." style "murrine-treeview-header" - -# Google Chrome/Chromium Styles (requires 9.0.597 or newer) - -style "chromium-toolbar-button" { - engine "murrine" { - roundness = 0 - textstyle = 0 - } -} - -style "chrome-gtk-frame" { - ChromeGtkFrame::frame-color = @titlebar_bg_color - ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color - - ChromeGtkFrame::frame-gradient-size = 0 - ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color - - ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color - ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color - - ChromeGtkFrame::incognito-frame-gradient-size = 0 - ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color - - ChromeGtkFrame::scrollbar-trough-color = @bg_color - ChromeGtkFrame::scrollbar-slider-normal-color = mix (0.21, @fg_color, @bg_color) - ChromeGtkFrame::scrollbar-slider-prelight-color = mix (0.31, @fg_color, @bg_color) -} - -class "ChromeGtkFrame" style "chrome-gtk-frame" - -widget_class "*Chrom*Button*" style "chromium-toolbar-button" - -# General Styles - -class "GtkWidget" style "murrine-default" - -class "GtkFrame" style "murrine-frame" -class "MetaFrames" style "metacity-frame" -class "GtkWindow" style "metacity-frame" - -class "GtkSeparator" style "murrine-wide" -class "GtkCalendar" style "murrine-wide" - -class "GtkSpinButton" style "murrine-spinbutton" - -class "GtkScale" style "murrine-scale" -class "GtkVScale" style "murrine-vscale" -class "GtkHScale" style "murrine-hscale" -class "GtkScrollbar" style "murrine-scrollbar" -class "GtkVScrollbar" style "murrine-vscrollbar" -class "GtkHScrollbar" style "murrine-hscrollbar" - -class "GtkEntry" style "murrine-entry" - -widget_class "*" style "clearlooks-notebook" -widget_class "**" style "clearlooks-notebook-bg" -widget_class "**" style "clearlooks-notebook-bg" -widget_class "**" style "clearlooks-notebook-bg" -widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook" - -widget_class "*" style "murrine-button" -widget_class "**" style "murrine-statusbar" -widget_class "*" style "murrine-progressbar" -widget_class "*" style "murrine-progressbar" - -widget_class "**" style "murrine-comboboxentry" -widget_class "**" style "murrine-comboboxentry" - -widget_class "**" style "murrine-menu" -widget_class "**" style "murrine-menu-item" -widget_class "**" style "murrine-separator-menu-item" -widget_class "*Menu*.*Sepa*" style "murrine-separator-menu-item" -widget_class "**" style "murrine-menubar" -widget_class "***" style "murrine-menubaritem" - -widget_class "*GtkToolButton*" style "murrine-toolbutton" -widget_class "*GtkToggleToolButton*" style "murrine-toolbutton" -widget_class "*GtkMenuToolButton*" style "murrine-toolbutton" -widget_class "*GtkToolbar*Button" style "murrine-toolbutton" - -widget_class "*.." style "murrine-frame-title" - -widget_class "*.*" style "murrine-treeview" -widget_class "*.." style "murrine-treeview-header" -widget_class "*.." style "murrine-treeview-header" -widget_class "*.." style "murrine-treeview-header" -widget_class "*.." style "murrine-treeview-header" - -widget_class "*." style "clearlooks-radiocheck" -widget_class "*.*." style "clearlooks-base-radiocheck" -widget_class "*" style "clearlooks-base-radiocheck" - -widget "gtk-tooltip*" style "murrine-tooltips" - -widget_class "**" style "murrine-overlay-scrollbar" - -# Workarounds and Non-Standard Styling - -style "text-is-fg-color-workaround" { - text[NORMAL] = @text_color - text[PRELIGHT] = @fg_color - text[SELECTED] = @selected_fg_color - text[ACTIVE] = @fg_color - text[INSENSITIVE] = mix (0.5, @bg_color, @fg_color) -} - -widget_class "*.." style "text-is-fg-color-workaround" - -style "fg-is-text-color-workaround" { - fg[NORMAL] = @text_color - fg[PRELIGHT] = @text_color - fg[ACTIVE] = @selected_fg_color - fg[SELECTED] = @selected_fg_color - fg[INSENSITIVE] = darker (@fg_color) -} - -widget_class "**" style "fg-is-text-color-workaround" -widget_class "*" style "fg-is-text-color-workaround" -widget_class "*" style "fg-is-text-color-workaround" - -style "murrine-evo-new-button-workaround" { - engine "murrine" { - toolbarstyle = 0 - } -} - -widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround" - -style "inkscape-toolbar-fix" { - engine "murrine" { - gradient_shades = { 1.0, 1.0, 1.0, 1.0 } - highlight_shade = 1.0 - } -} - -#widget "*GtkHandleBox*" style "inkscape-toolbar-fix" -#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix" -#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix" -widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix" - - - - -style "gimp-default-style" { -# Uncommenting this line allows to set a different (smaller) font for GIMP. -# -# font_name = "sans 8" -# Enabling the following line for some reason breaks toolbox resize -# increment calculation. You can enable it to get an even smaller GUI -# but need to restart GIMP after the theme change. -# -# GtkWidget::focus-padding = 0 - GtkOptionMenu::indicator-size = { 15, 25 } - GtkOptionMenu::indicator-spacing = { 10, 8, 4, 4 } - GtkPaned::handle-size = 5 - GimpDockWindow::default-height = 600 - GimpDock::font-scale = 1.0 - GimpMenuDock::minimal-width = 400 - GimpToolPalette::tool-icon-size = large-toolbar - GimpToolPalette::button-relief = none - GimpDockbook::tab-border = 0 - GimpDockbook::tab-icon-size = button - GimpColorNotebook::tab-border = 0 - GimpColorNotebook::tab-icon-size = button - GimpDeviceEditor::handle-size = 30 - GimpDockable::content-border = 1 - GimpEditor::content-spacing = 1 - GimpEditor::button-spacing = 1 - GimpEditor::button-icon-size = button - GimpDataEditor::minimal-height = 150 - GimpFrame::label-spacing = 5 - GtkDialog::content-area-border = 2 - GtkDialog::button-spacing = 20 - GtkDialog::action-area-border = 25 - GimpUnitComboBox::appears-as-list = 0 -} - -class "GtkWidget" style "gimp-default-style" -style "gimp-tool-dialog-style" = "gimp-default-style" -{ - GtkDialog::action-area-border = 6 -} -class "GimpToolDialog" style "gimp-tool-dialog-style" -style "gimp-grid-view-style" = "gimp-default-style" -{ - bg[NORMAL] = { 1.0, 1.0, 1.0 } -} -widget "*GimpContainerGridView*GtkViewport*" style "gimp-grid-view-style" -style "gimp-dockable-style" = "gimp-default-style" -{ - GimpFrame::label-bold = 0 - GtkButton::focus-line_width = 1 - GtkButton::focus-padding = 0 -} -widget "*GimpDockable.*" style "gimp-dockable-style" -style "gimp-display-style" = "gimp-default-style" -{ - GimpRuler::font-scale = 1.0 - GimpUnitComboBox::label-scale = 1.0 - GimpScaleComboBox::label-scale = 1.0 - GtkComboBox::arrow-size = 20 - GtkButton::inner-border = { 0, 0, 0, 0 } - GtkButton::focus-line-width = 0 - GtkButton::focus-padding = 0 -} -widget "*GimpDisplayShell.*" style "gimp-display-style" -style "gimp-overlay-style" = "gimp-display-style" -{ - GtkButton::focus-line_width = 2 -} -widget_class "**" style "gimp-overlay-style" - - - - -# Performance Fixes - -style "performance-fix" { - engine "murrine" { - textstyle = 0 - } -} - -widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape -widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp -widget_class "*GimpToolbox*" style "performance-fix" -widget_class "*GimpMenuDock*" style "performance-fix" -widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice -widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.) - -widget_class "*XfceHeading*" style "xfce-header" -widget_class "*XfceDesktop*" style "xfdesktop-windowlist" -widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view" -widget "xfwm4-tabwin*" style "xfwm-tabwin" -widget "xfwm4-tabwin*GtkButton*" style "xfwm-tabwin-button" -widget_class "*XfsmLogoutDialog*" style "xfsm-logout" -widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button" - -# button fg workaround: -widget_class "*.." style "murrine-buttonlabel" -widget_class "***" style:highest "murrine-buttonlabel" diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_colors.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_colors.scss deleted file mode 100644 index cdd74996..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_colors.scss +++ /dev/null @@ -1,67 +0,0 @@ -@import "global"; - -/* dark color scheme */ -@define-color dark_bg_color #{"" + $dark_bg_color}; -@define-color dark_fg_color #{"" + $dark_fg_color}; - -/* colormap actually used by the theme, to be overridden in other css files */ -@define-color theme_bg_color #{"" + $bg_color}; -@define-color theme_fg_color #{"" + $fg_color}; -@define-color theme_base_color #{"" + $base_color}; -@define-color theme_text_color #{"" + $text_color}; -@define-color theme_selected_bg_color #{"" + $selected_bg_color}; -@define-color theme_selected_fg_color #{"" + $selected_fg_color}; -@define-color theme_tooltip_bg_color #{"" + $tooltip_bg_color}; -@define-color theme_tooltip_fg_color #{"" + $tooltip_fg_color}; - -/* shadow effects */ -@define-color light_shadow #{"" + $light_shadow}; -@define-color dark_shadow #{"" + $dark_shadow}; - -/* misc colors used by gtk+ */ -@define-color info_fg_color #{"" + $info_fg_color}; -@define-color info_bg_color #{"" + $info_bg_color}; -@define-color warning_fg_color #{"" + $warning_fg_color}; -@define-color warning_bg_color #{"" + $warning_bg_color}; -@define-color question_fg_color #{"" + $question_fg_color}; -@define-color question_bg_color #{"" + $question_bg_color}; -@define-color error_fg_color #{"" + $error_fg_color}; -@define-color error_bg_color #{"" + $error_bg_color}; -@define-color link_color #{"" + $link_color}; -@define-color success_color #{"" + $success_color}; -@define-color warning_color #{"" + $warning_color}; -@define-color error_color #{"" + $error_color}; - -/* widget colors */ -@define-color titlebar_bg_color @dark_bg_color; -@define-color titlebar_fg_color @dark_fg_color; -@define-color menubar_bg_color @dark_bg_color; -@define-color menubar_fg_color @dark_fg_color; -@define-color toolbar_bg_color @theme_bg_color; -@define-color toolbar_fg_color @theme_fg_color; -@define-color menu_bg_color @dark_bg_color; -@define-color menu_fg_color @dark_fg_color; -@define-color panel_bg_color @dark_bg_color; -@define-color panel_fg_color @dark_fg_color; - -/* osd */ -@define-color osd_base #{"" + $osd_base}; -@define-color osd_bg #{"" + $osd_bg}; -@define-color osd_fg #{"" + $osd_fg}; - -/* lightdm greeter colors */ -@define-color lightdm_bg_color #{"" + $lightdm_bg_color}; -@define-color lightdm_fg_color #{"" + $lightdm_fg_color}; - -/* window manager colors */ -@define-color wm_bg #{"" + $wm_bg}; -@define-color wm_border_focused #{"" + $wm_border_focused}; -@define-color wm_border_unfocused #{"" + $wm_border_unfocused}; -@define-color wm_title_focused #{"" + $wm_title_focused}; -@define-color wm_title_unfocused #{"" + $wm_title_unfocused}; -@define-color wm_icons_focused #{"" + $wm_icons_focused}; -@define-color wm_icons_focused_prelight #{"" + $wm_icons_focused_prelight}; -@define-color wm_icons_focused_pressed #{"" + $wm_icons_unfocused_pressed}; -@define-color wm_icons_unfocused #{"" + $wm_icons_unfocused}; -@define-color wm_icons_unfocused_prelight #{"" + $wm_icons_unfocused_prelight}; -@define-color wm_icons_unfocused_pressed #{"" + $wm_icons_unfocused_pressed}; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_functions.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_functions.scss deleted file mode 100644 index 0de71b69..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_functions.scss +++ /dev/null @@ -1,79 +0,0 @@ -$modules: () !default; - -@mixin exports($name) { - @if (not index($modules, $name)) { - $modules: append($modules, $name) !global; - - @content; - } -} - -@function alpha($color, $amount) { - @if type-of($color) == "color" { - @return fade-out($color, (1 - $amount)); - } @else { - @return unquote("alpha(#{$color},#{$amount})"); - } -} - -@function shade($color, $amount) { - @if type-of($color) == "color" { - @if ($amount > 1) { - @return lighten($color, ($amount - 1) * lightness($color)) - } @else { - @return darken($color, (1 - $amount) * lightness($color)) - } - } @else { - @return unquote("shade(#{$color},#{$amount})"); - } -} - -@function mix($color1, $color2, $amount) { - @return unquote("mix(#{$color1},#{$color2},#{$amount})"); -} - -@function border_normal($color) { - @return shade($color, $contrast); -} - -@function border_focus($color) { - @return shade($color, ($contrast - .05)); -} - -@function border_active($color) { - @return shade($color, ($contrast - .1)); -} - -@function border_insensitive($color) { - @return shade($color, ($contrast + .05)); -} - -@mixin linear-gradient($color, $direction: to bottom) { - @if $gradient == 0 { - background-color: $color; - background-image: none; - } @else { - $amount: $gradient / 2; - - background-color: $color; - background-image: linear-gradient($direction, - shade($color, (1 + $amount)), - shade($color, (1 - $amount)) - ); - } -} - -@mixin border($color) { - border-color: border_normal($color); - - &:focus, &:hover { border-color: border_focus($color); } - - &:active, &:active:hover, - &:active:focus, &:active:hover:focus, - &:checked, &:checked:hover, - &:checked:focus, &:checked:hover:focus { border-color: border_active($color); } - - &:insensitive { border-color: border_insensitive($color); } - - &:active:insensitive, &:checked:insensitive { border-color: border_normal($color); } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_global.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_global.scss deleted file mode 100644 index 3ea0a364..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_global.scss +++ /dev/null @@ -1,89 +0,0 @@ -// scss-lint:disable ColorVariable - -@import "functions"; - -// default color scheme -$bg_color: if($variant == "dark", #ebdbb2, #282828); -$fg_color: if($variant == "dark", #282828, #ebdbb2); -$base_color: if($variant == "dark", #ebdbb2, #30302f); -$text_color: if($variant == "dark", #30302f, #ebdbb2); -$button_bg_color: if($variant == "dark", #ebdbb2, #32302f); -$button_fg_color: if($variant == "dark", #32302f, #ebdbb2); -$header_button_bg_color: #30302f; -$header_button_fg_color: #ebdbb2; -$selected_bg_color: #83a598; -$selected_fg_color: #ebdbb2; -$tooltip_bg_color: #282828; -$tooltip_fg_color: #ebdbb2; - -// dark colors -$dark_bg_color: #30302f; -$dark_fg_color: #ebdbb2; - -// shadows -$dark_shadow: #000; -$light_shadow: #fff; - -// caret -$primary_caret_color: #282828; -$secondary_caret_color: #282828; -$caret_aspect_ratio: 0.04; - -// white and black -$black: #000; -$white: #fff; - -// misc colors used by gtk+ -$info_fg_color: #fff; -$info_bg_color: #03a9f4; -$warning_fg_color: #fff; -$warning_bg_color: #ef6c00; -$question_fg_color: #fff; -$question_bg_color: #673ab7; -$error_fg_color: #fff; -$error_bg_color: #f44336; -$link_color: #83a598; -$success_color: #4caf50; -$warning_color: #ef6c00; -$error_color: #f44336; - -$toolbar_bg_color: $bg_color; -$toolbar_fg_color: $fg_color; - -$titlebar_bg_color: $dark_bg_color; -$titlebar_fg_color: $dark_fg_color; - -$menu_bg_color: $dark_bg_color; -$menu_fg_color: $dark_fg_color; - -$menubar_bg_color: $dark_bg_color; -$menubar_fg_color: $dark_fg_color; - -$panel_bg_color: $dark_bg_color; -$panel_fg_color: $dark_fg_color; - -$osd_base: $dark_bg_color; -$osd_fg: $dark_fg_color; -$osd_bg: alpha($osd_base, 0.8); - -$lightdm_bg_color: $dark_bg_color; -$lightdm_fg_color: $dark_fg_color; - -$wm_bg: $titlebar_bg_color; -$wm_border_focused: #32302f; -$wm_border_unfocused: #282828; -$wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1); -$wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, .4); -$wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1); -$wm_icons_focused_prelight: $selected_bg_color; -$wm_icons_focused_pressed: shade($selected_bg_color, .8); -$wm_icons_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, .4); -$wm_icons_unfocused_prelight: $selected_bg_color; -$wm_icons_unfocused_pressed: shade($selected_bg_color, .8); - -// widget styles -$roundness: 0px; -$spacing: 3px; -$gradient: 0.0; - -$contrast: .8; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_widgets.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_widgets.scss deleted file mode 100644 index db51b05f..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/_widgets.scss +++ /dev/null @@ -1,37 +0,0 @@ -@import "functions"; -@import "global"; -@import "colors"; - - -@import "widgets/base"; -@import "widgets/button"; -@import "widgets/entry"; -@import "widgets/actionbar"; -@import "widgets/calendar"; -@import "widgets/choosers"; -@import "widgets/grid"; -@import "widgets/infobar"; -@import "widgets/menu"; -@import "widgets/misc"; -@import "widgets/notebook"; -@import "widgets/osd"; -@import "widgets/overshoot"; -@import "widgets/progress"; -@import "widgets/scrollbar"; -@import "widgets/sidebar"; -@import "widgets/spinner"; -@import "widgets/toggle"; -@import "widgets/toolbar"; -@import "widgets/view"; -@import "widgets/window"; - -@import "apps/unity-greeter"; -@import "apps/gedit"; -@import "apps/nautilus"; -@import "apps/nemo"; -@import "apps/panel"; -@import "apps/synaptic"; -@import "apps/xfce"; -@import "apps/unity"; -@import "apps/lightdm"; -@import "apps/gnome-terminal"; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_gedit.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_gedit.scss deleted file mode 100644 index f1614a64..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_gedit.scss +++ /dev/null @@ -1,132 +0,0 @@ -/********* - ! Gedit * -**********/ - -@include exports("gedit") { - GeditWindow .pane-separator { - border-width: 0 1px 0 0; - border-style: solid; - - &, &:hover { - border-color: shade($bg_color, ($contrast + .1)); - background-color: $bg_color; - } - } - - .gedit-document-panel { - background-color: $bg_color; - color: mix($fg_color, $bg_color, .1); - - .list-row { - padding: $spacing; - - .button { - padding: 1px; - border-radius: $roundness; - border-style: solid; - border-color: transparent; - border-width: 1px; - background-color: transparent; - background-image: none; - color: transparent; - icon-shadow: none; - } - } - - .prelight-row .button { - border-color: alpha($black, .1); - color: alpha($white, .8); - - &:active { - border-color: alpha($black, .2); - background-color: alpha($black, .08); - color: $white; - } - } - - list-row, .prelight-row { - .button:hover { - border-color: alpha($black, .1); - color: $white; - } - } - } - - .gedit-document-panel-group-row { - &, &:hover { - border-top: 1px solid shade($bg_color, ($contrast + .1)); - background-color: $bg_color; - } - } - - .gedit-document-panel-document-row { - &:hover { background-color: shade($bg_color, 1.05); } - - &:selected { - &, &:hover { @extend %selected; } - } - } - - .gedit-document-panel-dragged-row { - border: 1px solid alpha($black, .1); - background-color: alpha($black, .5); - color: $white; - } - - .gedit-document-panel-placeholder-row { - border: 0; - background-color: alpha($black, .08); - transition: all 200ms ease-in; - } - - GeditStatusbar { border-top: 1px solid border_normal($bg_color); } - - GeditStatusbar GeditSmallButton, GeditStatusMenuButton { - text-shadow: none; - - .button { - border-style: solid; - border-width: 0 1px; - border-color: transparent; - border-radius: 0; - padding: 1px 6px 2px 4px; - - &:hover, &:active, &:active:hover { border-color: border_normal($bg_color); } - - &:active { - background-color: shade($bg_color, .95); - color: $fg_color; - } - } - } - - GeditViewFrame .gedit-search-slider { - padding: $spacing; - border-radius: 0 0 $roundness $roundness; - border-width: 0 1px 1px; - border-style: solid; - border-color: border_normal($base_color); - background-color: $base_color; - - .not-found { - background-color: $error_bg_color; - background-image: none; - color: $error_fg_color; - - &:selected { @extend %selected; } - } - } - - GeditFileBrowserWidget .toolbar { - padding: $spacing / 2; - border-top: 0; - background-color: $bg_color; - background-image: none; - } - - .gedit-search-entry-occurrences-tag { - margin: $spacing / 2; - padding: $spacing / 2; - color: mix($text_color, $base_color, .5); - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_gnome-terminal.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_gnome-terminal.scss deleted file mode 100644 index 178f7417..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_gnome-terminal.scss +++ /dev/null @@ -1,219 +0,0 @@ -/********************** - ! Genome Terminal * -***********************/ - -@include exports("gnome-terminal") { - VteTerminal { - background-color: $osd_base; - color: $osd_fg; - } - TerminalWindow { - .scrollbars-junction { - background-color: $osd_base; - } - .scrollbar { - &.trough { - background-color: $osd_base; - } - &.button { - color: shade($osd_base, 0.6); - &:active { - color: shade($osd_base, 0.6); - &:hover { - color: shade($osd_base, 0.6); - } - } - } - &.slider { - border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.21); - background-color: mix($osd_base, $osd_fg, 0.21); - &:hover { - border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.31); - background-color: mix($osd_base, $osd_fg, 0.31); - } - &.vertical { - &:hover { - border-color: mix(shade($osd_base, 0.87), $osd_fg, 0.31); - background-color: mix($osd_base, $osd_fg, 0.31); - } - &:active { - border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; - } - } - &:active { - border-color: shade($selected_bg_color, 0.9); - background-color: $selected_bg_color; - } - } - } - GtkNotebook.notebook { - border-right-width: 0; - border-bottom-width: 0; - border-left-width: 0; - } - } - - TerminalNotebook.notebook { //use dark variant by default - padding: 0; - border-width: 1px 0 0; - border-style: solid; - border-color: border_active($osd_base); - border-radius: 0; - @include linear-gradient($osd_base); - background-clip: border-box; - color: $osd_fg; - - -GtkNotebook-initial-gap: 0; - -GtkNotebook-arrow-spacing: 5; - -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: 1; - -GtkNotebook-has-tab-gap: false; - - &.frame { border-width: 1px; } - - &.header { - border-width: 0; - background-color: shade($osd_base, .85); - - &.frame { - border-color: border_focus($osd_base); - - &.top { border-width: 1px 1px 0 1px; } - - &.right { border-width: 1px 1px 1px 0; } - - &.bottom { border-width: 0 1px 1px 1px; } - - &.left { border-width: 1px 0 1px 1px; } - } - } - - GtkViewport { - border-width: 0; - background-color: $osd_base; - color: $osd_fg; - } - - tab { - padding: ($spacing + 1px) $spacing * 2; - border: 1px solid transparent; - background-color: transparent; - background-image: none; - - &:active { - background-color: transparent; - background-image: none; - } - - &.top { - border-bottom-width: 2px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - - &:hover { - border-bottom-color: alpha($selected_bg_color, 0.3); - } - - &:active { - border-bottom-color: $selected_bg_color; - } - } - - &.right { - border-left-width: 2px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - - &:hover { - border-left-color: alpha($selected_bg_color, 0.3); - } - - &:active { - border-left-color: $selected_bg_color; - } - } - - &.bottom { - border-top-width: 2px; - border-top-right-radius: 0; - border-top-left-radius: 0; - - &:hover { - border-top-color: alpha($selected_bg_color, 0.3); - } - - &:active { - border-top-color: $selected_bg_color; - } - } - - &.left { - border-right-width: 2px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - - &:hover { - border-right-color: alpha($selected_bg_color, 0.3); - } - - &:active { - border-right-color: $selected_bg_color; - } - } - - GtkLabel { color: mix($osd_fg, $osd_base, .3); } - - &.reorderable-page { - &:hover { - background-color: shade($osd_base, .85); - border-left: 0; - border-right: 0; - /* using box shadows instead of borders due to slanted edges */ - box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), inset 1px 0 shade($osd_base, .7), inset -1px 0 shade($osd_base, .7); - } - - &:active { - background-color: shade($osd_base, .9); - border-left: 0; - border-right: 0; - box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), inset 1px 0 shade($osd_base, .75), inset -1px 0 shade($osd_base, .75); - } - } - - /* close button styling */ - .button { - &, &:active, &:checked, &:hover { - padding: 1px; - border-width: 1px; - border-radius: 2px; - border-style: solid; - border-color: transparent; - background-image: none; - background-color: transparent; - color: mix($osd_fg, $osd_base, 0.5); - } - - &:hover { - color: $osd_fg; - border-color: shade($osd_base, 0.8); - } - - &:active, &:checked, &:active:hover, &:checked:hover { - border-color: shade($osd_base, 0.7); - background-color: shade($osd_base, 0.95); - } - } - - } - - .prelight-page { - &, GtkLabel { color: mix($osd_fg, $osd_base, .15); } - } - - .active-page { - &, GtkLabel { color: $osd_fg; } - } - - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_lightdm.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_lightdm.scss deleted file mode 100644 index 52eda611..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_lightdm.scss +++ /dev/null @@ -1,193 +0,0 @@ -/*********************** - ! LightDM GTK Greeter * - ***********************/ - -@include exports("lightdm") { - #panel_window { - background-color: transparent; - background-image: none; - color: $white; - font: bold; - text-shadow: 0 1px alpha($black, .5); - icon-shadow: 0 1px alpha($black, .5); - - .menubar { - &, > .menuitem { - background-color: transparent; - background-image: none; - color: $white; - font: bold; - text-shadow: 0 1px alpha($black, .5); - icon-shadow: 0 1px alpha($black, .5); - - *:hover { color: $white; } - - &:hover { - border-style: none; - background-color: alpha($white, .2); - background-image: none; - color: $white; - } - - &:insensitive { color: alpha($white, .7); } - - .menu { - border-radius: 1px; - - .menuitem { - font: normal; - text-shadow: none; - } - } - } - } - } - - #content_frame { padding-bottom: 14px; } - - #login_window, #shutdown_dialog, #restart_dialog { - border-style: none; - border-radius: $roundness; - background-color: $lightdm_bg_color; - color: $lightdm_fg_color; - - /* draw border using box-shadow */ - box-shadow: inset 1px 0 mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), - inset -1px 0 mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), - inset 0 1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), - inset 0 -1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21); - - .button { - padding: 3px 15px; - border-width: 1px; - border-radius: $roundness; - border-style: solid; - border-color: shade($lightdm_bg_color, .8); - background-color: shade($lightdm_bg_color, 1.08); - background-image: none; - color: $lightdm_fg_color; - transition: all 150ms ease-out; - - &.default, &:focus, &:active:focus { - border-color: shade($selected_bg_color, .8); - background-color: shade($selected_bg_color, 1.08); - background-image: none; - color: $selected_fg_color; - - &:hover { - border-color: shade($selected_bg_color, .7); - background-color: $selected_bg_color; - } - } - } - } - - - #login_window { - .menu { border-radius: 1px; } - - GtkComboBox .button { - &, &:hover, &:active, &:active:hover, - &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { - padding: 0; - background: none; - border-style: none; - box-shadow: none; - } - } - - .entry { - padding: 3px 5px; - border-width: 1px; - border-style: solid; - border-color: shade($lightdm_bg_color, .8); - border-radius: $roundness; - background-color: shade($lightdm_bg_color, .9); - background-image: none; - color: $lightdm_fg_color; - box-shadow: none; - transition: all 150ms ease-out; - - &:focus, &:hover { - border-color: shade($lightdm_bg_color, .7); - - box-shadow: inset 1px 0 alpha($dark_shadow, .1), - inset 0 1px alpha($dark_shadow, .12), - inset -1px 0 alpha($dark_shadow, .1), - inset 0 -1px alpha($dark_shadow, .05); - } - } - } - - #user_combobox { - color: $lightdm_fg_color; - font: 18px; - - .menu { font: normal; } - - .arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, .5); } - } - - #user_image { - padding: 3px; - border-radius: $roundness; - - /* draw border using box-shadow */ - box-shadow: inset 1px 0 shade($lightdm_bg_color, .7), - inset -1px 0 shade($lightdm_bg_color, .7), - inset 0 1px shade($lightdm_bg_color, .7), - inset 0 -1px shade($lightdm_bg_color, .7); - } - - #user_image_border { - border-radius: $roundness; - background-color: shade($lightdm_bg_color, .9); - background-image: none; - box-shadow: inset 1px 0 alpha($dark_shadow, .07), - inset 0 1px alpha($dark_shadow, .08), - inset -1px 0 alpha($dark_shadow, .07), - inset 0 -1px alpha($dark_shadow, .05); - } - - #buttonbox_frame { - padding-top: 10px; - padding-bottom: 0; - border-style: none; - border-bottom-left-radius: $roundness; - border-bottom-right-radius: $roundness; - background-color: transparent; - background-image: none; - box-shadow: none; - } - - - - /* shutdown button */ - #shutdown_button { - border-color: shade($error_bg_color, .8); - background-color: shade($error_bg_color, 1.08); - background-image: none; - color: $error_fg_color; - - &:hover, &:active, &:active:hover { - border-color: shade($error_bg_color, .7); - background-color: $error_bg_color; - } - } - - /* restart button */ - #restart_button { - border-color: shade($warning_bg_color, .8); - background-color: shade($warning_bg_color, 1.08); - background-image: none; - color: $warning_fg_color; - - &:hover, &:active, &:active:hover { - border-color: shade($warning_bg_color, .7); - background-color: $warning_bg_color; - } - } - - /* password warning */ - #greeter_infobar { font: bold; } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_mate-applications.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_mate-applications.scss deleted file mode 100644 index a7a3e1f2..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_mate-applications.scss +++ /dev/null @@ -1,82 +0,0 @@ -@import "panel"; - -/**************** - ! MATE styles * -*****************/ - -@include exports("mate-applications") { - .mate-panel-menu-bar { - @extend %panel; - - border: 0; - padding: 0; - text-shadow: none; - } - - MatePanelApplet .label, - PanelMenuBar.menubar > .menuitem { - color: $panel_fg_color; - } - - PanelSeparator, MatePanelAppletFrameDBus { - border-width: 0; - color: transparent; - background-image: -gtk-scaled(url("../assets/pane-handle.png"), - url("../assets/pane-handle@2.png")); - background-color: transparent; - background-repeat: no-repeat; - background-position: left; - } - - MatePanelApplet .button, - MatePanelApplet .button.flat, - MatePanelApplet .button.toggle - MatePanelApplet .button.flat.toggle { - background-image: none; - background-color: transparent; - border-color: transparent; - border-style: solid; - border-radius: 0; - border-width: 1px; - color: $panel_fg_color; - text-shadow: none; - box-shadow: none; - padding: 2px; - } - - MatePanelApplet .button:hover:active, - MatePanelApplet .button:checked, - MatePanelApplet .button:checked:hover, - MatePanelApplet .button.flat:hover:active, - MatePanelApplet .button.flat:checked, - MatePanelApplet .button.flat:checked:hover, - MatePanelApplet .button.toggle:hover:active, - MatePanelApplet .button.toggle:checked, - MatePanelApplet .button.toggle:checked:hover, - MatePanelApplet .button.flat.toggle:hover:active, - MatePanelApplet .button.flat.toggle:checked, - MatePanelApplet .button.flat.toggle:checked:hover { - background-image: none; - background-color: darker($panel_bg_color); - border-color: transparent; - border-radius: 0; - border-width: 1px; - color: lighter($panel_fg_color); - text-shadow: none; - padding: 2px; - } - - MatePanelApplet .button:hover, - MatePanelApplet .button.flat:hover, - MatePanelApplet .button.toggle:hover, - MatePanelApplet .button.flat.toggle:hover { - background-image: none; - background-color: shade($panel_bg_color, 1.3); - border-color: transparent; - border-radius: 0; - border-width: 1px; - color: $selected_fg_color; - text-shadow: none; - padding: 2px; - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_nautilus.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_nautilus.scss deleted file mode 100644 index e81a128d..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_nautilus.scss +++ /dev/null @@ -1,72 +0,0 @@ -/************ - ! Nautilus * -*************/ - -@include exports("nautilus") { - .nautilus-desktop.nautilus-canvas-item { - color: $white; - text-shadow: 1px 1px $black; - - &:active { color: $fg_color; } - - &:selected { color: $selected_fg_color; } - - &:active, &:hover, &:selected { text-shadow: none; } - } - - NautilusWindow { - .toolbar { - border-width: 0 0 1px; - border-style: solid; - border-color: border_normal($toolbar_bg_color); - } - - .sidebar .frame { border: 0; } - - GtkPaned { - border-width: 0 1px 0 0; - border-style: solid; - - &, &:hover { - border-color: shade($bg_color, ($contrast + .1)); - background-color: $bg_color; - } - } - } - - NautilusNotebook { - &.notebook { - border-right-width: 0; - border-left-width: 0; - border-bottom-width: 0; - } - - .frame { border: 0; } - } - - NautilusQueryEditor { - .toolbar { - padding-top: $spacing - 1px; - padding-bottom: $spacing - 2px; - border-width: 1px 0 0; - border-style: solid; - border-color: $toolbar_bg_color; - background-color: shade($toolbar_bg_color, .9); - - &:nth-child(2) { border-color: border_normal($toolbar_bg_color); } - - &.search-bar { - border-top-width: 0; - border-bottom-width: 0; - } - - &, &.search-bar { - &:last-child, &:only-child { - border-bottom-width: 1px; - border-bottom-color: border_normal($toolbar_bg_color); - } - } - - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_nemo.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_nemo.scss deleted file mode 100644 index d0aec8db..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_nemo.scss +++ /dev/null @@ -1,36 +0,0 @@ -/******** - ! Nemo * -*********/ - -@include exports("nemo") { - .nemo-desktop.nemo-canvas-item { - color: $white; - text-shadow: 1px 1px $black; - - &:active { color: $fg_color; } - - &:selected { color: $selected_fg_color; } - - &:active, &:hover, &:selected { text-shadow: none; } - } - - NemoPathbarButton { - @include button($toolbar_bg_color, $toolbar_fg_color); - - -NemoPathbarButton-border-radius: $roundness; - } - - NemoPlacesTreeView { - -NemoPlacesTreeView-disk-full-bg-color: shade($toolbar_bg_color, .8); - -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color; - -NemoPlacesTreeView-disk-full-bar-width: 1px; - -NemoPlacesTreeView-disk-full-bar-radius: 1px; - -NemoPlacesTreeView-disk-full-bottom-padding: 2px; - -NemoPlacesTreeView-disk-full-max-length: 70px; - - &:selected { - -NemoPlacesTreeView-disk-full-bg-color: $selected_fg_color; - -NemoPlacesTreeView-disk-full-fg-color: shade($selected_bg_color, 1.2); - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_panel.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_panel.scss deleted file mode 100644 index 56a87743..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_panel.scss +++ /dev/null @@ -1,80 +0,0 @@ -/*********************** - ! Fallback mode panel * -************************/ - -@include exports("panel") { - %panel { - @include linear-gradient($panel_bg_color); - - color: $panel_fg_color; - } - - %panelbutton { - border-width: 0 1px; - border-radius: 0; - border-color: transparent; - background-color: transparent; - background-image: none; - color: $panel_fg_color; - - &:hover, &:hover { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .11)); - - border-color: mix($panel_bg_color, $panel_fg_color, .11); - color: shade($panel_fg_color, 1.08); - } - - &:active, &:checked { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .21), to top); - - border-color: mix($panel_bg_color, $panel_fg_color, .21); - color: shade($panel_fg_color, 1.08); - - &:hover { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .31), to top); - - border-color: mix($panel_bg_color, $panel_fg_color, .31); - } - } - } - - PanelWidget, PanelApplet, PanelToplevel { - @extend %panel; - - padding: 0; - } - - PanelApplet { - border: 0; - - .button { - @extend %panelbutton; - - -GtkButton-inner-border: 2; - } - } - - PanelSeparator { - @extend %panel; - - border: 0; - } - - PanelApplet > GtkMenuBar.menubar, PanelMenuBar.menubar, .gnome-panel-menu-bar { - &.menuitem { - @extend %panel; - - border: 0; - - -PanelMenuBar-icon-visible: true; - } - } - - PanelAppletFrame { - @extend %panel; - - border: 0; - } - - WnckPager, WnckTasklist { @extend %panel; } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_synaptic.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_synaptic.scss deleted file mode 100644 index c19b78e9..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_synaptic.scss +++ /dev/null @@ -1,15 +0,0 @@ -/************ - ! Synaptic * -*************/ - -@include exports("synaptic") { - GtkWindow > GtkVBox > .dock { - &, > GtkHBox > GtkToolbar { - @include linear-gradient($toolbar-bg-color); - - padding: $spacing; - border: 0; - color: $toolbar_fg_color; - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_unity-greeter.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_unity-greeter.scss deleted file mode 100644 index f0c7da7f..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_unity-greeter.scss +++ /dev/null @@ -1,119 +0,0 @@ -/*********************** - ! Unity Greeter * - ***********************/ - -@include exports("unity-greeter") { - - - .lightdm.menu { - background-image: none; - background-color: fade-out($black, .4); - border-color: fade-out($white, .8); - border-radius: 4px; - padding: 1px; - - color: $white; - } - - .lightdm-combo .menu { - background-color: shade($dark_bg_color, 1.08); - border-radius: 0; - padding: 0; - color: $white; - } - - .lightdm.menu .menuitem *, - .lightdm.menu .menuitem.check:active, - .lightdm.menu .menuitem.radio:active { - color: $white; - } - - .lightdm.menubar *, - .lightdm.menubar .menuitem { - padding: 2px; - } - - .lightdm-combo.combobox-entry .button, - .lightdm-combo .cell, - .lightdm-combo .button, - .lightdm-combo .entry, - - .lightdm.button{ - background-image: none; - background-color: fade-out($black, .7); - border-color: fade-out($white, .1); - border-radius: 5px; - padding: 5px; - color: $white; - } - .lightdm.button:hover { - background-image: none; - background-color: fade-out($white, .7); - border-color: fade-out($white, .4); - border-radius: 5px; - padding: 5px; - color: $white; - text-shadow: none; - } - .lightdm.button:active, - .lightdm.button:active:focus, - .lightdm.button:focus, - - .lightdm.entry { - background-image: none; - background-color: fade-out($black, .7); - border-color: fade-out($white, .4); - border-radius: 5px; - padding: 6px; - color: $white; - text-shadow: none; - } - .lightdm.entry:hover, - .lightdm.entry:active, - .lightdm.entry:active:focus { - background-image: none; - border-image: none; - } - .lightdm.entry:focus { - border-color: fade-out($white, .4); - border-width: 1px; - border-style: solid; - color: $white; - } - .lightdm.entry:selected { - background-color: fade-out($white, .8); - } - - @keyframes dashentry_spinner { - to { -gtk-icon-transform: rotate(1turn); } - } - - .lightdm.entry:active { - -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); - animation: dashentry_spinner 1s infinite linear; - } - - .lightdm.option-button { - background: none; - border-width: 0; - } - - .lightdm.option-button:insensitive:insensitive { - background: none; - } - - .lightdm.toggle-button { - background: none; - border-width: 0; - } - .lightdm.toggle-button.selected:hover { - background-color: fade-out($white, .7); - border-color: fade-out($white, .7); - border-width: 1px; - } - .lightdm.toggle-button.selected { - background-color: fade-out($black, .7); - border-color: fade-out($white, .7); - border-width: 1px; - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_unity.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_unity.scss deleted file mode 100644 index 6bc77a98..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_unity.scss +++ /dev/null @@ -1,74 +0,0 @@ -@import "panel"; - -/**************** - ! Unity styles * -*****************/ - -@include exports("unity") { - UnityDecoration { - -UnityDecoration-extents: 28px 1px 1px 1px; - -UnityDecoration-input-extents: 10px; - - -UnityDecoration-shadow-offset-x: 1px; - -UnityDecoration-shadow-offset-y: 1px; - -UnityDecoration-active-shadow-color: rgba(0, 0, 0, .7); - -UnityDecoration-active-shadow-radius: 8px; - -UnityDecoration-inactive-shadow-color: rgba(0, 0, 0, .5); - -UnityDecoration-inactive-shadow-radius: 5px; - - -UnityDecoration-glow-size: 10px; - -UnityDecoration-glow-color: $selected_bg_color; - - -UnityDecoration-title-indent: 10px; - -UnityDecoration-title-fade: 35px; - -UnityDecoration-title-alignment: 0; - - - &.top { - border: 1px solid mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); - border-bottom: 0; - border-radius: 2px 2px 0 0; - padding: 1px 8px 0 8px; - background-color: $titlebar_bg_color; - color: mix($titlebar_fg_color, $titlebar_bg_color, .1); - text-shadow: none; - - &:backdrop { - border: 1px solid mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); - border-bottom: 0; - background-color: $titlebar_bg_color; - color: mix($titlebar_fg_color, $titlebar_bg_color, .4); - } - } - - &.left, &.right, &.bottom { - background-color: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); - - &:backdrop { - background-color: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12); - } - } - } - - UnityPanelWidget, .unity-panel { - @extend %panel; - - border: 0; - } - - .unity-panel { - &.menuitem, .menuitem { - border-width: 0 1px; - color: $panel_fg_color; - - &:hover, *:hover { - border-color: mix($panel_bg_color, $panel_fg_color, .21); - background-color: mix($panel_bg_color, $panel_fg_color, .21); - background-image: none; - color: shade($panel_fg_color, 1.08); - } - } - } - - SheetStyleDialog.unity-force-quit { background-color: $bg_color; } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_xfce.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_xfce.scss deleted file mode 100644 index dc38a86a..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/apps/_xfce.scss +++ /dev/null @@ -1,26 +0,0 @@ -@import "panel"; - -/*************** - ! Xfce styles * -****************/ - -@include exports("xfce") { - XfceHeading { - margin: 0; - padding: 0; - border: 0; - background-image: none; - background-color: $base_color; - color: $text_color; - } - - .xfce4-panel { - @extend %panel; - - font: normal; - - .button { @extend %panelbutton; } - - .menu { -gtk-image-effect: none; } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/gtk-dark.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/gtk-dark.scss deleted file mode 100644 index fd46aa1b..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/gtk-dark.scss +++ /dev/null @@ -1,3 +0,0 @@ -$variant: "dark"; - -@import "widgets"; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/gtk.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/gtk.scss deleted file mode 100644 index 44556695..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/gtk.scss +++ /dev/null @@ -1,3 +0,0 @@ -$variant: "light"; - -@import "widgets"; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_actionbar.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_actionbar.scss deleted file mode 100644 index 749f5498..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_actionbar.scss +++ /dev/null @@ -1,106 +0,0 @@ -@import "button"; -@import "toolbar"; - -/************** - ! Action-bar * -***************/ - -@include exports("actionbar") { - .action-bar { - @include linear-gradient($bg_color); - - padding: $spacing; - border-width: 1px 0 0; - border-style: solid; - border-color: border_normal($bg_color); - color: $fg_color; - - .button { - &.text-button { padding: $spacing - 1px; } - - &.image-button { padding: $spacing + 1px; } - } - - .title { - font: bold; - padding: 0 ($spacing * 2); - } - - .subtitle { - font: smaller; - padding: 0 ($spacing * 2); - } - } -} - - -/*************** - ! Search bars * -****************/ - -@include exports("searchbar") { - .search-bar { - @include linear-gradient(shade($bg_color, .98)); - - border-width: 0 0 1px; - border-style: solid; - border-color: border_normal($bg_color); - color: $fg_color; - - .button.close-button { padding: $spacing; } - } -} - - -/****************** - ! Action buttons * -*******************/ - -@include exports("actionbuttons") { - $types: ( - suggested: $success_color, - destructive: $error-color - ); - - @each $type, $color in $types { - .#{$type}-action.button { - @include button($color, $selected_fg_color); - } - } -} - - -/****************** -* selection mode * -******************/ - -@include exports("selectionmode") { - .selection-mode { - &.header-bar, &.toolbar { - @include toolbar($selected_bg_color, $selected_fg_color); - - .button { - @include button($selected_bg_color, $selected_fg_color); - - &.suggested-action { @extend .suggested-action.button; } - } - - .selection-menu.button { - border: 0; - background-color: transparent; - background-image: none; - color: shade($selected_bg_color, $contrast); - - &:hover { color: shade($selected_bg_color, ($contrast - .1)); } - - &:active { color: shade($selected_bg_color, ($contrast - .05)); } - } - - .dim-label, { - &, .selection-menu.button & { color: shade($selected_bg_color, ($contrast - .1)); } - } - } - - &.toolbar { padding: $spacing; } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_base.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_base.scss deleted file mode 100644 index 730bbec4..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_base.scss +++ /dev/null @@ -1,104 +0,0 @@ -/************** - ! GTK settings -***************/ - -* { - -GtkArrow-arrow-scaling: .5; - -GtkExpander-expander-size: 8; - -GtkStatusbar-shadow-type: none; - -GtkToolItemGroup-expander-size: 8; - -GtkWindow-resize-grip-height: 0; - -GtkWindow-resize-grip-width: 0; - -WnckTasklist-fade-overlay-rect: 0; - - -GtkWidget-cursor-color: $primary_caret_color; - -GtkWidget-secondary-cursor-color: $secondary_caret_color; - -GtkWidget-cursor-aspect-ratio: $caret_aspect_ratio; - - outline-color: alpha($selected_bg_color, .5); - outline-style: dashed; - outline-width: 1px; - outline-offset: -1px; - outline-radius: $roundness; -} - - -/************* - ! Base states - *************/ - -%selected { - &, &:focus { - background-color: $selected_bg_color; - color: $selected_fg_color; - } -} - -* { - /* hyperlinks */ - -GtkHTML-link-color: $link_color; - -GtkIMHtml-hyperlink-color: $link_color; - -GtkWidget-link-color: $link_color; - -GtkWidget-visited-link-color: $link_color; - - &:selected { @extend %selected; } - - &:insensitive, - &:insensitive:insensitive { color: mix($fg_color, $bg_color, .5); } - - &:insensitive { -gtk-image-effect: dim; } - - &:hover { -gtk-image-effect: highlight; } - - &:link, &:visited { color: $link_color; } -} - -.background { - background-color: $bg_color; - color: $fg_color; - - &:backdrop { - text-shadow: none; - icon-shadow: none; - } - - &.csd { background-color: $bg_color; } -} - -.gtkstyle-fallback { - background-color: alpha($bg_color, .5); - color: $fg_color; - - &:hover { - background-color: shade($bg_color, 1.1); - color: $fg_color; - } - - &:active { - background-color: shade($bg_color, .9); - color: $fg_color; - } - - &:insensitive { - background-color: shade(shade($bg_color, .95), 1.05); - color: mix($fg_color, $bg_color, .5); - } - - &:selected { @extend %selected; } -} - -GtkImage, GtkLabel, GtkBox, GtkGrid { - &, &:insensitive { background-color: transparent; } -} - -GtkLabel { - &.separator { - @extend .dim-label; - - color: $fg_color; - } - - &:selected { @extend %selected; } - - &:insensitive { color: mix($fg_color, $bg_color, .5); } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_button.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_button.scss deleted file mode 100644 index 6d26c9f4..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_button.scss +++ /dev/null @@ -1,376 +0,0 @@ -/********* - ! Buttons -**********/ - -@include exports("button_extends") { - %button { - padding: $spacing ($spacing + 2px); - border-width: 1px; - border-style: solid; - border-radius: $roundness; - transition: 150ms ease; - outline-color: transparent; - - -GtkWidget-focus-padding: 1; - -GtkWidget-focus-line-width: 0; - - &:focus, &:hover, &:active { transition: none; } - } - - %linked_middle { - border-radius: 0; - border-left-style: none; - border-right-style: solid; - - &:dir(rtl) { - border-radius: 0; // needed when including %linked_middle:dir(rtl) - border-right-style: none; - border-left-style: solid; - } - } - - %linked_button { - border-width: 1px; - border-style: solid; - border-radius: 0; - border-right-style: none; - border-left-style: none; - - &:first-child { - border-width: 1px; - border-radius: $roundness; - border-left-style: solid; - border-right-style: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - - &:dir(rtl) { - border-left-style: none; - border-right-style: solid; - } - } - - &:last-child { - border-width: 1px; - border-radius: $roundness; - border-left-style: none; - border-right-style: solid; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - - &:dir(rtl) { - border-left-style: solid; - border-right-style: none; - } - } - - &:only-child, &:first-child:only-child { - border-width: 1px; - border-style: solid; - border-radius: $roundness; - } - } -} - -@mixin linked_button($bg) { - $border_strength: if(lightness($bg) > 50, 0, .1); - $shadow_strength: if(lightness($bg) > 50, 0, .1); - - @extend %linked_button; - - box-shadow: inset -1px 0 border_normal(rgba(0, 0, 0, .12 + $border_strength)), - 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); - - &:focus, &:hover { - box-shadow: inset -1px 0 border_focus(rgba(0, 0, 0, .12 + $border_strength)), - 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); - } - - &:active, &:active:hover, - &:active:focus, &:active:hover:focus, - &:checked, &:checked:hover, - &:checked:focus, &:checked:hover:focus { - box-shadow: inset -1px 0 border_active(rgba(0, 0, 0, .12 + $border_strength)), - inset 0 1px alpha($dark_shadow, .07), - inset 0 -1px alpha($dark_shadow, .05); - } - - &:insensitive { box-shadow: inset -1px 0 shade($bg, .8); } - - &:last-child, &:only-child { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); } - - &:last-child:hover, &:only-child:hover { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } - - &:insensitive:last-child, &:insensitive:only-child, - &:active:insensitive:last-child, &:active:insensitive:only-child, - &:checked:insensitive:last-child, &:checked:insensitive:only-child { box-shadow: none; } - - &:active:last-child, &:active:last-child:focus, &:active:last-child:hover, &:active:last-child:hover:focus, - &:checked:last-child, &:checked:last-child:focus, &:checked:last-child:hover, &:checked:last-child:hover:focus { - box-shadow: inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06); - } - - &:active:only-child, &:active:only-child:focus, &:active:only-child:hover, &:active:only-child:hover:focus, - &:checked:only-child, &:checked:only-child:focus, &:checked:only-child:hover, &:checked:only-child:hover:focus { - box-shadow: inset 1px 0 alpha($dark_shadow, .06), - inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06); - } -} - -@mixin button($bg, $fg) { - $border_strength: if(lightness($bg) > 50, 0, .1); - $shadow_strength: if(lightness($bg) > 50, 0, .1); - - /*$button_bg: if(hue($bg) == 0deg, shade($bg, 1.2), $bg);*/ - $button_bg: $bg; - - @extend %button; - @include linear-gradient($button_bg); - @include border(rgba(0, 0, 0, .12 + $border_strength)); - - color: $fg; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); - - &.flat { - border-color: alpha($button_bg, 0); - background-color: alpha($button_bg, 0); - background-image: none; - box-shadow: none; - } - - &, &.flat { - &:focus, &:hover { - @include linear-gradient(shade($button_bg, 1.2)); - @include border(rgba(0, 0, 0, .2 + $border_strength)); - - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); - } - - &:active, &:checked { - @include linear-gradient(shade($button_bg, .7), to top); - - color: $selected_fg_color; - box-shadow: inset 1px 0 alpha($dark_shadow, .06), - inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06), - inset 0 -1px alpha($dark_shadow, .05); - - &:focus, &:hover { - @include linear-gradient(shade($button_bg, .65), to top); - - color: $selected_fg_color; - } - } - - &:focus, &:hover { color: $fg; } - - &:active:insensitive, &:checked:insensitive { - @include linear-gradient(shade($button_bg, .9)); - - color: $fg; - box-shadow: none; - } - - &:insensitive:insensitive { - @if (lightness($button_bg) > 50) { - @include linear-gradient(shade($button_bg, .95)); - } @else { - @include linear-gradient(alpha($button_bg, .3)); - } - - color: mix($button_bg, $fg, .5); - box-shadow: none; - } - } - - // Fixed: https://github.com/numixproject/numix-gtk-theme/issues/572 - // Webkitgtk workaround start - &:active { color: $fg; } - // Webkitgtk workaround end - - &.flat { - &:insensitive:insensitive { - background-color: transparent; - background-image: none; - color: mix($bg, $fg, .5); - box-shadow: none; - } - } - - &.separator, .separator { - border: 1px solid currentColor; - color: shade($button_bg, ($contrast + .1)); - - &:insensitive { color: shade($button_bg, .85); } - } -} - -@include exports("button") { - * { - -GtkButton-child-displacement-x: 0; - -GtkButton-child-displacement-y: 0; - -GtkButton-default-border: 0; - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 1; - -GtkButton-interior-focus: true; - -GtkButtonBox-child-min-height: 24; - -GtkButtonBox-child-internal-pad-y: 1; - -GtkToolButton-icon-spacing: 6; - } - - %close_button { - border: 1px solid transparent; - background-color: transparent; - background-image: none; - box-shadow: none; - - &:focus, &:hover { - border: 1px solid alpha($black, .3); - background-color: alpha($white, .2); - background-image: none; - box-shadow: none; - } - - &:active, &:checked, &:active:hover, &:checked:hover { - border: 1px solid alpha($black, .3); - background-color: alpha($black, .1); - background-image: none; - box-shadow: none; - } - } - - .button { - @include button($button_bg_color, $button_fg_color); - - &.default { @include button($selected_bg_color, $selected_fg_color); } - - &.linked, .linked & { @include linked_button($button_bg_color); } - - .spinbutton & { - color: mix($text_color, $base_color, .4); - padding: $spacing ($spacing * 2); - border: 0; - border-radius: 0; - border-style: none; - background-color: transparent; - background-image: none; - box-shadow: inset 1px 0 shade($base_color, .9); - - &:insensitive { - color: mix($text_color, $base_color, .7); - box-shadow: inset 1px 0 shade($base_color, .85); - } - - &:active, &:checked, &:hover { color: $text_color; } - - &:first-child { - border-radius: $roundness 0 0 $roundness; - box-shadow: none; - } - - &:last-child { border-radius: 0 $roundness $roundness 0; } - - &:dir(rtl) { box-shadow: inset -1px 0 shade($base_color, .9); } - } - - .spinbutton.vertical & { - border: 1px solid shade($bg_color, .8); - border-radius: $roundness; - background-color: shade($bg_color, 1.08); - background-image: none; - color: $fg_color; - box-shadow: none; - - &:hover { - border-color: shade($bg_color, .7); - background-color: shade($bg_color, 1.1); - background-image: none; - } - - &:active, &:checked { - border-color: shade($bg_color, .8); - background-color: shade($bg_color, .95); - background-image: none; - } - - &:active:hover, &:checked:hover { - border-color: shade($bg_color, .7); - } - - &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { border-color: shade($bg_color, .7); } - - &:insensitive { - border-color: shade($bg_color, .85); - background-color: shade($bg_color, .9); - background-image: none; - } - - &:first-child { - border-width: 1px; - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - } - - &:last-child { - border-width: 1px; - border-top-width: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; - } - } - - .spinbutton.vertical.entry { - border-width: 1px; - border-style: solid; - border-radius: 0; - } - } -} - - -/****************** -! ComboBoxes * -*******************/ - -@include exports("combobox") { - GtkComboBox { - > .button { - padding: ($spacing - 2px) ($spacing + 1px); - - -GtkComboBox-arrow-scaling: .5; - -GtkComboBox-shadow-type: none; - } - - &.combobox-entry { - .entry, .button { @extend %linked_button; } - } - - .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; - - border-style: none; - } - } - - .linked > GtkComboBox { - > .button { - // the combo is a composite widget so the way we do button linked doesn't - // work, special case needed. See - // https://bugzilla.gnome.org/show_bug.cgi?id=733979 - &:dir(ltr) { @extend %linked_middle; } // specificity bump - &:dir(rtl) { @extend %linked_middle:dir(rtl); } - } - - &:first-child > .button { @extend %linked_button:first-child; } - - &:last-child > .button { @extend %linked_button:last-child; } - - &:only-child > .button { @extend %linked_button:only-child; } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_calendar.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_calendar.scss deleted file mode 100644 index 5c7ca328..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_calendar.scss +++ /dev/null @@ -1,38 +0,0 @@ -/********** - ! Calendar -***********/ - -@include exports("calendar") { - GtkCalendar { - padding: 1px 3px; - outline-offset: -1px; - - &:inconsistent { color: mix($fg_color, $bg_color, .5); } - - &.view, &.highlight, &.header, &.button { - &, &:focus, &:hover, &:insensitive { - background-color: transparent; - background-image: none; - border-width: 0; - border-radius: 0; - } - } - - &.button { - &, &:focus, &:hover, &:insensitive { - color: $white; - border-width: 0; - box-shadow: none; - } - } - - &.highlight { color: $selected_bg_color; } - } - - /* gnome-calendar */ - .calendar-view { - background-color: $base_color; - color: $text_color; - } -} - diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_choosers.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_choosers.scss deleted file mode 100644 index ecd50dd5..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_choosers.scss +++ /dev/null @@ -1,125 +0,0 @@ -/*************** - ! Color chooser -****************/ - -@include exports("colorchooser") { - GtkColorSwatch { - &, &:selected { - border: 1px solid alpha($black, .1); - border-radius: $roundness; - background-color: transparent; - background-clip: border-box; - - &:hover { border-color: alpha($black, .3); } - } - - &.color-light:selected:hover, &.color-dark:selected:hover { background-image: none; } - - &.left, &:first-child { - border-top-left-radius: $roundness; - border-bottom-left-radius: $roundness; - } - - &.right, &:last-child { - border-top-right-radius: $roundness; - border-bottom-right-radius: $roundness; - } - - &:only-child { border-radius: $roundness; } - - &.top { - border-top-left-radius: $roundness; - border-top-right-radius: $roundness; - } - - &.bottom { - border-bottom-left-radius: $roundness; - border-bottom-right-radius: $roundness; - } - - GtkColorEditor & { - border-radius: $roundness; - - &.color-dark:hover, &.color-light:hover { - background-image: none; - border-color: alpha($black, .3); - } - } - } - - GtkColorChooserWidget #add-color-button { - background-clip: padding-box; - border-color: alpha($black, .1); - background-color: shade($bg_color, .95); - color: $fg_color; - - &:hover { - border-color: alpha($black, .3); - background-color: shade($bg_color, .9); - color: $fg_color; - } - } - - .color-active-badge { - &, &:selected { - border-width: 2px; - border-style: solid; - background-color: transparent; - } - - &.color-light { - &, &:hover { - border-color: alpha($black, .3); - color: alpha($black, .3); - } - } - - &.color-dark { - &, &:hover { - border-color: alpha($white, .3); - color: alpha($white, .3); - } - } - } - - GtkColorButton.button { padding: $spacing; } -} - - -/*********************** -! Font and file choosers -************************/ - -@include exports("miscchoosers") { - GtkFontButton, GtkFileChooserButton { - .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; - } - - GtkLabel:last-child { color: alpha(currentColor, .7); } - - GtkImage:last-child { color: alpha(currentColor, .7); } - } - - GtkFileChooser { - .pane-separator { - &, &:hover { - border-width: 0 1px 0 0; - border-style: solid; - border-color: currentColor; - background-color: $bg_color; - color: shade($bg_color, ($contrast + .1)); - } - } - - /* for fallback when header bar not used */ - .dialog-action-box { - border-width: 1px 0 0; - border-style: solid; - border-color: shade($bg_color, .7); - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_entry.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_entry.scss deleted file mode 100644 index e8d75624..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_entry.scss +++ /dev/null @@ -1,84 +0,0 @@ -/********* - ! Entry * -**********/ - -%linked_entry { - border-width: 1px; - border-radius: 0; - border-right-width: 0; - border-left-width: 0; - - &:first-child { - border-width: 1px; - border-radius: $roundness; - border-right-width: 0; - border-bottom-right-radius: 0; - border-top-right-radius: 0; - } - - &:last-child { - border-width: 1px; - border-radius: $roundness; - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } - - &:only-child { - border-width: 1px; - border-radius: $roundness; - } -} - -%entry { - padding: ($spacing - 1px) $spacing; - border-width: 1px; - border-style: solid; - border-radius: $roundness; - transition: border 150ms ease; - box-shadow: inset 1px 1px alpha($dark_shadow, .06), - inset -1px 0 alpha($dark_shadow, .06); - - &:focus, &:hover, &:active { transition: none; } - - &:selected, &:selected:focus { - background-color: $selected_bg_color; - color: $selected_fg_color; - } - - &:insensitive { box-shadow: none; } - - &.progressbar { - @include linear-gradient($selected_bg_color); - - border-width: 0; - border-radius: $roundness; - color: $selected_fg_color; - } - - &.image.left { padding-right: $spacing; } -} - -@mixin entry($bg, $fg) { - @extend %entry; - @include linear-gradient($bg, to top); - @include border($bg); - - color: $fg; - - &:focus, &:active { border-color: $selected_bg_color; } - - &:insensitive { - @include linear-gradient(shade($bg, .9), to top); - - color: mix($bg, $fg, .5); - } -} - -@include exports("entry") { - .entry { - @include entry($base_color, $text_color); - - &.linked, .linked & { @extend %linked_entry; } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_grid.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_grid.scss deleted file mode 100644 index e4b9e8f3..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_grid.scss +++ /dev/null @@ -1,48 +0,0 @@ -/****************** - ! Grid and flowbox -*******************/ - -@include exports("grid") { - .list { - background-color: shade($bg_color, .97); - color: $fg_color; - - &-row { - &, &.button { - border: 0; - border-radius: 0; - padding: $spacing; - background-image: none; - background-color: alpha($bg_color, 0); - box-shadow: none; - - &:hover { - background-image: none; - background-color: shade($bg_color, 1.02); - } - - &:selected { - &, &:hover, &:focus { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - } - } - } - - .grid-child { - &, GtkFlowBox & { - padding: $spacing; - border-radius: $roundness; - - &:selected { - @extend %selected; - - outline-offset: -2px; - } - } - } -} - diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_infobar.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_infobar.scss deleted file mode 100644 index 6f5865bb..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_infobar.scss +++ /dev/null @@ -1,38 +0,0 @@ -@import "button"; - - -/********* - ! Infobar -**********/ - -@include exports("infobar") { - GtkInfoBar { - border: 0; - } - - $types: ( - info: ($info_fg_color, $info_bg_color), - warning: ($warning_fg_color, $warning_bg_color), - question: ($question_fg_color, $question_bg_color), - error: ($error_fg_color, $error_bg_color), - ); - - - @each $type, $colors in $types { - $fg_color: nth($colors, 1); - $bg_color: nth($colors, 2); - - .#{$type} { - @include linear-gradient($bg_color); - - border: 1px solid shade($bg_color, .8); - color: $fg_color; - - .button { - @include button($bg_color, $fg_color); - - &.close { @extend %close_button; } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_menu.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_menu.scss deleted file mode 100644 index aa1ccfd9..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_menu.scss +++ /dev/null @@ -1,267 +0,0 @@ -@import "entry"; - - -/********* - ! Menubar -**********/ - -@include exports("menubar") { - .menubar { - -GtkWidget-window-dragging: true; - - border: 0; - background-color: $menubar_bg_color; - background-image: none; - color: $menubar_fg_color; - - - &.menuitem, .menuitem { - padding: $spacing ($spacing * 2); - border: 1px solid transparent; - background-color: transparent; - background-image: none; - color: $menubar_fg_color; - - &:hover { - border-color: mix($menubar_bg_color, $menubar_fg_color, .21); - background-color: mix($menubar_bg_color, $menubar_fg_color, .21); - background-image: none; - color: shade($menubar_fg_color, 1.08); - } - - *:hover { color: shade($menubar_fg_color, 1.08); } - } - } -} - - -/****** - ! Menu -*******/ - -@include exports("menu") { - * { - -GtkMenu-horizontal-padding: 0; - -GtkMenu-vertical-padding: 0; - } - - GtkTreeMenu, GtkMenuToolButton, GtkComboBox { - &.menu, .menu { - background-color: $menu_bg_color; - margin: $spacing; - } - } - - #toolbar-popup, .menu { - padding: 0; - border-radius: 0; - border: 0; - background-color: $menu_bg_color; - color: $menu_fg_color; - - &:selected { background-color: $selected_bg_color; } - - .button { - &, &:hover, &:active, &:active *:insensitive, &:insensitive { - border-width: 0; - background-color: transparent; - background-image: none; - } - } - } - - .context-menu { font: initial; } - - .menuitem { - GtkTreeMenu & { - padding: 0; - border-width: 0; - } - - &, .menu & { - margin: $spacing; - padding: $spacing; - border: 0; - border-radius: 0; - background-color: transparent; - background-image: none; - - -GtkMenuItem-arrow-scaling: .5; - - &:active, &:hover { - border: 0; - background-color: $selected_bg_color; - background-image: none; - color: $selected_fg_color; - } - - *:active, *:hover { color: $selected_fg_color; } - - &:insensitive, *:insensitive { color: mix($menu_fg_color, $menu_bg_color, .5); } - } - - &.check, &.radio { - &, &:focus, &:hover, &:insensitive { background-image: none; } - - &, &:focus, &:hover, &:active, &:insensitive { - border-style: none; - background-color: transparent; - } - } - - &.separator { - -GtkMenuItem-horizontal-padding: 0; - -GtkWidget-separator-height: 1; - - border-style: none; - color: shade($menu_bg_color, ($contrast + .1)); - } - - &.button, &.button.flat { - &, &:focus, &:active, &:insensitive, &:active:insensitive { - background-color: transparent; - background-image: none; - border: 0; - box-shadow: none; - color: currentColor; - } - - &:hover, &:focus:hover, &:active:hover, &:selected { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - - GtkCalendar { - &:inconsistent { color: mix($menu_fg_color, $menu_bg_color, .5); } - - .button { - border-style: none; - background-color: transparent; - background-image: none; - } - } - - .accelerator { - color: alpha($menu_fg_color, .6); - - &:hover { color: alpha($selected_fg_color, .8); } - - &:insensitive { color: alpha(mix($menu_fg_color, $menu_bg_color, .5), .4); } - } - - .entry { @include entry($menu_bg_color, $menu_fg_color); } - } - - GtkModelMenuItem GtkBox GtkImage { padding-right: $spacing; } -} - - -/********* - ! Popover -**********/ - -@include exports("popover") { - GtkPopover { - @include border($menu_bg_color); - - margin: 10px; - padding: $spacing; - border-radius: $roundness; - border-width: 1px; - border-style: solid; - background-clip: border-box; - background-color: $menu_bg_color; - background-image: none; - color: $menu_fg_color; - box-shadow: 0 3px 6px alpha($black, .16); - - &.background { - background-image: none; - background-color: $menu_bg_color; - color: $menu_fg_color; - } - - &:backdrop { box-shadow: none; } - - &.osd { - box-shadow: 0 2px 7px 3px alpha($black, .5); - - > .toolbar .button { - border-radius: 0; - border-width: 0; - background-color: transparent; - background-image: none; - } - } - - .view, .list { - background-color: shade($menu_bg_color, ($contrast + .5)); - background-image: none; - color: $menu_fg_color; - - &:hover { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - - .list-row { - &, &.button { - background-color: transparent; - background-image: none; - color: $menu_fg_color; - - &:focus, &:hover, &:active { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - } - - .frame { - border-color: border_normal($menu_bg_color); - border-radius: $roundness; - } - - .entry { @include entry($base_color, $text_color); } - - .button { @include button($header_button_bg_color, $header_button_fg_color); } - - > .list, > .view, > .toolbar { background-color: transparent; } - - .separator { - border: 0; - background-color: transparent; - color: shade($menu_bg_color, ($contrast + .1)); - font-size: 80%; - font-weight: bold; - } - } - - GtkModelButton.button { - &, &:backdrop { - @include button(transparent, currentColor); - - &:focus:hover, &.flat:checked:hover, &:active:hover, &:hover, &:selected { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - box-shadow: none; - } - - &.flat { - &:checked { - box-shadow: none; - } - - &, &:hover { - transition: none; - } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_misc.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_misc.scss deleted file mode 100644 index 015632d5..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_misc.scss +++ /dev/null @@ -1,227 +0,0 @@ -/*************** -! Dimmed label * -****************/ - -@include exports("dimlabel") { - .dim-label { - opacity: .5; - text-shadow: none; - } -} - - -/*********** - ! Tooltip * -************/ - -@include exports("tooltip") { - .tooltip { - &.background { - @include linear-gradient($tooltip_bg_color); - - border: 0; - border-radius: $roundness; - color: $tooltip_fg_color; - } - - * { - background-color: transparent; - color: inherit; - } - } -} - - -/*********** - ! Dialogs * -************/ - -@include exports("dialogs") { - GtkMessageDialog, .message-dialog, .prompt { - -GtkDialog-content-area-border: $spacing; - -GtkDialog-action-area-border: $spacing; - -GtkDialog-button-spacing: $spacing; - - margin: 0; - padding: 0; - } -} - - -/********************* - ! App notifications * -**********************/ - -@include exports("notifications") { - .app-notification { - &, &.frame { - border-style: solid; - border-color: border_normal($osd_bg); - border-width: 0 1px 1px; - border-radius: 0 0 $roundness $roundness; - padding: $spacing * 2; - background-color: $osd_bg; - background-image: none; - color: $osd_fg; - - .button { @include button($osd_bg, $osd_fg); } - } - } -} - - -/************* - ! Expanders * -**************/ - -@include exports("expander") { - GtkExpander { - padding: $spacing; - outline-offset: 1px; - } - - .expander { - color: alpha(currentColor, .7); - border: alpha(currentColor, .7); - - &:hover { - color: alpha(currentColor, .8); - border-color: alpha(currentColor, .8); - } - - &:active { - color: alpha(currentColor, .9); - border-color: alpha(currentColor, .9); - } - } -} - - -/******************* - ! Symbolic images * -********************/ - -@include exports("symbolicimage") { - .image { - color: alpha(currentColor, .5); - - &:hover { color: alpha(currentColor, .9); } - - &:selected, &:selected:hover { color: $selected_fg_color; } - } -} - - -/**************** - ! Floating bar * -*****************/ - -@include exports("floatingbar") { - .floating-bar { - @include linear-gradient($bg_color); - - border: 1px solid border_normal($bg_color); - border-radius: $roundness; - color: $fg_color; - - &.top { - border-top-width: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; - } - - &.right { - border-right-width: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - - &.bottom { - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - } - - &.left { - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } - - .button { - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 0; - - border: 0; - background-color: transparent; - background-image: none; - } - } -} - - -/************************* - ! Touch text selections * -**************************/ - -@include exports("touchbubble") { - GtkBubbleWindow { - border-radius: $roundness; - background-clip: border-box; - - &.osd.background { background-color: $osd_bg; } - - .toolbar { background-color: transparent; } - } -} - -/*************** - ! Font-viewer * -****************/ - -@include exports("fontviewer") { - SushiFontWidget { - padding: $spacing ($spacing * 2); - } -} - - -/************* - ! Gucharmap * -**************/ - -@include exports("charmap") { - GucharmapChartable { - background-color: $base_color; - color: $text_color; - - &:focus, &:hover, &:active, &:selected { @extend %selected; } - } -} - - -/************* - ! Evolution * -**************/ - -@include exports("evolution") { - EPreviewPane .entry { - background-color: $base_color; - color: $text_color; - } -} - - -/******************* - ! Gnome Bluetooth * -********************/ - -@include exports("gnome-bluetooth") { - GtkEntry.entry.pin-entry { - font: regular 50; - padding-left: 25px; - padding-right: 25px; - } - - GtkLabel.pin-label { font: regular 50; } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_notebook.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_notebook.scss deleted file mode 100644 index 962d8c32..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_notebook.scss +++ /dev/null @@ -1,139 +0,0 @@ -@import "button"; - - -/********** - ! Notebook -***********/ - -@include exports("notebook") { - .notebook { - padding: 0; - border-style: solid; - border-color: border_normal($bg_color); - border-radius: 0; - @include linear-gradient($bg_color); - background-clip: border-box; - color: $text_color; - - -GtkNotebook-initial-gap: 0; - -GtkNotebook-arrow-spacing: 5; - -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: 1; - -GtkNotebook-has-tab-gap: false; - - &.frame { - &.top { border-width: 0 1px 1px; } - - &.right { border-width: 1px 0 1px 1px; } - - &.bottom { border-width: 1px 1px 0; } - - &.left { border-width: 1px 1px 1px 0; } - } - - &.header { - border-width: 2px; - background-color: transparent; - } - - GtkViewport { - border-width: 0; - background-color: $base_color; - color: $text_color; - } - - tab { - padding: ($spacing + 1px) ($spacing * 2); - border-style: solid; - border-color: border_normal(shade($bg_color, 0.80)); - background-color: shade($bg_color, 0.80); - background-image: none; - - &:active { - background-color: $bg_color; - background-image: none; - } - - &.top { - border-width: 2px 1px 1px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - - &:active { - border-top-width: 3px; - border-top-color: $selected_bg_color; - border-bottom-width: 0; - } - } - - &.right { - border-width: 1px 2px 1px 1px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - - &:active { - border-right-width: 3px; - border-right-color: $selected_bg_color; - border-left-width: 0; - } - } - - - &.bottom { - border-width: 1px 1px 2px; - border-top-right-radius: 0; - border-top-left-radius: 0; - - &:active { - border-bottom-width: 3px; - border-bottom-color: $selected_bg_color; - border-top-width: 0; - } - } - - &.left { - border-width: 1px 1px 1px 2px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - - &:active { - border-left-width: 3px; - border-left-color: $selected_bg_color; - border-right-width: 0; - } - } - - GtkLabel { color: mix($text_color, $base_color, .3); } - - &.reorderable-page { - &:hover { - background-color: shade($base_color, .85); - border-left: 0; - border-right: 0; - /* using box shadows instead of borders due to slanted edges */ - box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), inset 1px 0 shade($base_color, .7), inset -1px 0 shade($base_color, .7); - } - - &:active { - background-color: shade($base_color, .9); - border-left: 0; - border-right: 0; - box-shadow: inset 0 3px alpha($black, .03), inset 0 2px alpha($black, .03), inset 0 1px alpha($black, .03), inset 1px 0 shade($base_color, .75), inset -1px 0 shade($base_color, .75); - } - } - - /* close button styling */ - .button { @extend %close_button; } - - } - - .prelight-page { - &, GtkLabel { color: mix($text_color, $base_color, .15); } - } - - .active-page { - &, GtkLabel { color: $text_color; } - } - - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_osd.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_osd.scss deleted file mode 100644 index dcb4e744..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_osd.scss +++ /dev/null @@ -1,132 +0,0 @@ -@import "button"; - - -/******* - ! OSD * -********/ - -@include exports("osd") { - GtkOverlay.osd { background-color: transparent; } - - .osd, - #XfceNotifyWindow { - &.background { - background-color: alpha($osd_bg, .8); - color: $osd_fg; - } - - &.frame { - background-clip: border-box; - background-origin: border-box; - } - - &.button, .button { @include button($osd_bg, $osd_fg); } - - - &.toolbar { - -GtkToolbar-button-relief: normal; - - padding: $spacing; - border: 1px solid border_normal($osd_bg); - border-radius: $roundness; - background-color: $osd_bg; - background-image: none; - color: $osd_fg; - - .separator { color: shade($osd_bg, ($contrast + .1)); } - } - - /* used by gnome-settings-daemon's media-keys OSD */ - &.trough { background-color: shade($osd_bg, .8); } - - &.progressbar { background-color: $osd_fg; } - - .scale { - &.slider { - @include linear-gradient(shade($osd_bg, 1.08)); - @include border($osd_bg); - - &:insensitive { @include linear-gradient(shade($osd_bg, .9)); } - } - - &.trough { - border-color: shade($osd_bg, .8); - background-color: shade($osd_bg, 1.08); - background-image: none; - - &.highlight { - border-color: $selected_bg_color; - background-color: $selected_bg_color; - background-image: none; - } - - &:insensitive, &.highlight:insensitive { - border-color: shade($osd_bg, .85); - background-color: shade($osd_bg, .9); - background-image: none; - } - } - } - - &.view, .view { background-color: $osd_bg; } - - .scrollbar { - .trough { background-color: $osd_bg; } - - .slider { - border: 1px solid mix(shade($osd_bg, .87), $osd_fg, .21); - border-radius: 0; - background-color: mix($osd_bg, $osd_fg, .21); - - &:hover { - border-color: mix(shade($osd_bg, .87), $osd_fg, .31); - background-color: mix($osd_bg, $osd_fg, .31); - } - - &:active { - border-color: shade($selected_bg_color, .9); - background-color: $selected_bg_color; - } - } - } - - GtkIconView.cell { - &:selected, &:selected:focus { - background-color: transparent; - border: 3px solid mix(shade($osd_bg, .87), $osd_fg, .21); - border-radius: $roundness; - outline-color: transparent; - } - } - - /* used by Documents */ - .page-thumbnail { - border: 1px solid shade($osd_bg, .9); - /* when there's no pixbuf yet */ - background-color: $osd_bg; - } - } - - .osd GtkProgressBar, GtkProgressBar.osd { - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 2px; - -GtkProgressBar-min-horizontal-bar-height: 2px; - - padding: 0; - - &.trough { - padding: 0; - border-style: none; - border-radius: 0; - background-image: none; - background-color: transparent; - } - - &.progressbar { - border-style: none; - border-radius: 0; - background-color: $selected_bg_color; - background-image: none; - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_overshoot.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_overshoot.scss deleted file mode 100644 index 9950eb18..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_overshoot.scss +++ /dev/null @@ -1,119 +0,0 @@ -@mixin overshoot($position, $type: normal, $color: $selected_bg_color) { - $_small_gradient_length: 5%; - $_big_gradient_length: 100%; - - $_position: center top; - $_small_gradient_size: 100% $_small_gradient_length; - $_big_gradient_size: 100% $_big_gradient_length; - - @if $position == bottom { - $_position: center bottom; - $_linear_gradient_direction: to top; - } @else if $position == right { - $_position: right center; - $_small_gradient_size: $_small_gradient_length 100%; - $_big_gradient_size: $_big_gradient_length 100%; - } @else if $position == left { - $_position: left center; - $_small_gradient_size: $_small_gradient_length 100%; - $_big_gradient_size: $_big_gradient_length 100%; - } - - $_small_gradient_color: $color; - $_big_gradient_color: $color; - - $_small_gradient: -gtk-gradient(radial, - $_position, 0, - $_position, .5, - to(alpha($_small_gradient_color, .35)), - to(alpha($_small_gradient_color, .25))); - - $_big_gradient: -gtk-gradient(radial, - $_position, 0, - $_position, .6, - from(alpha($_big_gradient_color, .2)), - to(alpha($_big_gradient_color, 0))); - - @if $type == normal { - background-image: $_small_gradient, $_big_gradient; - background-size: $_small_gradient_size, $_big_gradient_size; - } @else if $type == backdrop { - background-image: $_small_gradient; - background-size: $_small_gradient_size; - } - - background-repeat: no-repeat; - background-position: $_position; - - background-color: transparent; // reset some properties to be sure to not inherit them somehow - border: 0; - box-shadow: none; -} - -@mixin undershoot($position) { - $_undershoot_color_dark: alpha($black, .2); - $_undershoot_color_light: alpha($white, .2); - - $_gradient_dir: left; - $_dash_bg_size: 10px 1px; - $_gradient_repeat: repeat-x; - $_bg_pos: center $position; - - background-color: transparent; // shouldn't be needed, but better to be sure; - - @if ($position == left) or ($position == right) { - $_gradient_dir: top; - $_dash_bg_size: 1px 10px; - $_gradient_repeat: repeat-y; - $_bg_pos: $position center; - } - - /*background-image: linear-gradient(to $_gradient_dir, // this is the dashed line - $_undershoot_color_light 50%, - $_undershoot_color_dark 50%);*/ - - padding-#{$position}: 1px; - background-size: $_dash_bg_size; - background-repeat: $_gradient_repeat; - background-origin: content-box; - background-position: $_bg_pos; -} - -// This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. -// This draws a box on top of the content, the size changes programmatically. -.overshoot { - &.top { - @include overshoot(top); - - &:backdrop { @include overshoot(top, backdrop); } - } - - &.bottom { - @include overshoot(bottom); - - &:backdrop { @include overshoot(bottom, backdrop); } - } - - &.left { - @include overshoot(left); - - &:backdrop { @include overshoot(left, backdrop); } - } - - &.right { - @include overshoot(right); - - &:backdrop { @include overshoot(right, backdrop); } - } -} - -// Overflow indication, works similarly to the overshoot, the size if fixed tho. -.undershoot { - &.top { @include undershoot(top); } - - &.bottom { @include undershoot(bottom); } - - &.left { @include undershoot(left); } - - &.right { @include undershoot(right); } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_progress.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_progress.scss deleted file mode 100644 index 8a1ef116..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_progress.scss +++ /dev/null @@ -1,182 +0,0 @@ -/***************** - ! Progress bars * -******************/ - -@include exports("progressbar") { - GtkProgressBar { - padding: 0; - border-radius: $roundness; - font-size: smaller; - color: alpha($fg_color, .6); - - -GtkProgressBar-min-horizontal-bar-height: 6; - -GtkProgressBar-min-vertical-bar-width: 6; - - &.osd { - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 0; - -GtkProgressBar-min-horizontal-bar-height: 3; - } - - &.trough { - border: 1px solid alpha(border_normal($bg_color), .5); - background-color: shade($bg_color, 1.08); - background-image: none; - } - } - - .progressbar { - @include linear-gradient($selected_bg_color); - - border-radius: 0; - box-shadow: none; - - &.left { - border-top-left-radius: $roundness; - border-bottom-left-radius: $roundness; - } - - &.right { - border-top-right-radius: $roundness; - border-bottom-right-radius: $roundness; - } - - &.left.right { box-shadow: none; } - - &.vertical { - @include linear-gradient($selected_bg_color, to right); - - &.bottom { - border-bottom-left-radius: $roundness; - border-bottom-right-radius: $roundness; - } - - &.top { - border-top-left-radius: $roundness; - border-top-right-radius: $roundness; - } - } - } - - GtkLevelBar { - -GtkLevelBar-min-block-width: 34; - -GtkLevelBar-min-block-height: 3; - - &.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; - } - } - - .level-bar { - &.trough { - @include linear-gradient(shade($bg_color, 1.08), to top); - - border: 1px solid alpha(border_normal($bg_color), .5); - border-radius: $roundness; - } - - &.fill-block { - @include linear-gradient($selected_bg_color); - - // FIXME: it would be nice to set make fill blocks bigger, but we'd need - // :nth-child working on discrete indicators - border-color: transparent; - border-radius: 0; - - &.indicator-discrete { - &.horizontal { margin-right: 1px; } - - &.vertical { margin-bottom: 1px; } - } - - &.level-high { - background-color: $success_color; - border-color: transparent; - } - - &.level-low { - background-color: $warning_color; - border-color: transparent; - } - - &.empty-fill-block { - background-color: transparent; - border-color: transparent; - box-shadow: none; - } - } - } - - .scale { - -GtkRange-slider-width: 16; - -GtkRange-trough-border: 1; - -GtkScale-slider-length: 16; - - padding: 0; - border-width: 1px; - border-radius: $roundness; - outline-offset: -1px; - - - &.slider { - @include linear-gradient(shade($bg_color, 1.08)); - @include border($bg_color); - - border-radius: 8px; - border-width: 1px; - border-style: solid; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); - - &:insensitive { @include linear-gradient(shade($bg_color, .9)); } - } - - &.fine-tune { - &, &.horizontal { - &:active, &:active:hover { - background-size: 50%; - background-repeat: no-repeat; - background-position: center; - } - } - } - - &.mark { border-color: alpha(border_normal($bg_color), .5); } - - - &.trough { - @include linear-gradient(shade($bg_color, 1.08)); - - margin: 7px 0; - border: 1px solid alpha(border_normal($bg_color), .5); - border-radius: $roundness; - - &:insensitive { @include linear-gradient(shade($bg_color, .9)); } - - &.vertical { margin: 0 7px; } - } - - &.highlight.left { - &, .memuitem & { - @include linear-gradient($selected_bg_color); - border-color: $selected_bg_color; - - &:hover { - border-color: border_normal($selected_bg_color); - background-color: shade($selected_bg_color, .8); - } - - &:insensitive { - @include linear-gradient(shade($bg_color, .9)); - border-color: shade($bg_color, .85); - } - } - } - - &.highlight.bottom { - @include linear-gradient($selected_bg_color); - border-color: $selected_bg_color; - } - - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_scrollbar.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_scrollbar.scss deleted file mode 100644 index 2d1af41e..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_scrollbar.scss +++ /dev/null @@ -1,86 +0,0 @@ -/*********** - ! Scrollbar -************/ - -@include exports("scrollbar") { - * { - -GtkRange-slider-width: 8; - -GtkRange-stepper-spacing: 0; - -GtkRange-trough-border: 2; - -GtkRange-trough-under-steppers: 1; - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; - -GtkScrollbar-min-slider-length: 80; - -GtkScrolledWindow-scrollbar-spacing: 0; - -GtkScrolledWindow-scrollbars-within-bevel: 1; - } - - .scrollbar { - border: 0; - padding: 0; - - &.button { - &, &:active, &:active:hover { - border-width: 0; - border-radius: 0; - background-color: transparent; - background-image: none; - color: alpha($fg_color, .5); - } - } - - &.slider, &.slider.vertical { - border: 0; - border-radius: $roundness; - background-color: mix($bg_color, $fg_color, 0.21); - - &:hover { background-color: mix($bg_color, $fg_color, .31); } - - &:active { background-color: $selected_bg_color; } - - &.fine-tune:hover:active { border: 2px solid transparent; } - } - - // overlay scrolling indicator - &.overlay-indicator { - &:not(.dragging):not(.hovering) { - opacity: .5; - - -GtkRange-slider-width: 4px; - - .slider { - margin: 0; - background-color: $fg_color; - background-clip: padding-box; - } - - .trough { - border-style: none; - background-color: transparent; - } - } - - &.dragging, &.hovering { opacity: .7; } - } - } - - .scrollbars-junction, - .scrollbars-junction.frame, - .scrollbar.trough { - border: 0; - border-radius: 0; - background-color: $bg_color; - background-image: none; - } - - // ubuntu overlay scrollbars - OsThumb, OsScrollbar { - color: shade($bg_color, .7); - - &:selected { background-color: $selected_bg_color; } - - &:active { background-color: $selected_bg_color; } - - &:insensitive { background-color: shade($bg_color, .9); } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_sidebar.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_sidebar.scss deleted file mode 100644 index 7ec5727c..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_sidebar.scss +++ /dev/null @@ -1,114 +0,0 @@ -/********* - ! Sidebar -**********/ - -@include exports("sidebar") { - .sidebar { - &, &.view, .view, GtkScrolledWindow { - background-color: $bg_color; - color: mix($fg_color, $bg_color, .1); - - &.separator { - &, &:hover, &:focus { - border-width: 1px; - border-style: solid; - border-color: shade($bg_color, .9); - color: shade($bg_color, .9); - } - } - } - - row, .view row { - &:selected { - &, &:hover, &:focus { - border: 0; - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } - - &:hover { - border: 0; - background-image: none; - background-color: shade($selected_bg_color, 1.05); - color: $selected_fg_color; - } - } - - &:hover { - border: 0; - background-image: none; - background-color: shade($bg_color, 1.05); - } - } - - .frame { border-width: 0; } - - .sidebar-row { - padding: 1px; - } - - .sidebar-icon { - padding-left: $spacing * 2; - padding-right: $spacing * 2; - } - - GtkAssistant & { - padding: $spacing; - border-width: 0 1px 0 0; - border-style: solid; - border-right-color: border_normal($bg_color); - border-radius: 0; - background-color: $bg_color; - color: mix($fg_color, $bg_color, .1); - - &:dir(ltr) { border-width: 0 1px 0 0; } - - &:dir(rtl) { border-width: 0 0 0 1px; } - - .label { - padding: $spacing ($spacing * 2); - - &.highlight { background-color: mix($bg_color, $fg_color, .8); } - } - - &.csd .sidebar { border-top-style: none; } - - .highlight { font: bold; } - } - } -} - - -/****** -! Paned -*******/ - -@include exports("paned") { - GtkPaned { - -GtkPaned-handle-size: 1; - -gtk-icon-source: none; - margin: 0 $spacing; - - &:dir(rtl) { - margin-right: 0; - margin-left: $spacing; - } - - .pane-separator { background-color: shade($bg_color, .9); } - - &.wide { - -GtkPaned-handle-size: 4; - margin: 0; - - .pane-separator { - background-color: transparent; - border-style: none solid; - border-color: shade($bg_color, .9); - border-width: 1px; - } - - &.vertical .pane-separator { border-style: solid none; } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_spinner.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_spinner.scss deleted file mode 100644 index 9c753f73..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_spinner.scss +++ /dev/null @@ -1,24 +0,0 @@ -/******************* - ! Spinner animation -********************/ - -@include exports("spinner") { - @keyframes spin { - to { -gtk-icon-transform: rotate(1turn); } - } - - .spinner { - background-image: none; - background-color: $selected_bg_color; - opacity: 0; // non spinning spinner makes no sense - - -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); - - &:active { - opacity: 1; - animation: spin 1s linear infinite; - - &:insensitive { opacity: .5; } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_toggle.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_toggle.scss deleted file mode 100644 index b85fef28..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_toggle.scss +++ /dev/null @@ -1,128 +0,0 @@ -/*********************** - ! Check and Radio items -************************/ - -$suffix: if($variant == "dark", "-dark", ""); - -@mixin toggle($type) { - background-image: none; - - -gtk-icon-source: url("../assets/#{$type}-unchecked#{$suffix}.svg"); - - &:insensitive { -gtk-icon-source: url("../assets/#{$type}-unchecked-insensitive#{$suffix}.svg"); } - - &:checked, &:active { - -gtk-icon-source: url("../assets/#{$type}-checked#{$suffix}.svg"); - - &:insensitive { -gtk-icon-source: url("../assets/#{$type}-checked-insensitive#{$suffix}.svg"); } - } - - &:inconsistent { - -gtk-icon-source: url("../assets/#{$type}-mixed#{$suffix}.svg"); - - &:insensitive { -gtk-icon-source: url("../assets/#{$type}-mixed-insensitive#{$suffix}.svg"); } - } - - &.menuitem { - -gtk-icon-source: url("../assets/menuitem-#{$type}-unchecked.svg"); - - &:insensitive { - -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.svg"); - } - - &:checked, &:active { - -gtk-icon-source: url("../assets/menuitem-#{$type}-checked.svg"); - - &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-hover.svg"); } - - &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.svg"); } - } - - &:inconsistent { - -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed.svg"); - - &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-hover.svg"); } - - &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-insensitive.svg"); } - } - } -} - -@include exports("checkradio") { - * { - -GtkCheckButton-indicator-size: 16; - -GtkCheckMenuItem-indicator-size: 16; - } - - .radio { @include toggle("radio"); } - - .check { @include toggle("checkbox"); } - - //selection-mode - @each $s,$as in ('', '-unchecked'), - (':hover', '-unchecked'), - (':active', '-checked'), - (':backdrop', '-unchecked'), - (':checked', '-checked'), - (':checked:hover', '-checked'), - (':checked:active', '-checked'), - (':backdrop:checked', '-checked') { - .view.content-view.check#{$s}:not(list) { - icon-shadow: none; - -gtk-icon-source: url("../assets/grid-selection#{$as}#{$suffix}.svg"); - background-color: transparent; - } - } -} - - -/******** - ! Switch -*********/ - -@include exports("switch") { - GtkSwitch { - padding: 0; - border-radius: $roundness; - font: bold condensed; - outline-offset: -4px; - - &.slider { - @include linear-gradient(shade($bg_color, 1.2)); - - border: 1px solid rgba(0, 0, 0, .2); - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12); - - &:insensitive { - border-color: rgba(0, 0, 0, .1); - background-color: shade($bg_color, .9); - box-shadow: none; - } - } - - &.trough { - @include linear-gradient(shade($bg_color, .95), to top); - - border: 1px solid border_normal($bg_color); - color: $fg_color; - box-shadow: inset 1px 0 alpha($dark_shadow, .07), - inset 0 1px alpha($dark_shadow, .08), - inset -1px 0 alpha($dark_shadow, .07), - inset 0 -1px alpha($dark_shadow, .05); - - &:active { - @include linear-gradient($selected_bg_color, to top); - - border-color: shade($selected_bg_color, .9); - color: $selected_fg_color; - } - - &:insensitive { - @include linear-gradient(shade($bg_color, .9), to top); - - border-color: border_insensitive($bg_color); - color: mix($fg_color, $bg_color, .5); - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_toolbar.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_toolbar.scss deleted file mode 100644 index 362ade48..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_toolbar.scss +++ /dev/null @@ -1,132 +0,0 @@ -@import "button"; - - -/********* - ! Toolbar -**********/ - -@mixin toolbar($bg, $fg) { - @include linear-gradient($bg); - @include border($bg); - - padding: $spacing * 2; - color: $fg; - - &:insensitive { - @include linear-gradient(shade($bg, .9)); - - color: mix($fg, $bg, .5); - } - - .title { - font: bold; - padding: 0 ($spacing * 2); - } - - .subtitle { - font: smaller; - padding: 0 ($spacing * 2); - } - - .button { @include button($header_button_bg_color, $header_button_fg_color); } - - .button.linked, .linked .button { @include linked_button($header_button_bg_color); } - - GtkComboBox, .button { - padding: $spacing - 1px; - - &.text-button { padding: $spacing; } - - &.image-button { padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing; } - } - - GtkSeparatorToolItem, .separator, .separator:insensitive { - color: shade($bg, ($contrast + .1)); - border-color: currentColor; - - -GtkWidget-window-dragging: true; - } - - .menubar { -GtkToolbar-button-relief: normal; } -} - -@include exports("toolbar") { - .toolbar { - @include toolbar($bg_color, $fg_color); - - padding: 2px; - border-style: none; - - &.inline-toolbar { - background-image: none; - background-color: transparent; - } - GtkToolButton:insensitive GtkButton:insensitive, - GtkToolButton:insensitive GtkButton:insensitive.button, - GtkToolButton:insensitive GtkButton:insensitive.flat.button { - background-color: $bg_color; - } - } - - .header-bar { - @include toolbar($titlebar_bg_color, $titlebar_fg_color); - - border-width: 0 0 1px; - border-style: solid; - .button { - color: $header_button_fg_color; - } - } - - .titlebar { - @include linear-gradient($titlebar_bg_color); - - border-radius: $roundness $roundness 0 0; - color: mix($titlebar_fg_color, $titlebar_bg_color, .1); - - &:backdrop { - @include linear-gradient($titlebar_bg_color); - - color: mix($titlebar_fg_color, $titlebar_bg_color, .6); - text-shadow: none; - } - - &.default-decoration { - border: 0; - box-shadow: none; - } - - .tiled &, .maximized & { border-radius: 0; } - - .title { font: bold; } - - .titlebutton { - padding: $spacing; - border: 0; - background-image: none; - background-color: transparent; - color: mix($titlebar_fg_color, $titlebar_bg_color, .1); - box-shadow: none; - - &:hover, &:hover:focus { - background-image: none; - background-color: transparent; - color: $selected_bg_color; - box-shadow: none; - } - - &:active, &:active:hover { - background-image: none; - background-color: transparent; - color: shade($selected_bg_color, .9); - box-shadow: none; - } - - &:backdrop { - background: none; - color: mix($titlebar_fg_color, $titlebar_bg_color, .6); - icon-shadow: none; - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_view.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_view.scss deleted file mode 100644 index bfa33dcf..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_view.scss +++ /dev/null @@ -1,233 +0,0 @@ -/*************** - ! Generic views -****************/ - -@include exports("view") { - * { -GtkTextView-error-underline-color: $error_color; } - - .view { - color: $text_color; - background-color: $base_color; - - &:insensitive, &:insensitive:insensitive { - background-color: shade($base_color, .9); - color: mix($text_color, $base_color, .5); - } - - &:selected, &:selected:focus { @extend %selected; } - } - - .cell { - border-width: 0; - border-radius: 0; - - &:selected, &:selected:focus { - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - - row { - &:selected { - &, &:hover, &:focus { - -GtkWidget-focus-padding: 1; - -GtkWidget-focus-line-width: 0; - - border: 0; - background-color: $selected_bg_color; - background-image: none; - color: $selected_fg_color; - } - } - } - - .content-view { - &.view { - background-color: $base_color; - - &:hover { background-color: alpha($selected_bg_color, .6); } - - &:selected, &:active { background-color: $selected_bg_color; } - - &:insensitive { background-color: shade($base_color, .9); } - - &.check { - &, &:active, &:hover, &:insensitive, &:selected { background-color: transparent; } - } - } - - .subtitle { - font: smaller; - padding: 0 12px; - } - } - - GtkIconView { - &.content-view.check { @extend .content-view.check; } - - &.view.cell { - &:selected, &:selected:focus { - border: 0; - border-radius: 2px; - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - } - - .dim-label { - &, &.view { color: alpha(currentColor, .5); } - } - - .dnd { border: 1px solid $selected_bg_color; } - - .grip { background-color: transparent; } - - .arrow { color: alpha(currentColor, .7); } - - .rubberband { - &, &.view, &.content-view.view { - border: 1px solid $selected_bg_color; - border-radius: 0; - background-color: alpha($selected_bg_color, .3); - } - } - - GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } - - /* this will get overridden by .view, needed by gedit line numbers */ - GtkTextView { background-color: mix($bg_color, $base_color, .5); } - - GtkHTML { - @extend .view; - - &:insensitive { background-color: shade($base_color, .9); } - } - - GtkDrawingArea { background-color: transparent; } -} - -/************ - ! Treeview * -*************/ - -@include exports("treeview") { - GtkTreeView { - -GtkTreeView-expander-size: 8; - -GtkTreeView-vertical-separator: 0; - - outline-offset: -1px; - border-top-color: shade($menu_bg_color, ($contrast + .1)); - - &:hover, &:selected, &:selected:focus, &:backdrop:selected, &:backdrop:selected:focus { border-top-color: $selected_bg_color; } - - &.dnd { border: 1px solid $selected_bg_color; } - - .entry { - border-radius: 0; - background-color: $base_color; - background-image: none; - } - - .progressbar { - @include linear-gradient($selected_bg_color); - border: 1px solid border_normal($selected_bg_color); - - &:selected { - &:focus, & { - @include linear-gradient($selected_bg_color); - border: 1px solid border_focus($selected_bg_color); - color: $selected_fg_color; - } - } - - &:insensitive { - &:insensitive { - @include linear-gradient($bg_color); - border-color: border_insensitive($bg_color); - } - } - } - - .trough { - background-color: mix($bg_color, $base_color, .5); - border: 1px solid border_normal($base_color); - - &:selected { - &:focus, & { - background-color: $base_color; - border: 1px solid border_focus($bg_color); - color: $text_color; - } - } - - &:insensitive { - &:insensitive { - background-color: $base_color; - } - } - } - } -} - - -/*********** - ! Separator -************/ - -@include exports("separator") { - .view.separator, .separator { - color: shade($bg_color, ($contrast + .1)); - border: 1px solid currentColor; - } -} - - -/********************* - ! Column view headers -**********************/ - -@include exports("columnheader") { - column-header { - .button { - &, &:active { - border-width: 0 1px 1px 0; - border-radius: 0; - } - - &, &:active, &:focus, &:active:focus { - border-color: shade($base_color, .9); - border-bottom-color: shade($base_color, .8); - background-color: shade($base_color, .97); - background-image: none; - } - - &:hover, &:active:hover, &:hover:focus, &:active:hover:focus { - border-color: shade($base_color, .9); - border-bottom-color: shade($base_color, .8); - background-color: shade($base_color, .99); - background-image: none; - } - - &:last-child .button { border-width: 0 0 1px; } - } - } -} - - -/********** - ! Frames * -***********/ - -@include exports("frame") { - .frame { - border: 1px solid border_normal($bg_color); - - &.flat { border: 0; } - } - - /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ - GtkScrolledWindow GtkViewport.frame { border: 0; } -} - diff --git a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_window.scss b/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_window.scss deleted file mode 100644 index 7742fbb6..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.0/scss/widgets/_window.scss +++ /dev/null @@ -1,60 +0,0 @@ -/************** - ! Window frame -***************/ - -@include exports("window") { - %window { - box-shadow: 0 19px 38px rgba(0, 0, 0, .3), 0 15px 12px rgba(0, 0, 0, .22), - 0 0 0 1px $wm_border_focused; - - &:backdrop { - box-shadow: 0 10px 20px rgba(0, 0, 0, .19), 0 6px 6px rgba(0, 0, 0, .23), - 0 0 0 1px $wm_border_unfocused; - } - } - - .window-frame { - @extend %window; - - border: 0; - border-radius: $roundness $roundness 0 0; - background-color: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); - /* this is used for the resize cursor area */ - margin: $spacing * 3; - - &.tiled { border-radius: 0; } - - &.solid-csd { - border-radius: $roundness $roundness 0 0; - margin: 1px; - background-color: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21); - box-shadow: none; - } - - &.csd { - &.popup { - @extend %window; - - border-radius: 0; - } - - &.tooltip { - border-radius: $roundness; - box-shadow: none; - } - - &.message-dialog { - @extend %window; - - border-radius: $roundness; - } - } - - &.ssd { - // Fixed gtk-3.18 Unity bug (https://github.com/numixproject/numix-gtk-theme/issues/270) - box-shadow: 0 0 0 1px $wm_border_focused; - - &.maximized { border-radius: 0; } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/gtk.gresource b/.themes/oomox-numix-gruvbox/gtk-3.20/gtk.gresource deleted file mode 100644 index 0378033c..00000000 Binary files a/.themes/oomox-numix-gruvbox/gtk-3.20/gtk.gresource and /dev/null differ diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_colors.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_colors.scss deleted file mode 100644 index 8593ba9e..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_colors.scss +++ /dev/null @@ -1,101 +0,0 @@ -@import "global"; - -/* dark color scheme */ -@define-color dark_bg_color #{"" + $dark_bg_color}; -@define-color dark_fg_color #{"" + $dark_fg_color}; - -/* colormap actually used by the theme, to be overridden in other css files */ -@define-color theme_bg_color #{"" + $bg_color}; -@define-color theme_fg_color #{"" + $fg_color}; -@define-color theme_base_color #{"" + $base_color}; -@define-color theme_text_color #{"" + $text_color}; -@define-color theme_selected_bg_color #{"" + $selected_bg_color}; -@define-color theme_selected_fg_color #{"" + $selected_fg_color}; -@define-color theme_tooltip_bg_color #{"" + $tooltip_bg_color}; -@define-color theme_tooltip_fg_color #{"" + $tooltip_fg_color}; - -/* shadow effects */ -@define-color light_shadow #{"" + $light_shadow}; -@define-color dark_shadow #{"" + $dark_shadow}; - -/* misc colors used by gtk+ */ -@define-color info_fg_color #{"" + $info_fg_color}; -@define-color info_bg_color #{"" + $info_bg_color}; -@define-color warning_fg_color #{"" + $warning_fg_color}; -@define-color warning_bg_color #{"" + $warning_bg_color}; -@define-color question_fg_color #{"" + $question_fg_color}; -@define-color question_bg_color #{"" + $question_bg_color}; -@define-color error_fg_color #{"" + $error_fg_color}; -@define-color error_bg_color #{"" + $error_bg_color}; -@define-color link_color #{"" + $link_color}; -@define-color success_color #{"" + $success_color}; -@define-color warning_color #{"" + $warning_color}; -@define-color error_color #{"" + $error_color}; - -/* widget colors */ -@define-color titlebar_bg_color @dark_bg_color; -@define-color titlebar_fg_color @dark_fg_color; -@define-color menubar_bg_color @dark_bg_color; -@define-color menubar_fg_color @dark_fg_color; -@define-color toolbar_bg_color @theme_bg_color; -@define-color toolbar_fg_color @theme_fg_color; -@define-color menu_bg_color @dark_bg_color; -@define-color menu_fg_color @dark_fg_color; -@define-color panel_bg_color @dark_bg_color; -@define-color panel_fg_color @dark_fg_color; -@define-color borders #{"" + $borders_color}; -@define-color unfocused_borders #{"" + $backdrop_borders_color}; - -@define-color button_bg_color #{"" + $button_bg_color}; -@define-color button_fg_color #{"" + $button_fg_color}; -@define-color header_button_bg_color #{"" + $header_button_bg_color}; -@define-color header_button_fg_color #{"" + $header_button_fg_color}; - -@define-color insensitive_bg_color #{"" + $insensitive_bg_color}; -@define-color insensitive_fg_color #{"" + $insensitive_fg_color}; - -/* osd */ -@define-color osd_base #{"" + $osd_base}; -@define-color osd_bg #{"" + $osd_bg}; -@define-color osd_fg #{"" + $osd_fg}; -@define-color osd_insensitive_bg_color #{"" + $osd_insensitive_bg_color}; -@define-color osd_insensitive_fg_color #{"" + $osd_insensitive_fg_color}; -@define-color osd_borders_color #{"" + $osd_borders_color}; - -/* lightdm greeter colors */ -@define-color lightdm_bg_color #{"" + $lightdm_bg_color}; -@define-color lightdm_fg_color #{"" + $lightdm_fg_color}; - -/* widget text/foreground color on backdrop windows */ -@define-color theme_unfocused_fg_color #{"" + $backdrop_fg_color}; - -/* text color for entries, views and content in general on backdrop windows */ -@define-color theme_unfocused_text_color #{"" + $text_color}; - -/* widget base background color on backdrop windows */ -@define-color theme_unfocused_bg_color #{"" + $backdrop_bg_color}; - -/* text widgets and the like base background color on backdrop windows */ -@define-color theme_unfocused_base_color #{"" + $backdrop_base_color}; - -/* base background color of selections on backdrop windows */ -@define-color theme_unfocused_selected_bg_color #{"" + $selected_bg_color}; - -/* text/foreground color of selections on backdrop windows */ -@define-color theme_unfocused_selected_fg_color #{"" + $selected_fg_color}; - -/* insensitive color on backdrop windows*/ -@define-color unfocused_insensitive_color #{"" + $backdrop_insensitive_color}; - -/* window manager colors */ -@define-color wm_bg #{"" + $wm_bg}; -@define-color wm_border_focused #{"" + $wm_border_focused}; -@define-color wm_border_unfocused #{"" + $wm_border_unfocused}; -@define-color wm_title_focused #{"" + $wm_title_focused}; -@define-color wm_title_unfocused #{"" + $wm_title_unfocused}; -@define-color wm_icons_focused #{"" + $wm_icons_focused}; -@define-color wm_icons_focused_prelight #{"" + $wm_icons_focused_prelight}; -@define-color wm_icons_focused_pressed #{"" + $wm_icons_unfocused_pressed}; -@define-color wm_icons_unfocused #{"" + $wm_icons_unfocused}; -@define-color wm_icons_unfocused_prelight #{"" + $wm_icons_unfocused_prelight}; -@define-color wm_icons_unfocused_pressed #{"" + $wm_icons_unfocused_pressed}; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_functions.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_functions.scss deleted file mode 100644 index 8eb18c67..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_functions.scss +++ /dev/null @@ -1,95 +0,0 @@ -$modules: () !default; - -@mixin exports($name) { - @if (not index($modules, $name)) { - $modules: append($modules, $name) !global; - - @content; - } -} - -@function alpha($color, $amount) { - @if type-of($color) == "color" { - @return fade-out($color, (1 - $amount)); - } @else { - @return unquote("alpha(#{$color},#{$amount})"); - } -} - -@function shade($color, $amount) { - @if type-of($color) == "color" { - @if ($amount > 1) { - @return lighten($color, ($amount - 1) * lightness($color)) - } @else { - @return darken($color, (1 - $amount) * lightness($color)) - } - } @else { - @return unquote("shade(#{$color},#{$amount})"); - } -} - -@function mix($color1, $color2, $amount) { - @return unquote("mix(#{$color1},#{$color2},#{$amount})"); -} - -@function border_normal($color) { - @return shade($color, $contrast); -} - -@function border_focus($color) { - @return if($variant == 'light', mix($selected_bg_color, $color, .3), darken($selected_bg_color, 20%)); -} - -@function border_active($color) { - @return shade($color, ($contrast - .1)); -} - -@function border_insensitive($color) { - @return shade($color, ($contrast + .05)); -} - -@mixin linear-gradient($color, $direction: to bottom) { - @if $gradient == 0 { - background-color: $color; - background-image: none; - } @else { - $amount: $gradient / 2; - - background-color: $color; - background-image: linear-gradient($direction, - shade($color, (1 + $amount)), - shade($color, (1 - $amount)) - ); - } -} - -@mixin border($color) { - border-color: border_normal($color); - - &:focus, &:hover { border-color: border_focus($color); } - - &:active, &:active:hover, - &:active:focus, &:active:hover:focus, - &:checked, &:checked:hover, - &:checked:focus, &:checked:hover:focus { border-color: border_active($color); } - - &:disabled { border-color: border_insensitive($color); } - - &:active:disabled, &:checked:disabled { border-color: border_normal($color); } -} - -@function _text_shadow_color($tc: $fg_color, $bg: $bg_color) { - // - // calculate the color of text shadows - // - // $tc is the text color - // $bg is the background color - // - $_lbg: lightness($bg) / 100%; - - @if lightness($tc) < 50% { - @return transparentize(white, 1 - $_lbg / ($_lbg * 1.3)); - } @else { - @return transparentize(black, $_lbg * .8); - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_global.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_global.scss deleted file mode 100644 index 3954af77..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_global.scss +++ /dev/null @@ -1,150 +0,0 @@ -// scss-lint:disable ColorVariable - -@import "functions"; - -// default color scheme -$bg_color: if($variant == "dark", #ebdbb2, #282828); -$fg_color: if($variant == "dark", #282828, #ebdbb2); -$base_color: if($variant == "dark", #ebdbb2, #30302f); -$text_color: if($variant == "dark", #30302f, #ebdbb2); -$button_bg_color: if($variant == "dark", #ebdbb2, #32302f); -$button_fg_color: if($variant == "dark", #32302f, #ebdbb2); -$header_button_bg_color: #30302f; -$header_button_fg_color: #ebdbb2; -$selected_bg_color: #83a598; -$selected_fg_color: #ebdbb2; -$tooltip_bg_color: #282828; -$tooltip_fg_color: #ebdbb2; - -/*$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));*/ -/*$borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));*/ -$selected_borders_color: if($variant == 'light', mix($selected_bg_color, $fg_color, .3), darken($selected_bg_color, 20%)); -$borders_color: if($variant == 'light', mix($bg_color, $fg_color, .08), shade($bg_color, .88)); -$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93)); - -// dark colors -$dark_bg_color: #30302f; -$dark_fg_color: #ebdbb2; - -// shadows -/*$dark_shadow: #000;*/ -/*$light_shadow: #fff;*/ -$dark_shadow: shade($fg_color, .2); -$light_shadow: lighten($bg_color, .4); - -// caret -$primary_caret_color: #282828; -$secondary_caret_color: #282828; -$caret_aspect_ratio: 0.04; - -// white and black -$black: #000; -$white: #fff; - -/*$button_border_strength: if(lightness($bg) > 50, 0, .1);*/ -/*$button_shadow_strength: if(lightness($bg) > 50, 0, .1);*/ -$button_border_strength: 0.1; -$button_border: alpha($button_fg_color, .06 + $button_border_strength); -$entry_border: $borders_color; - -$scrollbar_bg_color: if($variant == 'light', darken($bg_color, 5%), mix($base_color, $bg_color, .4)); -$scrollbar_slider_color: mix($bg_color, $fg_color, .5); -$scrollbar_slider_hover_color: mix($bg_color, $fg_color, .7); -$scrollbar_slider_active_color: if($variant == 'light', darken($selected_bg_color, 5%), lighten($selected_bg_color, 10%)); - -$switch_disabled_bg_color: mix($bg_color, $base_color, .5); -$switch_disabled_border_color: $bg_color; -$switch_disabled_fg_color: $bg_color; -$switch_disabled_slider_bg_color: $bg_color; -$switch_bg_color: mix($bg_color, $base_color, .3); -$switch_fg_color: $text_color; -$switch_slider_bg_color: mix($text_color, $bg_color, .5); - -// @TODO: replace to xrdb values: -// misc colors used by gtk+ -$info_fg_color: #fff; -$info_bg_color: #03a9f4; -$warning_fg_color: #fff; -$warning_bg_color: #ef6c00; -$question_fg_color: #fff; -$question_bg_color: #673ab7; -$error_fg_color: #fff; -$error_bg_color: #f44336; -$link_color: #3f51b5; -$success_color: #4caf50; -$warning_color: #ef6c00; -$error_color: #f44336; - -$toolbar_bg_color: $bg_color; -$toolbar_fg_color: $fg_color; - -$titlebar_bg_color: $dark_bg_color; -$titlebar_fg_color: $dark_fg_color; - -$menu_bg_color: $dark_bg_color; -$menu_fg_color: $dark_fg_color; - -$menubar_bg_color: $dark_bg_color; -$menubar_fg_color: $dark_fg_color; - -$panel_bg_color: $dark_bg_color; -$panel_fg_color: $dark_fg_color; - -$osd_base: $dark_bg_color; -$osd_text_color: $dark_fg_color; -$osd_bg: alpha($osd_base, .8); -$osd_fg: $osd_text_color; -$osd_insensitive_bg_color: mix($osd_fg, $osd_bg, .5); -$osd_insensitive_fg_color: mix($osd_fg, $osd_base, .6); -$osd_borders_color: shade($osd_bg, .85); - -$lightdm_bg_color: $dark_bg_color; -$lightdm_fg_color: $dark_fg_color; - -$wm_bg: $titlebar_bg_color; -$wm_border_focused: #32302f; -$wm_border_unfocused: #282828; -$wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1); -$wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, .4); -$wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, .1); -$wm_icons_focused_prelight: $selected_bg_color; -$wm_icons_focused_pressed: shade($selected_bg_color, .8); -$wm_icons_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, .4); -$wm_icons_unfocused_prelight: $selected_bg_color; -$wm_icons_unfocused_pressed: shade($selected_bg_color, .8); - -//insensitive state derived colors -$insensitive_fg_color: mix($fg_color, $bg_color, .5); -$insensitive_bg_color: mix($bg_color, $base_color, .6); -$insensitive_borders_color: $borders_color; - -//colors for the backdrop state, derived from the main colors. -$backdrop_base_color: if($variant == 'light', darken($base_color, .01), lighten($base_color, .01)); -$backdrop_text_color: mix($backdrop_base_color, $text_color, .8); -$backdrop_bg_color: $bg_color; -$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, .5); -$backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%)); -$backdrop_selected_bg_color: $selected_bg_color; -$backdrop_selected_fg_color: mix($selected_bg_color, $selected_fg_color, .66); -$backdrop_borders_color: mix($bg_color, $borders_color, .9); -$backdrop_dark_fill: mix($backdrop_bg_color, $backdrop_borders_color, .35); -$backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, .5); - -$backdrop_osd_base: $osd_base; -$backdrop_osd_bg: $osd_bg; -$backdrop_osd_fg: mix($osd_fg, $backdrop_osd_base, .5); - -$backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%); -$backdrop_scrollbar_slider_color: mix($backdrop_fg_color, $backdrop_bg_color, .4); - -$backdrop_menu_color: if($variant == 'light', $backdrop_base_color, mix($backdrop_bg_color, $backdrop_base_color, .2)); - -$drop_target_color: #4e9a06; - -// widget styles -$_roundness: 0; -$_spacing: 3; -$roundness: 0px; -$spacing: 3px; -$gradient: 0.0; -$contrast: .8; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_widgets.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_widgets.scss deleted file mode 100644 index 719463b5..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/_widgets.scss +++ /dev/null @@ -1,41 +0,0 @@ -@import "functions"; -@import "global"; -@import "colors"; - - -@import "widgets/base"; -@import "widgets/button"; -@import "widgets/entry"; -@import "widgets/actionbar"; -@import "widgets/calendar"; -@import "widgets/choosers"; -@import "widgets/grid"; -@import "widgets/infobar"; -@import "widgets/menu"; -@import "widgets/misc"; -@import "widgets/notebook"; -@import "widgets/osd"; -@import "widgets/overshoot"; -@import "widgets/progress"; -@import "widgets/scrollbar"; -@import "widgets/sidebar"; -@import "widgets/spinner"; -@import "widgets/toggle"; -@import "widgets/toolbar"; -@import "widgets/view"; -@import "widgets/window"; - -@import "apps/mate-applications"; -@import "apps/cinnamon-applications"; -@import "apps/gnome-applications"; -@import "apps/unity-greeter"; -@import "apps/gedit"; -@import "apps/nautilus"; -@import "apps/nemo"; -@import "apps/panel"; -@import "apps/synaptic"; -@import "apps/xfce"; -@import "apps/unity"; -@import "apps/lightdm"; -@import "apps/gnome-terminal"; -@import "apps/budgie"; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_budgie.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_budgie.scss deleted file mode 100644 index 3b5ed0a0..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_budgie.scss +++ /dev/null @@ -1,27 +0,0 @@ -/****************** - ! Budgie Desktop * -*******************/ - -@include exports("budgie-desktop") { - .budgie-container { - background-color: transparent; - } - - .raven { - background-color: transparentize($bg_color, .07); - - .raven-header { - background-color: $bg_color; - border: solid $borders_color; - border-width: 1px 0; - } - - .raven-background { - background-color: transparentize($bg_color, .07); - } - } - - .raven-mpris { - background-color: transparentize($bg_color, .3); - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_cinnamon-applications.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_cinnamon-applications.scss deleted file mode 100644 index 28511c72..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_cinnamon-applications.scss +++ /dev/null @@ -1,19 +0,0 @@ -/********************* - ! Cinnamon Settings * -**********************/ - -@include exports("cinnamon-settings") { - .cs-category-view { - &, .view { - &, &:backdrop { - background-color: transparent; - } - - &:selected { - &:focus, & { - @extend %selected_items; - } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_gedit.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_gedit.scss deleted file mode 100644 index c1539304..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_gedit.scss +++ /dev/null @@ -1,143 +0,0 @@ -/********* - ! Gedit * -**********/ - -@include exports("gedit") { - GeditWindow .pane-separator { - border-width: 0 1px 0 0; - border-style: solid; - - &, &:hover { - border-color: shade($bg_color, ($contrast + .1)); - background-color: $bg_color; - } - } - - .gedit-document-panel { - background-color: $bg_color; - color: mix($fg_color, $bg_color, .1); - - list row { - padding: $spacing; - - button { - padding: 1px; - border-radius: $roundness; - border-style: solid; - border-color: transparent; - border-width: 1px; - background-color: transparent; - background-image: none; - color: transparent; - -gtk-icon-shadow: none; - } - } - - .prelight-row button { - border-color: alpha($black, .1); - color: alpha($white, .8); - - &:active { - border-color: alpha($black, .2); - background-color: alpha($black, .08); - color: $white; - } - } - - list row, .prelight-row { - button:hover { - border-color: alpha($black, .1); - color: $white; - } - } - } - - .gedit-document-panel-group-row { - &, &:hover { - border-top: 1px solid shade($bg_color, ($contrast + .1)); - background-color: $bg_color; - } - } - - .gedit-document-panel-document-row { - &:hover { background-color: shade($bg_color, 1.05); } - - &:selected { - &, &:hover { @extend %selected; } - } - } - - .gedit-document-panel-dragged-row { - border: 1px solid alpha($black, .1); - background-color: alpha($black, .5); - color: $white; - } - - .gedit-document-panel-placeholder-row { - border: 0; - background-color: alpha($black, .08); - transition: all 200ms ease-in; - } - - //Ignore: Global double border separator. - //statusbar { border-top: 1px solid border_normal($bg_color); } - - statusbar GeditSmallButton, GeditStatusMenuButton { - text-shadow: none; - - button { - border-style: solid; - border-width: 0 1px; - border-color: transparent; - border-radius: 0; - padding: 1px 6px 2px 4px; - - &:hover, &:active, &:active:hover { border-color: border_normal($bg_color); } - - &:active { - background-color: shade($bg_color, .95); - color: $fg_color; - } - } - } - - GeditViewFrame .gedit-search-slider { - padding: $spacing; - border-radius: 0 0 $roundness $roundness; - border-width: 0 1px 1px; - border-style: solid; - border-color: border_normal($base_color); - background-color: $base_color; - - .not-found { - background-color: $error_bg_color; - background-image: none; - color: $error_fg_color; - - &:selected { @extend %selected; } - } - } - - GeditFileBrowserWidget .toolbar { - padding: $spacing / 2; - border-top: 0; - background-color: $bg_color; - background-image: none; - } - - .gedit-search-entry-occurrences-tag { - margin: $spacing / 2; - padding: $spacing / 2; - color: mix($text_color, $base_color, .5); - } - - .gedit-bottom-panel-paned, - .gedit-side-panel-paned, - paned.titlebar { - margin-right: 0; - } - - .gedit-bottom-panel-paned notebook { - border-top: none; - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_gnome-applications.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_gnome-applications.scss deleted file mode 100644 index dc201448..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_gnome-applications.scss +++ /dev/null @@ -1,59 +0,0 @@ -/**************** - ! Gnome clocks * -*****************/ - -@include exports("gnome-clocks") { - .clocks-analog-frame { - &.trough { color: mix($fg_color, $bg_color, .85); } - - &.progress { color: mix($bg_color, $selected_bg_color, .5); } - - &.progress-fast { color: shade($selected_bg_color, .7); } - } -} - - -/***************** - ! Gnome Builder * -******************/ - -@include exports("gnome-builder") { - workbench.csd > stack.titlebar:not(headerbar) { - padding: 0; - background: none; - border: 0; - box-shadow: none; - - headerbar { - &, &:first-child, &:last-child { border-radius: $roundness $roundness 0 0; } - } - } -} - - -/************************ - ! Unity-Control-Center * -*************************/ - -@include exports("unity-control-center") { - // Fixed: https://github.com/numixproject/numix-gtk-theme/issues/634 - .background:not(.csd):not(.solid-csd) > box.vertical > notebook.frame { - // hide unwanted frames - border: 0 none transparent; - - > stack > scrolledwindow > viewport > box.vertical > frame > box.vertical { - // reset $base_color; - iconview.view { - &, &:backdrop { - background-color: transparent; - } - - &:selected { - &:focus, & { - @extend %selected_items; - } - } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_gnome-terminal.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_gnome-terminal.scss deleted file mode 100644 index c23893cd..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_gnome-terminal.scss +++ /dev/null @@ -1,37 +0,0 @@ -/********************** - ! Genome Terminal * -***********************/ - -@include exports("gnome-terminal") { - //noinspection ScssLintInspection,ScssLintInspection - VteTerminal { - background-color: $osd_base; - color: $osd_fg; - } - - terminal-window { - junction, scrollbar trough { - background-color: $osd_base; - border-color: border_normal($osd_base); - - //&:backdrop { - // background-color: shade($backdrop_osd_bg, .9); - // border-color: border_normal(shade($backdrop_osd_bg, .9)); - //} - } - - scrollbar.vertical { - slider { - background-color: mix($osd_base, $osd_fg, .2); - - &:hover { background-color: mix($osd_base, $osd_fg, .3); } - - &:hover:active { background-color: $selected_bg_color; } - - //&:backdrop { background-color: mix($backdrop_osd_fg, $backdrop_osd_bg, .4); } - - &:disabled { background-color: transparent; } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_lightdm.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_lightdm.scss deleted file mode 100644 index 76d189c6..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_lightdm.scss +++ /dev/null @@ -1,117 +0,0 @@ -/*********************** - ! LightDM GTK Greeter * - ***********************/ - -@include exports("lightdm") { - #panel_window { - background-color: $lightdm_bg_color; - background-image: none; - color: $white; - font-weight: bold; - text-shadow: 0 1px alpha($black, .5); - -gtk-icon-shadow: 0 1px alpha($black, .5); - - menubar { - padding-left: $spacing; - - &, > menuitem { - background-color: transparent; - background-image: none; - border-style: none; - color: $white; - text-shadow: 0 1px alpha($black, .5); - -gtk-icon-shadow: 0 1px alpha($black, .5); - - &:hover { - background-color: alpha($white, .2); - background-image: none; - color: $white; - } - - *:hover { color: $white; } - - &:disabled { color: alpha($white, .7); } - } - - menu > menuitem { font-weight: normal; } - } - } - - #content_frame { padding-bottom: $spacing * 3; } - - #login_window, #shutdown_dialog, #restart_dialog { - border-style: none; - border-radius: $roundness; - background-color: $lightdm_bg_color; - color: $lightdm_fg_color; - - /* draw border using box-shadow */ - box-shadow: inset 1px 0 mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), - inset -1px 0 mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), - inset 0 1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21), - inset 0 -1px mix(shade($lightdm_bg_color, .7), $lightdm_fg_color, .21); - - @extend %panelbutton; - } - - #login_window { - menu { border-radius: 0; } - - button { @include button($lightdm_bg_color, $lightdm_fg_color); } - - entry { @include entry($lightdm_bg_color, $lightdm_fg_color); } - } - - #user_combobox { - color: $lightdm_fg_color; - font-size: 18px; - - menu { font-weight: normal; } - - arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, .5); } - } - - #user_image { - border-radius: $roundness; - - /* draw border using box-shadow */ - box-shadow: inset 1px 0 shade($lightdm_bg_color, .7), - inset -1px 0 shade($lightdm_bg_color, .7), - inset 0 1px shade($lightdm_bg_color, .7), - inset 0 -1px shade($lightdm_bg_color, .7); - } - - #user_image_border { - border-radius: $roundness; - background-color: shade($lightdm_bg_color, .9); - background-image: none; - box-shadow: inset 1px 0 alpha($dark_shadow, .07), - inset 0 1px alpha($dark_shadow, .08), - inset -1px 0 alpha($dark_shadow, .07), - inset 0 -1px alpha($dark_shadow, .05); - } - - #buttonbox_frame { - padding-top: $spacing * 2; - padding-bottom: 0; - border-style: none; - border-bottom-left-radius: $roundness; - border-bottom-right-radius: $roundness; - background-color: transparent; - background-image: none; - box-shadow: none; - } - - /* shutdown button */ - #shutdown_button { - button { @include button($error_bg_color, $error_fg_color); } - } - - /* restart button */ - #restart_button { - button { @include button($warning_bg_color, $warning_fg_color); } - } - - /* password warning */ - #greeter_infobar { font-weight: bold; } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_mate-applications.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_mate-applications.scss deleted file mode 100644 index 87e76a04..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_mate-applications.scss +++ /dev/null @@ -1,86 +0,0 @@ -@import "panel"; - -/**************** - ! MATE styles * -*****************/ - -@include exports("mate-applications") { - .mate-panel-menu-bar { - @extend %panel; - - border: 0; - padding: 0; - text-shadow: none; - } - - #PanelApplet label, - .mate-panel-menu-bar menubar > menuitem { - color: $panel_fg_color; - } - - PanelSeparator, MatePanelAppletFrameDBus { - border-width: 0; - color: transparent; - background-image: -gtk-scaled(url("../assets/pane-handle.png"), - url("../assets/pane-handle@2.png")); - background-color: transparent; - background-repeat: no-repeat; - background-position: left; - } - - #PanelApplet button, - #PanelApplet button.flat, - #PanelApplet button.toggle - #PanelApplet button.flat.toggle { - background-image: none; - background-color: transparent; - border-color: transparent; - border-style: solid; - border-radius: 0; - border-width: 1px; - color: $panel_fg_color; - text-shadow: none; - box-shadow: none; - padding: 2px; - } - - #PanelApplet button:hover:active, - #PanelApplet button:checked, - #PanelApplet button:checked:hover, - #PanelApplet button.flat:hover:active, - #PanelApplet button.flat:checked, - #PanelApplet button.flat:checked:hover, - #PanelApplet button.toggle:hover:active, - #PanelApplet button.toggle:checked, - #PanelApplet button.toggle:checked:hover, - #PanelApplet button.flat.toggle:hover:active, - #PanelApplet button.flat.toggle:checked, - #PanelApplet button.flat.toggle:checked:hover { - background-image: none; - background-color: darker($panel_bg_color); - border-color: transparent; - border-radius: 0; - border-width: 1px; - color: lighter($panel_fg_color); - text-shadow: none; - padding: 2px; - } - - #PanelApplet button:hover, - #PanelApplet button.flat:hover, - #PanelApplet button.toggle:hover, - #PanelApplet button.flat.toggle:hover { - background-image: none; - background-color: shade($panel_bg_color, 1.3); - border-color: transparent; - border-radius: 0; - border-width: 1px; - color: $selected_fg_color; - text-shadow: none; - padding: 2px; - } - - .mate-panel-menu-bar menubar > menuitem { - padding: 3px 7px; - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_nautilus.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_nautilus.scss deleted file mode 100644 index 1b51e55b..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_nautilus.scss +++ /dev/null @@ -1,92 +0,0 @@ -/************ - ! Nautilus * -*************/ - -@include exports("nautilus") { - .nautilus-desktop, .nautilus-desktop * { - &, &:backdrop { - color: $white; - text-shadow: 1px 1px $black; - - &:active { color: $fg_color; } - - &:selected { color: $selected_fg_color; } - - &:active, &:hover, &:selected { text-shadow: none; } - } - } - - .nautilus-window { - toolbar { - border-width: 0 0 1px; - border-style: solid; - border-color: border_normal($toolbar_bg_color); - } - - .sidebar { - border: 0; - - frame { border: 0; } - } - - notebook { - background-color: $base_color; - border: 0; - - frame { border: 0; } - } - - .searchbar-container { - margin-top: -1px; - - searchbar { - padding-top: $spacing - 3px; - padding-bottom: $spacing - 2px; - border-bottom: 1px solid $borders_color; - } - } - } - - button.nautilus-circular-button.image-button { - @extend button.circular; - } - - $disk_space_unknown: alpha($fg_color, .5); - $disk_space_used: alpha($selected_bg_color, .8); - $disk_space_free: shade($bg_color, .95); - - .disk-space-display { - border-style: solid; - border-width: 1px; - - &.unknown { - background-color: $disk_space_unknown; - border-color: shade($disk_space_unknown, .9); - } - - &.used { - background-color: $disk_space_used; - border-color: shade($disk_space_used, .9); - } - - &.free { - background-color: $disk_space_free; - border-color: shade($disk_space_free, .9); - } - } - - // Batch renaming dialog - .conflict-row.activatable { - &, &:active { - color: $error_fg_color; - background-color: $error_color; - } - - &:hover { background-color: shade($error_color, 1.1); } - - &:selected { - color: $selected_fg_color; - background-color: $selected_bg_color; - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_nemo.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_nemo.scss deleted file mode 100644 index e2fe6712..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_nemo.scss +++ /dev/null @@ -1,174 +0,0 @@ -/******** - ! Nemo * -*********/ - -@include exports("nemo") { - .nemo-desktop, .nemo-desktop * { - &, &:backdrop { - color: $white; - text-shadow: 1px 1px $black; - - &:active { color: $fg_color; } - - &:selected { color: $selected_fg_color; } - - &:active, &:hover, &:selected { text-shadow: none; } - } - } - - .nemo-window { - toolbar { - border-width: 0 0 1px; - border-style: solid; - border-color: border_normal($toolbar_bg_color); - - button { - @include button($bg_color, $fg_color); - } - - .linked > button { @include linked_button($bg_color); } - - separator, separator:disabled { - color: shade($bg_color, ($contrast + .1)); - border-color: currentColor; - -GtkWidget-window-dragging: true; - } - - &.primary-toolbar button.image-button { - padding: 0 ($spacing + 5px); - } - - combobox, button { - padding: $spacing; - - &.text-button { padding: $spacing; } - - &.image-button { padding: $spacing; } - } - - /* Path Bar */ - toolitem stack { - margin-left: 15px; - - widget button { - @include linked_button($toolbar_bg_color); - -NemoPathbarButton-border-radius: $roundness; - } - } - } // END toolbar - - /* Status Bar */ - grid { - > widget:last-child { - button { - min-height: 16px; - min-width: 16px; - padding: ($spacing - 1px) (($spacing * 2) - 2px); - } - - button:first-child { - margin-left: 20px; - } - - button:first-child + button { - margin-right: 15px; - } - - button:first-child + button + separator + button { - margin-left: 15px; - } - - > box > scale { - margin-right: 12px; - } - - statusbar { - border: 0; - } - } - } // END Status Bar - - .sidebar { - .frame { - border: 0; - } - - image { - padding-left: $spacing; - padding-right: $spacing; - } - - .nemo-places-sidebar { - &, & .view { - background-color: mix($bg_color, $base_color, .5); - } - - .view { - -NemoPlacesTreeView-disk-full-bg-color: shade($bg_color, .8); - -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color; - -NemoPlacesTreeView-disk-full-bar-width: 2px; - -NemoPlacesTreeView-disk-full-bar-radius: 1px; - -NemoPlacesTreeView-disk-full-bottom-padding: 0; - -NemoPlacesTreeView-disk-full-max-length: 75px; - - &:selected { - -NemoPlacesTreeView-disk-full-bg-color: $selected_fg_color; - -NemoPlacesTreeView-disk-full-fg-color: shade($selected_bg_color, 1.2); - - &:focus, & { - @extend %selected_items; - } - } - } - } - - /* Nemo Query Editor (File Search Bar) */ - + separator + box .primary-toolbar { - @include linear-gradient(shade($bg_color, .98)); // Searchbar color (_actionbar.scss) - - padding-top: $spacing - 3px; - padding-bottom: $spacing - 3px; - border-bottom: 1px solid $borders_color; - - button:nth-child(2) { - border-right: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - - button:nth-child(3) { - margin-left: -6px; - border-left: none; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - - button.flat { - $bg: $bg_color; - $fg: $fg_color; - $border_strength: if(lightness($bg) > 50, 0, .1); - $shadow_strength: if(lightness($bg) > 50, 0, .1); - - $button_bg: if(hue($bg) == 0deg, shade($bg, 1.2), $bg); - - @extend %button; - @include linear-gradient($button_bg); - @include border(rgba(0, 0, 0, .12 + $border_strength)); - - color: $fg; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); - padding: 5px 6px; - } - } // END Nemo Query Editor - } // END .sidebar - - notebook { - background-color: $base_color; - border-width: 0; - - tabs { - border: 0; - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_panel.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_panel.scss deleted file mode 100644 index 814a4505..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_panel.scss +++ /dev/null @@ -1,91 +0,0 @@ -/*********************** - ! Fallback mode panel * -************************/ - -@include exports("panel") { - %panel { - @include linear-gradient($panel_bg_color); - - color: $panel_fg_color; - } - - %panellabel { - font-weight: normal; - color: $panel_fg_color; - } - - %panelbutton { - border-width: 0 1px; - border-radius: 0; - border-color: transparent; - background-color: transparent; - background-image: none; - color: $panel_fg_color; - - &:hover { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .11)); - - border-color: mix($panel_bg_color, $panel_fg_color, .11); - color: shade($panel_fg_color, 1.08); - } - - &:active, &:checked { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .21), to top); - - border-color: mix($panel_bg_color, $panel_fg_color, .21); - color: shade($panel_fg_color, 1.08); - - &:hover { - @include linear-gradient(mix($panel_bg_color, $panel_fg_color, .31), to top); - - border-color: mix($panel_bg_color, $panel_fg_color, .31); - } - } - } - - panel-plug, - panel-toplevel.background { - @extend %panel; - - padding: 0; - } - - .gp-text-color { - color: $black; - } - - #clock-applet-button { &, &:backdrop { @extend %panelbutton; } } - - panel-applet { - border: 0; - - button { - &, &:backdrop { @extend %panelbutton; } - } - } - - clock-box, - panel-applet > menubar, - panel-toplevel .gnome-panel-menu-bar { - &, &:backdrop { - @extend %panel; - - menuitem { - @extend %panel; - - border: 0; - - label { @extend %panellabel; } - } - } - } - - gp-calendar-window, - #tasklist-button, - #clock-applet-button, - #showdesktop-button { - label { @extend %panellabel; } - } - - wnck-pager, wnck-tasklist { @extend %panel; } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_synaptic.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_synaptic.scss deleted file mode 100644 index c19b78e9..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_synaptic.scss +++ /dev/null @@ -1,15 +0,0 @@ -/************ - ! Synaptic * -*************/ - -@include exports("synaptic") { - GtkWindow > GtkVBox > .dock { - &, > GtkHBox > GtkToolbar { - @include linear-gradient($toolbar-bg-color); - - padding: $spacing; - border: 0; - color: $toolbar_fg_color; - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_unity-greeter.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_unity-greeter.scss deleted file mode 100644 index 70f5c3a4..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_unity-greeter.scss +++ /dev/null @@ -1,105 +0,0 @@ -/*********************** - ! Unity Greeter * - ***********************/ - -@include exports("unity-greeter") { - @keyframes dashentry_spinner { - to { -gtk-icon-transform: rotate(1turn); } - } - - %lightdm-button { - background-image: none; - background-color: fade-out($black, .7); - border-color: fade-out($white, .1); - border-radius: ($roundness * 2) + 1px; - padding: $spacing; - color: $white; - } - - .lightdm { - &.menu { - background-image: none; - background-color: fade-out($black, .4); - border-color: fade-out($white, .8); - border-radius: $roundness * 2; - padding: 1px; - - color: $white; - - .menuitem { *, &.check:active, &.radio:active { color: $white; } } - } - - &.menubar { *, &.menuitem { padding: $spacing - 3px; } } - - &.option-button { - padding: $spacing; - background: none; - border: 0; - } - - &.toggle-button { - background: none; - border-width: 0; - - &.selected { - background-color: fade-out($black, .7); - border-color: fade-out($white, .7); - border-width: 1px; - - &:hover { background-color: fade-out($white, .7); } - } - } - - &.button { - @extend %lightdm-button; - - &:hover { - background-color: fade-out($white, .7); - border-color: fade-out($white, .4); - text-shadow: none; - } - } - - &.entry, &.button:active, &.button:active:focus, &.button:focus { - background-image: none; - background-color: fade-out($black, .7); - border-color: fade-out($white, .4); - border-radius: ($roundness * 2) + 1px; - padding: $spacing + 2px; - color: $white; - text-shadow: none; - } - - &.entry { - &:hover, &:active, &:active:focus { - background-image: none; - border-image: none; - } - - &:active { - -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); - animation: dashentry_spinner 1s infinite linear; - } - - &:focus { - border-color: fade-out($white, .4); - border-width: 1px; - border-style: solid; - color: $white; - } - - &:selected { background-color: fade-out($white, .8); } - } - } - - .lightdm-combo { - &.combobox-entry .button, .cell, .button, .entry { @extend %lightdm-button; } - - &.menu { - background-color: shade($dark_bg_color, 1.08); - border-radius: 0; - padding: 0; - color: $white; - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_unity.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_unity.scss deleted file mode 100644 index 54477cbb..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_unity.scss +++ /dev/null @@ -1,80 +0,0 @@ -@import "panel"; - -/**************** - ! Unity styles * -*****************/ - -@include exports("unity") { - UnityDecoration { - -UnityDecoration-extents: 24px 1px 1px 1px; - -UnityDecoration-input-extents: 10px; - - -UnityDecoration-shadow-offset-x: 1px; - -UnityDecoration-shadow-offset-y: 1px; - -UnityDecoration-active-shadow-color: rgba(0, 0, 0, .7); - -UnityDecoration-active-shadow-radius: 8px; - -UnityDecoration-inactive-shadow-color: rgba(0, 0, 0, .5); - -UnityDecoration-inactive-shadow-radius: 5px; - - -UnityDecoration-glow-size: 10px; - -UnityDecoration-glow-color: $selected_bg_color; - - -UnityDecoration-title-indent: 10px; - -UnityDecoration-title-fade: 35px; - -UnityDecoration-title-alignment: 0; - - - .top { - border: 1px solid $wm_border_focused; - border-bottom: 0; - border-radius: $roundness $roundness 0 0; - padding: 1px ($spacing + 3px) 0 ($spacing + 3px); - background-color: $titlebar_bg_color; - color: mix($titlebar_fg_color, $titlebar_bg_color, .1); - text-shadow: none; - - // Fixed: https://github.com/numixproject/numix-gtk-theme/issues/632 - // for L.I.M's selected menuitem - &:hover { - border-radius: 0; - border-color: mix($panel_bg_color, $panel_fg_color, .21); - background-color: mix($panel_bg_color, $panel_fg_color, .21); - background-image: none; - color: shade($panel_fg_color, 1.08); - } - - &:backdrop { - border: 1px solid $wm_border_unfocused; - color: mix($titlebar_fg_color, $titlebar_bg_color, .4); - } - } - - .left, .right, .bottom { - background-color: $titlebar_bg_color; - - &:backdrop { background-color: mix(shade($titlebar_bg_color, .7), $titlebar_fg_color, .21); } - } - } - - UnityPanelWidget, .unity-panel { - @extend %panel; - - border: 0; - } - - .unity-panel { - &.menuitem, .menuitem { - border-width: 0 1px; - color: $panel_fg_color; - - &:hover, *:hover { - border-color: mix($panel_bg_color, $panel_fg_color, .21); - background-color: mix($panel_bg_color, $panel_fg_color, .21); - background-image: none; - color: shade($panel_fg_color, 1.08); - } - } - } - - SheetStyleDialog.unity-force-quit { background-color: $bg_color; } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_xfce.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_xfce.scss deleted file mode 100644 index 4300474f..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/apps/_xfce.scss +++ /dev/null @@ -1,30 +0,0 @@ -@import "panel"; - -/*************** - ! Xfce styles * -****************/ - -@include exports("xfce") { - .XfceHeading { - margin: 0; - padding: 0; - border: 0; - background-image: none; - background-color: $base_color; - color: $text_color; - } - - .xfce4-panel { - @extend %panel; - - font: inherit; - - button { @extend %panelbutton; } - - menu { - -gtk-icon-effect: none; - - text-shadow: none; - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/gtk-dark.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/gtk-dark.scss deleted file mode 100644 index fd46aa1b..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/gtk-dark.scss +++ /dev/null @@ -1,3 +0,0 @@ -$variant: "dark"; - -@import "widgets"; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/gtk.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/gtk.scss deleted file mode 100644 index 44556695..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/gtk.scss +++ /dev/null @@ -1,3 +0,0 @@ -$variant: "light"; - -@import "widgets"; diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_actionbar.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_actionbar.scss deleted file mode 100644 index 3c6aa02c..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_actionbar.scss +++ /dev/null @@ -1,99 +0,0 @@ -@import "button"; -@import "toolbar"; - -/************** - ! Action-bar * -***************/ - -@include exports("actionbar") { - actionbar > revealer > box { - padding: $spacing; - border-top: 1px solid $borders_color; - - &:backdrop { border-color: $backdrop_borders_color; } - } -} - - -/**************************** - ! Search and Location bars * -*****************************/ - -@include exports("searchbar") { - searchbar, - .location-bar { - @include linear-gradient(shade($bg_color, .98)); - - border-width: 0 0 1px; - border-style: solid; - border-color: border_normal($bg_color); - color: $fg_color; - } -} - - -/****************** - ! Action buttons * -*******************/ - -@include exports("actionbuttons") { - $types: ( - suggested: $success_color, - destructive: $error-color - ); - - @each $type, $color in $types { - .#{$type}-action { - @include button($color, $selected_fg_color); - } - } -} - - -/****************** - ! Selection mode * -*******************/ - -@include exports("selectionmode") { - headerbar, - .titlebar:not(headerbar) { - &.selection-mode { - @include toolbar($selected_bg_color, $selected_fg_color); - - button { - @include button($selected_bg_color, $selected_fg_color); - - &.suggested-action { @extend .suggested-action; } - } - - &:backdrop { - background-color: $backdrop_selected_bg_color; - background-image: none; - } - - .selection-menu { - &:backdrop, & { - color: shade($selected_bg_color, $contrast); - background-color: transparent; - background-image: none; - box-shadow: none; - border: 0; - - &:hover { color: shade($selected_bg_color, ($contrast - .1)); } - - &:active { color: shade($selected_bg_color, ($contrast - .05)); } - - .arrow { - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - color: transparentize($selected_fg_color, .5); - -gtk-icon-shadow: none; - } - } - } - - .dim-label { - &, .selection-menu & { color: shade($selected_bg_color, ($contrast - .1)); } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_base.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_base.scss deleted file mode 100644 index 52a78e24..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_base.scss +++ /dev/null @@ -1,133 +0,0 @@ -/************** - ! GTK settings -***************/ - -* { - -GtkWindow-resize-grip-height: 0; - -GtkWindow-resize-grip-width: 0; - -WnckTasklist-fade-overlay-rect: 0; - - -GtkWidget-cursor-aspect-ratio: $caret_aspect_ratio; - - outline-color: alpha($selected_bg_color, .5); - outline-style: dashed; - outline-width: 1px; - outline-offset: -1px; - -gtk-outline-radius: $roundness; -} - - -/************* - ! Base states - *************/ - -%selected { - &, &:focus { - background-color: $selected_bg_color; - color: $selected_fg_color; - } -} - -* { - /* hyperlinks */ - -GtkIMHtml-hyperlink-color: $link_color; - - &:selected { @extend %selected; } - - &:disabled, - &:disabled:disabled { color: mix($fg_color, $bg_color, .5); } - - &:disabled, &:disabled { -gtk-icon-effect: dim; } - - &:hover { -gtk-icon-effect: highlight; } - - &:link, &:visited { color: $link_color; } -} - -.background { - background-color: $bg_color; - color: $fg_color; - - &:backdrop { - text-shadow: none; - -gtk-icon-shadow: none; - } - - &.csd { background-color: $bg_color; } -} - -.gtkstyle-fallback { - background-color: alpha($bg_color, .5); - color: $fg_color; - - &:hover { - background-color: shade($bg_color, 1.1); - color: $fg_color; - } - - &:active { - background-color: shade($bg_color, .9); - color: $fg_color; - } - - &:disabled { - background-color: shade(shade($bg_color, .95), 1.05); - color: mix($fg_color, $bg_color, .5); - } - - &:selected { @extend %selected; } -} - -image, label, box, grid { - &, &:disabled { background-color: transparent; } -} - -label { - &.separator { - @extend .dim-label; - - color: $fg_color; - - &:backdrop { color: $backdrop_fg_color; } - } - - row:selected &, - &:selected { @extend %nobg_selected_items; } - - selection { - background-color: $selected_bg_color; - color: $selected_fg_color; - } - - &:disabled { - color: $insensitive_fg_color; - - selection { @extend %selected_items:disabled; } - - &:backdrop { color: $backdrop_insensitive_color; } - } - - &:backdrop { - color: $backdrop_fg_color; - - selection { @extend %selected_items:backdrop; } - } -} - -assistant { - .sidebar { - background-color: $base_color; - border-top: 1px solid $borders_color; - - &:backdrop { - background-color: $backdrop_base_color; - border-color: $backdrop_borders_color; - } - } - - &.csd .sidebar { border-top-style: none; } - - .sidebar label { padding: $spacing ($spacing * 2); } - - .sidebar label.highlight { background-color: mix($fg_color, $bg_color, .8); } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_button.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_button.scss deleted file mode 100644 index 263c0379..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_button.scss +++ /dev/null @@ -1,566 +0,0 @@ -/********* - ! Buttons -**********/ - -@include exports("button_extends") { - // stuff for .needs-attention - $_dot_color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color, .15)); - - @keyframes needs_attention { - from { - background-image: -gtk-gradient(radial, center center, 0, center center, .01, to($_dot_color), to(transparent)); - } - - to { - background-image: -gtk-gradient(radial, center center, 0, center center, .5, to($selected_bg_color), to(transparent)); - } - } - - %needs_attention { - animation: needs_attention 150ms ease-in; - $_dot_shadow: _text_shadow_color(); - $_dot_shadow_r: if($variant == 'light', .5, .45); - background-image: -gtk-gradient(radial, center center, 0, center center, .5, to($_dot_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, $_dot_shadow_r, to($_dot_shadow), to(transparent)); - background-size: 6px 6px, 6px 6px; - background-repeat: no-repeat; - - @if $variant == 'light' { - background-position: right 3px, right 4px; - } @else { - background-position: right 3px, right 2px; - } - - &:backdrop { background-size: 6px 6px, 0 0; } - - &:dir(rtl) { - @if $variant == 'light' { - background-position: left 3px, left 4px; - } @else { - background-position: left 3px, left 2px; - } - } - } - - %button { - min-height: 14px + $spacing * 2; - min-width: 14px + $spacing * 2; - padding: $spacing ($spacing + 2px); - border-width: 1px; - border-style: solid; - border-radius: $roundness; - transition: 150ms ease; - outline-color: transparent; - } - - %undecorated_button { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: none; - } - - %linked_middle { - border-radius: 0; - border-left-style: none; - border-right-style: solid; - - &:dir(rtl) { - border-radius: 0; // needed when including %linked_middle:dir(rtl) - border-right-style: none; - border-left-style: solid; - } - } - - %linked_vertical_middle { - border-radius: 0; - border-top-style: none; - border-bottom-style: solid; - - &:dir(rtl) { - border-radius: 0; // needed when including %linked_vertical_middle:dir(rtl) - border-top-style: none; - border-bottom-style: solid; - } - } - - %linked_button { - border-width: 1px; - border-style: solid; - border-radius: 0; - border-right-style: none; - border-left-style: none; - - &:first-child { - border-width: 1px; - border-radius: $roundness; - border-left-style: solid; - border-right-style: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - - &:dir(rtl) { - border-left-style: none; - border-right-style: solid; - } - } - - &:last-child { - border-width: 1px; - border-radius: $roundness; - border-left-style: none; - border-right-style: solid; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - - &:dir(rtl) { - border-left-style: solid; - border-right-style: none; - } - } - - &:only-child, &:first-child:only-child { - border-width: 1px; - border-style: solid; - } - - &:only-child { - border-radius: $roundness; - } - } - - %linked_vertical_button { - border-width: 1px; - border-style: solid; - border-radius: 0; - border-top-style: none; - border-bottom-style: none; - - &:first-child { - border-width: 1px; - border-radius: $roundness; - border-top-style: solid; - border-bottom-style: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - - &:dir(rtl) { - border-top-style: none; - border-bottom-style: solid; - } - } - - &:last-child { - border-width: 1px; - border-radius: $roundness; - border-top-style: none; - border-bottom-style: solid; - border-top-left-radius: 0; - border-top-right-radius: 0; - - &:dir(rtl) { - border-top-style: solid; - border-bottom-style: none; - } - } - - &:only-child, &:first-child:only-child { - border-width: 1px; - border-style: solid; - } - - &:only-child { - border-radius: $roundness; - } - } -} - -@mixin linked_button($bg) { - $border_strength: if(lightness($bg) > 50, 0, .1); - $shadow_strength: if(lightness($bg) > 50, 0, .1); - - @extend %linked_button; - - box-shadow: inset -1px 0 border_normal(rgba(0, 0, 0, .12 + $border_strength)), - 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); - - &:focus, &:hover { - box-shadow: inset -1px 0 border_focus(rgba(0, 0, 0, .12 + $border_strength)), - 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); - } - - &:active, &:active:hover, - &:active:focus, &:active:hover:focus, - &:checked, &:checked:hover, - &:checked:focus, &:checked:hover:focus { - box-shadow: inset -1px 0 border_active(rgba(0, 0, 0, .12 + $border_strength)), - inset 0 1px alpha($dark_shadow, .07), - inset 0 -1px alpha($dark_shadow, .05); - } - - &:disabled { box-shadow: inset -1px 0 shade($bg, .8); } - - &:last-child, &:only-child { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); } - - &:last-child:hover, &:only-child:hover { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } - - &:disabled:last-child, &:disabled:only-child, - &:active:disabled:last-child, &:active:disabled:only-child, - &:checked:disabled:last-child, &:checked:disabled:only-child { box-shadow: none; } - - &:active:last-child, &:active:last-child:focus, &:active:last-child:hover, &:active:last-child:hover:focus, - &:checked:last-child, &:checked:last-child:focus, &:checked:last-child:hover, &:checked:last-child:hover:focus { - box-shadow: inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06); - } - - &:active:only-child, &:active:only-child:focus, &:active:only-child:hover, &:active:only-child:hover:focus, - &:checked:only-child, &:checked:only-child:focus, &:checked:only-child:hover, &:checked:only-child:hover:focus { - box-shadow: inset 1px 0 alpha($dark_shadow, .06), - inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06); - } -} - -@mixin linked_vertical_button($bg) { - $border_strength: if(lightness($bg) > 50, 0, .1); - $shadow_strength: if(lightness($bg) > 50, 0, .1); - - @extend %linked_vertical_button; - - box-shadow: inset 0 -1px border_normal(rgba(0, 0, 0, .12 + $border_strength)), - 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); - - &:focus, &:hover { - box-shadow: inset 0 -1px border_focus(rgba(0, 0, 0, .12 + $border_strength)), - 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); - } - - &:active, &:active:hover, - &:active:focus, &:active:hover:focus, - &:checked, &:checked:hover, - &:checked:focus, &:checked:hover:focus { - box-shadow: inset 0 -1px border_active(rgba(0, 0, 0, .12 + $border_strength)), - inset 1px 0 alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .05); - } - - &:disabled { box-shadow: inset 0 -1px shade($bg, .8); } - - &:last-child, &:only-child { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); } - - &:last-child:hover, &:only-child:hover { box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } - - &:disabled:last-child, &:disabled:only-child, - &:active:disabled:last-child, &:active:disabled:only-child, - &:checked:disabled:last-child, &:checked:disabled:only-child { box-shadow: none; } - - &:active:last-child, &:active:last-child:focus, &:active:last-child:hover, &:active:last-child:hover:focus, - &:checked:last-child, &:checked:last-child:focus, &:checked:last-child:hover, &:checked:last-child:hover:focus { - box-shadow: inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06); - } - - &:active:only-child, &:active:only-child:focus, &:active:only-child:hover, &:active:only-child:hover:focus, - &:checked:only-child, &:checked:only-child:focus, &:checked:only-child:hover, &:checked:only-child:hover:focus { - box-shadow: inset 1px 0 alpha($dark_shadow, .06), - inset 0 1px alpha($dark_shadow, .07), - inset -1px 0 alpha($dark_shadow, .06); - } -} - -@mixin button($bg, $fg) { - $border_strength: if(lightness($fg) > 50, .1, .2); - $shadow_strength: if(lightness($bg) > 50, 0, .1); - - $button_bg: $bg; - - @extend %button; - @include linear-gradient($button_bg); - @include border(alpha($fg, .12 + $border_strength)); - - color: $fg; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); - - - &.flat { - //color: mix($bg, $fg, .2); - color: $fg; - border-color: alpha($button_bg, 0); - background-color: alpha($button_bg, 0); - background-image: none; - box-shadow: none; - } - - &, &.flat { - - &:hover { - @include linear-gradient(shade($bg, 1.05)); - @include border(alpha($fg, .20 + $border_strength)); - - color: $fg; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .22 + $shadow_strength); - } - - &:focus { - @include linear-gradient(shade($bg, 1.05)); - @include border(alpha($fg, .20 + $border_strength)); - - color: $fg; - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); - &:hover { - @include linear-gradient(shade($bg, 1.1)); - @include border(alpha($fg, .20 + $border_strength)); - - box-shadow: 0 1px 2px -1px alpha($dark_shadow, .38 + $shadow_strength); - } - } - - &:checked, &:active { - /*@include linear-gradient(shade($bg, .7), to top);*/ - @include linear-gradient($selected_bg_color, to top); - - color: $selected_fg_color; - box-shadow: inset 1px 0 alpha($fg, .06), - inset 0 1px alpha($fg, .07), - inset -1px 0 alpha($fg, .06), - inset 0 -1px alpha($fg, .05); - @include border(alpha($fg, .12 + $border_strength)); - - &:focus, &:hover { - /*@include linear-gradient(shade($bg, .65), to top);*/ - @include linear-gradient(shade($selected_bg_color, 1.05), to top); - - color: $selected_fg_color; - } - } - - &:focus, &:hover { color: $fg; } - - &:disabled:disabled { - @include linear-gradient(alpha(mix($bg, $fg, .2), .4)); - /*border: 1px solid alpha($bg, .2);*/ - opacity: .4; - - color: mix($bg, $fg, .5); - box-shadow: none; - } - - &:active:disabled, &:checked:disabled { - @include linear-gradient(alpha($selected_bg_color, .6)); - - color: $selected_fg_color; - box-shadow: none; - } - } - - &.separator, .separator { - border: 1px solid currentColor; - color: alpha($bg, ($contrast + .1)); - - &:disabled { color: alpha($bg, .85); } - } -} - -@include exports("button") { - %close_button { - border: 1px solid transparent; - background-color: transparent; - background-image: none; - box-shadow: none; - - &:focus, &:hover { - border: 1px solid alpha($bg_color, .3); - background-color: alpha($fg_color, .2); - background-image: none; - box-shadow: none; - } - - &:active, &:checked, &:active:hover, &:checked:hover { - border: 1px solid alpha($selected_bg_color, .3); - background-color: alpha($selected_fg_color, .1); - background-image: none; - box-shadow: none; - } - } - - button { - @include button($button_bg_color, $button_fg_color); - - - .inline-toolbar &, - .linked > & { @include linked_button($button_bg_color); } - - .linked.vertical > & { @include linked_vertical_button($button_bg_color); } - - &.circular, - &.circular-button { // FIXME: aggregate to buttons - padding: 0; - min-width: 28px; - min-height: 28px; - border-radius: 9999px; // Fixed: https://github.com/GNOME/gtk/commit/a6409458f0d50d673a4dc370b9251993b7835b6b - -gtk-outline-radius: 9999px; - - label { padding: 0; } - } - } - - spinbutton { - - &:disabled { - opacity: .4; - } - - button { - color: $button_fg_color; - - &:active, &:checked, &:hover { - @include linear-gradient(shade($button_bg_color, 1.2)); - } - - &:disabled { color: mix($button_fg_color, $bg_color, .7); } - - &:backdrop { color: mix($backdrop_base_color, $backdrop_fg_color, .9); } - - &:backdrop:disabled { color: alpha($backdrop_insensitive_color, .8); } - } - - &:not(.vertical) { - /*@extend %entry;*/ - @include linear-gradient($base_color, to top); - /*@include border($base_color);*/ - - padding: 0; - border-radius: $roundness; - - color: $text_color; - caret-color: $text_color; - - /*&:focus, &:active { border-color: border_focus($borders_color); }*/ - - &:disabled { - @include linear-gradient(shade($base_color, .9), to top); - - color: mix($base_color, $text_color, .5); - } - - entry { - border-radius: $roundness 0 0 $roundness; - border-right-width: 0; - box-shadow: none; - } - - button { - @extend %linked_middle; - border-radius: 0; - /*border-color: alpha($borders_color, .8);*/ - /*border-style: none none none solid;*/ - background-image: none; - box-shadow: none; - - /* - @if (lightness($bg_color) > 50) { - background-color: shade($bg_color, 1.08); - } - - &:hover { - @if (lightness($bg_color) > 50) { - background-color: shade($bg_color, 1.11); - } - } - */ - - &:dir(rtl) { border-style: none solid none none; } - - &:active { box-shadow: inset 0 2px 3px -1px transparentize($black, .8); } - - &:backdrop { border-color: alpha($backdrop_borders_color, .8); } - - &:backdrop:disabled { - border-style: none none none solid; // It is needed or it gets overridden - &:dir(rtl) { border-style: none solid none none; } - } - - &:dir(rtl):first-child { border-radius: $roundness 0 0 $roundness; } - - &:dir(ltr):last-child { border-radius: 0 $roundness $roundness 0; } - } - } - - &.vertical { - button, entry { - min-width: 0; - padding-left: $spacing - 2px; - padding-right: $spacing - 2px; - } - - entry { - // reset all the other props since the spinbutton node is styled here - border-radius: 0; - border-top-width: 0; - border-bottom-width: 0; - } - - button { - &.up { - border-style: solid solid none solid; - border-radius: $roundness $roundness 0 0; - } - - &.down { - border-style: none solid solid solid; - border-radius: 0 0 $roundness $roundness; - } - } - } - } -} - -/****************** -! ComboBoxes * -*******************/ - -@include exports("combobox") { - combobox { - button.combo { - // otherwise the arrow placement is not symmetric - min-width: 0; - padding-left: $spacing + 2px; - padding-right: $spacing + 2px; - } - - arrow { - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - min-height: 16px; - min-width: 16px; - } - - box button, box entry { - @extend %linked_button; - padding: $spacing ($spacing + 2px); - } - - .linked:not(.vertical) > & > box > button.combo { - // the combo is a composite widget so the way we do button linked doesn't - // work, special case needed. See - // https://bugzilla.gnome.org/show_bug.cgi?id=733979 - &:dir(ltr) { @extend %linked_middle; } - // specificity bump - &:dir(rtl) { @extend %linked_middle:dir(rtl); } - } - - .linked:not(.vertical) > &:first-child > box > button.combo { @extend %linked_button:first-child; } - - .linked:not(.vertical) > &:last-child > box > button.combo { @extend %linked_button:last-child; } - - .linked:not(.vertical) > &:only-child > box > button.combo { @extend %linked_button:only-child; } - - .linked.vertical > & > box > button.combo { @extend %linked_vertical_middle; } - - .linked.vertical > &:first-child > box > button.combo { @extend %linked_vertical_button:first-child; } - - .linked.vertical > &:last-child > box > button.combo { @extend %linked_vertical_button:last-child; } - - .linked.vertical > &:only-child > box > button.combo { @extend %linked_vertical_button:only-child; } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_calendar.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_calendar.scss deleted file mode 100644 index c2243b9f..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_calendar.scss +++ /dev/null @@ -1,73 +0,0 @@ -/********** - ! Calendar -***********/ - -@include exports("calendar") { - calendar { - padding: 1px 3px; - outline-offset: -1px; - - color: $text_color; - - &.view { - &, &:backdrop { @extend %undecorated_button; } - } - - &:selected { - @extend %selected_items; - - border-radius: $roundness; - } - - &.header { - border-bottom: 1px solid transparentize($black, .9); - border-radius: 0; - - &:backdrop { border-color: transparentize($black, .9); } - } - - &.button { - @extend %undecorated_button; - - color: alpha($fg_color, .55); - - &:hover { - @extend %undecorated_button; - - color: $fg_color; - } - - &:backdrop { - @extend %undecorated_button; - - color: alpha($backdrop_fg_color, .55); - } - - &:disabled { - @extend %undecorated_button; - - color: alpha($insensitive_fg_color, .55); - } - } - - &:indeterminate, - &:indeterminate:backdrop { color: mix($fg_color, $bg_color, .5); } - - &.highlight, - &.highlight:backdrop { - font-size: smaller; - color: mix($selected_bg_color, $fg_color, .5); - } - - &:backdrop { - color: $backdrop_text_color; - } - } - - /* gnome-calendar */ - .calendar-view { - background-color: $base_color; - color: $text_color; - } -} - diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_choosers.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_choosers.scss deleted file mode 100644 index 6741bd81..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_choosers.scss +++ /dev/null @@ -1,181 +0,0 @@ -/*************** - ! Color chooser -****************/ - -@include exports("colorchooser") { - colorswatch { - // This widget is made of two boxes one on top of the other, the lower box is colorswatch {} the other one - // is colorswatch overlay {}, colorswatch has the programmatically set background, so most of the style is - // applied to the overlay box. - - &:drop(active), & { border-style: none; } // FIXME: implement a proper drop(active) state - - $_colorswatch_radius: $roundness; - - // base color corners rounding - // to avoid the artifacts caused by rounded corner anti-aliasing the base color - // sports a bigger radius. - // nth-child is needed by the custom color strip. - - &.top { - border-top-left-radius: $_colorswatch_radius + .5px; - border-top-right-radius: $_colorswatch_radius + .5px; - - overlay { - border-top-left-radius: $_colorswatch_radius; - border-top-right-radius: $_colorswatch_radius; - } - } - - &.bottom { - border-bottom-left-radius: $_colorswatch_radius + .5px; - border-bottom-right-radius: $_colorswatch_radius + .5px; - - overlay { - border-bottom-left-radius: $_colorswatch_radius; - border-bottom-right-radius: $_colorswatch_radius; - } - } - - &.left, - &:first-child:not(.top) { - border-top-left-radius: $_colorswatch_radius + .5px; - border-bottom-left-radius: $_colorswatch_radius + .5px; - - overlay { - border-top-left-radius: $_colorswatch_radius; - border-bottom-left-radius: $_colorswatch_radius; - } - } - - &.right, - &:last-child:not(.bottom) { - border-top-right-radius: $_colorswatch_radius + .5px; - border-bottom-right-radius: $_colorswatch_radius + .5px; - - overlay { - border-top-right-radius: $_colorswatch_radius; - border-bottom-right-radius: $_colorswatch_radius; - } - } - - &.dark overlay { - color: $selected_fg_color; - - &:hover { border-color: if($variant == 'light', transparentize($black, .2), $borders_color); } - - &:backdrop { color: $backdrop_selected_fg_color; } - } - - &.light overlay { - color: $text_color; - - &:hover { border-color: if($variant == 'light', transparentize($black, .5), $borders_color); } - - &:backdrop { color: $backdrop_text_color; } - } - - &:drop(active) { - box-shadow: none; - - &.light overlay { - border-color: $drop_target_color; - box-shadow: inset 0 0 0 2px if($variant == 'light', darken($drop_target_color, 7%), $borders_color), - inset 0 0 0 1px $drop_target_color; - } - - &.dark overlay { - border-color: $drop_target_color; - box-shadow: inset 0 0 0 2px if($variant == 'light', transparentize($black, .7), $borders_color), - inset 0 0 0 1px $drop_target_color; - } - } - - overlay { - border: 1px solid if($variant == 'light', transparentize($black, .7), $borders_color); - - &:hover { - box-shadow: inset 0 1px transparentize($white, .6), - inset 0 -1px transparentize($black, .8); - } - - &:backdrop, - &:backdrop:hover { - border-color: if($variant == 'light', transparentize($black, .7), $borders_color); - box-shadow: none; - } - } - - &:disabled { - opacity: .5; - - overlay { - border-color: transparentize($black, .4); - box-shadow: none; - } - } - - row:selected & { box-shadow: 0 0 0 2px $selected_fg_color; } - - &#add-color-button { - border-radius: $_colorswatch_radius $_colorswatch_radius 0 0; - - &:only-child { border-radius: $_colorswatch_radius; } - - overlay { - background-color: shade($bg_color, .95); - color: $fg_color; - - &:hover { background-color: shade($bg_color, .9); } - - &:backdrop { background-color: shade($backdrop_bg_color, .95); } - } - } - - &#editor-color-sample { - border-radius: $_colorswatch_radius; - - overlay { border-radius: $_colorswatch_radius + .5px; } - } - } - - button.color { - padding: $spacing; - - colorswatch:only-child { - &, overlay { border-radius: 0; } - - @if $variant == 'light' { box-shadow: 0 1px _text_shadow_color(); } - } - - @if $variant == 'light' { - &:disabled, - &:backdrop, - &:active, - &:checked { colorswatch:only-child { box-shadow: none; } } - } - } -} - - -/*********************** -! Font and file choosers -************************/ - -@include exports("miscchoosers") { - filechooser { - /* for fallback when header bar not used */ - .dialog-action-box { - border-top: 1px solid $borders_color; - - &:backdrop { border-top-color: $backdrop_borders_color; } - } - - #pathbarbox { border-bottom: 1px solid $bg_color; } - } - - filechooserbutton:drop(active) { - box-shadow: none; - border-color: transparent; - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_entry.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_entry.scss deleted file mode 100644 index 1b650447..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_entry.scss +++ /dev/null @@ -1,186 +0,0 @@ -/********* - ! Entry * -**********/ - -%linked_entry { - border-width: 1px; - border-radius: 0; - border-right-width: 0; - border-left-width: 0; - - &:first-child { - border-width: 1px; - border-radius: $roundness; - border-right-width: 0; - border-bottom-right-radius: 0; - border-top-right-radius: 0; - - &:dir(rtl) { - border-left-width: 0; - border-right-width: 1px; - } - } - - &:last-child { - border-width: 1px; - border-radius: $roundness; - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - - &:dir(rtl) { - border-left-width: 1px; - border-right-width: 0; - } - } - - &:only-child, &:first-child:only-child { - border-width: 1px; - } - - &:only-child { - border-radius: $roundness; - } -} - -%linked_vertical_entry { - border-width: 1px; - border-radius: 0; - border-top-width: 0; - border-bottom-width: 0; - - &:first-child { - border-width: 1px; - border-radius: $roundness; - border-top-width: 1px; - border-bottom-width: 0; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - - &:dir(rtl) { - border-top-width: 0; - border-bottom-width: 1px; - } - } - - &:last-child { - border-width: 1px; - border-radius: $roundness; - border-top-width: 0; - border-bottom-width: 1px; - border-top-left-radius: 0; - border-top-right-radius: 0; - - &:dir(rtl) { - border-top-width: 1px; - border-bottom-width: 0; - } - } - - &:only-child, &:first-child:only-child { - border-width: 1px; - } - - &:only-child { - border-radius: $roundness; - } -} - -%entry { - border-width: 1px; - border-style: solid; - border-radius: $roundness; - border-color: border_normal($bg_color); - transition: border 100ms ease-out; - &:focus, &:hover, &:active { transition: border 100ms ease-in; } - - box-shadow: inset 1px 0 alpha($dark_shadow, 0.10), - inset 0 1px alpha($dark_shadow, 0.12), - inset -1px 0 alpha($dark_shadow, 0.10), - inset 0 -1px alpha($dark_shadow, 0.05); - - - - &:selected { - &, &:selected:focus { - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - - &:disabled { box-shadow: none; } - - progress { - @include linear-gradient($selected_bg_color); - - border-width: 0; - border-radius: $roundness; - color: $selected_fg_color; - } - - image.left { padding-right: $spacing; } - - image.right { padding-left: $spacing; } - - selection { @extend %selected_items; } - - // entry error and warning style - @each $e_type, $e_color, $e_fg_color in (warning, $warning_bg_color, $warning_fg_color), - (error, $error_bg_color, $error_fg_color), - // entry.search-missing for Gnome-Builder - (search-missing, $error_bg_color, $error_fg_color) { - &.#{$e_type} { - color: $e_fg_color; - border-color: border_normal($e_color); - background-color: mix($base_color, $e_color, .6); - - image { color: $e_fg_color; } - - &:focus { - color: $e_fg_color; - border-color: border_focus($e_color); - background-color: $e_color; - box-shadow: none; - } - - selection { - background-color: $e_fg_color; - color: $e_color; - } - } - } -} - -@mixin entry($bg, $fg, $border: $borders_color) { - @extend %entry; - @include linear-gradient($bg, to top); - @include border(mix($bg, $fg, .20)); - - padding: $spacing; - - color: $fg; - caret-color: $primary_caret_color; - -gtk-secondary-caret-color: $secondary_caret_color; - - &:focus, &:active { border-color: border_focus($border); } - - &:disabled { - @include linear-gradient(shade($bg, .9), to top); - @include border(alpha(mix($bg, $fg, .20), .4)); - /*@include border(mix($bg, $fg, .20));*/ - /*border-color: alpha(mix($bg, $fg, .15), .8);*/ - /*opacity: .8;*/ - - color: mix($bg, $fg, .5); - } -} - -@include exports("entry") { - entry { - @include entry($base_color, $text_color); - - .linked:not(.vertical) > & { @extend %linked_entry; } - - .linked.vertical > & { @extend %linked_vertical_entry; } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_grid.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_grid.scss deleted file mode 100644 index 7a16dca8..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_grid.scss +++ /dev/null @@ -1,63 +0,0 @@ -/****************** - ! Grid and flowbox -*******************/ - -@include exports("grid") { - list { - color: $text_color; - background-color: $base_color; - border-color: $borders_color; - - &:backdrop { - background-color: $backdrop_base_color; - border-color: $backdrop_borders_color; - } - - row { padding: $spacing; } - } - - row { - transition: all 150ms cubic-bezier(.25, .46, .45, .94); - - &:hover { transition: none; } - - &:backdrop { transition: 200ms ease-out; } - - &.activatable { - &.has-open-popup, // this is for indicathing which row generated a popover see https://bugzilla.gnome.org/show_bug.cgi?id=754411 - - &:hover { background-color: if(variant == light, transparentize($fg_color, .9), transparentize($fg_color, .95)); } - - &:active { box-shadow: inset 0 2px 2px -2px transparentize($black, .8); } - - &:backdrop:hover { background-color: transparent; } - - &:selected { - &:active { box-shadow: inset 0 2px 3px -1px transparentize($black, .5); } - - &.has-open-popup, - &:hover { background-color: mix($selected_bg_color, $fg_color, .1); } - - &:backdrop { background-color: $selected_bg_color; } - } - } - - &:selected { @extend %selected_items; } - } - - flowbox { - rubberband { @extend rubberband; } - - flowboxchild { - padding: $spacing; - border-radius: $roundness; - - &:selected { - @extend %selected_items; - - outline-offset: -2px; - } - } - } -} - diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_infobar.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_infobar.scss deleted file mode 100644 index bf82db21..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_infobar.scss +++ /dev/null @@ -1,41 +0,0 @@ -@import "button"; - - -/********* - ! Infobar -**********/ - -@include exports("infobar") { - infobar { - border: 0; - - $types: ( - info: ($info_fg_color, $info_bg_color), - warning: ($warning_fg_color, $warning_bg_color), - question: ($question_fg_color, $question_bg_color), - error: ($error_fg_color, $error_bg_color), - ); - - @each $type, $colors in $types { - $fg_color: nth($colors, 1); - $bg_color: nth($colors, 2); - - &.#{$type} { - &, &:backdrop { // Backdrop button fix: https://github.com/numixproject/numix-gtk-theme/issues/544 - @include linear-gradient($bg_color); - - border: 1px solid shade($bg_color, .8); - caret-color: currentColor; - - label, & { color: $fg_color; } - } - - button { - @include button($bg_color, $fg_color); - - &.close { @extend %close_button; } - } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_menu.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_menu.scss deleted file mode 100644 index 1a7f2488..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_menu.scss +++ /dev/null @@ -1,319 +0,0 @@ -@import "entry"; - - - -@mixin menu_calendar($bg, $fg) { - color: $fg; - - &.header { - border-bottom: 1px solid shade($bg, ($contrast + .1)); - border-radius: 0; - - &:backdrop { border-color: shade($bg, ($contrast + .1)); } - } - - &.button { - @extend %undecorated_button; - color: alpha($fg, .55); - - &:hover { - @extend %undecorated_button; - color: $fg; - } - } - - &:indeterminate, - &:indeterminate:backdrop { color: mix($fg, $bg, .5); } -} - - -/********* - ! Menubar -**********/ - -@include exports("menubar") { - menubar, .menubar { - -GtkWidget-window-dragging: true; - - padding: 0; - border: 0; - background-color: $menubar_bg_color; - background-image: none; - //box-shadow: inset 0 -1px shade($menubar_bg_color, .9); - color: $menubar_fg_color; - - > menuitem { - min-height: 16px; - padding: $spacing*1.5 $spacing * 2.5; - border: 1px solid transparent; - background-color: transparent; - background-image: none; - color: $menubar_fg_color; - - &:hover { - border-color: mix($menubar_bg_color, $menubar_fg_color, .21); - background-color: mix($menubar_bg_color, $menubar_fg_color, .21); - background-image: none; - color: shade($menubar_fg_color, 1.08); - } - - *:hover { color: shade($menubar_fg_color, 1.08); } - } - } -} - - -/****** - ! Menu -*******/ - -@include exports("menu") { - menu, - .menu, - .context-menu { - border: 0; - border-radius: 0; - padding: $spacing; - background-color: $menu_bg_color; - color: $menu_fg_color; - - .csd & { border: 0; } // axes borders in a composited env - - &:selected { background-color: $selected_bg_color; } - - // A little hack to get some extra space above/below menuitem separators - separator, - .csd & separator { - background-color: shade($menu_bg_color, ($contrast + .1)); - margin: ($spacing - 2px) 0; - } - - // Firefox workaround - .separator, - .csd & .separator { color: shade($menu_bg_color, ($contrast + .1)); } - - menuitem { - min-height: 16px; - min-width: 40px; - padding: $spacing; - border-radius: 0; - - &:active, &:hover { - border: 0; - background-color: $selected_bg_color; - background-image: none; - color: $selected_fg_color; - } - - *:active, *:hover { color: $selected_fg_color; } - - &:disabled, *:disabled { color: mix($menu_fg_color, $menu_bg_color, .5); } - - // submenu indicators - arrow { - min-height: 16px; - min-width: 16px; - - &:dir(ltr) { - -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - margin-left: 10px; - } - - &:dir(rtl) { - -gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); - margin-right: 10px; - } - } - - &.button, &.button.flat { - &, &:focus, &:active, &:disabled, &:active:disabled { - background-color: transparent; - background-image: none; - border: 0; - box-shadow: none; - color: currentColor; - } - - &:hover, &:focus:hover, &:active:hover, &:selected { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - - calendar { @include menu_calendar($menu_bg_color, $menu_fg_color); } - - // avoids labels color being overridden, see - // https://bugzilla.gnome.org/show_bug.cgi?id=767058 - label { &:dir(rtl), &:dir(ltr) { color: inherit; } } - } - - // overflow arrows - > arrow { - //@include button(undecorated); - - min-height: 16px; - min-width: 16px; - padding: $spacing; - background-color: $menu_bg_color; - border-radius: 0; - - &.top { - margin-top: -6px; - border-bottom: 1px solid mix($fg_color, $base_color, .1); - -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); - } - - &.bottom { - margin-bottom: -6px; - border-top: 1px solid mix($fg_color, $base_color, .1); - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - } - - &:hover { background-color: mix($fg_color, $base_color, .1); } - - &:backdrop { background-color: $backdrop_menu_color; } - - &:disabled { - color: transparent; - background-color: transparent; - border-color: transparent; - } - } - } - - .context-menu { font: initial; } // Decouple the font of context menus from their entry/textview - - .monospace { font-family: monospace; } - - menuitem { - accelerator { - color: alpha($menu_fg_color, .6); - - &:hover { color: alpha($selected_fg_color, .8); } - - &:disabled { color: alpha(mix($menu_fg_color, $menu_bg_color, .5), .4); } - } - - check, radio { - min-height: 16px; - min-width: 16px; - - &:dir(ltr) { margin-right: 7px; } - &:dir(rtl) { margin-left: 7px; } - } - - window decoration { - box-shadow: 0 2px 3px alpha($black, .2); - } - - entry { @include entry($menu_bg_color, $menu_fg_color); } - } -} - - -/********* - ! Popover -**********/ - -@include exports("popover") { - popover.background { - padding: $spacing - 3px; - border-radius: $roundness; - background-clip: border-box; - background-color: $menu_bg_color; - background-image: none; - color: $menu_fg_color; - box-shadow: 0 3px 6px alpha($black, .16); - - .csd &, & { - /*@include border($menu_bg_color);*/ - @include border(alpha($menu_fg_color, .5)); - border-width: 1px; - border-style: solid; - } - - &:backdrop { box-shadow: none; } - - treeview.view { - &:hover, &:selected, &:selected:focus, &:backdrop:selected, &:backdrop:selected:focus { border-top-color: $selected_bg_color; } - - &, &:backdrop { border-top-color: shade($menu_bg_color, ($contrast + .4)); } - } - - view, .view, list { - &:hover { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } - - &, &:backdrop { - background-color: shade($menu_bg_color, ($contrast + .5)); - background-image: none; - color: $menu_fg_color; - border-color: border_normal($menu_bg_color); - } - } - - list row { - &, & .button { - background-color: transparent; - background-image: none; - color: $menu_fg_color; - - &:focus, &:hover, &:active { - background-image: none; - background-color: $selected_bg_color; - color: $selected_fg_color; - } - } - } - - .frame { - border-color: border_normal($menu_bg_color); - border-radius: $roundness; - } - - entry { @include entry($base_color, $text_color); } - - button { @include button($header_button_bg_color, $header_button_fg_color); } - .linked > button { @include linked_button($header_button_bg_color); } - - > list, > .view, > toolbar { - border-style: none; - background-color: transparent; - } - } - - modelbutton.flat, - menuitem.button.flat { - padding: $spacing ($spacing + 2px); - outline-color: transparent; - transition: none; - - @extend %undecorated_button; - - &:hover { - background-color: $selected_bg_color; - color: $selected_fg_color; - } - - &:active, &:selected { &, arrow { @extend %selected_items; } } - - &:checked { color: $fg_color; } - - arrow { - &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } - - &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - } - - // FIXME: temporary workaround - check:last-child, - radio:last-child { margin-left: 8px; } - - check:first-child, - radio:first-child { margin-right: 8px; } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_misc.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_misc.scss deleted file mode 100644 index da1c7dcb..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_misc.scss +++ /dev/null @@ -1,320 +0,0 @@ -/*************** -! Dimmed label * -****************/ - -@include exports("dimlabel") { - .dim-label { - opacity: .5; - text-shadow: none; - } -} - - -/*********** - ! Tooltip * -************/ - -@include exports("tooltip") { - .tooltip, // Firefox fix - tooltip { - &.background { - &, &.csd { - background-color: $tooltip_bg_color; - background-clip: padding-box; - border: 1px solid border_normal($tooltip_bg_color); - border-radius: $roundness; - color: $tooltip_fg_color; - } - } - - * { - background-color: transparent; - color: inherit; - } - } -} - - -/*********** - ! Dialogs * -************/ - -@include exports("dialogs") { - messagedialog, .message-dialog, .prompt { - -GtkDialog-content-area-border: 0; - -GtkDialog-action-area-border: 0; - -GtkDialog-button-spacing: $spacing; - - margin: 0; - padding: 0; - } - - printdialog { - paper { - color: $fg_color; - border: 1px solid $borders_color; - background: $white; - padding: 0; - - &:backdrop { - color: $backdrop_fg_color; - border-color: $backdrop_borders_color; - } - } - - .dialog-action-box { margin: $spacing * 2; } - } -} - - -/********************* - ! App notifications * -**********************/ - -@include exports("notifications") { - frame.app-notification { - border-style: solid; - border-color: border_normal($osd_bg); - border-width: 0 1px 1px; - border-radius: 0 0 $roundness $roundness; - padding: $spacing * 2; - background-color: $osd_bg; - background-image: none; - color: $osd_fg; - - button { - @include button($osd_bg, $osd_fg); - } - - border { - border: 0; - } - } -} - - -/************* - ! Expanders * -**************/ - -@include exports("expander") { - expander { - arrow { - min-width: 16px; - min-height: 16px; - -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - - &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } - - &:hover { color: alpha(currentColor, .8); } //only lightens the arrow - - &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } - } - } -} - - -/******************* - ! Symbolic images * -********************/ - -@include exports("symbolicimage") { - .image { - color: alpha(currentColor, .5); - - &:hover { color: alpha(currentColor, .9); } - - &:selected, &:selected:hover { color: $selected_fg_color; } - } -} - - -/**************** - ! Floating bar * -*****************/ - -@include exports("floatingbar") { - .floating-bar { - @include linear-gradient($bg_color); - - border: 1px solid border_normal($bg_color); - border-radius: $roundness; - color: $fg_color; - - &.top { - border-top-width: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; - } - - &.right { - border-right-width: 0; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - - &.bottom { - border-bottom-width: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; - } - - &.left { - border-left-width: 0; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } - - button { - border: 0; - background-color: transparent; - background-image: none; - } - } -} - - -/************************* - ! Touch text selections * -**************************/ - -@include exports("touchbubble") { - GtkBubbleWindow { - border-radius: $roundness; - background-clip: border-box; - - &.osd.background { background-color: $osd_bg; } - - .toolbar { background-color: transparent; } - } -} - -/*************** - ! Font-viewer * -****************/ - -@include exports("fontviewer") { - SushiFontWidget { - padding: $spacing ($spacing * 2); - } -} - - -/************* - ! Gucharmap * -**************/ - -@include exports("charmap") { - GucharmapChartable { - background-color: $base_color; - color: $text_color; - - &:focus, &:hover, &:active, &:selected { @extend %selected; } - } -} - - -/************* - ! Evolution * -**************/ - -@include exports("evolution") { - EPreviewPane .entry { - background-color: $base_color; - color: $text_color; - } -} - - -/******************* - ! Gnome Bluetooth * -********************/ - -@include exports("gnome-bluetooth") { - // Base code: https://github.com/GNOME/gnome-bluetooth/blob/a93575c4b590e2b831da32f739294bb2f197d420/lib/bluetooth-settings.css - entry.entry.pin-entry { - font-style: normal; - font-size: 50px; - padding-left: $spacing * 5; - padding-right: $spacing * 5; - } - - label.pin-label { - font-style: normal; - font-size: 50px; - } -} - - -/************************ - ! Shortcut window keys * -*************************/ - -@include exports("keycap") { - // shortcut window keys - .keycap { - min-width: 20px; - min-height: 24px; - margin-top: 2px; - padding-bottom: $spacing / 2; - padding-left: $spacing; - padding-right: $spacing; - - color: $fg_color; - background-color: $base_color; - border: 1px solid; - border-color: if($variant == 'light', mix($borders_color, $bg_color, .5), $borders_color); - border-radius: $roundness; - box-shadow: if($variant == 'light', inset 0 -3px mix($base_color, $bg_color, .2), inset 0 -3px mix($borders_color, $base_color, .6)); - font-size: smaller; - - &:backdrop { - background-color: $backdrop_base_color; - color: $backdrop_fg_color; - transition: 200ms ease-out; - } - } -} - - -/***************** - ! Stackswitcher * -******************/ - -@include exports("stackswitcher") { - stackswitcher button { - &.text-button { min-width: 80px; } // FIXME aggregate with buttons - - &.circular { // FIXME aggregate with buttons - min-width: 28px; - min-height: 28px; - padding: 0; - } - } -} - - -/******************* - ! Selected Items * -********************/ - -@include exports("selected_items") { - %selected_items { - background-color: $selected_bg_color; - - @at-root %nobg_selected_items, & { - color: $selected_fg_color; - - @if $variant == 'light' { outline-color: transparentize($selected_fg_color, .7); } - - &:disabled { color: mix($selected_fg_color, $selected_bg_color, .5); } - - &:backdrop { - background-color: $backdrop_selected_bg_color; // Fixed Issue #430 - color: $backdrop_selected_fg_color; - - &:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, .3); } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_notebook.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_notebook.scss deleted file mode 100644 index 92fa86bb..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_notebook.scss +++ /dev/null @@ -1,149 +0,0 @@ -@import "button"; - - -/********** - ! Notebook -***********/ - -@include exports("notebook") { - -notebook { - padding: 0; - - &.frame { - border: 1px solid $borders_color; - - > header { - // ugly hack to hide the borders around the header - margin: -1px; - &.top { margin-bottom: 0; } - &.bottom { margin-top: 0; } - &.left { margin-right: 0; } - &.right { margin-left: 0; } - - &.top, &.bottom { padding-left: 0; padding-right: 0; } - &.left, &.right { padding-top: 0; padding-bottom: 0; } - } - } - - > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks - background-color: $bg_color; - } - - > header { - padding: $spacing; - background-color: $bg_color; - - &.top { box-shadow: inset 0 -1px $borders_color; } - &.bottom { box-shadow: inset 0 1px $borders_color; } - &.right { box-shadow: inset 1px 0 $borders_color; } - &.left { box-shadow: inset -1px 0 $borders_color; } - - @each $_pos, $_bpos in (top, bottom), (bottom, top), (right, left), (left, right) { - // sizing and borders - &.#{$_pos} { - padding-#{$_bpos}: 0; - - > tabs > tab { - padding: $spacing $spacing + 8px; - min-width: 20px; - min-height: 20px; - - outline-offset: -4px; - - border: 1px solid transparent; - border-#{$_bpos}: none; - border-#{$_pos}-width: 3px; - - &:checked { - border-#{$_pos}-color: $selected_bg_color; - } - - // tab overlap - + tab { - @if $_pos==top or $_pos==bottom { margin-left: -1px; } - @else { margin-top: -1px; } - } - - - // tab border radius - @if $_pos==top { border-radius: 1px 1px 0 0; } - @else if $_pos==bottom { border-radius: 0 0 1px 1px; } - @else if $_pos==left { border-radius: 1px 0 0 1px; } - @else if $_pos==right { border-radius: 0 1px 1px 0; } - } - } - } - // overflow arrows - &.top, &.bottom { - > tabs > arrow.up { - -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - &:last-child { margin-left: 2px; } - } - > tabs > arrow.down { - -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); - &:first-child { margin-right: 2px; } - } - } - &.left, &.right { - > tabs > arrow.up { - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - &:last-child { margin-top: 2px; } - } - > tabs > arrow.down { - -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); - &:first-child { margin-bottom: 2px; } - } - } - > tabs > arrow { - @extend %close_button; - color: $insensitive_fg_color; - - &:hover { color: mix($fg_color, $insensitive_fg_color, 0.5); } - &:active { color: $fg_color; } - &:disabled { color: alpha($insensitive_fg_color,0.3); } - } - - // tab colors - - &.top > tabs > tab:hover:not(:checked) { box-shadow: inset 0 -1px $borders_color; } - &.bottom > tabs > tab:hover:not(:checked) { box-shadow: inset 0 1px $borders_color; } - &.left > tabs > tab:hover:not(:checked) { box-shadow: inset -1px 0 $borders_color; } - &.right > tabs > tab:hover:not(:checked) { box-shadow: inset 1px 0 $borders_color; } - - > tabs > tab { - color: alpha($fg_color, 0.8); - background-color: alpha(mix($bg_color, $fg_color, .1), 0.7); - - &:hover:not(:checked) { - color: mix($fg_color, $insensitive_fg_color, 0.5); - background-color: transparentize($base_color, 0.5); - border-color: $borders_color; - } - &:checked { - border-color: $borders_color; - color: $fg_color; - background-color: $bg_color; - } - // close button - button.flat { - min-height: 22px; - min-width: 16px; - padding: 0; - color: mix($bg_color, $fg_color, 0.35); - - &:hover { - @extend %undecorated_button; - color: lighten(red, 15%); - } - &:active, &:active:hover { - @extend %undecorated_button; - color: $selected_bg_color; - } - } - } - - } -} - -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_osd.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_osd.scss deleted file mode 100644 index 8a4d8d23..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_osd.scss +++ /dev/null @@ -1,268 +0,0 @@ -@import "button"; - - -/******* - ! OSD * -********/ - -@include exports("osd") { - overlay.osd { background-color: transparent; } - - colorchooser .popover.osd { border-radius: $roundness; } - - button.color { - .osd colorswatch:only-child { box-shadow: none; } - - @if $variant == 'light' { - .osd & { - &:disabled, - &:backdrop, - &:active, - &:checked { colorswatch:only-child { box-shadow: none; } } - } - } - } - - button.osd, - #XfceNotifyWindow button { - @include button($osd_bg, $osd_fg); - - &.image-button { - padding: 0; - min-height: 36px; - min-width: 36px; - } - } - - // stand-alone OSD toolbars - toolbar.osd { - -GtkToolbar-button-relief: normal; - - padding: $spacing; - border: 1px solid border_normal($osd_bg); - border-radius: $roundness; - background-color: $osd_bg; - background-image: none; - color: $osd_fg; - - separator { color: shade($osd_bg, ($contrast + .1)); } - - &.left, - &.right, - &.top, - &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars - } - - progressbar.osd { // progressbar.osd used for epiphany page loading progress - margin: 2px; - min-height: 2px; - min-width: 2px; - - trough { - border-style: none; - border-radius: 0; - background-image: none; - background-color: transparent; - } - - progress { - border-style: none; - border-radius: 0; - background-color: $selected_bg_color; - background-image: none; - } - } - - .osd, - #XfceNotifyWindow { - background-color: $osd_bg; - color: $osd_fg; - - &.background { - background-color: alpha($osd_bg, .8); - color: $osd_fg; - } - - .frame { - background-clip: border-box; - background-origin: border-box; - } - - button { @include button($osd_bg, $osd_fg); } - - entry { @include entry($osd_base, $osd_text_color, $osd_borders_color); } - - /* used by gnome-settings-daemon's media-keys OSD */ - trough, - &.trough { - background-color: alpha($osd_fg, .3); - } - - progressbar, - &.progressbar { - background-color: $osd_fg; - } - - // Old GTK 3.0 code - scale { - slider { - @include linear-gradient(shade($osd_bg, 1.08)); - @include border($osd_bg); - - &:disabled { @include linear-gradient(shade($osd_bg, .9)); } - } - - trough { - border-color: shade($osd_bg, .8); - background-color: shade($osd_bg, 1.08); - background-image: none; - - &.highlight { - border-color: $selected_bg_color; - background-color: $selected_bg_color; - background-image: none; - } - - &:disabled, &.highlight:disabled { - border-color: shade($osd_bg, .85); - background-color: shade($osd_bg, .9); - background-image: none; - } - } - } - - // New GTK 3.20 code - scale { - //OSD troughs - trough { - background-color: lighten($osd_bg, 7%); - - highlight { background-color: $selected_bg_color; } - } - - // OSD sliders - slider { - background-clip: border-box; - background-color: $selected_bg_color; - border-color: $selected_bg_color; - - &:hover { - background-color: lighten($selected_bg_color, 10%); - border-color: lighten($selected_bg_color, 10%); - } - - &:active { - background-color: darken($selected_bg_color, 10%); - border-color: darken($selected_bg_color, 10%); - } - } - } - - &.view, .view, view { background-color: $osd_bg; } - - scrollbar { - trough { background-color: $osd_bg; } - - slider { - border: 1px solid mix(shade($osd_bg, .87), $osd_fg, .21); - border-radius: 0; - background-color: mix($osd_bg, $osd_fg, .21); - - &:hover { - border-color: mix(shade($osd_bg, .87), $osd_fg, .31); - background-color: mix($osd_bg, $osd_fg, .31); - } - - &:active { - border-color: shade($selected_bg_color, .9); - background-color: $selected_bg_color; - } - } - } - - iconview.cell { - &:selected, &:selected:focus { - background-color: transparent; - border: 3px solid mix(shade($osd_bg, .87), $osd_fg, .21); - border-radius: $roundness; - outline-color: transparent; - } - } - - /* used by Documents */ - .page-thumbnail { - border: 1px solid shade($osd_bg, .9); - /* when there's no pixbuf yet */ - background-color: $osd_bg; - } - - popover.background { - box-shadow: 0 2px 7px 3px alpha($black, .5); - - > toolbar button { - border-radius: 0; - border-width: 0; - background-color: transparent; - background-image: none; - } - } - - spinbutton { - // OSD horizontal - &:not(.vertical) { - @include linear-gradient($osd_base, to top); - @include border($osd_base); - - padding: 0; - - color: $osd_text_color; - caret-color: $osd_text_color; - - &:focus, &:active { border-color: border_focus($osd_borders_color); } - - &:disabled { - @include linear-gradient(shade($osd_base, .9), to top); - - color: mix($osd_base, $osd_text_color, .5); - } - - button { - @include button($osd_bg, $osd_fg); - - border-radius: 0; - border-color: transparentize($osd_borders_color, .3); - border-style: none none none solid; - background-image: none; - box-shadow: none; - - &:dir(rtl) { border-style: none solid none none; } - - &:active, &:checked, &:hover { color: $osd_text_color; } - - &:disabled { color: alpha($osd_insensitive_fg_color, .8); } - - &:backdrop { color: mix($backdrop_base_color, $backdrop_fg_color, .9); } - - &:active { box-shadow: inset 0 2px 3px -1px transparentize($black, .8); } - - &:backdrop:disabled { - color: alpha($backdrop_insensitive_color, .8); - - border-style: none none none solid; // It is needed or it gets overridden - - &:dir(rtl) { border-style: none solid none none; } - } - - &:dir(rtl):first-child { border-radius: $roundness 0 0 $roundness; } - - &:dir(ltr):last-child { border-radius: 0 $roundness $roundness 0; } - } - } - - // OSD vertical - &.vertical button:first-child { - @include button($osd_bg, $osd_fg); - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_overshoot.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_overshoot.scss deleted file mode 100644 index a46fc074..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_overshoot.scss +++ /dev/null @@ -1,150 +0,0 @@ -@mixin overshoot($position, $type: normal, $color: $selected_bg_color) { - $_small_gradient_length: 5%; - $_big_gradient_length: 100%; - - $_position: center top; - $_small_gradient_size: 100% $_small_gradient_length; - $_big_gradient_size: 100% $_big_gradient_length; - - @if $position == bottom { - $_position: center bottom; - $_linear_gradient_direction: to top; - } @else if $position == right { - $_position: right center; - $_small_gradient_size: $_small_gradient_length 100%; - $_big_gradient_size: $_big_gradient_length 100%; - } @else if $position == left { - $_position: left center; - $_small_gradient_size: $_small_gradient_length 100%; - $_big_gradient_size: $_big_gradient_length 100%; - } - - $_small_gradient_color: $color; - $_big_gradient_color: $color; - - @if $color == $fg_color { - $_small_gradient_color: shade($borders_color, .9); - $_big_gradient_color: $fg_color; - - @if $type == backdrop { $_small_gradient_color: $backdrop_borders_color; } - } - - $_small_gradient: -gtk-gradient(radial, - $_position, 0, - $_position, .5, - to(alpha($_small_gradient_color, .35)), - to(alpha($_small_gradient_color, .25))); - - $_big_gradient: -gtk-gradient(radial, - $_position, 0, - $_position, .6, - from(alpha($_big_gradient_color, .2)), - to(alpha($_big_gradient_color, 0))); - - @if $type == normal { - background-image: $_small_gradient, $_big_gradient; - background-size: $_small_gradient_size, $_big_gradient_size; - } @else if $type == backdrop { - background-image: $_small_gradient; - background-size: $_small_gradient_size; - } - - background-repeat: no-repeat; - background-position: $_position; - - background-color: transparent; // reset some properties to be sure to not inherit them somehow - border: 0; - box-shadow: none; -} - -@mixin undershoot($position) { - $_undershoot_color_dark: alpha($black, .2); - $_undershoot_color_light: alpha($white, .2); - - $_gradient_dir: left; - $_dash_bg_size: 10px 1px; - $_gradient_repeat: repeat-x; - $_bg_pos: center $position; - - background-color: transparent; // shouldn't be needed, but better to be sure; - - @if ($position == left) or ($position == right) { - $_gradient_dir: top; - $_dash_bg_size: 1px 10px; - $_gradient_repeat: repeat-y; - $_bg_pos: $position center; - } - - // Disable - /*background-image: linear-gradient(to $_gradient_dir, // this is the dashed line - $_undershoot_color_light 50%, - $_undershoot_color_dark 50%);*/ - - padding-#{$position}: 1px; - background-size: $_dash_bg_size; - background-repeat: $_gradient_repeat; - background-origin: content-box; - background-position: $_bg_pos; - border: 0; - box-shadow: none; -} - -scrolledwindow { - viewport.frame { // avoid double borders when viewport inside scrolled window - border-style: none; - } - - // This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. - // This draws a box on top of the content, the size changes programmatically. - overshoot { - &.top { - @include overshoot(top); - - &:backdrop { @include overshoot(top, backdrop); } - } - - &.bottom { - @include overshoot(bottom); - - &:backdrop { @include overshoot(bottom, backdrop); } - } - - &.left { - @include overshoot(left); - - &:backdrop { @include overshoot(left, backdrop); } - } - - &.right { - @include overshoot(right); - - &:backdrop { @include overshoot(right, backdrop); } - } - } - - // Overflow indication, works similarly to the overshoot, the size if fixed tho. - undershoot { - &.top { @include undershoot(top); } - - &.bottom { @include undershoot(bottom); } - - &.left { @include undershoot(left); } - - &.right { @include undershoot(right); } - } - - junction { // the small square between two scrollbars - border-color: transparent; - // the border image is used to add the missing dot between the borders, details, details, details... - border-image: linear-gradient(to bottom, $borders_color 1px, transparent 1px) 0 0 0 1 / 0 1px stretch; - background-color: $scrollbar_bg_color; - - &:dir(rtl) { border-image-slice: 0 1 0 0; } - - &:backdrop { - border-image-source: linear-gradient(to bottom, $backdrop_borders_color 1px, transparent 1px); - background-color: $backdrop_scrollbar_bg_color; - transition: 200ms ease-out; - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_progress.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_progress.scss deleted file mode 100644 index de095ef2..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_progress.scss +++ /dev/null @@ -1,364 +0,0 @@ -/***************** - ! Progress bars * -******************/ - -@include exports("progressbar") { - progressbar { - padding: 0; - border-radius: $roundness; - font-size: smaller; - color: alpha($fg_color, .6); - - // sizing - &.horizontal { - trough, - progress { min-height: 6px; } - } - - &.vertical { - trough, - progress { min-width: 6px; } - } - - trough { - border: 1px solid mix($bg_color, $fg_color, .17); - background-color: shade($bg_color, 1.08); - background-image: none; - border-radius: $roundness; - } - - progress { - @include linear-gradient($selected_bg_color); - - border-radius: 0; - - &.left { - border-top-left-radius: $roundness; - border-bottom-left-radius: $roundness; - } - - &.right { - border-top-right-radius: $roundness; - border-bottom-right-radius: $roundness; - } - - &.bottom { - border-bottom-left-radius: $roundness; - border-bottom-right-radius: $roundness; - } - - &.top { - border-top-left-radius: $roundness; - border-top-right-radius: $roundness; - } - } - } - - levelbar { - &.horizontal block { - min-width: 34px; - min-height: 4px; - } - - &.vertical block { - min-width: 4px; - min-height: 34px; - } - - &:backdrop { transition: 200ms ease-out; } - - trough { - @include linear-gradient(shade($bg_color, 1.08), to top); - - border: 1px solid mix($bg_color, $fg_color, .17); - border-radius: $roundness; - padding: 2px; // make discrete block appear inside levelbar - } - - &.horizontal.discrete block { - margin: 0 1px; - - &:first-child { margin: 0; } - } - - &.vertical.discrete block { - margin: 1px 0; - - &:first-child { margin: 0; } - } - - block { - @include linear-gradient($selected_bg_color); - - border-color: transparent; - border-radius: $roundness; - - &.low { - background-color: $warning_color; - border-color: transparent; - } - - &.high, - &:not(.empty) { - background-color: $success_color; - border-color: transparent; - } - - &.full { - background-color: shade($selected_bg_color, .8); - border-color: transparent; - } - - &.empty { - background-color: transparent; - border-color: transparent; - box-shadow: none; - } - } - } - - scale { - $_marks_length: 3px; - $_marks_distance: 1px; - $button_bg: $button_bg_color; - $ease-out-quad: cubic-bezier(.25, .46, .45, .94); - $button_transition: all 200ms $ease-out-quad; - - min-height: 10px; - min-width: 10px; - padding: $spacing; - - &.horizontal { - trough { padding: 0 3px; } - - highlight, fill { margin: 0 -4px; } - } - - &.vertical { - trough { padding: 3px 0; } - - highlight, fill { margin: -4px 0; } - } - - // The slider is inside the trough, negative margin to make it bigger - slider { - min-height: 15px; - min-width: 15px; - margin: -7px; - } - - // Click-and-hold the slider to activate - &.fine-tune { - // Make the trough grow in fine-tune mode - slider { margin: -7px; } - - highlight { background-color: shade($selected_bg_color, 1.1); } - - fill, - highlight, - trough { - border-radius: 5px; - -gtk-outline-radius: 7px; - } - } - - // Trough - trough { - $_scale_trough_bg: mix($bg_color, $fg_color, .2); - - outline-offset: 2px; - -gtk-outline-radius: 4.5px; - - border-radius: 2.5px; - background-color: $_scale_trough_bg; - - &:disabled { background-color: mix($bg_color, $fg_color, .1); } - - // Troughs in selected list-rows and infobars - menuitem:hover &, - row:selected &, - infobar & { - background-color: transparentize($black, .8); - - highlight { - background-color: $selected_fg_color; - - &:disabled { background-color: mix($selected_fg_color, $selected_bg_color, .55); } - } - - &:disabled { background-color: transparentize($black, .9); } - } - } - - // The colored part of trough - highlight { - border-radius: 2.5px; - background-color: $selected_bg_color; - - &:disabled { background-color: transparentize($selected_bg_color, .45); } - } - - // this is another differently styled part of the trough, the most relevant use case is for example - // in media player to indicate how much video stream as been cached - fill { - border-radius: 2.5px; - background-color: transparentize($selected_bg_color, .5); - - &:disabled { background-color: transparent; } - } - - slider { - $_slider_border: $button_border; - - background-color: $button_bg; - border: 1px solid $_slider_border; - border-radius: 100%; - - transition: $button_transition; - transition-property: background, border; - - &:hover { background-color: lighten($button_bg, 5%); } - - &:active { - background-clip: border-box; - background-color: $selected_bg_color; - border-color: $selected_bg_color; - } - - &:disabled { - background-color: mix($button_bg, $bg_color, .55); - border-color: transparentize($_slider_border, .2); - } - - // Selected list-row and infobar sliders - menuitem:hover &, - row:selected &, - infobar & { - background-clip: border-box; - background-color: $selected_fg_color; - border-color: $selected_fg_color; - - &:hover { - background-color: mix($selected_fg_color, $selected_bg_color, .85); - border-color: mix($selected_fg_color, $selected_bg_color, .85); - } - - &:active { - background-color: mix($selected_fg_color, $selected_bg_color, .5); - border-color: mix($selected_fg_color, $selected_bg_color, .5); - } - - &:disabled { - background-color: mix($selected_fg_color, $selected_bg_color, .55); - border-color: mix($selected_fg_color, $selected_bg_color, .55); - } - } - } - - value { color: alpha(currentColor, .4); } - - marks { - color: alpha(currentColor, .4); - - @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), - (bottom, bottom, top), - (top, left, right), - (bottom, right, left) { - &.#{$marks_class} { - margin-#{$marks_margin}: $_marks_distance; - margin-#{$marks_pos}: -($_marks_distance + $_marks_length); - } - } - } - - &.fine-tune marks { - @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), - (bottom, bottom, top), - (top, left, right), - (bottom, right, left) { - &.#{$marks_class} { - margin-#{$marks_margin}: ($_marks_distance - 1px); - margin-#{$marks_pos}: -($_marks_distance + $_marks_length - 2px); - } - } - } - - &.horizontal { - indicator { - min-height: $_marks_length; - min-width: 1px; - } - - &.fine-tune indicator { min-height: ($_marks_length - 1px); } - } - - &.vertical { - indicator { - min-height: 1px; - min-width: $_marks_length; - } - - &.fine-tune indicator { min-width: ($_marks_length - 1px); } - } - - &.color { - trough { - padding: 0; - border: 0; - background-image: none; - } - - highlight, fill { margin: 0; } - - &.horizontal { - padding: 0 0 6px 0; - - trough { - border-top-left-radius: 0; - border-top-right-radius: 0; - } - - slider { - &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & { - margin-bottom: 0; - margin-top: 0; - } - } - } - - &.vertical { - &:dir(ltr) { - padding: 0 0 0 6px; - - trough { - border-bottom-right-radius: 0; - border-top-right-radius: 0; - } - - slider { - &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & { - margin-left: 0; - margin-right: 0; - } - } - } - - &:dir(rtl) { - padding: 0 6px 0 0; - - trough { - border-bottom-left-radius: 0; - border-top-left-radius: 0; - } - - slider { - &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & { - margin-right: 0; - margin-left: 0; - } - } - } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_scrollbar.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_scrollbar.scss deleted file mode 100644 index beff309a..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_scrollbar.scss +++ /dev/null @@ -1,134 +0,0 @@ -/*********** - ! Scrollbar -************/ - -@include exports("scrollbar") { - scrollbar { - $_slider_min_length: 40px; - $_slider_normal_width: 7px; - $_slider_small_width: 4px; - - // disable steppers - @at-root * { - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; - } - - background-color: $scrollbar_bg_color; - transition: 300ms ease-out; - - // scrollbar border on the content side - &.top { border-bottom: 1px solid $borders_color; } - &.bottom { border-top: 1px solid $borders_color; } - &.left { border-right: 1px solid $borders_color; } - &.right { border-left: 1px solid $borders_color; } - - &:backdrop { - background-color: $backdrop_scrollbar_bg_color; - border-color: $backdrop_borders_color; - transition: 400ms ease-in; - } - - slider { - min-width: $_slider_normal_width; - min-height: $_slider_normal_width; - border: 1px solid transparent; - border-radius: $roundness; - background-clip: padding-box; - background-color: $scrollbar_slider_color; - - &:hover { background-color: $scrollbar_slider_hover_color; } - &:hover:active { background-color: $scrollbar_slider_active_color; } - &:backdrop { background-color: $backdrop_scrollbar_slider_color; } - &:disabled { background-color: transparent; } - } - - &.horizontal slider { min-width: $_slider_min_length; } - &.vertical slider { min-height: $_slider_min_length; } - - &.fine-tune slider:active { - background-color: lighten($scrollbar_slider_active_color, 10%); - } - - &.overlay-indicator { - opacity: .8; - - &:not(.dragging):not(.hovering) { - border-color: transparent; - opacity: .4; - background-color: transparent; - - slider { - min-width: $_slider_small_width; - min-height: $_slider_small_width; - background-color: $fg_color; - border: 1px solid if($variant == 'light', $white, $black); - } - - // hide steppers - button { - min-width: $_slider_small_width; - min-height: $_slider_small_width; - border-color: transparent; - -gtk-icon-source: none; - } - - &.horizontal { - slider { min-width: $_slider_min_length; } - button { min-width: $_slider_normal_width; } - } - - &.vertical { - slider { min-height: $_slider_min_length; } - button { min-height: $_slider_normal_width; } - } - } - } - - // stepper styling - button { - min-width: $_slider_normal_width; - min-height: $_slider_normal_width; - padding: 0; - border: 0; - border-radius: 0; - border-color: $borders_color; // FIXME overwritten by global button definition - background-color: transparent; - box-shadow: none; - color: $scrollbar_slider_color; - - &:hover { color: $scrollbar_slider_hover_color; } - &:active, &:checked { color: $scrollbar_slider_active_color; } - &:backdrop { color: $backdrop_scrollbar_slider_color; } - } - - // button icons - &.vertical { - button { - &.down { - -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); - border-top: 1px solid $borders_color; - } - - &.up { - -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); - border-bottom: 1px solid $borders_color; - } - } - } - - &.horizontal { - button { - &.down { - -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - border-left: 1px solid $borders_color; - } - - &.up { - -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); - border-right: 1px solid $borders_color; - } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_sidebar.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_sidebar.scss deleted file mode 100644 index ab068f64..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_sidebar.scss +++ /dev/null @@ -1,226 +0,0 @@ -/********* - ! Sidebar -**********/ - -@include exports("sidebar") { - .sidebar { - border-style: none; - background-color: mix($bg_color, $base_color, .5); - - @at-root %sidebar_left, - &:dir(ltr), - &.left, - &.left:dir(rtl) { - border-right: 1px solid $borders_color; - border-left-style: none; - } - - @at-root %sidebar_right - &:dir(rtl), - &.right { - border-left: 1px solid $borders_color; - border-right-style: none; - } - - &:backdrop { - background-color: $backdrop_sidebar_bg_color; - border-color: $backdrop_borders_color; - transition: 200ms ease-out; - } - - .frame, frame { border-width: 0; } - - list { background-color: transparent; } - - paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border-style: none; } } - } - - stacksidebar { - &.sidebar { - &:dir(ltr), - &.left, - &.left:dir(rtl) { - list { @extend %sidebar_left; } - } - - &:dir(rtl), - &.right { - list { @extend %sidebar_right; } - } - } - - row { - padding: $spacing * 2 $spacing; - - > label { - padding-left: $spacing; - padding-right: $spacing; - } - - &.needs-attention > label { - @extend %needs_attention; - - background-size: 6px 6px, 0 0; - } - } - } - - $_placesidebar_icons_opacity: .7; - - placessidebar { - > viewport.frame { border-style: none; } - - row { - // Needs overriding of the GtkListBoxRow padding - min-height: 32px; - padding: 0; - - // Using margins/padding directly in the SidebarRow - // will make the animation of the new bookmark row jump - > revealer { padding: 0 $spacing * 2; } - - &:selected { color: $selected_fg_color; } - - &:disabled { color: $insensitive_fg_color; } - - &:backdrop { - color: $backdrop_fg_color; - - &:selected { color: $backdrop_selected_fg_color; } - - &:disabled { color: $backdrop_insensitive_color; } - } - - image.sidebar-icon { - opacity: $_placesidebar_icons_opacity; // dim the device icons - - &:dir(ltr) { - padding-right: $spacing*2 + 2; - padding-left: $spacing; - } - - &:dir(rtl) { - padding-left: $spacing*2 + 2; - padding-right: $spacing; - } - } - - label.sidebar-label { - &:dir(ltr) { padding-right: 2px; } - - &:dir(rtl) { padding-left: 2px; } - } - - @at-root button.sidebar-button { - //@extend %button_basic.flat; - - //@extend %button_selected.flat; - - min-height: 20px; - min-width: 20px; - margin-top: 2px; - margin-bottom: 2px; - padding: 0; - border-radius: 100%; - -gtk-outline-radius: 100%; - - &:not(:hover):not(:active), - &:backdrop { - > image { opacity: $_placesidebar_icons_opacity; } - } - } - - // in the sidebar case it makes no sense to click the selected row - &:selected:active { box-shadow: none; } - - &.sidebar-placeholder-row { - padding: 0 8px; - min-height: 2px; - background-image: image($drop_target_color); - background-clip: content-box; - } - - &.sidebar-new-bookmark-row { color: $selected_bg_color; } - - &:drop(active):not(:disabled) { - color: $drop_target_color; - box-shadow: inset 0 1px $drop_target_color, - inset 0 -1px $drop_target_color; - - &:selected { - color: $selected_fg_color; - background-color: $drop_target_color; - } - } - } - } -} - - -/****** -! Paned -*******/ - -@include exports("paned") { - paned { - > separator { - min-width: 1px; - min-height: 1px; - -gtk-icon-source: none; // defeats the ugly default handle decoration - border-style: none; // just to be sure - background-color: transparent; - // workaround, using background istead of a border since the border will get rendered twice (?) - background-image: image(shade($bg_color, .9)); - background-size: 1px 1px; - background-position: center center; - - &:selected { background-image: image($selected_bg_color); } // FIXME is this needed? - - &:backdrop { background-image: image($backdrop_borders_color); } - - &.wide { - min-width: 5px; - min-height: 5px; - background-color: $bg_color; - background-image: image(border_normal($bg_color)), image(border_normal($bg_color)); - background-size: 1px 1px, 1px 1px; - - &:backdrop { - background-color: $backdrop_bg_color; - background-image: image($backdrop_borders_color), - image($backdrop_borders_color); - } - } - } - - &.horizontal > separator { - background-repeat: repeat-y; - padding: 0 2px; - margin: 0 -2px; - - &.wide { - margin: 0; - padding: 0; - background-repeat: repeat-y, repeat-y; - background-position: left, right; - } - } - - &.vertical > separator { - background-repeat: repeat-x; - padding: 2px 0; - margin: -2px 0; - - &.wide { - margin: 0; - padding: 0; - background-repeat: repeat-x, repeat-x; - background-position: bottom, top; - } - } - - &.titlebar > separator { - background-image: image(shade($titlebar_bg_color, ($contrast + .1))); - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_spinner.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_spinner.scss deleted file mode 100644 index 9184446d..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_spinner.scss +++ /dev/null @@ -1,24 +0,0 @@ -/******************* - ! Spinner animation -********************/ - -@include exports("spinner") { - @keyframes spin { - to { -gtk-icon-transform: rotate(1turn); } - } - - spinner { - background-image: none; - color: $selected_bg_color; - opacity: 0; // non spinning spinner makes no sense - - -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); - - &:checked { - opacity: 1; - animation: spin 1s linear infinite; - - &:disabled { opacity: .5; } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_toggle.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_toggle.scss deleted file mode 100644 index 2cdf1219..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_toggle.scss +++ /dev/null @@ -1,155 +0,0 @@ -/*********************** - ! Check and Radio items -************************/ - -$suffix: if($variant == "dark", "-dark", ""); - -@mixin toggle($type) { - background-image: none; - - -gtk-icon-source: url("../assets/#{$type}-unchecked#{$suffix}.svg"); - - &:disabled { -gtk-icon-source: url("../assets/#{$type}-unchecked-disabled#{$suffix}.svg"); } - - &:checked, &:active { - -gtk-icon-source: url("../assets/#{$type}-checked#{$suffix}.svg"); - - &:disabled { -gtk-icon-source: url("../assets/#{$type}-checked-disabled#{$suffix}.svg"); } - } - - &:indeterminate { - -gtk-icon-source: url("../assets/#{$type}-mixed#{$suffix}.svg"); - - &:disabled { -gtk-icon-source: url("../assets/#{$type}-mixed-disabled#{$suffix}.svg"); } - } - - menuitem &, modelbutton & { - -gtk-icon-source: url("../assets/menuitem-#{$type}-unchecked.svg"); - - &:disabled { - -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-disabled.svg"); - } - - &:checked, &:active { - -gtk-icon-source: url("../assets/menuitem-#{$type}-checked.svg"); - - &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-hover.svg"); } - - &:disabled { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-disabled.svg"); } - } - - &:indeterminate { - -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed.svg"); - - &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-hover.svg"); } - - &:disabled { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-disabled.svg"); } - } - } -} - -@include exports("checkradio") { - radio { - @include toggle("radio"); - min-width: 16px; - min-height: 16px; - margin-right: $spacing; - } - - check { - @include toggle("checkbox"); - min-width: 16px; - min-height: 16px; - margin-right: $spacing; - } - - radio:dir(rtl), check:dir(rtl) { - margin-right: 0; - margin-left: $spacing; - } - - //selection-mode - @each $s,$as in ('', '-unchecked'), - (':hover', '-unchecked'), - (':active', '-checked'), - (':backdrop', '-unchecked'), - (':checked', '-checked'), - (':checked:hover', '-checked'), - (':checked:active', '-checked'), - (':backdrop:checked', '-checked') { - .view.content-view.check#{$s}:not(list) { - -gtk-icon-shadow: none; - -gtk-icon-source: url("../assets/grid-selection#{$as}#{$suffix}.svg"); - background-color: transparent; - } - } -} - - -/******** - ! Switch -*********/ - -@include exports("switch") { - switch { - border-radius: $roundness; - padding: $spacing - 1px; - border: none; - outline: none; - transition: background-color .3s linear; - min-width: 88px; - min-height: 24px; - background-color: $switch_bg_color; - color: $switch_fg_color; - box-shadow: inset 1px -1px 0 alpha($dark_shadow, .06), inset -1px 1px 0 alpha($dark_shadow, .06); - - slider { - background-color: $switch_slider_bg_color; - transition: all 0.3s ease-in; - box-shadow: 0 1px 2px 0 alpha($dark_shadow, .07), 1px 0 2px 0 alpha($dark_shadow, .07); - border-radius: $roundness; - } - - &:checked { - background-color: $selected_bg_color; - background-image: none; - border-color: $selected_bg_color; - color: $base_color; - - slider { - background-color: $white; - box-shadow: 0 1px 3px 0 alpha($dark_shadow, .1); - } - } - - &:disabled { - background-color: $switch_disabled_bg_color; - background-image: none; - border-color: $switch_disabled_border_color; - color: $switch_disabled_fg_color; - box-shadow: none; - - slider { - background-color: $switch_disabled_slider_bg_color; - } - } - - list row:selected & { - background-color: $switch_disabled_slider_bg_color; - color: $switch_disabled_bg_color; - - slider { - background-color: mix($switch_disabled_bg_color, $base_color, .4); - } - - &:checked { - color: $selected_bg_color; - background-color: $switch_slider_bg_color; - - slider { - background-color: $selected_bg_color; - } - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_toolbar.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_toolbar.scss deleted file mode 100644 index 0b6f30e0..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_toolbar.scss +++ /dev/null @@ -1,237 +0,0 @@ -@import "button"; - - -/********* - ! Toolbar -**********/ - -@mixin toolbar($bg, $fg) { - @include linear-gradient($bg); - @include border($bg); - - color: $fg; - - &:disabled { - @include linear-gradient(shade($bg, .9)); - - color: mix($fg, $bg, .5); - } - - .title { - font-weight: bold; - padding: 0 ($spacing * 2); - } - - .subtitle { - font-size: smaller; - padding: 0 ($spacing * 2); - } - - button { @include button($bg, $fg); } - - .linked > button { @include linked_button($bg); } - - combobox, button { - padding: $spacing; - - &.text-button { padding: $spacing; } - - &.image-button { padding: $spacing; } - } - - separator { - &, &:disabled { - color: shade($bg, ($contrast - .2)); - border-color: currentColor; - - -GtkWidget-window-dragging: true; - } - } -} - -@mixin inline-toolbar($bg, $fg) { - padding: 1px; - border-width: 0 1px 1px; - border-style: solid; - border-color: $borders_color; - background-color: mix($borders_color, $bg_color, .7);; - background-image: none; - - &:backdrop { - border-color: $backdrop_borders_color; - background-color: $backdrop_dark_fill; - transition: 200ms ease-out; - } - - button { @include button($toolbar_bg_color, $toolbar_fg_color); } - - toolbutton, - toolbutton:backdrop { - > button.flat { @extend %linked_middle; } - - &:first-child > button.flat { @extend %linked_button:first-child; } - - &:last-child > button.flat { @extend %linked_button:last-child; } - - &:only-child > button.flat { @extend %linked_button:only-child; } - } -} - -@include exports("toolbar_extends") { - %toolbar { - padding: $spacing - 1px; - border-style: none; - - // toolbar separators - &.horizontal separator { margin: 0 ($spacing + 2px) 1px; } - - &.vertical separator { margin: ($spacing + 2px) 1px ($spacing + 2px) 0; } - } - - %headerbar { - border-width: 0 0 1px; - border-style: solid; - - // add vertical margins to common widget on the headerbar to avoid them spanning the whole height - entry, - spinbutton, - separator, - button { // Size height - margin-top: $spacing + 3px; - margin-bottom: $spacing + 3px; - } - - switch { // Size height - margin-top: $spacing + 1px; - margin-bottom: $spacing + 1px; - } - - window:not(.tiled):not(.maximized) separator:first-child + &, // tackles the paned container case - window:not(.tiled):not(.maximized) &:first-child { &:backdrop, & { border-top-left-radius: $roundness; } } - - window:not(.tiled):not(.maximized) &:last-child { &:backdrop, & { border-top-right-radius: $roundness; } } - } - - %titlebar { // Default headerbar and titlebar code. - @include toolbar($titlebar_bg_color, $titlebar_fg_color); - @include linear-gradient($titlebar_bg_color); - - border-radius: $roundness $roundness 0 0; - color: mix($titlebar_fg_color, $titlebar_bg_color, .1); - padding: 0 $spacing * 2; - min-height: 42px; - - &:backdrop { - @include linear-gradient($titlebar_bg_color); - - color: mix($titlebar_fg_color, $titlebar_bg_color, .6); - text-shadow: none; - } - - &.default-decoration { // Default titlebar (old metacity) - min-height: 24px; - box-shadow: none; - border: 0; - - button.titlebutton { - min-height: 16px; - min-width: 16px; - margin: 0; - padding: 0; - } - } - - .tiled &, - .maximized & { &:backdrop, & { border-radius: 0; } } // squared corners when the window is maximized or tiled - - .title { font-weight: bold; } - - separator.titlebutton { margin-left: $spacing; } - - button { - @include button($header_button_bg_color, $header_button_fg_color); - } - - button.titlebutton + separator.titlebutton { - margin-left: 0; - margin-right: $spacing; - } - - button.titlebutton { - border: 0; - background-image: none; - background-color: transparent; - color: mix($titlebar_fg_color, $titlebar_bg_color, .1); - box-shadow: none; - - &:hover, &:hover:focus { - background-image: none; - background-color: transparent; - color: $selected_bg_color; - box-shadow: none; - } - - &:active, &:active:hover { - background-image: none; - background-color: transparent; - color: shade($selected_bg_color, .9); - box-shadow: none; - } - - &:backdrop { - background: none; - color: mix($titlebar_fg_color, $titlebar_bg_color, .6); - -gtk-icon-shadow: none; - } - } - } -} - -@include exports("toolbar") { - toolbar { - @include toolbar($toolbar_bg_color, $toolbar_fg_color); - - @extend %toolbar; - - &.inline-toolbar { @include inline-toolbar($toolbar_bg_color, $toolbar_fg_color); } - } - - headerbar { - @extend %titlebar; - @extend %headerbar; - } - - .titlebar:not(headerbar) { - window.csd > & { - // in csd we assume every titlebar is a headerbar so reset anything, this is needed for split toolbars cases - padding: 0; - background-color: transparent; - background-image: none; - border-style: none; - border-color: transparent; - box-shadow: none; - } - - > separator { background-color: shade($titlebar_bg_color, .88); } // $borders_color - - @extend %titlebar; - } - - .background:not(.tiled):not(.maximized) .titlebar { - &:backdrop, & { - border-top-left-radius: $roundness; - border-top-right-radius: $roundness; - } - } - - // Fixed: https://github.com/numixproject/numix-gtk-theme/issues/585 - // workaround for ugly Ubuntu-related CSD patches - .background:not(.csd):not(.ssd):not(.solid-csd) headerbar { - &, &:backdrop { - &, &:not(:last-child) { - border-radius: 0; - border-top-color: transparent; - } - } - } -} diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_view.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_view.scss deleted file mode 100644 index ece8b414..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_view.scss +++ /dev/null @@ -1,354 +0,0 @@ -/*************** - ! Generic views -****************/ - -@include exports("view") { - .view, - %view { - color: $text_color; - background-color: $base_color; - caret-color: $primary_caret_color; - -gtk-secondary-caret-color: $secondary_caret_color; - - &:backdrop { - color: $backdrop_text_color; - background-color: $backdrop_base_color; - } - - &:selected { - &:focus, & { - @extend %selected_items; - - border-radius: $roundness; - } - } - } - - .view, - textview { - text { - @extend %view; - - selection { &:focus, & { @extend %selected_items; } } - } - } - - textview border { background-color: mix($bg_color, $base_color, .5); } - - iconview { @extend .view; } -} - - -/************ -! Treeview -*************/ - -@include exports("treeview") { - .rubberband, - rubberband { - border: 1px solid darken($selected_bg_color, .1); - background-color: transparentize(darken($selected_bg_color, .1), .8); - } - - treeview entry { - &:focus { - &:dir(rtl), &:dir(ltr) { // specificity bump hack - background-color: $base_color; - transition-property: color, background; - } - } - - &.flat, & { - border-radius: 0; - background-image: none; - background-color: $base_color; - - &:focus { border-color: $selected_bg_color; } - } - } - - %column_header_button { - padding: ($spacing - 2px) ($spacing + 1px); - border-radius: 0; - background-image: none; - text-shadow: none; - border-style: none solid solid none; - border-color: $bg_color; - - &:disabled { - border-color: $bg_color; - background-image: none; - } - - &:backdrop { - border-color: $backdrop_bg_color; - border-style: none solid solid none; - color: mix($backdrop_fg_color, $backdrop_bg_color, .5); - background-image: none; - background-color: $backdrop_base_color; - - &:disabled { - border-color: $backdrop_bg_color; - background-image: none; - } - } - } - - treeview.view { - -GtkTreeView-grid-line-width: 1; - -GtkTreeView-grid-line-pattern: ''; - -GtkTreeView-tree-line-width: 1; - -GtkTreeView-tree-line-pattern: ''; - - border-left-color: mix($fg_color, $base_color, .5); // this is actually the tree lines color, - border-top-color: $bg_color; // while this is the grid lines color, better then nothing - - rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props - - &:selected { - &:focus, & { - @extend %selected_items; - - border-radius: 0; - } - - &:backdrop, & { - border-left-color: mix($selected_fg_color, $selected_bg_color, .5); - border-top-color: transparentize($fg_color, .9); // doesn't work unfortunatelly - } - } - - &:disabled { - color: $insensitive_fg_color; - - &:selected { - color: mix($selected_fg_color, $selected_bg_color, .4); - - &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, .3); } - } - - &:backdrop { color: $backdrop_insensitive_color; } - } - - &.separator { - min-height: 2px; - color: $bg_color; - - &:backdrop { color: transparentize($bg_color, .9); } - } - - &:backdrop { - border-left-color: mix($backdrop_fg_color, $backdrop_bg_color, .5); - border-top: $backdrop_bg_color; - } - - &:drop(active) { - border-style: solid none; - border-width: 1px; - border-color: $selected_borders_color; - - &.after { border-top-style: none; } - - &.before { border-bottom-style: none; } - } - - &.expander { - -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - color: mix($base_color, $fg_color, .7); - - &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } - - &:hover { color: $fg_color; } - - &:selected { - color: mix($selected_bg_color, $selected_fg_color, .7); - - &:hover { color: $selected_fg_color; } - - &:backdrop { color: mix($selected_bg_color, $backdrop_selected_fg_color, .7); } - } - - &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } - - &:backdrop { color: mix($backdrop_base_color, $backdrop_fg_color, .7); } - } - - &.progressbar { // progress bar in treeviews - @if $variant == light { color: $base_color; } - - border-radius: $roundness; - border: 1px solid $selected_borders_color; - background-color: $selected_bg_color; - //background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color, .1)); - //box-shadow: inset 0 1px $fg_color, - //0 1px if($variant == 'light', transparentize($black, .8), transparentize($black, .9)); - - &:selected { - &:focus, & { - @if $variant == 'light' { - color: $selected_fg_color; - box-shadow: none; - } @else { - box-shadow: inset 0 1px transparentize($white, .95); - } - - @include linear-gradient($selected_bg_color); - border-radius: $roundness; - - &:backdrop { - @if $variant == 'light' { - color: $backdrop_selected_fg_color; - border-color: $selected_borders_color; // otherwise it gets inherited by .view(?!?) - } @else { - border-color: $backdrop_base_color; - } - - background-color: mix($backdrop_base_color, $selected_bg_color, .9); - } - } - border: 1px solid mix($selected_bg_color, $selected_fg_color, .2); - } - - &:disabled { - @include linear-gradient($bg_color); - border-color: border_insensitive($bg_color); - } - - &:backdrop { - @if $variant == 'light' { - color: $backdrop_base_color; - } @else { - border-color: $backdrop_base_color; - } - - background-image: none; - box-shadow: none; - } - } - - &.trough { // progress bar trough in treeviews - background-color: transparentize($fg_color, .9); - border-radius: $roundness; - - &:selected { - &:focus, & { - background-color: if($variant == 'light', transparentize($selected_fg_color, .7), darken($selected_bg_color, .1)); - - @if $variant == 'light' { - border-width: 1px 0; - border-style: solid; - border-color: $selected_bg_color; - } - border-radius: $roundness; - } - } - } - - header { - button { - $_column_header_color: mix($fg_color, $base_color, .5); - - @extend %column_header_button; - - color: $_column_header_color; - background-color: $base_color; - font-weight: bold; - text-shadow: none; - box-shadow: none; - - &:hover { - @extend %column_header_button; - - color: mix($_column_header_color, $fg_color, .5); - box-shadow: none; - transition: none; //I shouldn't need this - } - - &:active { - @extend %column_header_button; - - color: $fg_color; - transition: none; //I shouldn't need this - } - } - - button:last-child { &:backdrop, & { border-right-style: none; } } - } - - button.dnd, - header.button.dnd { // for treeview-like derive widgets - &:active, &:selected, &:hover, & { - padding: 0 6px; - transition: none; - background-image: none; - background-color: $selected_bg_color; - color: $base_color; - border-radius: 0; - border-style: none; - box-shadow: inset 0 0 0 1px $base_color; - text-shadow: none; - } - } - - acceleditor > label { background-color: $selected_bg_color; } - } -} - - -/*********** - ! Separator -************/ - -@include exports("separator") { - separator { // vbox and hbox separators - background: transparentize($black, .9); - min-width: 1px; - min-height: 1px; - } -} - - -/********** - ! Frames * -***********/ - -@include exports("frame") { - frame > border, .frame { - border: 1px solid $borders_color; - - &.flat { border-style: none; } - - &:backdrop { border-color: $backdrop_borders_color; } - } - - /* avoid double borders when a viewport is packed into a GtkScrolledWindow */ - scrolledwindow viewport.frame { border: 0; } -} - - -/*************** - ! Places view * -****************/ - -@include exports("placesview") { - placesview { - .server-list-button > image { - transition: 200ms cubic-bezier(.25, .46, .45, .94); - -gtk-icon-transform: rotate(0turn); - } - - .server-list-button:checked > image { - transition: 200ms cubic-bezier(.25, .46, .45, .94); - -gtk-icon-transform: rotate(-0.5turn); - } - - row.activatable:hover { background-color: transparent; } - - // this selects the "connect to server" label - > actionbar > revealer > box > label { - padding-left: 8px; - padding-right: 8px; - } - } -} - diff --git a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_window.scss b/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_window.scss deleted file mode 100644 index c58a1b37..00000000 --- a/.themes/oomox-numix-gruvbox/gtk-3.20/scss/widgets/_window.scss +++ /dev/null @@ -1,63 +0,0 @@ -/************** - ! Window frame -***************/ - -@include exports("window") { - decoration { - $_wm_border: if($variant == 'light', transparentize($black, .77), transparentize($borders_color, .1)); - - border-radius: $roundness $roundness 0 0; - // lamefun trick to get rounded borders regardless of CSD use - //border-width: 0; - - //box-shadow: 0 3px 9px 1px transparentize($black, .3), 0 0 0 1px $wm_border_focused; //doing borders with box-shadow - /* this is used for the resize cursor area */ - //margin: $spacing * 3; - - border-width: $spacing % 2; - border-style: solid; - //border-color: $wm_border_focused; - //@TODO: - border-color: $wm_border_unfocused; - - - &:backdrop { - //box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px transparentize($black, .6), 0 0 0 1px $wm_border_unfocused; - border-color: $wm_border_unfocused; - transition: 200ms ease-out; - } - - .maximized &, .fullscreen &, .tiled & { border-radius: 0; } - - .popup & { box-shadow: none; } - - // this needs to be transparent - // see bug #722563 - // server-side decorations as used by mutter - // Fixed gtk-3.18 Unity bug (https://github.com/numixproject/numix-gtk-theme/issues/270) - .ssd & { box-shadow: 0 0 0 1px $wm_border_focused; } //just doing borders, wm draws actual shadows - - .solid-csd & { - border-radius: 0; - //margin: 1px; - //background-color: $bg_color; - // Unity/compiz regression: Issue: https://github.com/numixproject/numix-gtk-theme/issues/206 - box-shadow: none; - } - - .csd.popup & { - border-radius: 0; - box-shadow: 0 1px 2px transparentize($black, .8), 0 0 0 1px transparentize($_wm_border, .1); - } - - tooltip.csd & { - border-radius: $roundness; - box-shadow: none; - } - - messagedialog.csd & { - border-radius: $roundness; - box-shadow: 0 1px 2px transparentize($black, .8), 0 0 0 1px transparentize($_wm_border, .1); - } - } -} diff --git a/.themes/oomox-numix-gruvbox/xfwm4/close-pressed.png b/.themes/oomox-numix-gruvbox/xfwm4/close-pressed.png deleted file mode 100644 index 0c386b92..00000000 Binary files a/.themes/oomox-numix-gruvbox/xfwm4/close-pressed.png and /dev/null differ diff --git a/.themes/oomox-numix-gruvbox/xfwm4/hide-pressed.png b/.themes/oomox-numix-gruvbox/xfwm4/hide-pressed.png deleted file mode 100644 index 3b255f08..00000000 Binary files a/.themes/oomox-numix-gruvbox/xfwm4/hide-pressed.png and /dev/null differ diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-pressed.png b/.themes/oomox-numix-gruvbox/xfwm4/maximize-pressed.png deleted file mode 100644 index 33700a05..00000000 Binary files a/.themes/oomox-numix-gruvbox/xfwm4/maximize-pressed.png and /dev/null differ diff --git a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-pressed.png b/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-pressed.png deleted file mode 100644 index 33700a05..00000000 Binary files a/.themes/oomox-numix-gruvbox/xfwm4/maximize-toggled-pressed.png and /dev/null differ diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-pressed.png b/.themes/oomox-numix-gruvbox/xfwm4/shade-pressed.png deleted file mode 100644 index 58bffbef..00000000 Binary files a/.themes/oomox-numix-gruvbox/xfwm4/shade-pressed.png and /dev/null differ diff --git a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-pressed.png b/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-pressed.png deleted file mode 100644 index 33ea2788..00000000 Binary files a/.themes/oomox-numix-gruvbox/xfwm4/shade-toggled-pressed.png and /dev/null differ diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-pressed.png b/.themes/oomox-numix-gruvbox/xfwm4/stick-pressed.png deleted file mode 100644 index bfcd7667..00000000 Binary files a/.themes/oomox-numix-gruvbox/xfwm4/stick-pressed.png and /dev/null differ diff --git a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-pressed.png b/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-pressed.png deleted file mode 100644 index c98e1550..00000000 Binary files a/.themes/oomox-numix-gruvbox/xfwm4/stick-toggled-pressed.png and /dev/null differ