Skip to content
Browse files

Various enhancements and fixes

  • Loading branch information...
1 parent 65e8cd4 commit 72ddc37bd1062e66ddb06a4dfafd88ecef1f38f4 @satya164 satya164 committed Jan 18, 2013
Showing with 288 additions and 184 deletions.
  1. +103 −45 gtk-3.0/apps/gnome-applications.css
  2. +46 −43 gtk-3.0/apps/granite-widgets.css
  3. +7 −7 gtk-3.0/apps/unity.css
  4. +113 −80 gtk-3.0/gtk-widgets.css
  5. +19 −9 gtk-3.0/gtk.css
View
148 gtk-3.0/apps/gnome-applications.css
@@ -4,25 +4,25 @@
PanelWidget,
PanelApplet,
PanelToplevel {
+ padding: 0;
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.5)),
- to (shade(@theme_bg_color, 1.05)));
+ from (shade(@panel_bg_color, 1.5)),
+ to (shade(@panel_bg_color, 1.05)));
- padding: 0;
- color: @theme_fg_color;
+ color: @panel_fg_color;
}
PanelApplet {
border-width: 0;
}
PanelSeparator {
+ border-width: 0;
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.5)),
- to (shade(@theme_bg_color, 1.05)));
+ from (shade(@panel_bg_color, 1.5)),
+ to (shade(@panel_bg_color, 1.05)));
- border-width: 0;
- color: @theme_fg_color;
+ color: @panel_fg_color;
}
.gnome-panel-menu-bar,
@@ -32,63 +32,65 @@ PanelMenuBar.menubar,
PanelMenuBar.menubar.menuitem {
-PanelMenuBar-icon-visible: true;
+ border-width: 0;
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.5)),
- to (shade(@theme_bg_color, 1.05)));
+ from (shade(@panel_bg_color, 1.5)),
+ to (shade(@panel_bg_color, 1.05)));
}
-PanelAppletFrame {
- background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.5)),
- to (shade(@theme_bg_color, 1.05)));
-
- background-color: @theme_bg_color;
+PanelAppletFrame {
border-width: 0;
+ background-color: @panel_bg_color;
+ background-image: -gtk-gradient(linear, left top, left bottom,
+ from (shade(@panel_bg_color, 1.5)),
+ to (shade(@panel_bg_color, 1.05)));
}
PanelApplet .button {
-GtkButton-inner-border: 2;
+ border-width: 0 1px;
+ border-radius: 0;
+ border-color: transparent;
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.5)),
- to (shade(@theme_bg_color, 1.05)));
+ from (shade(@panel_bg_color, 1.5)),
+ to (shade(@panel_bg_color, 1.05)));
- border-color: shade(@theme_bg_color, 0.7);
- border-radius: 0;
- border-width: 0 1px 0 1px;
- color: @theme_fg_color;
- text-shadow: none;
+ color: @panel_fg_color;
+ text-shadow: none;
box-shadow: none;
}
-PanelApplet .button:prelight:active,
PanelApplet .button:active {
- background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 0.85)),
- to (shade(@theme_bg_color, 1.0)));
-
- border-color: shade(@theme_bg_color, 0.7);
+ border-width: 0 1px;
border-radius: 0;
- border-width: 0 1px 0 1px;
+ border-color: shade(@panel_bg_color, 0.7);
+ background-image: -gtk-gradient(linear, left top, left bottom,
+ from (shade(@panel_bg_color, 0.85)),
+ to (shade(@panel_bg_color, 1.0)));
}
PanelApplet .button:prelight {
- background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.7)),
- to (shade(@theme_bg_color, 1.25)));
-
- border-color: shade(@theme_bg_color, 0.7);
+ border-width: 0 1px;
border-radius: 0;
- border-width: 0 1px 0 1px;
+ border-color: shade(@panel_bg_color, 0.7);
+ background-image: -gtk-gradient(linear, left top, left bottom,
+ from (shade(@panel_bg_color, 1.7)),
+ to (shade(@panel_bg_color, 1.25)));
}
-ClockBox {
- text-shadow: 0 -1px shade(@theme_bg_color, 0.6);
+PanelApplet .button:active:prelight {
+ border-width: 0 1px;
+ border-radius: 0;
+ border-color: shade(@panel_bg_color, 0.7);
+ background-image: -gtk-gradient(linear, left top, left bottom,
+ from (shade(@panel_bg_color, 0.85)),
+ to (shade(@panel_bg_color, 1.0)));
}
WnckPager, WnckTasklist {
- background-color: @theme_bg_color;
+ background-color: @panel_bg_color;
}
/************
@@ -129,39 +131,39 @@ NautilusWindow .sidebar .frame {
}
NautilusWindow > GtkGrid > .pane-separator {
- background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1);
border-width: 1px 1px 0 0;
border-style: solid;
border-color: shade(@theme_bg_color, 0.8);
+ background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1);
}
NautilusView.frame,
NautilusNotebook.notebook {
border-right-width: 0;
- border-left-width: 0;
border-bottom-width: 0;
+ border-left-width: 0;
}
NautilusNotebook .frame {
border-width: 1px 0 0 0;
}
NautilusQueryEditor .primary-toolbar.toolbar {
+ padding: 4px;
border-top-width: 1px;
border-bottom-width: 0;
- padding: 4px;
}
NautilusQueryEditor .primary-toolbar.toolbar .button {
padding: 0;
}
NautilusQueryEditor .toolbar {
- background-color: mix(@theme_bg_color, @theme_base_color, 0.5);
padding: 4px 4px 3px 4px;
border-width: 1px 0 0 0;
border-style: solid;
border-color: @theme_bg_color;
+ background-color: mix(@theme_bg_color, @theme_base_color, 0.5);
}
NautilusQueryEditor .toolbar:nth-child(2) {
@@ -179,7 +181,7 @@ NautilusNotebook.notebook NautilusQueryEditor .primary-toolbar.toolbar:only-chil
}
.toolbar NautilusPathBar .button {
- padding: 1px 4px;
+ padding: 1px 5px;
}
/******************
@@ -193,11 +195,67 @@ TerminalScreen {
}
TerminalWindow GtkNotebook.notebook {
- border-bottom-width: 0;
border-right-width: 0;
+ border-bottom-width: 0;
border-left-width: 0;
}
+TerminalWindow .scrollbars-junction,
+TerminalWindow .scrollbar.trough {
+ background-color: @theme_bg_color;
+}
+
+TerminalWindow .scrollbar.button,
+TerminalWindow .scrollbar.button:active,
+TerminalWindow .scrollbar.button:active:hover {
+ color: shade(#333, 0.6);
+}
+
+/*********
+ * gedit *
+ *********/
+GeditWindow .pane-separator,
+GeditWindow .pane-separator:hover {
+ border-width: 0 1px 1px 1px;
+ border-style: solid;
+ border-color: shade(@theme_bg_color, 0.9);
+ background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1);
+ color: mix(@theme_text_color, @theme_base_color, 0.3);
+}
+
+GeditPanel.title GtkLabel {
+ padding: 5px 0;
+}
+
+GeditPanel .toolbar {
+ border-style: none;
+ background-color: transparent;
+}
+
+GeditDocumentsPanel .view {
+ background-color: shade(@theme_bg_color, 1.02);
+}
+
+GeditPanel .notebook {
+ padding: 0;
+ border-width: 1px 0;
+}
+
+GeditWindow .notebook {
+ border-width: 1px 0;
+}
+
+GeditPanel .notebook tab,
+GeditWindow .notebook tab {
+ border-width: 0;
+}
+
+GeditFloatingSlider .not-found {
+ background-color: @error_bg_color;
+ background-image: none;
+ color: @error_fg_color;
+}
+
/***********************
* gnome control center *
***********************/
View
89 gtk-3.0/apps/granite-widgets.css
@@ -15,12 +15,12 @@
}
.dynamic-notebook .notebook tab {
- background-image: none;
- background-color: transparent;
+ padding: 2px 3px 0 3px;
+ border-width: 0 1px 0 0;
border-color: shade(@theme_bg_color, 0.7);
border-radius: 0;
- border-width: 0 1px 0 0;
- padding: 2px 3px 0 3px;
+ background-color: transparent;
+ background-image: none;
color: @theme_fg_color;
}
@@ -29,10 +29,10 @@
}
.dynamic-notebook .notebook tab:active {
- background-color: shade(@theme_bg_color, 1.12);
+ border-width: 1px;
border-color: shade(@theme_bg_color, 0.7);
border-radius: 3px;
- border-width: 1px;
+ background-color: shade(@theme_bg_color, 1.12);
color: @theme_fg_color;
}
@@ -42,13 +42,9 @@
.dynamic-notebook .notebook .button,
.dynamic-notebook .notebook .button:hover,
.dynamic-notebook .notebook .button:hover:active {
+ padding: 0;
background-color: transparent;
background-image: none;
- padding: 0;
-}
-
-.dynamic-notebook tab {
- border-radius: 0;
}
/****************
@@ -61,14 +57,13 @@
}
.content-view-window {
+ border-width: 1px;
+ border-style: solid;
+ border-color: shade(@theme_bg_color, 0.7);
+ border-radius: 5px;
background-image: -gtk-gradient(linear, left top, left bottom,
from (shade(@theme_bg_color, 1.18)),
to (shade(@theme_bg_color, 1.17)));
-
- border-radius: 5px;
- border-width: 1px;
- border-style: solid;
- border-color: shade(@theme_bg_color, 0.7);
}
.content-view .entry {
@@ -88,10 +83,10 @@
}
.content-view .button {
- background-color: alpha(@theme_bg_color, 0.0);
- background-image: none;
border-style: solid;
border-radius: 3px;
+ background-color: alpha(@theme_bg_color, 0.0);
+ background-image: none;
color: @theme_fg_color;
}
@@ -111,26 +106,25 @@
}
.content-view .toolbar {
- -GtkWidget-window-dragging: true;
-
+ padding: 1px;
+ border-width: 0 0 1px 0;
+ border-style: solid;
+ border-color: shade(@theme_bg_color, 0.7);
background-image: -gtk-gradient(linear, left top, left bottom,
from (shade(@theme_bg_color, 1.2)),
to (shade(@theme_bg_color, 0.97)));
- border-style: solid;
- border-width: 0 0 1px 0;
- border-color: shade(@theme_bg_color, 0.7);
- padding: 1px;
+ -GtkWidget-window-dragging: true;
}
/*******************
* album list view *
*******************/
.album-list-view,
.album-list-view * {
- background-color: @theme_base_color;
- border-radius: 0;
border-color: shade(@theme_bg_color, 0.7);
+ border-radius: 0;
+ background-color: @theme_base_color;
color: @theme_fg_color;
}
@@ -143,27 +137,26 @@
}
.album-list-view GtkTreeView row:nth-child(even) {
- background-color: shade(@theme_base_color, 0.95);
border-width: 0;
border-style: none;
+ background-color: shade(@theme_base_color, 0.95);
}
.album-list-view GtkTreeView row:nth-child(odd) {
- background-color: shade(@theme_base_color, 1.0);
border-width: 0;
border-style: none;
+ background-color: shade(@theme_base_color, 1.0);
}
/*************
* statusbar *
*************/
GraniteWidgetsStatusBar {
+ padding: 1px;
background-image: -gtk-gradient(linear, left top, left bottom,
from (shade(@theme_bg_color, 1.0)),
to (shade(@theme_bg_color, 0.88)));
- padding: 1px;
-
box-shadow: inset 0 1px shade(@theme_bg_color, 0.7);
}
@@ -177,32 +170,36 @@ GraniteWidgetsPopOver {
-GraniteWidgetsPopOver-border-width: 1;
-GraniteWidgetsPopOver-shadow-size: 15;
- border-style: solid;
- border-color: shade(@theme_bg_color, 0.7);
margin: 0;
+ border-style: solid;
+ border-color: shade(@menu_bg_color, 0.7);
+ color: @menu_fg_color;
}
.popover_bg {
background-color: transparent;
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.18)),
- to (shade(@theme_bg_color, 1.17)));
+ from (shade(@menu_bg_color, 1.18)),
+ to (shade(@menu_bg_color, 1.17)));
}
GraniteWidgetsPopOver .sidebar.view,
GraniteWidgetsPopOver * {
background-color: transparent;
+ color: @menu_fg_color;
}
GraniteWidgetsPopOver .button {
- background-image: none;
+ border-color: shade(@menu_bg_color, 0.8);
background-color: transparent;
+ background-image: none;
+ color: @menu_fg_color;
}
GraniteWidgetsPopOver .button:active,
GraniteWidgetsPopOver .button:hover:active {
+ background-color: @menu_bg_color;
background-image: none;
- background-color: @theme_bg_color;
}
GraniteWidgetsPopOver .entry {
@@ -231,40 +228,46 @@ GraniteWidgetsPopOver .entry {
* wingpanel *
*************/
.panel {
- background-color: rgba(0, 0, 0, 0.7);
+ background-color: alpha (#000, 0.6);
color: #fff;
}
.shadow {
+ background-color: transparent;
background-image: -gtk-gradient(linear,
left top, left bottom,
from (rgba(0, 0, 0, 0.3)),
to (transparent));
-
- background-color: transparent;
}
.composited-indicator,
.wingpanel-app-button,
.wingpanel-indicator-button {
+ padding: 0 3px;
background-color: transparent;
color: #fff;
}
+.composited-indicator.menuitem:active,
+.composited-indicator.menuitem:prelight {
+ border-style: none;
+ background-image: none;
+}
+
/**********
* notify *
**********/
.notify {
- background-color: alpha(@theme_base_color, 0.98);
- border-radius: 5px;
border-width: 1px;
border-style: solid;
- border-color: shade(@theme_bg_color, 0.7);
+ border-color: shade(@theme_bg_color, 0.8);
+ border-radius: 5px;
+ background-color: @theme_base_color;
color: @theme_text_color;
}
.notify .low {
}
.notify .critical {
-}
+}
View
14 gtk-3.0/apps/unity.css
@@ -1,12 +1,11 @@
UnityPanelWidget,
.unity-panel {
- background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.2)),
- to (shade(@theme_bg_color, 1.0)));
-
- border-color: shade(@theme_bg_color, 1.0);
- border-style: solid;
border-width: 0 0 1px 0;
+ border-style: solid;
+ border-color: shade(@panel_bg_color, 1.0);
+ background-image: -gtk-gradient(linear, left top, left bottom,
+ from (shade(@panel_bg_color, 1.2)),
+ to (shade(@panel_bg_color, 1.0)));
}
.unity-panel.menubar,
@@ -16,14 +15,15 @@ UnityPanelWidget,
.unity-panel.menuitem,
.unity-panel .menuitem {
border-width: 0 1px;
+ color: @panel_fg_color;
}
.unity-panel.menubar.menuitem:hover,
.unity-panel.menubar .menuitem *:hover {
+ border-color: shade(@panel_bg_color, 0.8);
background-image: -gtk-gradient(linear, left top, left bottom,
from (shade(@theme_bg_color, 1.2)),
to (shade(@theme_bg_color, 1.0)));
- border-color: shade(@theme_bg_color, 0.85);
color: @theme_fg_color;
}
View
193 gtk-3.0/gtk-widgets.css
@@ -108,23 +108,26 @@ GtkWindow {
color: @theme_selected_fg_color;
}
+.background {
+ color: @theme_fg_color;
+ background-color: @theme_bg_color;
+}
+
/******************
* common effects *
******************/
/* transitions animations */
-/* disabled to fix memory-leak
.button,
-.slider {
- transition: background .15s linear;
-}
-
-.entry {
- transition: border .15s ease;
+.slider,
+.check,
+.radio {
+ transition: background .15s ease-in-out;
}
-*/
/* inset shadow */
.button,
+.primary-toolbar .raised .button,
+.primary-toolbar .raised.button,
GtkSwitch.slider {
box-shadow: inset 1px 1px alpha(@light_shadow, 0.4),
inset -1px 0 alpha(@light_shadow, 0.4);
@@ -170,10 +173,10 @@ GtkSwitch.slider:insensitive {
.toolbar .menu,
.toolbar .primary-toolbar .menu,
.menu {
- box-shadow: inset 1px 0 shade(@theme_bg_color, 0.8),
- inset 0 1px shade(@theme_bg_color, 0.8),
- inset -1px 0 shade(@theme_bg_color, 0.8),
- inset 0 -1px shade(@theme_bg_color, 0.8);
+ box-shadow: inset 1px 0 shade(@menu_bg_color, 0.8),
+ inset 0 1px shade(@menu_bg_color, 0.8),
+ inset -1px 0 shade(@menu_bg_color, 0.8),
+ inset 0 -1px shade(@menu_bg_color, 0.8);
}
GtkScale.slider {
@@ -255,14 +258,23 @@ GtkAssistant .sidebar {
color: @theme_fg_color;
}
+.button:hover {
+ border-top-color: shade(@theme_bg_color, 0.85);
+ border-right-color: shade(@theme_bg_color, 0.78);
+ border-left-color: shade(@theme_bg_color, 0.78);
+ border-bottom-color: shade(@theme_bg_color, 0.7);
+ background-image: -gtk-gradient(linear, left top, left bottom,
+ from (shade(@theme_bg_color, 1.15)),
+ to (shade(@theme_bg_color, 1.07)));
+}
+
.button:active {
border-color: shade(@theme_bg_color, 0.6);
background-image: -gtk-gradient(linear, left top, left bottom,
from (shade(shade(@theme_bg_color, 0.85), 1.05)),
to (shade(shade(@theme_bg_color, 0.85), 0.97)));
}
-.button:hover,
.button:active:hover {
border-top-color: shade(@theme_bg_color, 0.85);
border-right-color: shade(@theme_bg_color, 0.78);
@@ -433,6 +445,13 @@ GtkAssistant .sidebar {
border-width: 0;
border-radius: 0;
background-color: @theme_base_color;
+ color: @theme_text_color;
+}
+
+.cell:selected,
+.cell:selected:focus {
+ background-color: @theme_selected_bg_color;
+ color: @theme_selected_fg_color;
}
row:selected,
@@ -709,6 +728,11 @@ GtkLabel:insensitive {
/***********
* infobar *
***********/
+GtkInfoBar {
+ border-width: 0;
+ border-style: none;
+}
+
.info {
border-width: 1px;
border-style: solid;
@@ -807,8 +831,8 @@ GtkLabel:insensitive {
.floating-bar {
border-width: 1px;
border-style: solid;
- border-radius: 3px;
border-color: shade(@theme_bg_color, 0.7);
+ border-radius: 3px;
background-image: -gtk-gradient(linear, left top, left bottom,
from (shade(@theme_bg_color, 1.2)),
to (shade(@theme_bg_color, 0.9)));
@@ -875,7 +899,7 @@ GtkLabel:insensitive {
GtkTreeMenu.menu,
GtkMenuToolButton.menu,
GtkComboBox .menu {
- background-color: shade(@theme_bg_color, 1.18);
+ background-color: shade(@menu_bg_color, 1.18);
}
.primary-toolbar .button .menu,
@@ -885,8 +909,8 @@ GtkComboBox .menu {
padding: 0;
border-width: 0;
border-radius: 0;
- background-color: shade(@theme_bg_color, 1.18);
- color: @theme_fg_color;
+ background-color: shade(@menu_bg_color, 1.18);
+ color: @menu_fg_color;
}
.menu.button:hover,
@@ -895,7 +919,7 @@ GtkComboBox .menu {
.menu.button:insensitive,
.menu.button {
border-width: 0;
- background-color: shade(@theme_bg_color, 1.18);
+ background-color: shade(@menu_bg_color, 1.18);
background-image: none;
}
@@ -906,7 +930,9 @@ GtkComboBox .menu {
-GtkWidget-window-dragging: true;
border-width: 0;
- color: @theme_fg_color;
+ background-color: @menubar_bg_color;
+ background-image: none;
+ color: @menubar_fg_color;
}
/***************
@@ -939,7 +965,7 @@ GtkTreeMenu .menuitem {
}
GtkTreeMenu .menuitem * {
- color: @theme_fg_color;
+ color: @menu_fg_color;
}
.menuitem,
@@ -968,7 +994,7 @@ GtkTreeMenu .menuitem * {
.menu .menuitem:insensitive,
.menu .menuitem *:insensitive {
- color: mix(@theme_fg_color, @theme_bg_color, 0.4);
+ color: mix(@menu_fg_color, @menu_bg_color, 0.4);
}
.menuitem.check,
@@ -988,36 +1014,29 @@ GtkTreeMenu .menuitem * {
background-color: transparent;
}
-.menuitem GtkCalendar:inconsistent {
- color: alpha(@theme_fg_color, 0.6);
-}
-
-.menuitem GtkCalendar,
-.menuitem GtkCalendar.button,
-.menuitem GtkCalendar.header,
-.menuitem GtkCalendar.view {
- border-width: 0;
+.menuitem GtkCalendar.button {
+ border-style: none;
background-color: transparent;
background-image: none;
}
.menuitem .entry {
- border-color: shade(@theme_bg_color, 0.7);
- background-color: shade(@theme_base_color, 0.98);
+ border-color: shade(@menu_bg_color, 0.7);
+ background-color: @menu_bg_color;
background-image: none;
- color: @theme_fg_color;
+ color: @menu_fg_color;
}
.menuitem .accelerator {
- color: alpha(@theme_fg_color, 0.6);
+ color: alpha(@menu_fg_color, 0.6);
}
.menuitem .accelerator:hover {
color: alpha(@theme_selected_fg_color, 0.8);
}
.menuitem .accelerator:insensitive {
- color: alpha(mix(@theme_fg_color, @theme_bg_color, 0.5), 0.6);
+ color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6);
}
/************
@@ -1158,6 +1177,7 @@ GtkLevelBar.vertical {
.level-bar.trough {
padding: 2px;
+ border-radius: 2px;
}
.level-bar.fill-block {
@@ -1459,8 +1479,8 @@ GtkScrolledWindow GtkViewport.frame {
-GtkMenuItem-horizontal-padding: 0;
-GtkWidget-separator-height: 1;
- border-color: @theme_bg_color;
- color: @theme_bg_color;
+ border-color: @menu_bg_color;
+ color: @menu_bg_color;
}
GtkComboBox .separator {
@@ -1746,8 +1766,8 @@ GtkTextView {
padding: 2px;
border-style: none;
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.0)),
- to (shade(@theme_bg_color, 0.88)));
+ from (shade(@toolbar_bg_color, 1.0)),
+ to (shade(@toolbar_bg_color, 0.88)));
}
/* primary-toolbar */
@@ -1759,12 +1779,12 @@ GtkTextView {
padding: 2px;
border-width: 0 0 1px 0;
border-style: solid;
- border-color: shade(@theme_bg_color, 0.7);
+ border-color: shade(@toolbar_bg_color, 0.7);
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.0)),
- to (shade(@theme_bg_color, 0.88)));
+ from (shade(@toolbar_bg_color, 1.0)),
+ to (shade(@toolbar_bg_color, 0.88)));
- color: @theme_fg_color;
+ color: @toolbar_fg_color;
}
.primary-toolbar GtkComboBox,
@@ -1776,62 +1796,74 @@ GtkTextView {
border-radius: 3px;
background-color: transparent;
background-image: none;
- color: @theme_fg_color;
+ color: @toolbar_fg_color;
}
.primary-toolbar .raised .button,
-.primary-toolbar .raised.button {
- border-color: shade(@theme_bg_color, 0.7);
+.primary-toolbar .raised.button,
+.toolbar .button {
+ border-top-color: shade(@toolbar_bg_color, 0.8);
+ border-right-color: shade(@toolbar_bg_color, 0.72);
+ border-left-color: shade(@toolbar_bg_color, 0.72);
+ border-bottom-color: shade(@toolbar_bg_color, 0.7);
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.15)),
- to (shade(@theme_bg_color, 1.07)));
+ from (shade(shade(@toolbar_bg_color, 1.02), 1.05)),
+ to (shade(shade(@toolbar_bg_color, 1.02), 0.97)));
+
+ color: @toolbar_fg_color;
}
-.primary-toolbar .button:hover {
- border-top-color: shade(@theme_bg_color, 0.85);
- border-right-color: shade(@theme_bg_color, 0.78);
- border-left-color: shade(@theme_bg_color, 0.78);
- border-bottom-color: shade(@theme_bg_color, 0.7);
+.primary-toolbar .button:hover,
+.toolbar .button:hover {
+ border-top-color: shade(@toolbar_bg_color, 0.85);
+ border-right-color: shade(@toolbar_bg_color, 0.78);
+ border-left-color: shade(@toolbar_bg_color, 0.78);
+ border-bottom-color: shade(@toolbar_bg_color, 0.7);
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.15)),
- to (shade(@theme_bg_color, 1.07)));
+ from (shade(@toolbar_bg_color, 1.15)),
+ to (shade(@toolbar_bg_color, 1.07)));
}
-.primary-toolbar .button:active {
- border-color: shade(@theme_bg_color, 0.6);
+.primary-toolbar .button:active,
+.toolbar .button:active {
+ border-color: shade(@toolbar_bg_color, 0.6);
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(shade(@theme_bg_color, 0.85), 1.05)),
- to (shade(shade(@theme_bg_color, 0.85), 0.97)));
+ from (shade(shade(@toolbar_bg_color, 0.85), 1.05)),
+ to (shade(shade(@toolbar_bg_color, 0.85), 0.97)));
}
-.primary-toolbar .button:active:hover {
- border-top-color: shade(@theme_bg_color, 0.85);
- border-right-color: shade(@theme_bg_color, 0.78);
- border-left-color: shade(@theme_bg_color, 0.78);
- border-bottom-color: shade(@theme_bg_color, 0.7);
+.primary-toolbar .button:active:hover,
+.toolbar .button:active:hover {
+ border-top-color: shade(@toolbar_bg_color, 0.85);
+ border-right-color: shade(@toolbar_bg_color, 0.78);
+ border-left-color: shade(@toolbar_bg_color, 0.78);
+ border-bottom-color: shade(@toolbar_bg_color, 0.7);
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(@theme_bg_color, 1.15)),
- to (shade(@theme_bg_color, 1.07)));
+ from (shade(@toolbar_bg_color, 1.15)),
+ to (shade(@toolbar_bg_color, 1.07)));
}
-.primary-toolbar .button:insensitive {
- border-color: shade(@theme_bg_color, 0.8);
+.primary-toolbar .button:insensitive,
+.toolbar .button:insensitive {
+ border-color: shade(@toolbar_bg_color, 0.8);
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(shade(@theme_bg_color, 0.95), 1.05)),
- to (shade(shade(@theme_bg_color, 0.95), 0.97)));
+ from (shade(shade(@toolbar_bg_color, 0.95), 1.05)),
+ to (shade(shade(@toolbar_bg_color, 0.95), 0.97)));
}
-.primary-toolbar .button:active:insensitive {
- border-color: shade(@theme_bg_color, 0.8);
+.primary-toolbar .button:active:insensitive,
+.toolbar .button:active:insensitive {
+ border-color: shade(@toolbar_bg_color, 0.8);
background-image: -gtk-gradient(linear, left top, left bottom,
- from (shade(shade(@theme_bg_color, 0.95), 1.05)),
- to (shade(shade(@theme_bg_color, 0.95), 0.97)));
+ from (shade(shade(@toolbar_bg_color, 0.95), 1.05)),
+ to (shade(shade(@toolbar_bg_color, 0.95), 0.97)));
}
-.primary-toolbar .entry,
-.primary-toolbar .entry:active,
-.primary-toolbar .entry:focus {
- border-radius: 3px;
+.primary-toolbar .entry {
+ border-top-color: shade(@toolbar_bg_color, 0.6);
+ border-right-color: shade(@toolbar_bg_color, 0.7);
+ border-left-color: shade(@toolbar_bg_color, 0.7);
+ border-bottom-color: shade(@toolbar_bg_color, 0.72);
}
.primary-toolbar GtkSeparatorToolItem,
@@ -1991,8 +2023,9 @@ GtkTextView {
.tooltip {
border-width: 1px;
border-style: solid;
- border-color: @theme_tooltip_bg_color;
- border-radius: 2px;
+ border-color: alpha(@theme_tooltip_bg_color, 0.9);
+ border-radius: 3px;
+ background-image: none;
background-color: alpha(@theme_tooltip_bg_color, 0.9);
color: @theme_tooltip_fg_color;
}
View
28 gtk-3.0/gtk.css
@@ -23,18 +23,28 @@
@define-color dark_shadow #000;
/* misc colors used by gtk+ */
-@define-color info_fg_color rgb(80, 80, 80);
-@define-color info_bg_color rgb(250, 250, 130);
-@define-color warning_fg_color rgb(255, 255, 255);
-@define-color warning_bg_color rgb(255, 150, 80);
-@define-color question_fg_color rgb(80, 80, 80);
-@define-color question_bg_color rgb(150, 180, 230);
-@define-color error_fg_color rgb(255, 255, 255);
-@define-color error_bg_color rgb(200, 70, 50);
-@define-color link_color #2c82dd;
+@define-color info_fg_color rgb (0, 0, 0);
+@define-color info_bg_color rgb (252, 246, 202);
+@define-color warning_fg_color rgb (0, 0, 0);
+@define-color warning_bg_color rgb (250, 173, 61);
+@define-color question_fg_color rgb (255, 255, 255);
+@define-color question_bg_color rgb (57, 142, 231);
+@define-color error_fg_color rgb (255, 255, 255);
+@define-color error_bg_color rgb (237, 54, 54);
+@define-color link_color #569be4;
@define-color success_color #4e9a06;
@define-color error_color #cc0000;
+/* widget colors */
+@define-color menubar_bg_color @theme_bg_color;
+@define-color menubar_fg_color @theme_fg_color;
+@define-color toolbar_bg_color @theme_bg_color;
+@define-color toolbar_fg_color @theme_fg_color;
+@define-color menu_bg_color @theme_bg_color;
+@define-color menu_fg_color @theme_fg_color;
+@define-color panel_bg_color @theme_bg_color;
+@define-color panel_fg_color @theme_fg_color;
+
/* osd */
@define-color osd_base #333;
@define-color osd_fg #eee;

0 comments on commit 72ddc37

Please sign in to comment.
Something went wrong with that request. Please try again.