From 4680d4f189640f88ec7ce64d8bb5a46d8a5e4392 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Tue, 9 Dec 2014 01:17:23 +0530
Subject: [PATCH] Tweaks
---
gtk-3.0/scss/_button.scss | 3 +-
gtk-3.0/scss/_entry.scss | 37 ++++++++-----
gtk-3.0/scss/_view.scss | 12 +++++
gtk-3.0/scss/widgets.scss | 107 ++++----------------------------------
4 files changed, 47 insertions(+), 112 deletions(-)
diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss
index 44cbcd2..caae335 100755
--- a/gtk-3.0/scss/_button.scss
+++ b/gtk-3.0/scss/_button.scss
@@ -130,13 +130,14 @@
border: none;
background-color: transparent;
background-image: none;
+ box-shadow: none;
}
// TODO
}
&.separator, .separator {
- color: shade($bg, .95);
+ color: shade($bg, ($contrast + .05));
border: 1px solid currentColor;
&:insensitive { color: shade($bg, .85); }
diff --git a/gtk-3.0/scss/_entry.scss b/gtk-3.0/scss/_entry.scss
index 7720308..bd00cf1 100755
--- a/gtk-3.0/scss/_entry.scss
+++ b/gtk-3.0/scss/_entry.scss
@@ -81,22 +81,33 @@
! Combobox entry *
*******************/
-@include exports("comboboxentry") {
- GtkComboBox.combobox-entry {
- .entry {
- &, &:hover, &:focus, &:active, &:insensitive {
- border-width: 1px 0 1px 1px;
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
+@include exports("combobox") {
+ GtkComboBox {
+ &.combobox-entry {
+ .entry {
+ &, &:hover, &:focus, &:active, &:insensitive {
+ border-width: 1px 0 1px 1px;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: 0;
+ }
+ }
+
+ .button {
+ &, &:hover, &:focus, &:active, &:insensitive {
+ border-width: 1px 1px 1px 1px;
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+ }
}
}
- .button {
- &, &:hover, &:focus, &:active, &:insensitive {
- border-width: 1px 1px 1px 1px;
- border-bottom-left-radius: 0;
- border-top-left-radius: 0;
- }
+ .separator {
+ /* always disable separators */
+ -GtkWidget-wide-separators: true;
+ -GtkWidget-horizontal-separator: 0;
+ -GtkWidget-vertical-separator: 0;
+
+ border-style: none;
}
}
}
diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss
index cf5e5d9..e2e0c4c 100644
--- a/gtk-3.0/scss/_view.scss
+++ b/gtk-3.0/scss/_view.scss
@@ -132,6 +132,18 @@
}
+/***********
+ ! Separator
+************/
+
+@include exports("separator") {
+ .view.separator, .separator {
+ color: shade($bg_color, ($contrast + .10));
+ border: 1px solid currentColor;
+ }
+}
+
+
/*********************
! Column view headers
**********************/
diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss
index 81844c9..a357096 100755
--- a/gtk-3.0/scss/widgets.scss
+++ b/gtk-3.0/scss/widgets.scss
@@ -2,110 +2,21 @@
@import "colors";
@import "base";
@import "button";
-@import "toggle";
@import "entry";
-@import "menu";
-@import "toolbar";
-@import "sidebar";
-@import "view";
-@import "grid";
-@import "progress";
-@import "spinner";
-@import "window";
@import "calendar";
+@import "grid";
@import "infobar";
+@import "menu";
@import "notebook";
+@import "progress";
@import "scrollbar";
+@import "sidebar";
+@import "spinner";
+@import "toggle";
+@import "toolbar";
+@import "view";
+@import "window";
-/*************
-* separator *
-*************/
-.view.separator,
-.separator {
- border-width: 1px;
- border-style: solid;
- border-color: shade($bg_color, 0.9);
- color: shade($bg_color, 0.9);
-}
-
-.button .separator,
-.button.separator {
- border-color: shade($bg_color, 0.95);
-}
-
-.button .separator:insensitive,
-.button.separator:insensitive {
- border-color: shade($bg_color, 0.85);
-}
-
-.primary-toolbar GtkSeparatorToolItem,
-.primary-toolbar .separator,
-.primary-toolbar .separator:insensitive,
-.toolbar GtkSeparatorToolItem,
-.toolbar .separator,
-.toolbar .separator:insensitive {
- -GtkWidget-window-dragging: true;
-
- border-color: shade($toolbar_bg_color, 0.95);
- color: shade($toolbar_bg_color, 0.95);
-}
-
-.header-bar GtkSeparatorToolItem,
-.header-bar .separator,
-.header-bar .separator:insensitive,
-.titlebar GtkSeparatorToolItem,
-.titlebar .separator,
-.titlebar .separator:insensitive {
- -GtkWidget-window-dragging: true;
-
- border-color: shade($titlebar_bg_color, 0.95);
- color: shade($titlebar_bg_color, 0.95);
-}
-
-.primary-toolbar .button .separator,
-.primary-toolbar .button.separator,
-.toolbar .button .separator,
-.toolbar .button.separator {
- border-color: shade($toolbar_bg_color, 0.95);
-}
-
-.header-bar .button .separator,
-.header-bar .button.separator,
-.titlebar .button .separator,
-.titlebar .button.separator {
- border-color: shade($titlebar_bg_color, 0.95);
-}
-
-.primary-toolbar .button .separator:insensitive,
-.primary-toolbar .button.separator:insensitive,
-.toolbar .button .separator:insensitive,
-.toolbar .button.separator:insensitive {
- border-color: shade($toolbar_bg_color, 0.85);
-}
-
-.header-bar .button .separator:insensitive,
-.header-bar .button.separator:insensitive,
-.titlebar .button .separator:insensitive,
-.titlebar .button.separator:insensitive {
- border-color: shade($titlebar_bg_color, 0.85);
-}
-
-.menuitem.separator {
- -GtkMenuItem-horizontal-padding: 0;
- -GtkWidget-separator-height: 1;
-
- border-style: none;
- color: shade($menu_bg_color, 0.9);
-}
-
-GtkComboBox .separator {
- /* always disable separators */
- -GtkWidget-wide-separators: true;
- -GtkWidget-horizontal-separator: 0;
- -GtkWidget-vertical-separator: 0;
-
- border-style: none;
-}
/**************
* spinbutton *