diff --git a/README b/README
index 245ff3e19c8e5d2e06c8d9d372547c0203f5afef..e4dae5ada30ebe3bf6100cba517c358140dbc587 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Name: Greenbird
Summary: Desktop Suite for Xfce.
URL: http://git.manjaro.org/artwork/greenbird-theme
-Copyright 2013 Manjaro (based on Greybird by Simon Steinbeiß and Satyajit Sahoo)
+Copyright 2013 - 2014 Manjaro (based on Greybird by Simon Steinbeiß and Satyajit Sahoo)
Greybird is dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later.
Desktop Suite for Xfce.
diff --git a/gtk-2.0/apps/chromium.rc b/gtk-2.0/apps/chromium.rc
index e463e7f691fd4e6b7b401ec3f2bb49321f45aa3f..8d03147f29d53e3be45f2d0686e49ec7203bbc84 100644
--- a/gtk-2.0/apps/chromium.rc
+++ b/gtk-2.0/apps/chromium.rc
@@ -3,10 +3,14 @@ style "chrome-gtk-frame"
{
ChromeGtkFrame::frame-color = shade (0.5, @bg_color)
ChromeGtkFrame::inactive-frame-color = shade (0.5, @bg_color)
+ ChromeGtkFrame::incognito-frame-color = shade (0.5, @bg_color)
+ ChromeGtkFrame::incognito-inactive-frame-color = shade (0.5, @bg_color)
ChromeGtkFrame::frame-gradient-size = 100
ChromeGtkFrame::frame-gradient-color = shade (1.08,@bg_color)
ChromeGtkFrame::inactive-frame-gradient-color = shade (1.08,@bg_color)
+ ChromeGtkFrame::incognito-frame-gradient-color = shade (1.08,@bg_color)
+ ChromeGtkFrame::incognito-inactive-frame-gradient-color = shade (1.08,@bg_color)
ChromeGtkFrame::scrollbar-trough-color = @base_color
ChromeGtkFrame::scrollbar-slider-prelight-color = shade(0.92, @bg_color)
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index d1b4cce5f9caa48b561b7660e946a0bf9bc81375..665909d50790860b3235ebd172c2507f7cfe3bff 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -609,34 +609,60 @@ style "xfwm-tabwin"
style "xfdesktop-icon-view"
{
- font_name = "bold"
XfdesktopIconView::label-alpha = 0
- XfdesktopIconView::selected-label-alpha = 60
+ XfdesktopIconView::selected-label-alpha = 80
+ XfdesktopIconView::shadow-x-offset = 1
+ XfdesktopIconView::shadow-y-offset = 1
+ XfdesktopIconView::selected-shadow-x-offset = 1
+ XfdesktopIconView::selected-shadow-y-offset = 1
+ XfdesktopIconView::shadow-color = @tooltip_bg_color
+ XfdesktopIconView::selected-shadow-color = @tooltip_bg_color
+ XfdesktopIconView::cell-spacing = 2
+ XfdesktopIconView::cell-padding = 6
+ XfdesktopIconView::cell-text-width-proportion = 1.9
+
fg[NORMAL] = shade (0.9, @selected_fg_color)
fg[ACTIVE] = @selected_fg_color
+
engine "murrine"
{
- textstyle = 5
- text_shade = 0.05
}
}
-style "xfsm-logout" = "dark"
+style "xfsm-logout"
{
- bg[NORMAL] = shade (0.35, @bg_color_dark)
- bg[SELECTED] = shade (0.25, @bg_color_dark) # Borderline around the dialog
- bg[INSENSITIVE] = shade (0.6, @bg_color_dark)
+ GtkDialog::content-area-border = 12
+ GtkDialog::content-area-spacing = 6
+ GtkDialog::action-area-spacing = 0
+
+ bg_pixmap[NORMAL] = "xfsmlogout.png"
+
+ bg[NORMAL] = @bg_color
+ bg[SELECTED] = shade (1.18, @bg_color) # Border around the dialog
+ fg[NORMAL] = @fg_color
engine "murrine"
- {
- contrast = 1.2
- highlight_shade = 1.00
- lightborder_shade = 1.95
- gradient_shades = {1.2,1.1,0.95,0.93}
- border_shades = { 1.2,0.95 }
- reliefstyle = 2
- shadow_shades = { 1.3, 1.7 }
- }
+ {
+ }
+}
+
+style "xfsm-label"
+{
+ font_name = "14"
+
+ engine "murrine"
+ {
+ textstyle = 1
+ text_shade = 0.85
+ }
+}
+
+style "xfsm-button" = "button"
+{
+ engine "murrine"
+ {
+ textstyle = 0
+ }
}
style "calendar"
@@ -735,6 +761,8 @@ widget_class "*GnmSimpleCanvas*" style "treeview-header" # Gnumeric treeview-he
widget_class "*XfceHeading*" style "xfce-header"
widget "xfwm4-tabwin*" style "xfwm-tabwin"
widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
+widget_class "*XfsmLogoutDialog*GtkVBox.GtkVBox.GtkLabel" style "xfsm-label"
+widget_class "*XfsmLogoutDialog*GtkButton*" style "xfsm-button"
widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
widget_class "*<OsScrollbar>" style "overlay-scrollbar"
diff --git a/gtk-2.0/xfsmlogout.png b/gtk-2.0/xfsmlogout.png
new file mode 100644
index 0000000000000000000000000000000000000000..609a954d3ce468fdd07cc0ded03497dfc15823f4
Binary files /dev/null and b/gtk-2.0/xfsmlogout.png differ
diff --git a/gtk-3.0/apps/gnome-applications.css b/gtk-3.0/apps/gnome-applications.css
index 6b511bba7e1efd2074c37e9460a88711a5a68ca4..d0743da7627a8a0df9d0ef33bf19716ee909a1a3 100644
--- a/gtk-3.0/apps/gnome-applications.css
+++ b/gtk-3.0/apps/gnome-applications.css
@@ -139,7 +139,7 @@ NautilusWindow .sidebar .frame {
NautilusWindow > GtkGrid > .pane-separator,
NautilusWindow > GtkGrid > .pane-separator:hover {
- border-width: 0 1px 0 1px;
+ border-width: 0 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);
@@ -155,7 +155,7 @@ NautilusNotebook .frame {
border-width: 0;
}
-NautilusQueryEditor .primary-toolbar.toolbar {
+NautilusQueryEditor .search-bar.toolbar {
border-top-width: 0;
border-bottom-width: 0;
}
@@ -174,7 +174,7 @@ NautilusQueryEditor .toolbar:nth-child(2) {
}
NautilusQueryEditor .toolbar:last-child,
-NautilusQueryEditor .primary-toolbar.toolbar:only-child {
+NautilusQueryEditor .search-bar.toolbar:only-child {
border-bottom-width: 1px;
border-bottom-color: shade(@toolbar_bg_color, 0.8);
}
@@ -196,7 +196,7 @@ TerminalWindow GtkNotebook.notebook {
/*********
* gedit *
*********/
-GeditWindow .pane-separator,
+GeditWindow .pane-separator,
GeditWindow .pane-separator:hover {
border-width: 0 1px 1px 1px;
border-style: solid;
@@ -205,59 +205,103 @@ GeditWindow .pane-separator:hover {
color: shade(@theme_bg_color, 0.8);
}
-GeditPanel.title GtkLabel {
- padding: 5px 0;
+.gedit-document-panel {
+ 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.vertical .title {
- padding: 5px 0 4px 3px;
- border-style: none;
+.gedit-document-panel-group-row,
+.gedit-document-panel-group-row:hover {
+ border-top: 1px solid shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.9);
+ background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1);
}
-GeditPanel .toolbar {
- border-style: none;
+.gedit-document-panel-document-row:hover {
+ background-color: shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.95);
+}
+
+.gedit-document-panel-document-row:selected,
+.gedit-document-panel-document-row:selected:hover {
+ background-color: @theme_selected_bg_color;
+ color: @theme_selected_fg_color;
+}
+
+.gedit-document-panel .list-row .button {
+ padding: 1px;
+ border-image: none;
+ border-radius: 3px;
+ border-style: solid;
+ border-color: transparent;
+ border-width: 1px;
background-color: transparent;
+ background-image: none;
+ color: transparent;
+ icon-shadow: none;
}
-GeditDocumentsPanel .view {
- background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1);
+.gedit-document-panel .prelight-row .button {
+ border-color: alpha(black, 0.1);
+ color: mix(@theme_text_color, @theme_base_color, 0.5);
}
-GeditPanel.vertical .notebook {
- padding: 0;
- border-width: 1px 0;
+.gedit-document-panel .list-row .button:hover,
+.gedit-document-panel .prelight-row .button:hover {
+ color: @theme_text_color;
+ border-color: alpha(black, 0.1);
}
-GeditPanel.horizontal .notebook {
- padding: 0;
- border-width: 0 1px 1px 0;
+.gedit-document-panel .prelight-row .button:active {
+ color: @theme_text_color;
+ background-color: alpha(black, 0.08);
+ border-color: alpha(black, 0.27)
+ alpha(black, 0.13)
+ alpha(black, 0.13)
+ alpha(black, 0.13);
}
-GeditWindow .notebook {
- border-width: 1px 0;
+GeditStatusbar {
+ border-top: 1px solid shade(@theme_bg_color, 0.8);
}
-GeditPanel .notebook tab,
-GeditWindow .notebook tab {
- border-width: 0;
+GeditStatusbar GeditSmallButton,
+GeditStatusMenuButton {
+ text-shadow: none;
}
-GeditStatusComboBox .button,
-GeditStatusComboBox .button:hover,
-GeditStatusComboBox .button:active,
-GeditStatusComboBox .button:active:hover {
- padding: 1px 6px 2px 4px;
+GeditStatusbar GeditSmallButton.button,
+GeditStatusbar GeditSmallButton.button:hover,
+GeditStatusbar GeditSmallButton.button:active,
+GeditStatusbar GeditSmallButton.button:active:hover,
+GeditStatusMenuButton.button,
+GeditStatusMenuButton.button:hover,
+GeditStatusMenuButton.button:active,
+GeditStatusMenuButton.button:active:hover {
+ border-image: none;
border-style: solid;
border-width: 0 1px;
border-radius: 0;
+ padding: 1px 6px 2px 4px;
}
-GeditStatusComboBox .button:hover,
-GeditStatusComboBox .button:active,
-GeditStatusComboBox .button:active:hover {
+GeditStatusbar GeditSmallButton.button:hover,
+GeditStatusbar GeditSmallButton.button:active,
+GeditStatusbar GeditSmallButton.button:active:hover,
+GeditStatusMenuButton.button:hover,
+GeditStatusMenuButton.button:active,
+GeditStatusMenuButton.button:active:hover {
border-color: shade(@theme_bg_color, 0.8);
}
+GeditStatusbar GeditSmallButton.button:active,
+GeditStatusMenuButton.button:active {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ shade(@theme_bg_color, 0.8),
+ shade(@theme_bg_color, 0.95));
+
+ color: @theme_fg_color;
+}
+
GeditViewFrame .gedit-search-slider {
padding: 4px;
border-radius: 0 0 3px 3px;
@@ -278,13 +322,19 @@ GeditViewFrame .gedit-search-slider .not-found:selected {
color: @theme_selected_fg_color;
}
-GeditFileBrowserWidget .primary-toolbar.toolbar {
+GeditFileBrowserWidget .toolbar {
padding: 2px;
border-top: none;
background-color: @theme_bg_color;
background-image: none;
}
+.gedit-search-entry-occurrences-tag {
+ margin: 2px;
+ padding: 2px;
+ color: mix(@theme_text_color, @theme_base_color, 0.4);
+}
+
/***************
* font-viewer *
***************/
@@ -314,3 +364,24 @@ EPreviewPane .entry {
background-color: @theme_base_color;
color: @theme_text_color;
}
+
+/******************
+ * gnome calendar *
+ ******************/
+.calendar-view {
+ background-color: shade(@theme_base_color, 0.95);
+ color: @theme_text_color;
+}
+
+/*******************
+ * gnome-bluetooth *
+ *******************/
+GtkEntry.entry.pin-entry {
+ font: regular 50;
+ padding-left: 25px;
+ padding-right: 25px;
+}
+
+GtkLabel.pin-label {
+ font: regular 50;
+}
diff --git a/gtk-3.0/apps/lightdm-gtk-greeter.css b/gtk-3.0/apps/lightdm-gtk-greeter.css
index 8a8f22c8f141cdad6653f258a1a2b1d57f753324..f5fb55bbae33859987884cb385d0518ae5616148 100644
--- a/gtk-3.0/apps/lightdm-gtk-greeter.css
+++ b/gtk-3.0/apps/lightdm-gtk-greeter.css
@@ -1,92 +1,270 @@
-/* General colors for the greeter */
-#login_window,
-#panel_window,
+/*********
+ * panel *
+ *********/
+#panel_window {
+ background-color: alpha (black, 0.5);
+ color: white;
+ font: bold;
+ text-shadow: 0 1px alpha(black, 0.5);
+ icon-shadow: 0 1px alpha(black, 0.5);
+ box-shadow: inset 0 -1px alpha (black, 0.5);
+}
+
#panel_window .menubar,
-#panel_window .menubar > .menuitem,
-#restart_dialog,
-#shutdown_dialog,
+#panel_window .menubar > .menuitem {
+ background-color: transparent;
+ color: white;
+ font: bold;
+ text-shadow: 0 1px alpha(black, 0.5);
+ icon-shadow: 0 1px alpha(black, 0.5);
+}
+
+#panel_window .menubar .menuitem:insensitive {
+ color: alpha(white, 0.7);
+}
+
+#panel_window .menubar .menu {
+ border-radius: 1px;
+}
+
+#panel_window .menubar .menu .menuitem {
+ font: normal;
+ text-shadow: none;
+}
+
+/****************
+ * login window *
+ ****************/
#login_window,
-#login_window #user_combobox .arrow {
- background-color: shade (@lightdm_bg_color, 0.9);
+#shutdown_dialog,
+#restart_dialog {
+ border-style: none;
+ border-radius: 5px;
+ background-color: @lightdm_bg_color;
color: @lightdm_fg_color;
+
+ /* draw border using box-shadow */
+ box-shadow: inset 1px 0 shade(@lightdm_bg_color, 0.6),
+ inset -1px 0 shade(@lightdm_bg_color, 0.6),
+ inset 0 1px shade(@lightdm_bg_color, 0.6),
+ inset 0 -1px shade(@lightdm_bg_color, 0.6);
}
-/* Add border-outlines to all the dialogs */
-#restart_dialog,
-#shutdown_dialog,
-#login_window {
- border-width: 0px;
+#content_frame {
+ padding-bottom: 14px;
+}
+
+#login_window .menu {
+ border-radius: 1px;
+}
+
+#login_window GtkComboBox .button,
+#login_window GtkComboBox .button:hover,
+#login_window GtkComboBox .button:active,
+#login_window GtkComboBox .button:active:hover,
+#login_window GtkComboBox .button:focus,
+#login_window GtkComboBox .button:hover:focus,
+#login_window GtkComboBox .button:active:focus,
+#login_window GtkComboBox .button:active:hover:focus {
+ padding: 0;
+ background: none;
+ border-style: none;
+ box-shadow: none;
+}
+
+#login_window GtkComboBox .button:focus,
+#login_window GtkComboBox .button:hover:focus,
+#login_window GtkComboBox .button:active:focus,
+#login_window GtkComboBox .button:active:hover:focus {
+ box-shadow: inset 1px 0 alpha(@theme_selected_bg_color, 0.6),
+ inset -1px 0 alpha(@theme_selected_bg_color, 0.6),
+ inset 0 1px alpha(@theme_selected_bg_color, 0.6),
+ inset 0 -1px alpha(@theme_selected_bg_color, 0.6);
+}
+
+#login_window #user_combobox {
+ color: @lightdm_fg_color;
+ font: 18px;
+}
+
+#login_window #user_combobox .menu {
+ font: normal;
+}
+
+#login_window #user_combobox .arrow {
+ color: mix(@lightdm_fg_color, @lightdm_bg_color, 0.5);
+}
+
+#login_window .entry {
+ padding: 3px 5px;
+ border-width: 1px;
border-style: solid;
- border-color: @dark_shadow;
- box-shadow: inset 1px 0px alpha(@light_shadow,0.2),
- inset -1px 0px alpha(@light_shadow,0.2),
- inset 0px 1px alpha(@light_shadow,0.2),
- inset 0px -1px alpha(@light_shadow,0.2);
- border-radius: 10px;
+ border-color: shade(@lightdm_bg_color, 0.8);
+ border-radius: 3px;
+ background-image: linear-gradient(to bottom,
+ shade(@lightdm_bg_color, 0.95),
+ shade(@lightdm_bg_color, 0.97) 30%,
+ shade(@lightdm_bg_color, 1.02)
+ );
+
+ color: @lightdm_fg_color;
+
+ box-shadow: none;
+ transition: all 150ms ease-out;
+}
+
+#login_window .entry:focus,
+#login_window .entry:hover {
+ border-color: shade(@lightdm_bg_color, 0.7);
+
+ box-shadow: inset 1px 0 alpha(@dark_shadow, 0.10),
+ inset 0 1px alpha(@dark_shadow, 0.12),
+ inset -1px 0 alpha(@dark_shadow, 0.10);
}
-/* Set all buttons and the user-avatar to a dark style */
#login_window .button,
-#restart_dialog .button,
#shutdown_dialog .button,
+#restart_dialog .button {
+ padding: 3px 15px;
+ transition: all 150ms ease-out;
+}
+
#user_image {
- background-color: shade(@lightdm_bg_color, 0.9);
- background-image: none;
- color: @lightdm_fg_color;
- border-color: alpha(@dark_shadow, 0.9);
- border-radius: 4px;
- text-shadow: 0px 1px alpha(@dark_shadow, 1.0);
- box-shadow: inset 1px 0px alpha(@light_shadow, 0.2),
- inset -1px 0px alpha(@light_shadow, 0.2),
- inset 0px 1px alpha(@light_shadow, 0.3),
- inset 0px -1px alpha(@light_shadow, 0.1);
+ padding: 3px;
+ border-radius: 3px;
+
+ /* draw border using box-shadow */
+ box-shadow: inset 1px 0 shade(@lightdm_bg_color, 0.75),
+ inset -1px 0 shade(@lightdm_bg_color, 0.75),
+ inset 0 1px shade(@lightdm_bg_color, 0.55),
+ inset 0 -1px shade(@lightdm_bg_color, 1.8);
}
-/* Add some padding to the buttons, except the user-combobox */
-#cancel_button,
-#login_button,
-#shutdown_button,
-#restart_button {
- padding: 4px 16px 4px 16px;
+#user_image_border {
+ border-radius: 3px;
+ background-image: linear-gradient(to bottom,
+ shade(@lightdm_bg_color, 0.9),
+ shade(@lightdm_bg_color, 0.98) 10%,
+ shade(@lightdm_bg_color, 1.0) 99%,
+ shade(@lightdm_bg_color, 1.0)
+ );
+
+ box-shadow: inset 0 1px shade(@lightdm_bg_color, 0.8),
+ inset 0 -1px shade(@lightdm_bg_color, 0.55);
}
-/* Add more padding to the user-avatar */
-#user_image {
- padding: 4px;
+#buttonbox_frame {
+ padding-top: 20px;
+ padding-bottom: 0px;
+ border-style: none;
+ border-bottom-left-radius: 5px;
+ border-bottom-right-radius: 5px;
+ background-image: linear-gradient(to bottom,
+ shade(@bg_color, 0.85),
+ shade(@bg_color, 0.98) 10%,
+ shade(@bg_color, 1.0) 99%,
+ shade(@bg_color, 1.0)
+ );
+
+ box-shadow: inset 1px 0 shade(@lightdm_bg_color, 0.6),
+ inset -1px 0 shade(@lightdm_bg_color, 0.6),
+ inset 0 1px shade(@lightdm_bg_color, 0.6),
+ inset 0 -1px shade(@lightdm_bg_color, 0.6);
}
-/* Highlight for default-buttons and focus for better keyboard-navigation */
+/******************************
+ * default and focused button *
+ ******************************/
#login_window .button.default,
-#restart_dialog .button.default,
#shutdown_dialog .button.default,
+#restart_dialog .button.default,
#login_window .button:focus,
+#login_window .button:active:focus,
+#shutdown_dialog .button:focus,
+#shutdown_dialog .button:active:focus,
#restart_dialog .button:focus,
-#shutdown_dialog .button:focus {
- background-color: shade(@lightdm_bg_color, 1.25);
- box-shadow: inset 1px 0px alpha(@light_shadow, 0.3),
- inset -1px 0px alpha(@light_shadow, 0.3),
- inset 0px 1px alpha(@light_shadow, 0.4),
- inset 0px -1px alpha(@light_shadow, 0.2);
+#restart_dialog .button:active:focus {
+ border-color: shade(@theme_selected_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(@theme_selected_bg_color, 1.02),
+ shade(@theme_selected_bg_color, 0.95) 90%,
+ shade(@theme_selected_bg_color, 0.90)
+ );
+
+ color: @theme_selected_fg_color;
}
-/* General button hover-effect */
-#login_window .button:hover,
-#restart_dialog .button:hover,
-#shutdown_dialog .button:hover {
- background-color: shade(@lightdm_bg_color, 1.35);
+#login_window .button.default:hover,
+#shutdown_dialog .button.default:hover,
+#restart_dialog .button.default:hover,
+#login_window .button:hover:focus,
+#login_window .button:active:hover:focus,
+#shutdown_dialog .button:hover:focus,
+#shutdown_dialog .button:active:hover:focus,
+#restart_dialog .button:hover:focus,
+#restart_dialog .button:active:hover:focus {
+ border-color: shade(@theme_selected_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@theme_selected_bg_color, 1.12),
+ shade(@theme_selected_bg_color, 1.05) 90%,
+ shade(@theme_selected_bg_color, 1.00)
+ );
}
-/* Login/Unlock button is blue on hover */
-#login_button.button:hover {
- background-color: shade(@theme_selected_bg_color, 0.6);
+/*******************
+ * shutdown button *
+ *******************/
+#shutdown_button.button {
+ border-color: shade(@error_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(@error_bg_color, 1.02),
+ shade(@error_bg_color, 0.95) 90%,
+ shade(@error_bg_color, 0.90)
+ );
+
+ color: @error_fg_color;
+}
+
+#shutdown_button.button:hover,
+#shutdown_button.button:active,
+#shutdown_button.button:active:hover {
+ border-color: shade(@error_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@error_bg_color, 1.12),
+ shade(@error_bg_color, 1.05) 90%,
+ shade(@error_bg_color, 1.00)
+ );
+}
+
+/******************
+ * restart button *
+ ******************/
+#restart_button.button {
+ border-color: shade(@warning_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(@warning_bg_color, 1.02),
+ shade(@warning_bg_color, 0.95) 90%,
+ shade(@warning_bg_color, 0.90)
+ );
+
+ color: @warning_fg_color;
}
-/* Shutdown button is red on hover */
-#shutdown_button.button:hover {
- background-color: shade(@error_bg_color,0.95);
+#restart_button.button:hover,
+#restart_button.button:active,
+#restart_button.button:active:hover {
+ border-color: shade(@warning_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@warning_bg_color, 1.12),
+ shade(@warning_bg_color, 1.05) 90%,
+ shade(@warning_bg_color, 1.00)
+ );
}
-/* Restart button is dark yellow on hover */
-#restart_button.button:hover {
- background-color: shade(@warning_bg_color,0.75);
+/********************
+ * password warning *
+ ********************/
+#greeter_infobar {
+ border-bottom-width: 0;
+ font: bold;
}
diff --git a/gtk-3.0/apps/synaptic.css b/gtk-3.0/apps/synaptic.css
new file mode 100644
index 0000000000000000000000000000000000000000..594430086ad4322394e9bbdf5957cdf8bd622099
--- /dev/null
+++ b/gtk-3.0/apps/synaptic.css
@@ -0,0 +1,15 @@
+/* Synaptic's toolbar */
+GtkWindow > GtkVBox > .dock,
+GtkWindow > GtkVBox > .dock > GtkHBox > GtkToolbar {
+ padding: 6px;
+ border-style: none;
+ background-image: linear-gradient(to bottom,
+ shade(@toolbar_bg_color, 1.0),
+ shade(@toolbar_bg_color, 0.88)
+ );
+
+ color: @toolbar_fg_color;
+
+ box-shadow: inset 0 -1px shade(@toolbar_bg_color, 0.7);
+}
+
diff --git a/gtk-3.0/apps/unity.css b/gtk-3.0/apps/unity.css
index aacd15f4ae49799c1ce1f85852efcba96b6e00cf..5bd318966f582e745a2be919860eae84cda9a6a2 100644
--- a/gtk-3.0/apps/unity.css
+++ b/gtk-3.0/apps/unity.css
@@ -1,3 +1,60 @@
+UnityDecoration {
+ -UnityDecoration-extents: 28px 1px 1px 1px;
+ -UnityDecoration-input-extents: 10px;
+
+ -UnityDecoration-shadow-offset-x: 1px;
+ -UnityDecoration-shadow-offset-y: 1px;
+ -UnityDecoration-active-shadow-color: rgba(0,0,0,0.7);
+ -UnityDecoration-active-shadow-radius: 8px;
+ -UnityDecoration-inactive-shadow-color: rgba(0,0,0,0.5);
+ -UnityDecoration-inactive-shadow-radius: 5px;
+
+ -UnityDecoration-glow-size: 10px;
+ -UnityDecoration-glow-color: @theme_selected_bg_color;
+
+ -UnityDecoration-title-indent: 10px;
+ -UnityDecoration-title-fade: 35px;
+ -UnityDecoration-title-alignment: 0.0;
+}
+
+UnityDecoration.top {
+ border: 1px solid shade(@titlebar_bg_color, 0.7);
+ border-bottom-width: 0;
+ border-radius: 4px 4px 0 0;
+ padding: 1px 8px 0 8px;
+ background-image: linear-gradient(to bottom,
+ shade(@titlebar_bg_color, 1.07),
+ @titlebar_bg_color
+ );
+
+ color: @titlebar_fg_color;
+ text-shadow: 0 1px shade(@titlebar_bg_color, 1.2);
+}
+
+UnityDecoration.top:backdrop {
+ border: 1px solid shade(@titlebar_bg_color, 0.8);
+ border-bottom-width: 0;
+ background-image: linear-gradient(to bottom,
+ shade(@titlebar_bg_color, 1.02),
+ @titlebar_bg_color
+ );
+
+ color: @titlebar_fg_color;
+ text-shadow: 0 1px shade(@titlebar_bg_color, 1.1);
+}
+
+UnityDecoration.left,
+UnityDecoration.right,
+UnityDecoration.bottom {
+ background-color: shade(@titlebar_bg_color, 0.7);
+}
+
+UnityDecoration.left:backdrop,
+UnityDecoration.right:backdrop,
+UnityDecoration.bottom:backdrop {
+ background-color: shade(@titlebar_bg_color, 0.8);
+}
+
UnityPanelWidget,
.unity-panel {
border-width: 0 0 1px 0;
@@ -23,9 +80,9 @@ UnityPanelWidget,
.unity-panel.menubar .menuitem *:hover {
border-color: shade(@panel_bg_color, 0.8);
background-image: linear-gradient(to bottom,
- shade(@theme_bg_color, 1.2),
- shade(@theme_bg_color, 1.0)
+ shade(@panel_bg_color, 1.2),
+ shade(@panel_bg_color, 1.0)
);
- color: @theme_fg_color;
+ color: @panel_fg_color;
}
diff --git a/gtk-3.0/apps/xfce.css b/gtk-3.0/apps/xfce.css
index 0af21b342c07a9e23c895d8d51670ee21d05a13d..3415217bf847db5a33b3c05a8f2faa497612e767 100644
--- a/gtk-3.0/apps/xfce.css
+++ b/gtk-3.0/apps/xfce.css
@@ -1,62 +1,59 @@
-XfceHeading {
- background-color: @theme_base_color;
- background-image: none;
+CatfishWindow .pane-separator {
+ background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1);
+}
+
+XfceHeading,
+.XfceHeading {
+ margin: 0;
padding: 0;
border-width: 0;
+ background-image: none;
+ background-color: shade(@theme_bg_color, 1.18);
+ color: @theme_text_color;
+ text-shadow: 0px 1px alpha(@dark_shadow, 0.15);
}
.xfce4-panel {
background-color: shade(@panel_bg_color, 0.35);
+ color: @panel_fg_color;
font: normal;
}
.xfce4-panel .button {
border-radius: 0;
- padding: 1px;
+ padding: 0 1px;
color: @panel_fg_color;
+ text-shadow: 0px 1px alpha(@dark_shadow, 1.0);
}
.xfce4-panel .button:active {
background-image: none;
background-color: shade(@panel_bg_color, 0.7);
border-color: shade(@panel_bg_color, 0.6);
+ color: @panel_fg_color;
transition: none;
}
.xfce4-panel .button:hover,
.xfce4-panel .button:active:hover {
+ border-color: shade(@selected_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(@selected_bg_color, 0.88),
shade(@selected_bg_color, 0.85)
);
- border-color: shade(@selected_bg_color, 0.6);
+ color: @panel_fg_color;
+
box-shadow: inset 0 -1px alpha(white, 0.0),
inset 1px 0 alpha(white, 0.15),
inset -1px 0 alpha(white, 0.15),
inset 0 1px alpha(white, 0.15);
- transition: none;
-}
-
-/* menu-styling, e.g. for indicators */
-.xfce4-panel .menu,
-.xfce4-panel .menu GtkLabel,
-.xfce4-panel .menu GtkImage {
- background-color: shade(@menu_bg_color, 1.18);
- color: @menu_fg_color;
-}
-
-.xfce4-panel .menu *:hover {
- background-image: linear-gradient(to bottom,
- shade(@theme_selected_bg_color, 1.2),
- shade(@theme_selected_bg_color, 1.0)
- );
transition: none;
}
-.xfce4-panel .menu GtkLabel:hover,
-.xfce4-panel .menu GtkImage:hover {
- background-image: none;
- background-color: transparent;
+.xfce4-panel .menu {
+ -gtk-image-effect: none;
+
+ text-shadow: none;
}
diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css
index 0c46887726c906de47691aa4bc087973f643234a..48d30121db5e645d1e8997ad8eea0825f07ce5cd 100644
--- a/gtk-3.0/gtk-widgets-assets.css
+++ b/gtk-3.0/gtk-widgets-assets.css
@@ -155,6 +155,7 @@ GtkIconView.content-view.cell.check:active {
/******************
* pane separator *
******************/
+.pane-separator,
.pane-separator.horizontal {
background-image: url("assets/pane-separator.png");
background-repeat: no-repeat;
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index b2d8f7f559c590f3b4c4e3435a2c1a89afac66a5..17227013c9b9aa7157495cc394df197225ec244f 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -3,10 +3,6 @@
/* default */
* {
- engine: none;
-
- background-clip: padding-box;
-
-GtkArrow-arrow-scaling: 0.6;
-GtkButton-child-displacement-x: 0;
-GtkButton-child-displacement-y: 0;
@@ -14,6 +10,8 @@
-GtkButton-image-spacing: 0;
-GtkButton-inner-border: 1;
-GtkButton-interior-focus: true;
+ -GtkButtonBox-child-min-height: 24;
+ -GtkButtonBox-child-internal-pad-y: 1;
-GtkCheckButton-indicator-size: 15;
-GtkCheckMenuItem-indicator-size: 14;
-GtkExpander-expander-size: 12;
@@ -48,6 +46,8 @@
-GtkWindow-resize-grip-width: 13;
-WnckTasklist-fade-overlay-rect: 0;
+ background-clip: padding-box;
+
outline-color: alpha(@theme_fg_color, 0.3);
outline-style: dashed;
outline-offset: 2px;
@@ -61,29 +61,12 @@
color: @theme_fg_color;
}
-.background.client-decorated {
- background-color: transparent;
-}
-
-.background.window-content {
- background-color: @theme_bg_color;
-}
-
-GtkClutterOffscreen {
- background-color: @theme_bg_color;
- color: @theme_fg_color;
-}
-
*:selected,
*:selected:focus {
background-color: @theme_selected_bg_color;
color: @theme_selected_fg_color;
}
-*:active {
- background-color: shade(@theme_bg_color, 0.85);
-}
-
*:insensitive,
*:insensitive:insensitive {
color: mix(@theme_fg_color, @theme_bg_color, 0.4);
@@ -123,6 +106,17 @@ GtkClutterOffscreen {
color: @theme_selected_fg_color;
}
+GtkImage,
+GtkImage:insensitive,
+GtkLabel,
+GtkLabel:insensitive,
+GtkBox,
+GtkBox:insensitive,
+GtkGrid,
+GtkGrid:insensitive {
+ background-color: transparent;
+}
+
/******************
* visual effects *
******************/
@@ -177,7 +171,7 @@ GtkSwitch.slider:insensitive {
box-shadow: inset 1px 1px alpha(@dark_shadow, 0.1);
}
-/* disable box shadow */
+/* disable inset shadow */
.primary-toolbar GtkComboBox,
.primary-toolbar .button *,
.primary-toolbar .button,
@@ -200,7 +194,7 @@ GtkAssistant .sidebar {
border-right-color: shade(@theme_bg_color, 0.7);
border-radius: 0;
background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1);
- color: @theme_text_color;
+ color: mix(@theme_text_color, @theme_base_color, 0.3);
}
/**********
@@ -212,12 +206,12 @@ GtkAssistant .sidebar {
padding: 2px 4px;
border-width: 1px;
+ border-radius: 3px;
border-style: solid;
border-top-color: shade(@theme_bg_color, 0.8);
border-right-color: shade(@theme_bg_color, 0.72);
border-left-color: shade(@theme_bg_color, 0.72);
border-bottom-color: shade(@theme_bg_color, 0.7);
- border-radius: 3px;
background-image: linear-gradient(to bottom,
shade(shade(@theme_bg_color, 1.02), 1.05),
shade(shade(@theme_bg_color, 1.02), 0.97)
@@ -329,6 +323,9 @@ GtkAssistant .sidebar {
row:selected,
row:selected:hover,
row:selected:focus {
+ -GtkWidget-focus-padding: 1;
+ -GtkWidget-focus-line-width: 0;
+
border-width: 1px 0;
border-style: solid;
border-color: shade(@theme_selected_bg_color, 0.8);
@@ -338,9 +335,6 @@ row:selected:focus {
);
color: @theme_selected_fg_color;
-
- -GtkWidget-focus-padding: 1;
- -GtkWidget-focus-line-width: 0;
}
/*******************
@@ -445,11 +439,11 @@ GtkIconView.content-view.check:selected {
* drawing area *
****************/
GtkDrawingArea {
- background-color: transparent;
+ background-color: @theme_base_color;
}
GtkDrawingArea:insensitive {
- background-color: @theme_bg_color;
+ background-color: shade(@theme_base_color, 0.9);
}
/***********
@@ -547,11 +541,11 @@ GtkComboBox.combobox-entry .button:insensitive {
border-left-color: shade(@theme_bg_color, 0.7);
border-bottom-color: shade(@theme_bg_color, 0.72);
border-radius: 3px;
+ background-color: @theme_base_color;
background-image: linear-gradient(to bottom,
shade(@theme_base_color, 0.99),
@theme_base_color
);
- background-color: @theme_base_color;
color: @theme_text_color;
}
@@ -559,6 +553,7 @@ GtkComboBox.combobox-entry .button:insensitive {
.entry:active,
.entry:focus {
border-color: shade(@theme_selected_bg_color, 0.8);
+ background-color: @theme_base_color;
}
.entry:selected,
@@ -589,11 +584,32 @@ GtkComboBox.combobox-entry .button:insensitive {
* expander *
************/
.expander {
- color: alpha(@theme_fg_color, 0.7);
+ color: alpha(currentColor, 0.7);
}
.expander:hover {
- color: alpha(@theme_fg_color, 0.8);
+ color: alpha(currentColor, 0.8);
+}
+
+.expander:active {
+ color: alpha(currentColor, 0.9);
+}
+
+/**************
+ * list boxes *
+ **************/
+.list {
+ background-color: shade(@theme_bg_color, 0.97);
+ color: @theme_fg_color;
+}
+
+.list-row:hover {
+ background-color: shade(@theme_bg_color, 1.02);
+}
+
+.list-row:selected {
+ background-color: @theme_selected_bg_color;
+ color: @theme_selected_fg_color;
}
/*********
@@ -649,24 +665,6 @@ GtkIconView.view.cell:selected:focus {
background-color: alpha(@theme_selected_bg_color, 0.3);
}
-/*********
- * image *
- *********/
-GtkImage,
-GtkImage:active,
-GtkImage:insensitive {
- background-color: transparent;
-}
-
-/*********
- * label *
- *********/
-GtkLabel,
-GtkLabel:active,
-GtkLabel:insensitive {
- background-color: transparent;
-}
-
/***********
* infobar *
***********/
@@ -687,6 +685,49 @@ GtkInfoBar {
color: @info_fg_color;
}
+.info .button {
+ border-top-color: shade(@info_bg_color, 0.8);
+ border-right-color: shade(@info_bg_color, 0.72);
+ border-left-color: shade(@info_bg_color, 0.72);
+ border-bottom-color: shade(@info_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@info_bg_color, 1.02), 1.05),
+ shade(shade(@info_bg_color, 1.02), 0.97)
+ );
+
+ color: @info_fg_color;
+}
+
+.info .button:hover {
+ border-top-color: shade(@info_bg_color, 0.85);
+ border-right-color: shade(@info_bg_color, 0.78);
+ border-left-color: shade(@info_bg_color, 0.78);
+ border-bottom-color: shade(@info_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@info_bg_color, 1.15),
+ shade(@info_bg_color, 1.07)
+ );
+}
+
+.info .button:active {
+ border-color: shade(@info_bg_color, 0.6);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@info_bg_color, 0.85), 1.05),
+ shade(shade(@info_bg_color, 0.85), 0.97)
+ );
+}
+
+.info .button:active:hover {
+ border-top-color: shade(@info_bg_color, 0.85);
+ border-right-color: shade(@info_bg_color, 0.78);
+ border-left-color: shade(@info_bg_color, 0.78);
+ border-bottom-color: shade(@info_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@info_bg_color, 1.15),
+ shade(@info_bg_color, 1.07)
+ );
+}
+
.info .button.close {
color: @info_fg_color;
}
@@ -717,6 +758,49 @@ GtkInfoBar {
color: @warning_fg_color;
}
+.warning .button {
+ border-top-color: shade(@warning_bg_color, 0.8);
+ border-right-color: shade(@warning_bg_color, 0.72);
+ border-left-color: shade(@warning_bg_color, 0.72);
+ border-bottom-color: shade(@warning_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@warning_bg_color, 1.02), 1.05),
+ shade(shade(@warning_bg_color, 1.02), 0.97)
+ );
+
+ color: @warning_fg_color;
+}
+
+.warning .button:hover {
+ border-top-color: shade(@warning_bg_color, 0.85);
+ border-right-color: shade(@warning_bg_color, 0.78);
+ border-left-color: shade(@warning_bg_color, 0.78);
+ border-bottom-color: shade(@warning_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@warning_bg_color, 1.15),
+ shade(@warning_bg_color, 1.07)
+ );
+}
+
+.warning .button:active {
+ border-color: shade(@warning_bg_color, 0.6);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@warning_bg_color, 0.85), 1.05),
+ shade(shade(@warning_bg_color, 0.85), 0.97)
+ );
+}
+
+.warning .button:active:hover {
+ border-top-color: shade(@warning_bg_color, 0.85);
+ border-right-color: shade(@warning_bg_color, 0.78);
+ border-left-color: shade(@warning_bg_color, 0.78);
+ border-bottom-color: shade(@warning_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@warning_bg_color, 1.15),
+ shade(@warning_bg_color, 1.07)
+ );
+}
+
.warning .button.close {
color: @warning_fg_color;
}
@@ -747,6 +831,49 @@ GtkInfoBar {
color: @question_fg_color;
}
+.question .button {
+ border-top-color: shade(@question_bg_color, 0.8);
+ border-right-color: shade(@question_bg_color, 0.72);
+ border-left-color: shade(@question_bg_color, 0.72);
+ border-bottom-color: shade(@question_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@question_bg_color, 1.02), 1.05),
+ shade(shade(@question_bg_color, 1.02), 0.97)
+ );
+
+ color: @question_fg_color;
+}
+
+.question .button:hover {
+ border-top-color: shade(@question_bg_color, 0.85);
+ border-right-color: shade(@question_bg_color, 0.78);
+ border-left-color: shade(@question_bg_color, 0.78);
+ border-bottom-color: shade(@question_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@question_bg_color, 1.15),
+ shade(@question_bg_color, 1.07)
+ );
+}
+
+.question .button:active {
+ border-color: shade(@question_bg_color, 0.6);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@question_bg_color, 0.85), 1.05),
+ shade(shade(@question_bg_color, 0.85), 0.97)
+ );
+}
+
+.question .button:active:hover {
+ border-top-color: shade(@question_bg_color, 0.85);
+ border-right-color: shade(@question_bg_color, 0.78);
+ border-left-color: shade(@question_bg_color, 0.78);
+ border-bottom-color: shade(@question_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@question_bg_color, 1.15),
+ shade(@question_bg_color, 1.07)
+ );
+}
+
.question .button.close {
color: @question_fg_color;
}
@@ -777,6 +904,49 @@ GtkInfoBar {
color: @error_fg_color;
}
+.error .button {
+ border-top-color: shade(@error_bg_color, 0.8);
+ border-right-color: shade(@error_bg_color, 0.72);
+ border-left-color: shade(@error_bg_color, 0.72);
+ border-bottom-color: shade(@error_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@error_bg_color, 1.02), 1.05),
+ shade(shade(@error_bg_color, 1.02), 0.97)
+ );
+
+ color: @error_fg_color;
+}
+
+.error .button:hover {
+ border-top-color: shade(@error_bg_color, 0.85);
+ border-right-color: shade(@error_bg_color, 0.78);
+ border-left-color: shade(@error_bg_color, 0.78);
+ border-bottom-color: shade(@error_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@error_bg_color, 1.15),
+ shade(@error_bg_color, 1.07)
+ );
+}
+
+.error .button:active {
+ border-color: shade(@error_bg_color, 0.6);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@error_bg_color, 0.85), 1.05),
+ shade(shade(@error_bg_color, 0.85), 0.97)
+ );
+}
+
+.error .button:active:hover {
+ border-top-color: shade(@error_bg_color, 0.85);
+ border-right-color: shade(@error_bg_color, 0.78);
+ border-left-color: shade(@error_bg_color, 0.78);
+ border-bottom-color: shade(@error_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@error_bg_color, 1.15),
+ shade(@error_bg_color, 1.07)
+ );
+}
+
.error .button.close {
color: @error_fg_color;
}
@@ -798,18 +968,24 @@ GtkInfoBar {
/*******************
* symbolic images *
*******************/
-.image,
-.view.image {
- color: alpha(@theme_fg_color, 0.5);
+.image {
+ color: alpha(currentColor, 0.5);
}
-.image:hover,
-.view.image:hover {
- color: @theme_fg_color;
+.image:hover {
+ color: alpha(currentColor, 0.9);
}
.image:selected,
-.image:selected:hover,
+.image:selected:hover {
+ color: @theme_selected_fg_color;
+}
+
+.view.image,
+.view.image:hover {
+ color: alpha(currentColor, 0.9);
+}
+
.view.image:selected,
.view.image:selected:hover {
color: @theme_selected_fg_color;
@@ -880,7 +1056,7 @@ GtkInfoBar {
}
.arrow {
- color: alpha(@theme_fg_color, 0.7);
+ color: alpha(currentColor, 0.7);
}
/********
@@ -908,6 +1084,11 @@ GtkComboBox .menu {
color: @menu_fg_color;
}
+/* Hover-effect on play-button in ubuntu soundmenu */
+.menu:selected {
+ background-color: @selected_bg_color;
+}
+
.menu.button:hover,
.menu.button:active,
.menu.button:active *:insensitive,
@@ -945,7 +1126,7 @@ GtkComboBox .menu {
***************/
.menubar.menuitem,
.menubar .menuitem {
- padding: 3px 5px;
+ padding: 3px 8px;
border-width: 1px;
border-style: solid;
border-color: transparent;
@@ -979,6 +1160,8 @@ GtkTreeMenu .menuitem {
.menuitem,
.menu .menuitem {
+ -GtkMenuItem-arrow-scaling: 0.5;
+
padding: 3px;
border-width: 1px;
border-style: solid;
@@ -987,8 +1170,6 @@ GtkTreeMenu .menuitem {
background-color: transparent;
background-image: none;
color: @menu_fg_color;
-
- -GtkMenuItem-arrow-scaling: 0.5;
}
.menu .menuitem:active,
@@ -1029,10 +1210,6 @@ GtkTreeMenu .menuitem {
background-color: transparent;
}
-.menuitem.arrow {
- color: alpha(@menu_fg_color, 0.6);
-}
-
.menuitem GtkCalendar:inconsistent {
color: mix(@menu_fg_color, @menu_bg_color, 0.5);
}
@@ -1071,6 +1248,69 @@ GtkModelMenuItem GtkBox GtkImage {
padding-right: 4px;
}
+/************
+ * popovers *
+ ************/
+GtkPopover {
+ margin: 10px;
+ padding: 2px;
+ border-radius: 3px;
+ border-color: shade(@theme_bg_color, 0.8);
+ border-width: 1px;
+ border-style: solid;
+ background-clip: border-box;
+ background-color: @theme_bg_color;
+ color: @theme_fg_color;
+ box-shadow: 0 2px 3px alpha(black, 0.5);
+}
+
+GtkPopover.osd {
+ box-shadow: 0 2px 7px 3px alpha(black, 0.5);
+}
+
+GtkPopover > .list,
+GtkPopover > .view,
+GtkPopover > .toolbar {
+ background-color: transparent;
+}
+
+GtkPopover.osd > .toolbar .button {
+ border-radius: 0;
+ border-width: 0;
+ background-image: none;
+ background-color: transparent;
+}
+
+GtkPopover .separator {
+ border: 0;
+ background-color: transparent;
+ color: alpha(currentColor, 0.5);
+ font-size: 80%;
+ font-weight: bold;
+}
+
+GtkModelButton.button,
+GtkModelButton.button:active,
+GtkModelButton.button:insensitive,
+GtkModelButton.button:active:insensitive {
+ background-color: transparent;
+ background-image: none;
+ border-color: transparent;
+ border-style: none;
+ box-shadow: none;
+ color: @theme_fg_color;
+}
+
+GtkModelButton.button:active:hover,
+GtkModelButton.button:hover,
+GtkModelButton.button:selected {
+ border-width: 0;
+ border-color: transparent;
+ background-color: @theme_selected_bg_color;
+ background-image: none;
+ color: @theme_selected_fg_color;
+}
+
/************
* notebook *
************/
@@ -1085,7 +1325,37 @@ GtkModelMenuItem GtkBox GtkImage {
background-clip: border-box;
}
+.notebook.frame {
+ border-width: 1px;
+}
+
+.notebook.header {
+ border-width: 0;
+ background-color: shade(@theme_base_color, 0.85);
+}
+
+.notebook.header.frame {
+ border-color: shade(@theme_base_color, 0.75);
+}
+
+.notebook.header.frame.top {
+ border-width: 1px 1px 0 1px;
+}
+
+.notebook.header.frame.right {
+ border-width: 1px 1px 1px 0;
+}
+
+.notebook.header.frame.bottom {
+ border-width: 0 1px 1px 1px;
+}
+
+.notebook.header.frame.left {
+ border-width: 1px 0 1px 1px;
+}
+
.notebook GtkViewport {
+ border-width: 0;
background-color: @theme_base_color;
color: @theme_text_color;
}
@@ -1148,6 +1418,40 @@ GtkModelMenuItem GtkBox GtkImage {
padding: 3px 4px;
}
+.notebook tab GtkLabel {
+ color: mix(@theme_text_color, @theme_base_color, 0.3);
+}
+
+.notebook .active-page,
+.notebook tab .active-page GtkLabel {
+ color: @theme_text_color;
+}
+
+/* close button styling */
+.notebook tab .button,
+.notebook tab .button:active,
+.notebook tab .button:hover {
+ padding: 1px;
+ border-width: 1px;
+ border-radius: 2px;
+ border-style: solid;
+ border-color: transparent;
+ background-image: none;
+ background-color: transparent;
+ color: mix(@theme_text_color, @theme_base_color, 0.5);
+}
+
+.notebook tab .button:hover {
+ color: @theme_text_color;
+ border-color: shade(@theme_base_color, 0.8);
+}
+
+.notebook tab .button:active,
+.notebook tab .button:active:hover {
+ border-color: shade(@theme_base_color, 0.7);
+ background-color: shade(@theme_base_color, 0.95);
+}
+
/******************
* pane separator *
******************/
@@ -1292,13 +1596,13 @@ GtkLevelBar.vertical {
}
.scale {
- padding: 0;
- border-width: 1px;
- border-radius: 3px;
-
-GtkRange-slider-width: 13;
-GtkRange-trough-border: 1;
-GtkScale-slider-length: 13;
+
+ padding: 0;
+ border-width: 1px;
+ border-radius: 3px;
}
.scale.slider {
@@ -1393,7 +1697,7 @@ GtkLevelBar.vertical {
);
}
-.menubar .menuitem .scale.highlight.left,
+.menuitem .scale.highlight.left,
.scale.highlight.left {
border-color: shade(@theme_selected_bg_color, 0.7);
background-image: linear-gradient(to bottom,
@@ -1402,7 +1706,7 @@ GtkLevelBar.vertical {
);
}
-.menubar .menuitem .scale.highlight.left:hover {
+.menuitem .scale.highlight.left:hover {
border-color: shade(@theme_selected_bg_color, 0.5);
background-image: linear-gradient(to bottom,
shade(shade(@theme_selected_bg_color, 0.9), 0.9),
@@ -1517,9 +1821,8 @@ GtkLevelBar.vertical {
}
.scrollbar.slider.fine-tune:prelight:active {
- background-size: 50%;
- background-repeat: no-repeat;
- background-position: center;
+ border-width: 2px;
+ border-color: transparent;
}
/* overlay scrollbar */
@@ -1569,30 +1872,51 @@ OsScrollbar:insensitive {
.primary-toolbar .separator:insensitive,
.toolbar GtkSeparatorToolItem,
.toolbar .separator,
-.toolbar .separator:insensitive
+.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 {
- border-color: transparent;
- color: transparent;
+.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,
+.toolbar .button.separator {
+ border-color: shade(@toolbar_bg_color, 0.95);
+}
+
.header-bar .button .separator,
-.header-bar .button.separator {
- border-color: transparent;
+.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,
+.toolbar .button.separator:insensitive {
+ border-color: shade(@toolbar_bg_color, 0.85);
+}
+
.header-bar .button .separator:insensitive,
-.header-bar .button.separator:insensitive {
- border-color: transparent;
+.header-bar .button.separator:insensitive,
+.titlebar .button .separator:insensitive,
+.titlebar .button.separator:insensitive {
+ border-color: shade(@titlebar_bg_color, 0.85);
}
.menuitem.separator {
@@ -1604,12 +1928,13 @@ OsScrollbar:insensitive {
}
GtkComboBox .separator {
- border-style: none;
-
/* always disable separators */
-GtkWidget-wide-separators: true;
-GtkWidget-horizontal-separator: 0;
-GtkWidget-vertical-separator: 0;
+
+ border-style: none;
+
}
/***********
@@ -1623,17 +1948,6 @@ GtkComboBox .separator {
color: mix(@theme_text_color, @theme_base_color, 0.3);
}
-.sidebar .scrollbar.trough {
- background-image: linear-gradient(to right,
- shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.9),
- shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 1.1)
- );
-}
-
-.sidebar .frame {
- border-width: 0;
-}
-
.sidebar row:selected,
.sidebar row:selected:hover,
.sidebar row:selected:focus,
@@ -1659,6 +1973,18 @@ GtkComboBox .separator {
border-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.3);
background-color: mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.3);
background-image: none;
+ color: @theme_text_color;
+}
+
+.sidebar .scrollbar.trough {
+ background-image: linear-gradient(to right,
+ shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 0.9),
+ shade(mix(shade(@theme_base_color, 0.9), shade(@theme_selected_bg_color, 1.35), 0.1), 1.1)
+ );
+}
+
+.sidebar .frame {
+ border-width: 0;
}
/**************
@@ -1900,8 +2226,12 @@ GtkComboBox .separator {
}
.menu.spinner,
+.menu .spinner,
+.menu .spinner:hover,
.primary-toolbar .spinner {
color: @theme_selected_bg_color;
+ border: none;
+ box-shadow: none;
}
/*************
@@ -2085,13 +2415,16 @@ GtkColorButton.button {
**************/
.header-bar {
padding: 6px;
- border-width: 0 0 1px;
+ border-width: 0 0 1px 0;
border-style: solid;
- border-color: shade(@theme_bg_color, 0.7);
+ border-color: shade(@titlebar_bg_color, 0.7);
+ background-color: @titlebar_bg_color;
background-image: linear-gradient(to bottom,
- shade(@toolbar_bg_color, 1.0),
- shade(@toolbar_bg_color, 0.88)
+ shade(@titlebar_bg_color, 1.0),
+ shade(@titlebar_bg_color, 0.88)
);
+
+ color: @titlebar_fg_color;
}
.header-bar .button.text-button {
@@ -2104,10 +2437,91 @@ GtkColorButton.button {
.header-bar .title {
font: bold;
+ padding: 0 12px;
}
.header-bar .subtitle {
font: smaller;
+ padding: 0 12px;
+}
+
+.header-bar GtkComboBox,
+.header-bar .button {
+ border-top-color: shade(@titlebar_bg_color, 0.8);
+ border-right-color: shade(@titlebar_bg_color, 0.72);
+ border-left-color: shade(@titlebar_bg_color, 0.72);
+ border-bottom-color: shade(@titlebar_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@titlebar_bg_color, 1.02), 1.05),
+ shade(shade(@titlebar_bg_color, 1.02), 0.97)
+ );
+
+ color: @titlebar_fg_color;
+}
+
+.header-bar .button:hover {
+ border-top-color: shade(@titlebar_bg_color, 0.85);
+ border-right-color: shade(@titlebar_bg_color, 0.78);
+ border-left-color: shade(@titlebar_bg_color, 0.78);
+ border-bottom-color: shade(@titlebar_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@titlebar_bg_color, 1.15),
+ shade(@titlebar_bg_color, 1.07)
+ );
+}
+
+.header-bar .button:active {
+ border-color: shade(@titlebar_bg_color, 0.6);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@titlebar_bg_color, 0.85), 1.05),
+ shade(shade(@titlebar_bg_color, 0.85), 0.97)
+ );
+}
+
+.header-bar .button:active:hover {
+ border-top-color: shade(@titlebar_bg_color, 0.85);
+ border-right-color: shade(@titlebar_bg_color, 0.78);
+ border-left-color: shade(@titlebar_bg_color, 0.78);
+ border-bottom-color: shade(@titlebar_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@titlebar_bg_color, 1.15),
+ shade(@titlebar_bg_color, 1.07)
+ );
+}
+
+.header-bar .button:focus,
+.header-bar .button:hover:focus,
+.header-bar .button:active:focus,
+.header-bar .button:active:hover:focus {
+ border-color: shade(@theme_selected_bg_color, 0.8);
+}
+
+.header-bar .button:insensitive {
+ border-color: shade(@titlebar_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@titlebar_bg_color, 0.95), 1.05),
+ shade(shade(@titlebar_bg_color, 0.95), 0.97)
+ );
+}
+
+.header-bar .button:active *:insensitive {
+ border-color: shade(@titlebar_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@titlebar_bg_color, 0.95), 1.05),
+ shade(shade(@titlebar_bg_color, 0.95), 0.97)
+ );
+}
+
+.header-bar .entry {
+ border-top-color: shade(@titlebar_bg_color, 0.6);
+ border-right-color: shade(@titlebar_bg_color, 0.7);
+ border-left-color: shade(@titlebar_bg_color, 0.7);
+ border-bottom-color: shade(@titlebar_bg_color, 0.72);
+}
+
+.header-bar .entry:active,
+.header-bar .entry:focus {
+ border-color: shade(@theme_selected_bg_color, 0.8);
}
/***********
@@ -2116,10 +2530,13 @@ GtkColorButton.button {
.toolbar {
padding: 6px;
border-style: none;
+ background-color: @toolbar_bg_color;
background-image: linear-gradient(to bottom,
shade(@toolbar_bg_color, 1.0),
shade(@toolbar_bg_color, 0.88)
);
+
+ color: @toolbar_fg_color;
}
.toolbar .button {
@@ -2131,12 +2548,12 @@ GtkColorButton.button {
}
.toolbar .button.image-button {
- padding: 4px 3px 3px 4px;
+ padding: 3px 2px 2px 3px;
}
.toolbar:insensitive {
- color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.5);
background-color: shade(@toolbar_bg_color, 0.9);
+ color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.5);
}
/* menubar toolbars */
@@ -2156,6 +2573,7 @@ GtkColorButton.button {
border-width: 0 0 1px 0;
border-style: solid;
border-color: shade(@toolbar_bg_color, 0.7);
+ background-color: @toolbar_bg_color;
background-image: linear-gradient(to bottom,
shade(@toolbar_bg_color, 1.0),
shade(@toolbar_bg_color, 0.88)
@@ -2178,9 +2596,7 @@ GtkColorButton.button {
.primary-toolbar .raised .button,
.primary-toolbar .raised.button,
.toolbar GtkComboBox,
-.toolbar .button,
-.header-bar GtkComboBox,
-.header-bar .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);
@@ -2194,8 +2610,7 @@ GtkColorButton.button {
}
.primary-toolbar .button:hover,
-.toolbar .button:hover,
-.header-bar .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);
@@ -2207,8 +2622,7 @@ GtkColorButton.button {
}
.primary-toolbar .button:active,
-.toolbar .button:active,
-.header-bar .button:active {
+.toolbar .button:active {
border-color: shade(@toolbar_bg_color, 0.6);
background-image: linear-gradient(to bottom,
shade(shade(@toolbar_bg_color, 0.85), 1.05),
@@ -2217,8 +2631,7 @@ GtkColorButton.button {
}
.primary-toolbar .button:active:hover,
-.toolbar .button:active:hover,
-.header-bar .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);
@@ -2236,17 +2649,12 @@ GtkColorButton.button {
.toolbar .button:focus,
.toolbar .button:hover:focus,
.toolbar .button:active:focus,
-.toolbar .button:active:hover:focus,
-.header-bar .button:focus,
-.header-bar .button:hover:focus,
-.header-bar .button:active:focus,
-.header-bar .button:active:hover:focus {
+.toolbar .button:active:hover:focus {
border-color: shade(@theme_selected_bg_color, 0.8);
}
.primary-toolbar .button:insensitive,
-.toolbar .button:insensitive,
-.header-bar .button:insensitive {
+.toolbar .button:insensitive {
border-color: shade(@toolbar_bg_color, 0.8);
background-image: linear-gradient(to bottom,
shade(shade(@toolbar_bg_color, 0.95), 1.05),
@@ -2255,8 +2663,7 @@ GtkColorButton.button {
}
.primary-toolbar .button:active *:insensitive,
-.toolbar .button:active *:insensitive,
-.header-bar .button:active *:insensitive {
+.toolbar .button:active *:insensitive {
border-color: shade(@toolbar_bg_color, 0.8);
background-image: linear-gradient(to bottom,
shade(shade(@toolbar_bg_color, 0.95), 1.05),
@@ -2265,8 +2672,7 @@ GtkColorButton.button {
}
.primary-toolbar .entry,
-.toolbar .entry,
-.header-bar .entry {
+.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);
@@ -2276,9 +2682,7 @@ GtkColorButton.button {
.primary-toolbar .entry:active,
.primary-toolbar .entry:focus,
.toolbar .entry:active,
-.toolbar .entry:focus,
-.header-bar .entry:active,
-.header-bar .entry:focus {
+.toolbar .entry:focus {
border-color: shade(@theme_selected_bg_color, 0.8);
}
@@ -2286,7 +2690,7 @@ GtkColorButton.button {
.inline-toolbar.toolbar {
-GtkToolbar-button-relief: normal;
- padding: 1px;
+ padding: 4px;
border-width: 1px;
border-style: solid;
border-color: shade(@theme_bg_color, 0.8);
@@ -2305,7 +2709,7 @@ GtkColorButton.button {
}
.inline-toolbar.toolbar .button {
- padding: 1px;
+ padding: 2px;
border-width: 1px 0 1px 1px;
border-style: solid;
border-color: shade(@theme_bg_color, 0.8);
@@ -2620,10 +3024,7 @@ GtkColorButton.button {
.primary-toolbar .raised.linked .button,
.toolbar .button.raised.linked,
.toolbar .raised.linked .button,
-.toolbar .linked .button,
-.header-bar .button.raised.linked,
-.header-bar .raised.linked .button,
-.header-bar .linked .button {
+.toolbar .linked .button {
box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8),
inset 1px 1px alpha(@light_shadow, 0.4);
}
@@ -2632,10 +3033,7 @@ GtkColorButton.button {
.primary-toolbar .raised.linked .button:active,
.toolbar .button.raised.linked:active,
.toolbar .raised.linked .button:active,
-.toolbar .linked .button:active,
-.header-bar .button.raised.linked:active,
-.header-bar .raised.linked .button:active,
-.header-bar .linked .button:active {
+.toolbar .linked .button:active {
box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8),
inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
@@ -2645,10 +3043,7 @@ GtkColorButton.button {
.primary-toolbar .raised.linked .button:insensitive,
.toolbar .button.raised.linked:insensitive,
.toolbar .raised.linked .button:insensitive,
-.toolbar .linked .button:insensitive,
-.header-bar .button.raised.linked:insensitive,
-.header-bar .raised.linked .button:insensitive,
-.header-bar .linked .button:insensitive {
+.toolbar .linked .button:insensitive {
box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.8),
inset 1px 1px alpha(@light_shadow, 0.2);
}
@@ -2663,13 +3058,7 @@ GtkColorButton.button {
.toolbar .raised.linked .button:active *:insensitive:last-child,
.toolbar .raised.linked .button:active *:insensitive:only-child,
.toolbar .linked .button:active *:insensitive:last-child,
-.toolbar .linked .button:active *:insensitive:only-child,
-.header-bar .button:active *:insensitive.raised.linked:last-child,
-.header-bar .button:active *:insensitive.raised.linked:only-child,
-.header-bar .raised.linked .button:active *:insensitive:last-child,
-.header-bar .raised.linked .button:active *:insensitive:only-child,
-.header-bar .linked .button:active *:insensitive:last-child,
-.header-bar .linked .button:active *:insensitive:only-child {
+.toolbar .linked .button:active *:insensitive:only-child {
box-shadow: none;
}
@@ -2683,13 +3072,7 @@ GtkColorButton.button {
.toolbar .raised.linked .button:last-child,
.toolbar .raised.linked .button:only-child,
.toolbar .linked .button:last-child,
-.toolbar .linked .button:only-child,
-.header-bar .button.raised.linked:last-child,
-.header-bar .button.raised.linked:only-child,
-.header-bar .raised.linked .button:last-child,
-.header-bar .raised.linked .button:only-child,
-.header-bar .linked .button:last-child,
-.header-bar .linked .button:only-child {
+.toolbar .linked .button:only-child {
box-shadow: inset 1px 1px alpha(@light_shadow, 0.4),
inset -1px 0 alpha(@light_shadow, 0.4);
}
@@ -2703,13 +3086,7 @@ GtkColorButton.button {
.toolbar .raised.linked .button:insensitive:last-child,
.toolbar .raised.linked .button:insensitive:only-child,
.toolbar .linked .button:insensitive:last-child,
-.toolbar .linked .button:insensitive:only-child,
-.header-bar .button:insensitive.raised.linked:last-child,
-.header-bar .button:insensitive.raised.linked:only-child,
-.header-bar .raised.linked .button:insensitive:last-child,
-.header-bar .raised.linked .button:insensitive:only-child,
-.header-bar .linked .button:insensitive:last-child,
-.header-bar .linked .button:insensitive:only-child {
+.toolbar .linked .button:insensitive:only-child {
box-shadow: inset 1px 1px alpha(@light_shadow, 0.2),
inset -1px 0 alpha(@light_shadow, 0.2);
}
@@ -2723,13 +3100,7 @@ GtkColorButton.button {
.toolbar .raised.linked .button:active:last-child,
.toolbar .raised.linked .button:active:only-child,
.toolbar .linked .button:active:last-child,
-.toolbar .linked .button:active:only-child,
-.header-bar .button:active.raised.linked:last-child,
-.header-bar .button:active.raised.linked:only-child,
-.header-bar .raised.linked .button:active:last-child,
-.header-bar .raised.linked .button:active:only-child,
-.header-bar .linked .button:active:last-child,
-.header-bar .linked .button:active:only-child {
+.toolbar .linked .button:active:only-child {
box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06),
inset -1px -1px alpha(@dark_shadow, 0.06);
}
@@ -2749,16 +3120,7 @@ GtkColorButton.button {
.toolbar .raised.linked .button:insensitive,
.toolbar .linked .button,
.toolbar .linked .button:active,
-.toolbar .linked .button:insensitive,
-.header-bar .button.raised.linked,
-.header-bar .button.raised.linked:active,
-.header-bar .button.raised.linked:insensitive,
-.header-bar .raised.linked .button,
-.header-bar .raised.linked .button:active,
-.header-bar .raised.linked .button:insensitive,
-.header-bar .linked .button,
-.header-bar .linked .button:active,
-.header-bar .linked .button:insensitive {
+.toolbar .linked .button:insensitive {
border-width: 1px;
border-radius: 0;
border-right-width: 0;
@@ -2780,16 +3142,7 @@ GtkColorButton.button {
.toolbar .raised.linked .button:insensitive:first-child,
.toolbar .linked .button:first-child,
.toolbar .linked .button:active:first-child,
-.toolbar .linked .button:insensitive:first-child,
-.header-bar .button.raised.linked:first-child,
-.header-bar .button.raised.linked:active:first-child,
-.header-bar .button.raised.linked:insensitive:first-child,
-.header-bar .raised.linked .button:first-child,
-.header-bar .raised.linked .button:active:first-child,
-.header-bar .raised.linked .button:insensitive:first-child,
-.header-bar .linked .button:first-child,
-.header-bar .linked .button:active:first-child,
-.header-bar .linked .button:insensitive:first-child {
+.toolbar .linked .button:insensitive:first-child {
border-width: 1px;
border-radius: 3px;
border-right-width: 0;
@@ -2812,16 +3165,7 @@ GtkColorButton.button {
.toolbar .raised.linked .button:insensitive:last-child,
.toolbar .linked .button:last-child,
.toolbar .linked .button:active:last-child,
-.toolbar .linked .button:insensitive:last-child,
-.header-bar .button.raised.linked:last-child,
-.header-bar .button.raised.linked:active:last-child,
-.header-bar .button.raised.linked:insensitive:last-child,
-.header-bar .raised.linked .button:last-child,
-.header-bar .raised.linked .button:active:last-child,
-.header-bar .raised.linked .button:insensitive:last-child,
-.header-bar .linked .button:last-child,
-.header-bar .linked .button:active:last-child,
-.header-bar .linked .button:insensitive:last-child {
+.toolbar .linked .button:insensitive:last-child {
border-width: 1px;
border-radius: 3px;
border-left-width: 0;
@@ -2844,7 +3188,126 @@ GtkColorButton.button {
.toolbar .raised.linked .button:insensitive:only-child,
.toolbar .linked .button:only-child,
.toolbar .linked .button:active:only-child,
-.toolbar .linked .button:insensitive:only-child,
+.toolbar .linked .button:insensitive:only-child {
+ border-width: 1px;
+ border-radius: 3px;
+}
+
+/* linked titlebar buttons */
+.header-bar .button.raised.linked,
+.header-bar .raised.linked .button,
+.header-bar .linked .button {
+ box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.8),
+ inset 1px 1px alpha(@light_shadow, 0.4);
+}
+
+.header-bar .button.raised.linked:active,
+.header-bar .raised.linked .button:active,
+.header-bar .linked .button:active {
+ box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.8),
+ inset 1px 1px alpha(@dark_shadow, 0.06),
+ inset -1px -1px alpha(@dark_shadow, 0.06);
+}
+
+.header-bar .button.raised.linked:insensitive,
+.header-bar .raised.linked .button:insensitive,
+.header-bar .linked .button:insensitive {
+ box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.8),
+ inset 1px 1px alpha(@light_shadow, 0.2);
+}
+
+/* remove box shadow from last-child and only-child */
+.header-bar .button:active *:insensitive.raised.linked:last-child,
+.header-bar .button:active *:insensitive.raised.linked:only-child,
+.header-bar .raised.linked .button:active *:insensitive:last-child,
+.header-bar .raised.linked .button:active *:insensitive:only-child,
+.header-bar .linked .button:active *:insensitive:last-child,
+.header-bar .linked .button:active *:insensitive:only-child {
+ box-shadow: none;
+}
+
+/* add back the inset shadow effect */
+.header-bar .button.raised.linked:last-child,
+.header-bar .button.raised.linked:only-child,
+.header-bar .raised.linked .button:last-child,
+.header-bar .raised.linked .button:only-child,
+.header-bar .linked .button:last-child,
+.header-bar .linked .button:only-child {
+ box-shadow: inset 1px 1px alpha(@light_shadow, 0.4),
+ inset -1px 0 alpha(@light_shadow, 0.4);
+}
+
+.header-bar .button:insensitive.raised.linked:last-child,
+.header-bar .button:insensitive.raised.linked:only-child,
+.header-bar .raised.linked .button:insensitive:last-child,
+.header-bar .raised.linked .button:insensitive:only-child,
+.header-bar .linked .button:insensitive:last-child,
+.header-bar .linked .button:insensitive:only-child {
+ box-shadow: inset 1px 1px alpha(@light_shadow, 0.2),
+ inset -1px 0 alpha(@light_shadow, 0.2);
+}
+
+.header-bar .button:active.raised.linked:last-child,
+.header-bar .button:active.raised.linked:only-child,
+.header-bar .raised.linked .button:active:last-child,
+.header-bar .raised.linked .button:active:only-child,
+.header-bar .linked .button:active:last-child,
+.header-bar .linked .button:active:only-child {
+ box-shadow: inset 1px 1px alpha(@dark_shadow, 0.06),
+ inset -1px -1px alpha(@dark_shadow, 0.06);
+}
+
+/* middle button */
+.header-bar .button.raised.linked,
+.header-bar .button.raised.linked:active,
+.header-bar .button.raised.linked:insensitive,
+.header-bar .raised.linked .button,
+.header-bar .raised.linked .button:active,
+.header-bar .raised.linked .button:insensitive,
+.header-bar .linked .button,
+.header-bar .linked .button:active,
+.header-bar .linked .button:insensitive {
+ border-width: 1px;
+ border-radius: 0;
+ border-right-width: 0;
+ border-left-width: 0;
+}
+
+/* leftmost button */
+.header-bar .button.raised.linked:first-child,
+.header-bar .button.raised.linked:active:first-child,
+.header-bar .button.raised.linked:insensitive:first-child,
+.header-bar .raised.linked .button:first-child,
+.header-bar .raised.linked .button:active:first-child,
+.header-bar .raised.linked .button:insensitive:first-child,
+.header-bar .linked .button:first-child,
+.header-bar .linked .button:active:first-child,
+.header-bar .linked .button:insensitive:first-child {
+ border-width: 1px;
+ border-radius: 3px;
+ border-right-width: 0;
+ border-bottom-right-radius: 0;
+ border-top-right-radius: 0;
+}
+
+/* rightmost button */
+.header-bar .button.raised.linked:last-child,
+.header-bar .button.raised.linked:active:last-child,
+.header-bar .button.raised.linked:insensitive:last-child,
+.header-bar .raised.linked .button:last-child,
+.header-bar .raised.linked .button:active:last-child,
+.header-bar .raised.linked .button:insensitive:last-child,
+.header-bar .linked .button:last-child,
+.header-bar .linked .button:active:last-child,
+.header-bar .linked .button:insensitive:last-child {
+ border-width: 1px;
+ border-radius: 3px;
+ border-left-width: 0;
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+}
+
+/* linked single button */
.header-bar .button.raised.linked:only-child,
.header-bar .button.raised.linked:active:only-child,
.header-bar .button.raised.linked:insensitive:only-child,
@@ -2887,7 +3350,7 @@ GtkTreeView {
GtkTreeView.dnd {
border-width: 1px;
border-style: solid;
- border-color: shade(@theme_selected_bg_color, 1.2);
+ border-color: @theme_selected_bg_color;
border-radius: 0;
}
@@ -2929,6 +3392,84 @@ GtkViewport.frame {
color: @theme_selected_fg_color;
}
+/**************
+ * action-bar *
+ **************/
+.action-bar {
+ padding: 6px;
+ border-width: 0 0 1px 0;
+ border-style: solid;
+ border-color: shade(@theme_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(@theme_bg_color, 1.0),
+ shade(@theme_bg_color, 0.88)
+ );
+}
+
+.action-bar .button.text-button {
+ padding: 4px;
+}
+
+.action-bar .button.image-button {
+ padding: 6px;
+}
+
+.action-bar .title {
+ font: bold;
+ padding: 0 12px;
+}
+
+.action-bar .subtitle {
+ font: smaller;
+ padding: 0 12px;
+}
+
+/***************
+ * search bars *
+ ***************/
+.search-bar {
+ border-width: 0 0 1px 0;
+ border-style: solid;
+ border-color: shade(@theme_bg_color, 0.8);
+ background-color: shade(@theme_bg_color, 0.98);
+}
+
+.search-bar .button.close-button {
+ padding: 4px;
+}
+
+/***********
+ * dialogs *
+ ***********/
+GtkMessageDialog,
+.prompt {
+ -GtkDialog-content-area-border: 0;
+ -GtkDialog-action-area-border: 0;
+ -GtkDialog-button-spacing: 0;
+
+ margin: 0;
+ padding: 0;
+}
+
+/********************
+ * various choosers *
+ ********************/
+GtkFontButton .separator,
+GtkFileChooserButton .separator {
+ /* always disable separators */
+ -GtkWidget-wide-separators: true;
+ -GtkWidget-horizontal-separator: 0;
+ -GtkWidget-vertical-separator: 0;
+}
+
+GtkFontButton GtkLabel:last-child {
+ color: alpha(currentColor, 0.7);
+}
+
+GtkFileChooserButton GtkImage:last-child {
+ color: alpha(currentColor, 0.7);
+}
+
/*********************
* app notifications *
*********************/
@@ -3102,7 +3643,6 @@ GtkOverlay.osd {
}
.osd .scale.slider {
- border-radius: 7px;
background-color: shade(@osd_bg, 1.08);
background-image: none;
/* we will draw the border using box shadow for now */
@@ -3149,10 +3689,11 @@ GtkOverlay.osd {
.osd GtkProgressBar,
GtkProgressBar.osd {
- padding: 0;
-GtkProgressBar-xspacing: 0;
-GtkProgressBar-yspacing: 2px;
-GtkProgressBar-min-horizontal-bar-height: 2px;
+
+ padding: 0;
}
.osd GtkProgressBar.trough,
@@ -3167,7 +3708,7 @@ GtkProgressBar.osd.trough {
.osd GtkProgressBar.progressbar,
GtkProgressBar.osd.progressbar {
border-style: none;
- border-radius: 0;
+ border-radius: 0;
background-color: @theme_selected_bg_color;
background-image: none;
}
@@ -3221,7 +3762,6 @@ GtkProgressBar.osd.progressbar {
* destructive action buttons *
******************************/
.destructive-action.button {
- padding: 4px;
border-width: 1px;
border-style: solid;
border-color: shade(@error_color, 0.8);
@@ -3259,6 +3799,46 @@ GtkProgressBar.osd.progressbar {
);
}
+/******************************
+ * suggested action buttons *
+ ******************************/
+.suggested-action.button {
+ border-width: 1px;
+ border-style: solid;
+ border-color: shade(@theme_selected_bg_color, 0.8);
+ border-radius: 3px;
+ background-image: linear-gradient(to bottom,
+ shade(shade(@theme_bg_color, 1.02), 1.05),
+ shade(shade(@theme_bg_color, 1.02), 0.97)
+ );
+
+ color: @theme_fg_color;
+}
+
+.suggested-action.button:hover {
+ border-color: shade(@theme_selected_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(@theme_bg_color, 1.15),
+ shade(@theme_bg_color, 1.07)
+ );
+}
+
+.suggested-action.button:active {
+ border-color: shade(@theme_selected_bg_color, 0.7);
+ background-image: linear-gradient(to bottom,
+ shade(shade(@theme_bg_color, 0.85), 1.05),
+ shade(shade(@theme_bg_color, 0.85), 0.97)
+ );
+}
+
+.suggested-action.button:hover:active {
+ border-color: shade(@theme_selected_bg_color, 0.8);
+ background-image: linear-gradient(to bottom,
+ shade(@theme_bg_color, 1.15),
+ shade(@theme_bg_color, 1.07)
+ );
+}
+
/******************
* selection mode *
******************/
@@ -3287,7 +3867,6 @@ GtkProgressBar.osd.progressbar {
.selection-mode.header-bar .button,
.selection-mode.toolbar .button,
.selection-mode.toolbar GtkToolButton .button {
- padding: 4px;
border-width: 1px;
border-style: solid;
border-color: shade(@theme_selected_bg_color, 0.8);
@@ -3335,7 +3914,6 @@ GtkProgressBar.osd.progressbar {
.selection-mode.header-bar .suggested-action.button,
.selection-mode.toolbar .suggested-action.button,
.selection-mode.toolbar GtkToolButton.suggested-action .button {
- padding: 4px;
border-width: 1px;
border-style: solid;
border-color: shade(@theme_selected_bg_color, 0.8);
@@ -3427,9 +4005,19 @@ GtkBubbleWindow .toolbar {
.titlebar {
border-radius: 4px 4px 0 0;
background-image: linear-gradient(to bottom,
- @wm_bg_a,
- shade(@wm_bg_b, 0.88)
+ shade(@titlebar_bg_color, 1.07),
+ shade(@titlebar_bg_color, 0.88)
);
+
+ color: @titlebar_fg_color;
+}
+
+.tiled .titlebar {
+ border-radius: 0;
+}
+
+.maximized .titlebar {
+ border-radius: 0;
}
/* this is the default titlebar that is added by GTK
@@ -3443,33 +4031,33 @@ GtkBubbleWindow .toolbar {
.titlebar .title {
font: bold;
- text-shadow: 0 1px @wm_title_focused_shadow;
+ text-shadow: 0 1px shade(@titlebar_bg_color, 1.2);
}
.titlebar:backdrop {
background-image: linear-gradient(to bottom,
- shade(@wm_bg_a, 0.97),
- shade(@wm_bg_b, 0.88)
+ shade(@titlebar_bg_color, 1.02),
+ shade(@titlebar_bg_color, 0.88)
);
}
.titlebar .title:backdrop {
- text-shadow: 0 1px @wm_title_unfocused_shadow;
+ text-shadow: 0 1px shade(@titlebar_bg_color, 1.1);
}
.titlebar .titlebutton {
padding: 4px;
border-style: none;
background: none;
- color: mix(@wm_title_focused, @wm_bg_a, 0.2);
- icon-shadow: 0 1px @wm_title_focused_shadow;
+ color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.3);
+ icon-shadow: 0 1px shade(@titlebar_bg_color, 1.2);
box-shadow: none;
}
.titlebar .titlebutton:hover,
.titlebar .titlebutton:hover:focus {
background: none;
- color: @wm_title_focused;
+ color: @titlebar_fg_color;
box-shadow: none;
}
@@ -3482,14 +4070,14 @@ GtkBubbleWindow .toolbar {
/*
.titlebar .right .titlebutton:first-child {
- border-left: 1px solid shade(@wm_bg_a, 0.9);
+ border-left: 1px solid shade(@titlebar_bg_color, 0.9);
}
.titlebar .right .titlebutton:last-child {
}
.titlebar .left .titlebutton:last-child {
- border-right: 1px solid shade(@wm_bg_a, 0.9);
+ border-right: 1px solid shade(@titlebar_bg_color, 0.9);
}
.titlebar .left .titlebutton:first-child {
@@ -3498,20 +4086,24 @@ GtkBubbleWindow .toolbar {
.titlebar .titlebutton:backdrop {
background-image: none;
- color: @wm_title_unfocused;
- icon-shadow: 0 1px @wm_title_unfocused_shadow;
+ color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
+ icon-shadow: 0 1px shade(@titlebar_bg_color, 1.1);
}
.window-frame {
border-style: none;
border-radius: 4px 4px 0 0;
box-shadow: 0 3px 7px alpha(black, 0.7),
- 0 0 0 1px alpha(black, 0.2);
+ 0 0 0 1px alpha(black, 0.3);
/* this is used for the resize cursor area */
margin: 10px;
}
+.window-frame.tiled {
+ border-radius: 0;
+}
+
.window-frame:backdrop {
box-shadow: 0 3px 5px alpha(black, 0.5),
0 0 0 1px alpha(black, 0.2);
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 2d7be279790b002b11ecf73586f0b59f819d76cd..29c8975bb0f562feef776fcd24a59fb360d836fd 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -23,13 +23,13 @@
@define-color dark_shadow #000;
/* misc colors used by gtk+ */
-@define-color info_fg_color rgb (0, 0, 0);
+@define-color info_fg_color rgb (50, 49, 40);
@define-color info_bg_color rgb (252, 246, 202);
-@define-color warning_fg_color rgb (0, 0, 0);
+@define-color warning_fg_color rgb (50, 34, 12);
@define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color rgb (255, 255, 255);
+@define-color question_fg_color rgb (215, 232, 250);
@define-color question_bg_color rgb (57, 142, 231);
-@define-color error_fg_color rgb (255, 255, 255);
+@define-color error_fg_color rgb (251, 214, 214);
@define-color error_bg_color rgb (237, 54, 54);
@define-color link_color #1b983b;
@define-color success_color #4e9a06;
@@ -37,6 +37,8 @@
@define-color error_color #cc0000;
/* widget colors */
+@define-color titlebar_bg_color @theme_bg_color;
+@define-color titlebar_fg_color @theme_fg_color;
@define-color menubar_bg_color @theme_bg_color;
@define-color menubar_fg_color @theme_fg_color;
@define-color toolbar_bg_color @theme_bg_color;
@@ -52,24 +54,25 @@
@define-color osd_bg alpha(@osd_base, 0.8);
/* window manager colors */
-@define-color wm_bg_a shade(@theme_bg_color, 1.07);
-@define-color wm_bg_b @theme_bg_color;
-@define-color wm_title_focused shade(@theme_fg_color, 1.2);
-@define-color wm_title_focused_shadow shade(@theme_bg_color, 1.2);
-@define-color wm_title_unfocused shade(@theme_fg_color, 2.0);
-@define-color wm_title_unfocused_shadow shade(@theme_bg_color, 1.1);
-@define-color wm_border_focused shade(@theme_bg_color, 0.7);
-@define-color wm_border_unfocused shade(@theme_bg_color, 0.8);
+@define-color wm_bg_a shade(@titlebar_bg_color, 1.07);
+@define-color wm_bg_b @titlebar_bg_color;
+@define-color wm_title_focused shade(@titlebar_fg_color, 1.2);
+@define-color wm_title_focused_shadow shade(@titlebar_bg_color, 1.2);
+@define-color wm_title_unfocused shade(@titlebar_fg_color, 2.0);
+@define-color wm_title_unfocused_shadow shade(@titlebar_bg_color, 1.1);
+@define-color wm_border_focused shade(@titlebar_bg_color, 0.7);
+@define-color wm_border_unfocused shade(@titlebar_bg_color, 0.8);
/* lightdm greeter color scheme */
@define-color lightdm_bg_color #242424;
-@define-color lightdm_fg_color #efefef;
+@define-color lightdm_fg_color #3c3c3c;
@import url("gtk-widgets.css");
@import url("gtk-widgets-assets.css");
@import url("apps/gnome-applications.css");
@import url("apps/granite-widgets.css");
@import url("apps/unity.css");
+@import url("apps/xfce.css");
@import url("apps/lightdm-unity-greeter.css");
@import url("apps/lightdm-gtk-greeter.css");
-@import url("apps/xfce.css");
+@import url("apps/synaptic.css");
diff --git a/index.theme b/index.theme
index fe4c84542dd6bd1eb4106b4e431464f7424259d7..f4d3abededac1e64d49ab8d0e77c5aff2e83579f 100644
--- a/index.theme
+++ b/index.theme
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=X-GNOME-Metatheme
-Name=Grenbird
+Name=Greenbird
Comment=Greenbird theme
Encoding=UTF-8
diff --git a/xfce-notify-4.0/gtkrc b/xfce-notify-4.0/gtkrc
index 8c956758ba3daa5a90d46afb43c54ba5536c5c8a..30a6800e27bfb655aff1d24e37ddfc285ad7cfb7 100644
--- a/xfce-notify-4.0/gtkrc
+++ b/xfce-notify-4.0/gtkrc
@@ -26,6 +26,7 @@ style "notify-button"
style "notify-text"
{
fg[NORMAL] = "#ffffff"
+ fg[PRELIGHT] = "#ffffff"
GtkWidget::link-color = "#a7a7a7"
}