diff --git a/gtk-3.0/assets/assets.sketch b/gtk-3.0/assets/assets.sketch
new file mode 100644
index 0000000..aa048c3
Binary files /dev/null and b/gtk-3.0/assets/assets.sketch differ
diff --git a/gtk-3.0/assets/checkbox-checked-dark.png b/gtk-3.0/assets/checkbox-checked-dark.png
new file mode 100644
index 0000000..3612805
Binary files /dev/null and b/gtk-3.0/assets/checkbox-checked-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-dark.png b/gtk-3.0/assets/checkbox-checked-insensitive-dark.png
new file mode 100644
index 0000000..ab056cb
Binary files /dev/null and b/gtk-3.0/assets/checkbox-checked-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.png b/gtk-3.0/assets/checkbox-checked-insensitive.png
new file mode 100644
index 0000000..09c6615
Binary files /dev/null and b/gtk-3.0/assets/checkbox-checked-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-checked.png b/gtk-3.0/assets/checkbox-checked.png
new file mode 100644
index 0000000..6b11832
Binary files /dev/null and b/gtk-3.0/assets/checkbox-checked.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed-dark.png b/gtk-3.0/assets/checkbox-mixed-dark.png
new file mode 100644
index 0000000..7b5ee7a
Binary files /dev/null and b/gtk-3.0/assets/checkbox-mixed-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png
new file mode 100644
index 0000000..654d78a
Binary files /dev/null and b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.png b/gtk-3.0/assets/checkbox-mixed-insensitive.png
new file mode 100644
index 0000000..1f73901
Binary files /dev/null and b/gtk-3.0/assets/checkbox-mixed-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed.png b/gtk-3.0/assets/checkbox-mixed.png
new file mode 100644
index 0000000..5cd581f
Binary files /dev/null and b/gtk-3.0/assets/checkbox-mixed.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked-dark.png b/gtk-3.0/assets/checkbox-unchecked-dark.png
new file mode 100644
index 0000000..3e0cafc
Binary files /dev/null and b/gtk-3.0/assets/checkbox-unchecked-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png
new file mode 100644
index 0000000..e98cc68
Binary files /dev/null and b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive.png b/gtk-3.0/assets/checkbox-unchecked-insensitive.png
new file mode 100644
index 0000000..80c76dc
Binary files /dev/null and b/gtk-3.0/assets/checkbox-unchecked-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked.png b/gtk-3.0/assets/checkbox-unchecked.png
new file mode 100644
index 0000000..8fa6972
Binary files /dev/null and b/gtk-3.0/assets/checkbox-unchecked.png differ
diff --git a/gtk-3.0/assets/grid-selection-checked-dark.png b/gtk-3.0/assets/grid-selection-checked-dark.png
new file mode 100644
index 0000000..6b96036
Binary files /dev/null and b/gtk-3.0/assets/grid-selection-checked-dark.png differ
diff --git a/gtk-3.0/assets/grid-selection-checked.png b/gtk-3.0/assets/grid-selection-checked.png
new file mode 100644
index 0000000..bb975c1
Binary files /dev/null and b/gtk-3.0/assets/grid-selection-checked.png differ
diff --git a/gtk-3.0/assets/grid-selection-unchecked-dark.png b/gtk-3.0/assets/grid-selection-unchecked-dark.png
new file mode 100644
index 0000000..2f40f86
Binary files /dev/null and b/gtk-3.0/assets/grid-selection-unchecked-dark.png differ
diff --git a/gtk-3.0/assets/grid-selection-unchecked.png b/gtk-3.0/assets/grid-selection-unchecked.png
new file mode 100644
index 0000000..f2b67fa
Binary files /dev/null and b/gtk-3.0/assets/grid-selection-unchecked.png differ
diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-hover.png b/gtk-3.0/assets/menuitem-checkbox-checked-hover.png
new file mode 100644
index 0000000..7a27aa2
Binary files /dev/null and b/gtk-3.0/assets/menuitem-checkbox-checked-hover.png differ
diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png
new file mode 100644
index 0000000..b3ab5ce
Binary files /dev/null and b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png differ
diff --git a/gtk-3.0/assets/menuitem-checkbox-checked.png b/gtk-3.0/assets/menuitem-checkbox-checked.png
new file mode 100644
index 0000000..4f609d6
Binary files /dev/null and b/gtk-3.0/assets/menuitem-checkbox-checked.png differ
diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png
new file mode 100644
index 0000000..8b11a27
Binary files /dev/null and b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png differ
diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png
new file mode 100644
index 0000000..b49cb30
Binary files /dev/null and b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png differ
diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed.png b/gtk-3.0/assets/menuitem-checkbox-mixed.png
new file mode 100644
index 0000000..1081f3a
Binary files /dev/null and b/gtk-3.0/assets/menuitem-checkbox-mixed.png differ
diff --git a/gtk-3.0/assets/menuitem-radio-checked-hover.png b/gtk-3.0/assets/menuitem-radio-checked-hover.png
new file mode 100644
index 0000000..bfb97ea
Binary files /dev/null and b/gtk-3.0/assets/menuitem-radio-checked-hover.png differ
diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.png b/gtk-3.0/assets/menuitem-radio-checked-insensitive.png
new file mode 100644
index 0000000..9bbb22a
Binary files /dev/null and b/gtk-3.0/assets/menuitem-radio-checked-insensitive.png differ
diff --git a/gtk-3.0/assets/menuitem-radio-checked.png b/gtk-3.0/assets/menuitem-radio-checked.png
new file mode 100644
index 0000000..067e6e8
Binary files /dev/null and b/gtk-3.0/assets/menuitem-radio-checked.png differ
diff --git a/gtk-3.0/assets/radio-checked-dark.png b/gtk-3.0/assets/radio-checked-dark.png
new file mode 100644
index 0000000..be4856c
Binary files /dev/null and b/gtk-3.0/assets/radio-checked-dark.png differ
diff --git a/gtk-3.0/assets/radio-checked-insensitive-dark.png b/gtk-3.0/assets/radio-checked-insensitive-dark.png
new file mode 100644
index 0000000..24403ff
Binary files /dev/null and b/gtk-3.0/assets/radio-checked-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/radio-checked-insensitive.png b/gtk-3.0/assets/radio-checked-insensitive.png
new file mode 100644
index 0000000..bb07e1c
Binary files /dev/null and b/gtk-3.0/assets/radio-checked-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-checked.png b/gtk-3.0/assets/radio-checked.png
new file mode 100644
index 0000000..f2da6f6
Binary files /dev/null and b/gtk-3.0/assets/radio-checked.png differ
diff --git a/gtk-3.0/assets/radio-mixed-dark.png b/gtk-3.0/assets/radio-mixed-dark.png
new file mode 100644
index 0000000..6fced71
Binary files /dev/null and b/gtk-3.0/assets/radio-mixed-dark.png differ
diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.png b/gtk-3.0/assets/radio-mixed-insensitive-dark.png
new file mode 100644
index 0000000..d20db95
Binary files /dev/null and b/gtk-3.0/assets/radio-mixed-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/radio-mixed-insensitive.png b/gtk-3.0/assets/radio-mixed-insensitive.png
new file mode 100644
index 0000000..9b96272
Binary files /dev/null and b/gtk-3.0/assets/radio-mixed-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-mixed.png b/gtk-3.0/assets/radio-mixed.png
new file mode 100644
index 0000000..54f7510
Binary files /dev/null and b/gtk-3.0/assets/radio-mixed.png differ
diff --git a/gtk-3.0/assets/radio-unchecked-dark.png b/gtk-3.0/assets/radio-unchecked-dark.png
new file mode 100644
index 0000000..535c85c
Binary files /dev/null and b/gtk-3.0/assets/radio-unchecked-dark.png differ
diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-dark.png b/gtk-3.0/assets/radio-unchecked-insensitive-dark.png
new file mode 100644
index 0000000..6c8f7c8
Binary files /dev/null and b/gtk-3.0/assets/radio-unchecked-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/radio-unchecked-insensitive.png b/gtk-3.0/assets/radio-unchecked-insensitive.png
new file mode 100644
index 0000000..cd409f7
Binary files /dev/null and b/gtk-3.0/assets/radio-unchecked-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-unchecked.png b/gtk-3.0/assets/radio-unchecked.png
new file mode 100644
index 0000000..ada911b
Binary files /dev/null and b/gtk-3.0/assets/radio-unchecked.png differ
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
new file mode 100755
index 0000000..3c469d4
--- /dev/null
+++ b/gtk-3.0/gtk-dark.css
@@ -0,0 +1 @@
+@import url("dist/gtk-dark.css");
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index a245e70..415ea7b 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1,2 +1 @@
-
@import url("dist/gtk.css");
diff --git a/gtk-3.0/scss/_functions.scss b/gtk-3.0/scss/_functions.scss
index 6216dc2..a1e33cf 100755
--- a/gtk-3.0/scss/_functions.scss
+++ b/gtk-3.0/scss/_functions.scss
@@ -17,7 +17,15 @@ $modules: () !default;
}
@function shade($color, $amount) {
- @return unquote("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) {
@@ -37,7 +45,7 @@ $modules: () !default;
}
@function border_insensitive($color) {
- @return shade($color, ($contrast + .1));
+ @return shade($color, ($contrast + .05));
}
@mixin linear-gradient($color, $direction: to bottom) {
diff --git a/gtk-3.0/scss/_global.scss b/gtk-3.0/scss/_global.scss
index d2b1c51..1110ace 100755
--- a/gtk-3.0/scss/_global.scss
+++ b/gtk-3.0/scss/_global.scss
@@ -1,17 +1,17 @@
@import "functions";
// default color scheme
-$bg_color: #eee;
-$fg_color: #333;
-$base_color: #fff;
-$text_color: #333;
-$selected_bg_color: #f06860;
+$bg_color: if($variant == "dark", #444, #eee);
+$fg_color: if($variant == "dark", #ccc, #555);
+$base_color: if($variant == "dark", #333, #fff);
+$text_color: if($variant == "dark", #eee, #333);
+$selected_bg_color: #f0544c;
$selected_fg_color: #fff;
-$tooltip_bg_color: #333;
+$tooltip_bg_color: #444;
$tooltip_fg_color: #eee;
// dark colors
-$dark_bg_color: #333;
+$dark_bg_color: #444;
$dark_fg_color: #eee;
// shadows
@@ -19,18 +19,18 @@ $dark_shadow: #000;
$light_shadow: #fff;
// misc colors used by gtk+
-$info_fg_color: #3986ac;
-$info_bg_color: #d9edf7;
-$warning_fg_color: #c09853;
-$warning_bg_color: #fcf8e3;
-$question_fg_color: #d64937;
-$question_bg_color: #fce5d5;
-$error_fg_color: #b94a48;
-$error_bg_color: #f2dede;
-$link_color: #fc6f5d;
-$success_color: #53a93f;
-$warning_color: #f57900;
-$error_color: #cc0000;
+$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;
@@ -41,8 +41,8 @@ $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;
+$menubar_bg_color: $bg_color;
+$menubar_fg_color: $fg_color;
$panel_bg_color: $dark_bg_color;
$panel_fg_color: $dark_fg_color;
@@ -54,8 +54,8 @@ $lightdm_bg_color: $dark_bg_color;
$lightdm_fg_color: $dark_fg_color;
$wm_bg: $titlebar_bg_color;
-$wm_border_focused: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.21);
-$wm_border_unfocused: mix(shade($titlebar_bg_color, 0.7), $titlebar_fg_color, 0.12);
+$wm_border_focused: transparent;
+$wm_border_unfocused: transparent;
$wm_title_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1);
$wm_title_unfocused: mix($titlebar_fg_color, $titlebar_bg_color, 0.4);
$wm_icons_focused: mix($titlebar_fg_color, $titlebar_bg_color, 0.1);
@@ -67,6 +67,6 @@ $wm_icons_unfocused_pressed: shade($selected_bg_color, 0.8);
// widget styles
$roundness: 2px;
-$spacing: 4px;
+$spacing: 5px;
$gradient: 0;
-$contrast: .7;
+$contrast: .8;
diff --git a/gtk-3.0/scss/_widgets.scss b/gtk-3.0/scss/_widgets.scss
new file mode 100755
index 0000000..62de316
--- /dev/null
+++ b/gtk-3.0/scss/_widgets.scss
@@ -0,0 +1,36 @@
+@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/gedit";
+@import "apps/nautilus";
+@import "apps/nemo";
+@import "apps/panel";
+@import "apps/synaptic";
+@import "apps/xfce";
+@import "apps/unity";
+@import "apps/lightdm";
diff --git a/gtk-3.0/scss/apps/_lightdm.scss b/gtk-3.0/scss/apps/_lightdm.scss
index 333d6af..453434e 100644
--- a/gtk-3.0/scss/apps/_lightdm.scss
+++ b/gtk-3.0/scss/apps/_lightdm.scss
@@ -125,7 +125,7 @@
.menu { font: normal; }
- .arrow { olor: mix($lightdm_fg_color, $lightdm_bg_color, 0.5); }
+ .arrow { color: mix($lightdm_fg_color, $lightdm_bg_color, 0.5); }
}
#user_image {
diff --git a/gtk-3.0/scss/apps/_nautilus.scss b/gtk-3.0/scss/apps/_nautilus.scss
index d31a25e..9a9f754 100644
--- a/gtk-3.0/scss/apps/_nautilus.scss
+++ b/gtk-3.0/scss/apps/_nautilus.scss
@@ -23,7 +23,7 @@
.sidebar .frame { border: none; }
- > GtkGrid > .pane-separator {
+ GtkPaned {
border-width: 0 1px 0 0;
border-style: solid;
@@ -45,11 +45,6 @@
}
NautilusQueryEditor {
- .search-bar.toolbar {
- border-top-width: 0;
- border-bottom-width: 0;
- }
-
.toolbar {
padding-top: $spacing - 1px;
padding-bottom: $spacing - 2px;
@@ -66,7 +61,7 @@
}
&, &.search-bar {
- &:only-child {
+ &:last-child, &:only-child {
border-bottom-width: 1px;
border-bottom-color: border_normal($toolbar_bg_color);
}
diff --git a/gtk-3.0/scss/gtk-dark.scss b/gtk-3.0/scss/gtk-dark.scss
new file mode 100644
index 0000000..fd46aa1
--- /dev/null
+++ b/gtk-3.0/scss/gtk-dark.scss
@@ -0,0 +1,3 @@
+$variant: "dark";
+
+@import "widgets";
diff --git a/gtk-3.0/scss/gtk.scss b/gtk-3.0/scss/gtk.scss
old mode 100755
new mode 100644
index e593bcb..4455669
--- a/gtk-3.0/scss/gtk.scss
+++ b/gtk-3.0/scss/gtk.scss
@@ -1,35 +1,3 @@
-@import "functions";
-@import "global";
-@import "colors";
+$variant: "light";
-
-@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/progress";
-@import "widgets/scrollbar";
-@import "widgets/sidebar";
-@import "widgets/spinner";
-@import "widgets/toggle";
-@import "widgets/toolbar";
-@import "widgets/view";
-@import "widgets/window";
-
-
-@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 "widgets";
diff --git a/gtk-3.0/scss/widgets/_actionbar.scss b/gtk-3.0/scss/widgets/_actionbar.scss
index 4f1280a..6745b23 100644
--- a/gtk-3.0/scss/widgets/_actionbar.scss
+++ b/gtk-3.0/scss/widgets/_actionbar.scss
@@ -58,7 +58,7 @@
@include exports("actionbuttons") {
$types: (
- suggested: $selected_bg_color,
+ suggested: $success_color,
destructive: $error-color
);
diff --git a/gtk-3.0/scss/widgets/_base.scss b/gtk-3.0/scss/widgets/_base.scss
index a1916f6..bad015d 100755
--- a/gtk-3.0/scss/widgets/_base.scss
+++ b/gtk-3.0/scss/widgets/_base.scss
@@ -4,34 +4,9 @@
* {
-GtkArrow-arrow-scaling: 0.5;
- -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;
-GtkExpander-expander-size: 8;
- -GtkMenu-horizontal-padding: 0;
- -GtkMenu-vertical-padding: 0;
- -GtkPaned-handle-size: 4;
- -GtkProgressBar-min-horizontal-bar-height: 12;
- -GtkProgressBar-min-vertical-bar-width: 12;
- -GtkRange-slider-width: 12;
- -GtkRange-stepper-spacing: 0;
- -GtkRange-trough-border: 0;
- -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;
-GtkStatusbar-shadow-type: none;
- -GtkTextView-error-underline-color: $error_color;
- -GtkToolButton-icon-spacing: 6;
-GtkToolItemGroup-expander-size: 8;
- -GtkTreeView-expander-size: 8;
-GtkWindow-resize-grip-height: 0;
-GtkWindow-resize-grip-width: 0;
-WnckTasklist-fade-overlay-rect: 0;
@@ -82,6 +57,8 @@
text-shadow: none;
icon-shadow: none;
}
+
+ &.csd { background-color: $bg_color; }
}
.gtkstyle-fallback {
diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss
index 9310af9..f54d96b 100755
--- a/gtk-3.0/scss/widgets/_button.scss
+++ b/gtk-3.0/scss/widgets/_button.scss
@@ -4,15 +4,17 @@
@include exports("button_extends") {
%button {
- padding: ($spacing - 1px) ($spacing + 1px);
+ padding: $spacing ($spacing + 2px);
border-width: 1px;
border-style: solid;
border-radius: $roundness;
- transition: 100ms ease;
+ transition: 150ms ease;
outline-color: transparent;
-GtkWidget-focus-padding: 1;
-GtkWidget-focus-line-width: 0;
+
+ &:focus, &:hover, &:active { transition: none; }
}
%linked_middle {
@@ -71,95 +73,107 @@
}
@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($bg),
- 0 1px 2px -1px alpha($dark_shadow, .3);
+ 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($bg),
- 0 1px 2px -1px alpha($dark_shadow, .3);
+ 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($bg),
- inset 1px 0 alpha($dark_shadow, .07),
- inset 0 1px alpha($dark_shadow, .08),
+ 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 border_insensitive($bg); }
+ &: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); }
- &:last-child, &:only-child,
&: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:only-child,
- &:active:last-child:focus, &:active:only-child:focus,
- &:active:last-child:hover, &:active:only-child:hover,
- &:active:last-child:hover:focus, &:active:only-child:hover:focus,
- &:checked:last-child, &:checked:only-child,
- &:checked:last-child:focus, &:checked:only-child:focus,
- &:checked:last-child:hover, &:checked:only-child:hover,
- &:checked:last-child:hover:focus, &:checked:only-child:hover:focus {
- box-shadow: inset 1px 0 alpha($dark_shadow, .07),
- inset 0 1px alpha($dark_shadow, .08),
- inset -1px 0 alpha($dark_shadow, .07);
+ &: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) {
- @include linear-gradient(shade($bg, 1.05));
+ $border_strength: if(lightness($bg) > 50, 0, .1);
+ $shadow_strength: if(lightness($bg) > 50, 0, .1);
+
@extend %button;
+ @include linear-gradient(shade($bg, 1.2));
+ @include border(rgba(0,0,0,.12 + $border_strength));
color: $fg;
- box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3);
-
- &:insensitive {
- @include linear-gradient(shade($bg, .95));
-
- color: mix($bg, $fg, .5);
- box-shadow: none;
- }
-
- &, &.flat {
- @include border(shade($bg, 1.05));
-
- &:focus, &:hover {
- @include linear-gradient(shade($bg, 1.1));
-
- box-shadow: 0 1px 3px -1px alpha($dark_shadow, .5);
- }
-
- &:checked, &:active {
- @include linear-gradient(shade($bg, .95));
-
- 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:insensitive,
- &:checked:insensitive {
- @include linear-gradient(shade($bg, .8));
-
- box-shadow: none;
- }
- }
+ box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
&.flat {
- color: inherit;
border-color: transparent;
background-color: transparent;
background-image: none;
box-shadow: none;
}
+ &, &.flat {
+ &:focus, &:hover {
+ @include linear-gradient(shade($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($bg, .9), to top);
+
+ color: $fg;
+ 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);
+ }
+
+ &:active:insensitive, &:checked:insensitive {
+ @include linear-gradient(shade($bg, .8));
+
+ color: $fg;
+ box-shadow: none;
+ }
+
+ &:insensitive:insensitive {
+ @if (lightness($bg) > 50) {
+ @include linear-gradient(shade($bg, .95));
+ } @else {
+ @include linear-gradient(alpha($bg, .3));
+ }
+
+ color: mix($bg, $fg, .5);
+ box-shadow: none;
+ }
+ }
+
&.separator, .separator {
border: 1px solid currentColor;
color: shade($bg, ($contrast + .1));
@@ -169,6 +183,18 @@
}
@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;
@@ -176,15 +202,15 @@
box-shadow: none;
&:focus, &:hover {
- border: 1px solid alpha(black, 0.3);
- background-color: alpha(white, 0.2);
+ 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, 0.3);
- background-color: alpha(black, 0.1);
+ border: 1px solid alpha(black, .3);
+ background-color: alpha(black, .1);
background-image: none;
box-shadow: none;
}
@@ -195,21 +221,21 @@
&.default { @include button($selected_bg_color, $selected_fg_color); }
- &.linked, .linked & { @include linked_button($bg_color); }
+ &.linked, .linked & { @include linked_button(shade($bg_color, 1.2)); }
.spinbutton & {
- color: mix($text_color, $base_color, 0.4);
+ color: mix($text_color, $base_color, .4);
padding: $spacing ($spacing * 2);
border: none;
border-radius: 0;
border-style: none;
background-color: transparent;
background-image: none;
- box-shadow: inset 1px 0 shade($base_color, 0.9);
+ box-shadow: inset 1px 0 shade($base_color, .9);
&:insensitive {
- color: mix($text_color, $base_color, 0.7);
- box-shadow: inset 1px 0 shade($base_color, 0.85);
+ color: mix($text_color, $base_color, .7);
+ box-shadow: inset 1px 0 shade($base_color, .85);
}
&:active, &:checked, &:hover { color: $text_color; }
@@ -221,11 +247,11 @@
&:last-child { border-radius: 0 $roundness $roundness 0; }
- &:dir(rtl) { box-shadow: inset -1px 0 shade($base_color, 0.9); }
+ &:dir(rtl) { box-shadow: inset -1px 0 shade($base_color, .9); }
}
.spinbutton.vertical & {
- border: 1px solid shade($bg_color, 0.8);
+ border: 1px solid shade($bg_color, .8);
border-radius: $roundness;
background-color: shade($bg_color, 1.08);
background-image: none;
@@ -233,26 +259,26 @@
box-shadow: none;
&:hover {
- border-color: shade($bg_color, 0.7);
+ border-color: shade($bg_color, .7);
background-color: shade($bg_color, 1.1);
background-image: none;
}
&:active, &:checked {
- border-color: shade($bg_color, 0.8);
- background-color: shade($bg_color, 0.95);
+ border-color: shade($bg_color, .8);
+ background-color: shade($bg_color, .95);
background-image: none;
}
&:active:hover, &:checked:hover {
- border-color: shade($bg_color, 0.7);
+ border-color: shade($bg_color, .7);
}
- &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { border-color: shade($bg_color, 0.7); }
+ &:focus, &:hover:focus, &:active:focus, &:active:hover:focus { border-color: shade($bg_color, .7); }
&:insensitive {
- border-color: shade($bg_color, 0.85);
- background-color: shade($bg_color, 0.9);
+ border-color: shade($bg_color, .85);
+ background-color: shade($bg_color, .9);
background-image: none;
}
@@ -289,7 +315,7 @@
> .button {
padding: ($spacing - 2px) ($spacing + 1px);
- -GtkComboBox-arrow-scaling: 0.5;
+ -GtkComboBox-arrow-scaling: .5;
-GtkComboBox-shadow-type: none;
}
diff --git a/gtk-3.0/scss/widgets/_calendar.scss b/gtk-3.0/scss/widgets/_calendar.scss
index ee88e64..909ea9c 100644
--- a/gtk-3.0/scss/widgets/_calendar.scss
+++ b/gtk-3.0/scss/widgets/_calendar.scss
@@ -10,7 +10,7 @@
&:inconsistent { color: mix($fg_color, $bg_color, 0.5); }
&.view, &.highlight, &.header, &.button {
- &, &:hover, &:insensitive {
+ &, &:focus, &:hover, &:insensitive {
border: none;
background-color: transparent;
background-image: none;
diff --git a/gtk-3.0/scss/widgets/_entry.scss b/gtk-3.0/scss/widgets/_entry.scss
index 0015dee..6605f01 100755
--- a/gtk-3.0/scss/widgets/_entry.scss
+++ b/gtk-3.0/scss/widgets/_entry.scss
@@ -30,33 +30,23 @@
}
}
-@mixin entry($bg, $fg) {
- @include border(shade($bg, .9));
-
+%entry {
padding: ($spacing - 1px) $spacing;
border-width: 1px;
border-style: solid;
border-radius: $roundness;
- background-color: $bg;
- background-image: none;
- transition: border 100ms ease;
- 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),
- 0 1px 2px -1px shade($bg, 1.4);
+ 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 {
- background-color: shade($bg, .9);
- background-image: none;
- color: mix($bg, $fg, .5);
- box-shadow: none;
- }
+ &:insensitive { box-shadow: none; }
&.progressbar {
@include linear-gradient($selected_bg_color);
@@ -69,6 +59,22 @@
&.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);
diff --git a/gtk-3.0/scss/widgets/_grid.scss b/gtk-3.0/scss/widgets/_grid.scss
index 573e5c2..13016da 100644
--- a/gtk-3.0/scss/widgets/_grid.scss
+++ b/gtk-3.0/scss/widgets/_grid.scss
@@ -13,7 +13,7 @@
border-radius: 0;
padding: $spacing;
background-image: none;
- background-color: transparent;
+ background-color: alpha($bg_color, 0);
box-shadow: none;
&:hover {
diff --git a/gtk-3.0/scss/widgets/_menu.scss b/gtk-3.0/scss/widgets/_menu.scss
index 8d0bdf7..35a2581 100755
--- a/gtk-3.0/scss/widgets/_menu.scss
+++ b/gtk-3.0/scss/widgets/_menu.scss
@@ -40,6 +40,11 @@
*******/
@include exports("menu") {
+ * {
+ -GtkMenu-horizontal-padding: 0;
+ -GtkMenu-vertical-padding: 0;
+ }
+
GtkTreeMenu, GtkMenuToolButton, GtkComboBox {
&.menu, .menu {
background-color: $menu_bg_color;
@@ -50,7 +55,7 @@
#toolbar-popup, .menu {
padding: 0;
border-radius: 0;
- border-style: none;
+ border: none;
background-color: $menu_bg_color;
color: $menu_fg_color;
@@ -191,9 +196,10 @@
}
}
- .list {
+ .view, .list {
background-color: transparent;
background-image: none;
+ color: $menu_fg_color;
}
.list-row {
diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss
index b6fa512..8eb1de3 100644
--- a/gtk-3.0/scss/widgets/_misc.scss
+++ b/gtk-3.0/scss/widgets/_misc.scss
@@ -34,7 +34,7 @@
@include exports("dialogs") {
GtkMessageDialog, .message-dialog, .prompt {
-GtkDialog-content-area-border: 0;
- -GtkDialog-action-area-border: 0;
+ -GtkDialog-action-area-border: $spacing;
-GtkDialog-button-spacing: 0;
margin: 0;
diff --git a/gtk-3.0/scss/widgets/_notebook.scss b/gtk-3.0/scss/widgets/_notebook.scss
index 7d5c1ef..e3c155e 100644
--- a/gtk-3.0/scss/widgets/_notebook.scss
+++ b/gtk-3.0/scss/widgets/_notebook.scss
@@ -27,10 +27,10 @@
&.header {
border-width: 0;
- background-color: shade($base_color, 0.85);
+ background-color: shade($base_color, .9);
&.frame {
- border-color: shade($base_color, 0.75);
+ border-color: border_normal($base_color);
&.top { border-width: 1px 1px 0 1px; }
@@ -49,55 +49,45 @@
}
tab {
- padding: $spacing ($spacing * 2);
+ padding: ($spacing + 1px) ($spacing * 2);
border: 1px solid transparent;
background-color: transparent;
background-image: none;
+ &:hover {
+ background-color: shade($base_color, .95);
+ border-color: shade($base_color, .8);
+ }
+
&:active {
- background-color: transparent;
+ background-color: $base_color;
background-image: none;
+ border-color: shade($base_color, .85);
}
&.top {
- border-bottom-width: 2px;
+ border-bottom-width: 0;
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-left-width: 0;
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-width: 0;
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-right-width: 0;
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($text_color, $base_color, 0.3); }
diff --git a/gtk-3.0/scss/widgets/_overshoot.scss b/gtk-3.0/scss/widgets/_overshoot.scss
new file mode 100644
index 0000000..fa5fe1b
--- /dev/null
+++ b/gtk-3.0/scss/widgets/_overshoot.scss
@@ -0,0 +1,123 @@
+@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, 0.5,
+ to(alpha($_small_gradient_color, .35)),
+ to(alpha($_small_gradient_color, .25)));
+
+ $_big_gradient: -gtk-gradient(radial,
+ $_position, 0,
+ $_position, 0.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: none;
+ 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/gtk-3.0/scss/widgets/_progress.scss b/gtk-3.0/scss/widgets/_progress.scss
index c09ff40..f6943df 100644
--- a/gtk-3.0/scss/widgets/_progress.scss
+++ b/gtk-3.0/scss/widgets/_progress.scss
@@ -9,13 +9,13 @@
font-size: smaller;
color: alpha($fg_color, 0.6);
- -GtkProgressBar-min-horizontal-bar-height: 12;
- -GtkProgressBar-min-vertical-bar-width: 12;
+ -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;
+ -GtkProgressBar-min-horizontal-bar-height: 4;
}
&.trough {
@@ -119,8 +119,8 @@
&.slider {
- @include linear-gradient(shade($bg_color, 1.08));
- @include border($bg_color);
+ @include linear-gradient($base_color);
+ @include border($base_color);
border-radius: 8px;
border-width: 1px;
@@ -146,13 +146,13 @@
&.trough {
@include linear-gradient(shade($bg_color, 1.08));
- margin: 7px 0;
- border: 1px solid alpha(border_normal($bg_color), 0.5);
+ margin: 8px 0;
+ border: 0;
border-radius: $roundness;
&:insensitive { @include linear-gradient(shade($bg_color, 0.9)); }
- &.vertical { margin: 0 7px; }
+ &.vertical { margin: 0 8px; }
}
&.highlight {
diff --git a/gtk-3.0/scss/widgets/_scrollbar.scss b/gtk-3.0/scss/widgets/_scrollbar.scss
index b2548ed..969ece6 100644
--- a/gtk-3.0/scss/widgets/_scrollbar.scss
+++ b/gtk-3.0/scss/widgets/_scrollbar.scss
@@ -3,6 +3,18 @@
************/
@include exports("scrollbar") {
+ * {
+ -GtkRange-slider-width: 8;
+ -GtkRange-stepper-spacing: 0;
+ -GtkRange-trough-border: $spacing;
+ -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: none;
padding: 0;
@@ -18,24 +30,15 @@
}
&.slider, &.slider.vertical {
- border: 1px solid mix(shade($bg_color, 0.87), $fg_color, 0.21);
- border-radius: 0;
+ border: none;
+ border-radius: $roundness;
background-color: mix($bg_color, $fg_color, 0.21);
- &:hover {
- border-color: mix(shade($bg_color, 0.87), $fg_color, 0.31);
- background-color: mix($bg_color, $fg_color, 0.31);
- }
+ &:hover { background-color: $selected_bg_color; }
- &:active {
- border-color: shade($selected_bg_color, 0.9);
- background-color: $selected_bg_color;
- }
+ &:active { background-color: shade($selected_bg_color, .9); }
- &.fine-tune:prelight:active {
- border-width: 2px;
- border-color: transparent;
- }
+ &.fine-tune:prelight:active { border: 2px solid transparent; }
}
}
diff --git a/gtk-3.0/scss/widgets/_sidebar.scss b/gtk-3.0/scss/widgets/_sidebar.scss
index b3185d5..7d5d9f1 100755
--- a/gtk-3.0/scss/widgets/_sidebar.scss
+++ b/gtk-3.0/scss/widgets/_sidebar.scss
@@ -38,8 +38,7 @@
&:prelight {
border: none;
background-image: none;
- background-color: shade($bg_color, 0.95);
- color: $fg_color;
+ background-color: shade($bg_color, 1.05);
}
}
@@ -57,7 +56,7 @@
&:dir(ltr) { border-width: 0 1px 0 0; }
&:dir(rtl) { border-width: 0 0 0 1px; }
- GtkLabel {
+ .label {
padding: $spacing ($spacing * 2);
&.highlight { background-color: mix($bg_color, $fg_color, 0.80); }
@@ -71,51 +70,38 @@
}
-/***************
-! Pane separator
-****************/
+/******
+! Paned
+*******/
-@include exports("paneseparator") {
- .pane-separator {
- background-color: $bg_color;
- color: transparent;
+@include exports("paned") {
+ GtkPaned {
+ -GtkPaned-handle-size: 1;
+ -gtk-icon-source: none;
- &, &.horizontal {
- background-image: linear-gradient(to bottom,
- shade($bg_color, 0.8) 0%,
- shade($bg_color, 0.8) 20%,
- transparent 20%,
- transparent 45%,
- shade($bg_color, 0.8) 45%,
- shade($bg_color, 0.8) 55%,
- transparent 55%,
- transparent 80%,
- shade($bg_color, 0.8) 80%,
- shade($bg_color, 0.8)
- );
-
- background-size: 4px 10px;
- background-repeat: no-repeat;
- background-position: center center;
- }
-
- &.vertical {
- background-image: linear-gradient(to right,
- shade($bg_color, 0.8) 0%,
- shade($bg_color, 0.8) 20%,
- transparent 20%,
- transparent 45%,
- shade($bg_color, 0.8) 45%,
- shade($bg_color, 0.8) 55%,
- transparent 55%,
- transparent 80%,
- shade($bg_color, 0.8) 80%,
- shade($bg_color, 0.8)
- );
-
- background-size: 10px 4px;
- background-repeat: no-repeat;
- background-position: center center;
- }
+ margin: 0 $spacing;
}
+
+
+ GtkPaned:dir(rtl) {
+ margin-right: 0;
+ margin-left: $spacing;
+ }
+
+ GtkPaned .pane-separator { background-color: shade($bg_color, 0.9); }
+
+ GtkPaned.wide {
+ -GtkPaned-handle-size: 4;
+
+ margin: 0;
+ }
+
+ GtkPaned.wide .pane-separator {
+ background-color: transparent;
+ border-style: none solid;
+ border-color: shade($bg_color, 0.9);
+ border-width: 1px;
+ }
+
+ GtkPaned.wide.vertical .pane-separator { border-style: solid none; }
}
diff --git a/gtk-3.0/scss/widgets/_toggle.scss b/gtk-3.0/scss/widgets/_toggle.scss
index cf4936c..c9e40f0 100755
--- a/gtk-3.0/scss/widgets/_toggle.scss
+++ b/gtk-3.0/scss/widgets/_toggle.scss
@@ -2,23 +2,25 @@
! Check and Radio items
************************/
+$suffix: if($variant == "dark", "-dark", "");
+
@mixin toggle($type) {
background-image: none;
- -gtk-icon-source: url('../assets/#{$type}-unchecked.svg');
+ -gtk-icon-source: url("../assets/#{$type}-unchecked#{$suffix}.png");
- &:insensitive { -gtk-icon-source: url('../assets/#{$type}-unchecked-insensitive.svg'); }
+ &:insensitive { -gtk-icon-source: url("../assets/#{$type}-unchecked-insensitive#{$suffix}.png"); }
&:checked, &:active {
- -gtk-icon-source: url('../assets/#{$type}-checked.svg');
+ -gtk-icon-source: url("../assets/#{$type}-checked#{$suffix}.png");
- &:insensitive { -gtk-icon-source: url('../assets/#{$type}-checked-insensitive.svg'); }
+ &:insensitive { -gtk-icon-source: url("../assets/#{$type}-checked-insensitive#{$suffix}.png"); }
}
&:inconsistent {
- -gtk-icon-source: url('../assets/#{$type}-mixed.svg');
+ -gtk-icon-source: url("../assets/#{$type}-mixed#{$suffix}.png");
- &:insensitive { -gtk-icon-source: url('../assets/#{$type}-mixed-insensitive.svg'); }
+ &:insensitive { -gtk-icon-source: url("../assets/#{$type}-mixed-insensitive#{$suffix}.png"); }
}
&.menuitem {
@@ -27,19 +29,19 @@
&:insensitive { -gtk-icon-source: none; }
&:checked, &:active {
- -gtk-icon-source: url('../assets/menuitem-#{$type}-checked.svg');
+ -gtk-icon-source: url("../assets/menuitem-#{$type}-checked.png");
- &:hover { -gtk-icon-source: url('../assets/menuitem-#{$type}-checked-hover.svg'); }
+ &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-hover.png"); }
- &:insensitive { -gtk-icon-source: url('../assets/menuitem-#{$type}-checked-insensitive.svg'); }
+ &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-checked-insensitive.png"); }
}
&:inconsistent {
- -gtk-icon-source: url('../assets/menuitem-#{$type}-mixed.svg');
+ -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed.png");
- &:hover { -gtk-icon-source: url('../assets/menuitem-#{$type}-mixed-hover.svg'); }
+ &:hover { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-hover.png"); }
- &:insensitive { -gtk-icon-source: url('../assets/menuitem-#{$type}-mixed-insensitive.svg'); }
+ &:insensitive { -gtk-icon-source: url("../assets/menuitem-#{$type}-mixed-insensitive.png"); }
}
}
}
@@ -47,7 +49,7 @@
@include exports("checkradio") {
* {
-GtkCheckButton-indicator-size: 16;
- -GtkCheckMenuItem-indicator-size: 14;
+ -GtkCheckMenuItem-indicator-size: 16;
}
.radio { @include toggle("radio"); }
@@ -55,9 +57,9 @@
.check { @include toggle("checkbox"); }
GtkIconView.content-view.cell.check {
- -gtk-icon-source: url("assets/grid-selection-unchecked.svg");
+ -gtk-icon-source: url("assets/grid-selection-unchecked#{$suffix}.png");
- &:active { -gtk-icon-source: url("assets/grid-selection-checked.svg"); }
+ &:active { -gtk-icon-source: url("assets/grid-selection-checked#{$suffix}.png"); }
}
}
@@ -74,29 +76,39 @@
outline-offset: -4px;
&.slider {
- border: 1px solid border_normal($bg_color);
- background-color: shade($bg_color, 1.08);
+ @include linear-gradient(shade($bg_color, 1.2));
+
+ border: 1px solid rgba(0,0,0,0.2);
+ box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12);
&:insensitive {
- border-color: border_insensitive($bg_color);
+ border-color: rgba(0,0,0,0.1);
background-color: shade($bg_color, 0.9);
+ box-shadow: none;
}
}
&.trough {
+ @include linear-gradient(shade($bg_color, .95), to top);
+
border: 1px solid border_normal($bg_color);
- background-color: shade($bg_color, 0.95);
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, 0.9);
- background-color: $selected_bg_color;
color: $selected_fg_color;
}
&:insensitive {
+ @include linear-gradient(shade($bg_color, .9), to top);
+
border-color: border_insensitive($bg_color);
- background-color: shade($bg_color, 0.9);
color: mix($fg_color, $bg_color, 0.5);
}
}
diff --git a/gtk-3.0/scss/widgets/_toolbar.scss b/gtk-3.0/scss/widgets/_toolbar.scss
index c9d37c2..ab8d98f 100755
--- a/gtk-3.0/scss/widgets/_toolbar.scss
+++ b/gtk-3.0/scss/widgets/_toolbar.scss
@@ -9,7 +9,7 @@
@include linear-gradient($bg);
@include border($bg);
- padding: $spacing;
+ padding: $spacing * 2;
color: $fg;
&:insensitive {
@@ -37,7 +37,7 @@
&.text-button { padding: $spacing; }
- &.image-button { padding: $spacing ($spacing - 1px) ($spacing - 1px) $spacing; }
+ &.image-button { padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing; }
}
GtkSeparatorToolItem, .separator, .separator:insensitive {
@@ -55,6 +55,11 @@
@include toolbar($bg_color, $fg_color);
border-style: none;
+
+ &.inline-toolbar {
+ background-image: none;
+ background-color: transparent;
+ }
}
.header-bar {
@@ -97,20 +102,17 @@
&: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/gtk-3.0/scss/widgets/_view.scss b/gtk-3.0/scss/widgets/_view.scss
index c7a6998..e077972 100644
--- a/gtk-3.0/scss/widgets/_view.scss
+++ b/gtk-3.0/scss/widgets/_view.scss
@@ -3,6 +3,8 @@
****************/
@include exports("view") {
+ * { -GtkTextView-error-underline-color: $error_color; }
+
.view {
color: $text_color;
background-color: $base_color;
@@ -92,9 +94,6 @@
}
}
- /* used by GtkScrolledWindow, shown when content is touch-dragged past boundaries. */
- .overshoot { background-color: alpha($selected_bg_color, 0.3); }
-
GdMainIconView.content-view { -GdMainIconView-icon-size: 40; }
/* this will get overridden by .view, needed by gedit line numbers */
@@ -115,6 +114,7 @@
@include exports("treeview") {
GtkTreeView {
+ -GtkTreeView-expander-size: 8;
-GtkTreeView-vertical-separator: 0;
outline-offset: -1px;
diff --git a/gtk-3.0/scss/widgets/_window.scss b/gtk-3.0/scss/widgets/_window.scss
index 8d60778..0b8f88b 100755
--- a/gtk-3.0/scss/widgets/_window.scss
+++ b/gtk-3.0/scss/widgets/_window.scss
@@ -4,11 +4,11 @@
@include exports("window") {
%window {
- box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23),
+ box-shadow: 0 19px 38px rgba(0,0,0,0.30), 0 15px 12px rgba(0,0,0,0.22),
0 0 0 1px $wm_border_focused;
&:backdrop {
- box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24),
+ box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23),
0 0 0 1px $wm_border_unfocused;
}
}
@@ -16,8 +16,8 @@
.window-frame {
@extend %window;
- border: none;
- border-radius: $roundness $roundness 0 0;
+ border: 0;
+ border-radius: $roundness + 1;
/* this is used for the resize cursor area */
margin: $spacing * 3;
diff --git a/unity/close.svg b/unity/close.svg
index 4a4ca0b..1d739f2 100755
--- a/unity/close.svg
+++ b/unity/close.svg
@@ -1 +1 @@
-
+
diff --git a/unity/maximize.svg b/unity/maximize.svg
index d62a015..a84ce25 100755
--- a/unity/maximize.svg
+++ b/unity/maximize.svg
@@ -1 +1 @@
-
+
diff --git a/unity/minimize.svg b/unity/minimize.svg
index 09e7c2e..a7075cc 100755
--- a/unity/minimize.svg
+++ b/unity/minimize.svg
@@ -1 +1 @@
-
+
diff --git a/unity/minimized.svg b/unity/minimized.svg
index 09e7c2e..a7075cc 100755
--- a/unity/minimized.svg
+++ b/unity/minimized.svg
@@ -1 +1 @@
-
+
diff --git a/unity/progress_bar_trough.svg b/unity/progress_bar_trough.svg
index 8082c32..4d4b209 100755
--- a/unity/progress_bar_trough.svg
+++ b/unity/progress_bar_trough.svg
@@ -59,7 +59,7 @@
id="image6" />
diff --git a/unity/unmaximize.svg b/unity/unmaximize.svg
index eee6717..9f6d305 100755
--- a/unity/unmaximize.svg
+++ b/unity/unmaximize.svg
@@ -1 +1 @@
-
+
diff --git a/xfce-notify-4.0/gtkrc b/xfce-notify-4.0/gtkrc
index 274b046..b4ea119 100755
--- a/xfce-notify-4.0/gtkrc
+++ b/xfce-notify-4.0/gtkrc
@@ -1,6 +1,6 @@
style "notify-window" {
XfceNotifyWindow::summary-bold = 1
- XfceNotifyWindow::border-color = "#2d2d2d"
+ XfceNotifyWindow::border-color = "#444444"
XfceNotifyWindow::border-color-hover = "#333333"
XfceNotifyWindow::border-radius = 2.0
XfceNotifyWindow::border-width = 1.0
@@ -10,13 +10,13 @@ style "notify-window" {
}
style "notify-button" {
- bg[NORMAL] = "#2d2d2d"
- bg[PRELIGHT] = "#333333"
- bg[ACTIVE] = "#2d2d2d"
+ bg[NORMAL] = "#444444"
+ bg[PRELIGHT] = "#555555"
+ bg[ACTIVE] = "#444444"
- fg[NORMAL] = "#dcdcdc"
- fg[PRELIGHT] = "#dedede"
- fg[ACTIVE] = "#dedede"
+ fg[NORMAL] = "#eeeeee"
+ fg[PRELIGHT] = "#eeeeee"
+ fg[ACTIVE] = "#eeeeee"
engine "murrine" {
gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
@@ -46,9 +46,9 @@ style "notify-progressbar" {
xthickness = 1
ythickness = 1
- bg[NORMAL] = "#dcdcdc"
- bg[ACTIVE] = "#2d2d2d"
- bg[SELECTED] = "#dedede"
+ bg[NORMAL] = "#eeeeee"
+ bg[ACTIVE] = "#444444"
+ bg[SELECTED] = "#eeeeee"
fg[PRELIGHT] = "#333333"
fg[ACTIVE] = "#f9f9f9"
diff --git a/xfwm4/close-active.xpm b/xfwm4/close-active.xpm
index 3424b7c..73ee20b 100755
--- a/xfwm4/close-active.xpm
+++ b/xfwm4/close-active.xpm
@@ -2,8 +2,8 @@
static char * close_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
+". c #444444",
+"+ c #eeeeee",
"........................",
"........................",
"........................",
diff --git a/xfwm4/close-inactive.xpm b/xfwm4/close-inactive.xpm
index 9201e50..eb5514e 100755
--- a/xfwm4/close-inactive.xpm
+++ b/xfwm4/close-inactive.xpm
@@ -2,7 +2,7 @@
static char * close_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #888888",
"........................",
"........................",
diff --git a/xfwm4/close-prelight.xpm b/xfwm4/close-prelight.xpm
index e8916bd..f7ebf57 100755
--- a/xfwm4/close-prelight.xpm
+++ b/xfwm4/close-prelight.xpm
@@ -1,8 +1,8 @@
-/* XPM */
+s/* XPM */
static char * close_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/close-pressed.xpm b/xfwm4/close-pressed.xpm
index e8916bd..644cedb 100755
--- a/xfwm4/close-pressed.xpm
+++ b/xfwm4/close-pressed.xpm
@@ -2,7 +2,7 @@
static char * close_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/hide-active.xpm b/xfwm4/hide-active.xpm
index 4a01c16..0f4de57 100755
--- a/xfwm4/hide-active.xpm
+++ b/xfwm4/hide-active.xpm
@@ -2,8 +2,8 @@
static char * hide_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
+". c #444444",
+"+ c #eeeeee",
"........................",
"........................",
"........................",
diff --git a/xfwm4/hide-inactive.xpm b/xfwm4/hide-inactive.xpm
index 3da4487..6e210d2 100755
--- a/xfwm4/hide-inactive.xpm
+++ b/xfwm4/hide-inactive.xpm
@@ -2,7 +2,7 @@
static char * hide_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #888888",
"........................",
"........................",
diff --git a/xfwm4/hide-prelight.xpm b/xfwm4/hide-prelight.xpm
index 040ece7..be53c73 100755
--- a/xfwm4/hide-prelight.xpm
+++ b/xfwm4/hide-prelight.xpm
@@ -2,7 +2,7 @@
static char * hide_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/hide-pressed.xpm b/xfwm4/hide-pressed.xpm
index 040ece7..be53c73 100755
--- a/xfwm4/hide-pressed.xpm
+++ b/xfwm4/hide-pressed.xpm
@@ -2,7 +2,7 @@
static char * hide_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/maximize-active.xpm b/xfwm4/maximize-active.xpm
index ce44a5f..e56f28e 100755
--- a/xfwm4/maximize-active.xpm
+++ b/xfwm4/maximize-active.xpm
@@ -2,8 +2,8 @@
static char * maximize_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
+". c #444444",
+"+ c #eeeeee",
"........................",
"........................",
"........................",
diff --git a/xfwm4/maximize-inactive.xpm b/xfwm4/maximize-inactive.xpm
index 153b4d2..7983fe3 100755
--- a/xfwm4/maximize-inactive.xpm
+++ b/xfwm4/maximize-inactive.xpm
@@ -2,7 +2,7 @@
static char * maximize_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #888888",
"........................",
"........................",
diff --git a/xfwm4/maximize-prelight.xpm b/xfwm4/maximize-prelight.xpm
index 6a73981..342bddb 100755
--- a/xfwm4/maximize-prelight.xpm
+++ b/xfwm4/maximize-prelight.xpm
@@ -2,7 +2,7 @@
static char * maximize_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/maximize-pressed.xpm b/xfwm4/maximize-pressed.xpm
index 6a73981..342bddb 100755
--- a/xfwm4/maximize-pressed.xpm
+++ b/xfwm4/maximize-pressed.xpm
@@ -2,7 +2,7 @@
static char * maximize_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/maximize-toggled-active.xpm b/xfwm4/maximize-toggled-active.xpm
index a34f44a..fa463e7 100755
--- a/xfwm4/maximize-toggled-active.xpm
+++ b/xfwm4/maximize-toggled-active.xpm
@@ -2,8 +2,8 @@
static char * maximize_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
+". c #444444",
+"+ c #eeeeee",
"........................",
"........................",
"........................",
diff --git a/xfwm4/maximize-toggled-inactive.xpm b/xfwm4/maximize-toggled-inactive.xpm
index 914eed8..962e5e3 100755
--- a/xfwm4/maximize-toggled-inactive.xpm
+++ b/xfwm4/maximize-toggled-inactive.xpm
@@ -2,7 +2,7 @@
static char * maximize_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #888888",
"........................",
"........................",
diff --git a/xfwm4/maximize-toggled-prelight.xpm b/xfwm4/maximize-toggled-prelight.xpm
index 0c7ed43..c4c45a2 100755
--- a/xfwm4/maximize-toggled-prelight.xpm
+++ b/xfwm4/maximize-toggled-prelight.xpm
@@ -2,7 +2,7 @@
static char * maximize_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/maximize-toggled-pressed.xpm b/xfwm4/maximize-toggled-pressed.xpm
index 0c7ed43..c4c45a2 100755
--- a/xfwm4/maximize-toggled-pressed.xpm
+++ b/xfwm4/maximize-toggled-pressed.xpm
@@ -2,7 +2,7 @@
static char * maximize_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/menu-active.xpm b/xfwm4/menu-active.xpm
index 3ec59e2..89a9597 100755
--- a/xfwm4/menu-active.xpm
+++ b/xfwm4/menu-active.xpm
@@ -2,7 +2,7 @@
static char * menu_active_xpm[] = {
"24 16 2 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"........................",
"........................",
"........................",
diff --git a/xfwm4/menu-inactive.xpm b/xfwm4/menu-inactive.xpm
index bd7c7e4..e1cba46 100755
--- a/xfwm4/menu-inactive.xpm
+++ b/xfwm4/menu-inactive.xpm
@@ -2,7 +2,7 @@
static char * menu_inactive_xpm[] = {
"24 16 2 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"........................",
"........................",
"........................",
diff --git a/xfwm4/menu-prelight.xpm b/xfwm4/menu-prelight.xpm
index 958dbb6..c1ca9ae 100755
--- a/xfwm4/menu-prelight.xpm
+++ b/xfwm4/menu-prelight.xpm
@@ -2,7 +2,7 @@
static char * menu_prelight_xpm[] = {
"24 24 2 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"........................",
"........................",
"........................",
diff --git a/xfwm4/menu-pressed.xpm b/xfwm4/menu-pressed.xpm
index d546a2c..cfa77c9 100755
--- a/xfwm4/menu-pressed.xpm
+++ b/xfwm4/menu-pressed.xpm
@@ -2,7 +2,7 @@
static char * menu_pressed_xpm[] = {
"24 24 2 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"........................",
"........................",
"........................",
diff --git a/xfwm4/shade-active.xpm b/xfwm4/shade-active.xpm
index 4dac8e8..4caf24e 100755
--- a/xfwm4/shade-active.xpm
+++ b/xfwm4/shade-active.xpm
@@ -2,8 +2,8 @@
static char * shade_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
+". c #444444",
+"+ c #eeeeee",
"........................",
"........................",
"........................",
diff --git a/xfwm4/shade-inactive.xpm b/xfwm4/shade-inactive.xpm
index 9751094..3b42c60 100755
--- a/xfwm4/shade-inactive.xpm
+++ b/xfwm4/shade-inactive.xpm
@@ -2,7 +2,7 @@
static char * shade_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #888888",
"........................",
"........................",
diff --git a/xfwm4/shade-prelight.xpm b/xfwm4/shade-prelight.xpm
index e50b07a..69ce622 100755
--- a/xfwm4/shade-prelight.xpm
+++ b/xfwm4/shade-prelight.xpm
@@ -2,7 +2,7 @@
static char * shade_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/shade-pressed.xpm b/xfwm4/shade-pressed.xpm
index e50b07a..69ce622 100755
--- a/xfwm4/shade-pressed.xpm
+++ b/xfwm4/shade-pressed.xpm
@@ -2,7 +2,7 @@
static char * shade_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/shade-toggled-active.xpm b/xfwm4/shade-toggled-active.xpm
index 1421f70..7464780 100755
--- a/xfwm4/shade-toggled-active.xpm
+++ b/xfwm4/shade-toggled-active.xpm
@@ -2,8 +2,8 @@
static char * shade_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
+". c #444444",
+"+ c #eeeeee",
"........................",
"........................",
"........................",
diff --git a/xfwm4/shade-toggled-inactive.xpm b/xfwm4/shade-toggled-inactive.xpm
index 1e3e4bf..847bb3b 100755
--- a/xfwm4/shade-toggled-inactive.xpm
+++ b/xfwm4/shade-toggled-inactive.xpm
@@ -2,7 +2,7 @@
static char * shade_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #888888",
"........................",
"........................",
diff --git a/xfwm4/shade-toggled-prelight.xpm b/xfwm4/shade-toggled-prelight.xpm
index 0cecaba..8af2d64 100755
--- a/xfwm4/shade-toggled-prelight.xpm
+++ b/xfwm4/shade-toggled-prelight.xpm
@@ -2,7 +2,7 @@
static char * shade_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/shade-toggled-pressed.xpm b/xfwm4/shade-toggled-pressed.xpm
index 0cecaba..8af2d64 100755
--- a/xfwm4/shade-toggled-pressed.xpm
+++ b/xfwm4/shade-toggled-pressed.xpm
@@ -2,7 +2,7 @@
static char * shade_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/stick-active.xpm b/xfwm4/stick-active.xpm
index c8610f8..c7fc821 100755
--- a/xfwm4/stick-active.xpm
+++ b/xfwm4/stick-active.xpm
@@ -2,8 +2,8 @@
static char * stick_active_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
+". c #444444",
+"+ c #eeeeee",
"........................",
"........................",
"........................",
diff --git a/xfwm4/stick-inactive.xpm b/xfwm4/stick-inactive.xpm
index d4cc7fe..41fac3d 100755
--- a/xfwm4/stick-inactive.xpm
+++ b/xfwm4/stick-inactive.xpm
@@ -2,7 +2,7 @@
static char * stick_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #888888",
"........................",
"........................",
diff --git a/xfwm4/stick-prelight.xpm b/xfwm4/stick-prelight.xpm
index ea2a259..0d1418e 100755
--- a/xfwm4/stick-prelight.xpm
+++ b/xfwm4/stick-prelight.xpm
@@ -2,7 +2,7 @@
static char * stick_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/stick-pressed.xpm b/xfwm4/stick-pressed.xpm
index ea2a259..0d1418e 100755
--- a/xfwm4/stick-pressed.xpm
+++ b/xfwm4/stick-pressed.xpm
@@ -2,7 +2,7 @@
static char * stick_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/stick-toggled-active.xpm b/xfwm4/stick-toggled-active.xpm
index 25de32c..ee04ce3 100755
--- a/xfwm4/stick-toggled-active.xpm
+++ b/xfwm4/stick-toggled-active.xpm
@@ -2,8 +2,8 @@
static char * stick_toggled_active_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
-"+ c #DCDCDC",
+". c #444444",
+"+ c #eeeeee",
"........................",
"........................",
"........................",
diff --git a/xfwm4/stick-toggled-inactive.xpm b/xfwm4/stick-toggled-inactive.xpm
index c33b36e..9dec10a 100755
--- a/xfwm4/stick-toggled-inactive.xpm
+++ b/xfwm4/stick-toggled-inactive.xpm
@@ -2,7 +2,7 @@
static char * stick_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #888888",
"........................",
"........................",
diff --git a/xfwm4/stick-toggled-prelight.xpm b/xfwm4/stick-toggled-prelight.xpm
index 5763b9b..1575562 100755
--- a/xfwm4/stick-toggled-prelight.xpm
+++ b/xfwm4/stick-toggled-prelight.xpm
@@ -2,7 +2,7 @@
static char * stick_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/stick-toggled-pressed.xpm b/xfwm4/stick-toggled-pressed.xpm
index 5763b9b..1575562 100755
--- a/xfwm4/stick-toggled-pressed.xpm
+++ b/xfwm4/stick-toggled-pressed.xpm
@@ -2,7 +2,7 @@
static char * stick_toggled_prelight_xpm[] = {
"24 24 3 1",
" c None",
-". c #2D2D2D",
+". c #444444",
"+ c #f0544c s active_color_1",
"........................",
"........................",
diff --git a/xfwm4/themerc b/xfwm4/themerc
index e345ddd..740d09c 100755
--- a/xfwm4/themerc
+++ b/xfwm4/themerc
@@ -2,7 +2,7 @@
# Author: Satyajit Sahoo
# License: GPL-3.0+
-active_text_color=#dcdcdc
+active_text_color=#eeeeee
inactive_text_color=#888888
button_offset=3
button_spacing=0
diff --git a/xfwm4/title-1-active.xpm b/xfwm4/title-1-active.xpm
index 0dbc3ab..52fb899 100755
--- a/xfwm4/title-1-active.xpm
+++ b/xfwm4/title-1-active.xpm
@@ -3,7 +3,7 @@ static char * title_1_active_xpm[] = {
"2 26 3 1",
" c None",
". c #484848",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/title-1-inactive.xpm b/xfwm4/title-1-inactive.xpm
index e8a927a..212d7aa 100755
--- a/xfwm4/title-1-inactive.xpm
+++ b/xfwm4/title-1-inactive.xpm
@@ -3,7 +3,7 @@ static char * title_1_inactive_xpm[] = {
"2 26 3 1",
" c None",
". c #393939",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/title-2-active.xpm b/xfwm4/title-2-active.xpm
index 4c7fd81..7f234ff 100755
--- a/xfwm4/title-2-active.xpm
+++ b/xfwm4/title-2-active.xpm
@@ -3,7 +3,7 @@ static char * title_2_active_xpm[] = {
"2 26 3 1",
" c None",
". c #484848",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/title-2-inactive.xpm b/xfwm4/title-2-inactive.xpm
index 9a165cc..e5cabe3 100755
--- a/xfwm4/title-2-inactive.xpm
+++ b/xfwm4/title-2-inactive.xpm
@@ -3,7 +3,7 @@ static char * title_2_inactive_xpm[] = {
"2 26 3 1",
" c None",
". c #393939",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/title-3-active.xpm b/xfwm4/title-3-active.xpm
index 372d7af..b2829b9 100755
--- a/xfwm4/title-3-active.xpm
+++ b/xfwm4/title-3-active.xpm
@@ -3,7 +3,7 @@ static char * title_3_active_xpm[] = {
"2 26 3 1",
" c None",
". c #484848",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/title-3-inactive.xpm b/xfwm4/title-3-inactive.xpm
index 81157b1..1eacd85 100755
--- a/xfwm4/title-3-inactive.xpm
+++ b/xfwm4/title-3-inactive.xpm
@@ -3,7 +3,7 @@ static char * title_3_inactive_xpm[] = {
"2 26 3 1",
" c None",
". c #393939",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/title-4-active.xpm b/xfwm4/title-4-active.xpm
index 85aa732..707d2a5 100755
--- a/xfwm4/title-4-active.xpm
+++ b/xfwm4/title-4-active.xpm
@@ -3,7 +3,7 @@ static char * title_4_active_xpm[] = {
"2 26 3 1",
" c None",
". c #484848",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/title-4-inactive.xpm b/xfwm4/title-4-inactive.xpm
index cd1e555..4a86d59 100755
--- a/xfwm4/title-4-inactive.xpm
+++ b/xfwm4/title-4-inactive.xpm
@@ -3,7 +3,7 @@ static char * title_4_inactive_xpm[] = {
"2 26 3 1",
" c None",
". c #393939",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/title-5-active.xpm b/xfwm4/title-5-active.xpm
index c88372c..31316b8 100755
--- a/xfwm4/title-5-active.xpm
+++ b/xfwm4/title-5-active.xpm
@@ -3,7 +3,7 @@ static char * title_5_active_xpm[] = {
"2 26 3 1",
" c None",
". c #484848",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/title-5-inactive.xpm b/xfwm4/title-5-inactive.xpm
index e1385ff..aa33f4c 100755
--- a/xfwm4/title-5-inactive.xpm
+++ b/xfwm4/title-5-inactive.xpm
@@ -3,7 +3,7 @@ static char * title_5_inactive_xpm[] = {
"2 26 3 1",
" c None",
". c #393939",
-"+ c #2D2D2D",
+"+ c #444444",
"..",
"++",
"++",
diff --git a/xfwm4/top-left-active.xpm b/xfwm4/top-left-active.xpm
index 4dc55d6..675afd3 100755
--- a/xfwm4/top-left-active.xpm
+++ b/xfwm4/top-left-active.xpm
@@ -4,7 +4,7 @@ static char * top_left_active_xpm[] = {
" c None",
". c #484848",
"+ c #343434",
-"@ c #2D2D2D",
+"@ c #444444",
" .",
".+",
".@",
diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm
index 834acf1..0a922d8 100755
--- a/xfwm4/top-left-inactive.xpm
+++ b/xfwm4/top-left-inactive.xpm
@@ -4,7 +4,7 @@ static char * top_left_inactive_xpm[] = {
" c None",
". c #393939",
"+ c #303030",
-"@ c #2D2D2D",
+"@ c #444444",
" .",
".+",
".@",
diff --git a/xfwm4/top-right-active.xpm b/xfwm4/top-right-active.xpm
index 9558840..3ed6265 100755
--- a/xfwm4/top-right-active.xpm
+++ b/xfwm4/top-right-active.xpm
@@ -4,7 +4,7 @@ static char * top_right_active_xpm[] = {
" c None",
". c #484848",
"+ c #343434",
-"@ c #2D2D2D",
+"@ c #444444",
". ",
"+.",
"@.",
diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm
index 5776746..e847a56 100755
--- a/xfwm4/top-right-inactive.xpm
+++ b/xfwm4/top-right-inactive.xpm
@@ -4,7 +4,7 @@ static char * top_right_inactive_xpm[] = {
" c None",
". c #393939",
"+ c #303030",
-"@ c #2D2D2D",
+"@ c #444444",
". ",
"+.",
"@.",