Merge pull request #45 from shimmerproject/master

Fixed various bugs

README

@@ -1,4 +1,4 @@
-Numix is a modern looking flat theme for Gnome. It supports Gnome, Unity, Pantheon, XFCE and Openbox. The theme is compatible with GTK 3.6 and 3.8. It also includes a GTK 2.0 theme using Murrine engine.
+Numix is a modern looking flat theme for Gnome. It supports Gnome, Unity, XFCE and Openbox. The theme is compatible with GTK 3.6 and 3.8. It also includes a GTK 2.0 theme using Murrine engine.
 
 ---
 

gtk-2.0/gtkrc

@@ -118,7 +118,7 @@ style "murrine-default" {
 		colorize_scrollbar = FALSE		
 		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
 		contrast = 0.8
-		focusstyle = 3 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
+		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
 		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
 		glowstyle = 0
 		gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
@@ -154,12 +154,8 @@ style "murrine-wider" {
 # Notebook
 
 style "murrine-notebook-bg" {
-	bg[NORMAL] = shade (1.08, @bg_color)
-	bg[ACTIVE] = shade (0.90, @bg_color)
-
-	engine "murrine" {
-		border_shades = { 0.8, 0.8 }
-	}
+	bg[NORMAL] = @base_color
+	bg[ACTIVE] = shade (0.87, @base_color)
 }
 
 style "murrine-notebook" = "murrine-notebook-bg" {
@@ -286,8 +282,8 @@ style "murrine-radiocheck" = "murrine-default" {
 }
 
 style "murrine-entry" = "murrine-wider" {
-
 	engine "murrine" {
+		border_shades = { 1.3, 1.3 }
 	}
 }
 
@@ -296,7 +292,7 @@ style "metacity-frame" = "murrine-default" {
 }
 
 style "murrine-statusbar" { }
-style "murrine-comboboxentry" = "murrine-entry" { }
+style "murrine-comboboxentry" = "murrine-entry" { ythickness = 1 }
 style "murrine-hscale" = "murrine-scale" { }
 style "murrine-vscale" = "murrine-scale" { }
 style "murrine-hscrollbar" = "murrine-scrollbar" { }
@@ -539,15 +535,36 @@ style "xfwm-tabwin" {
 	Xfwm4TabwinWidget::border-width = 0
 	Xfwm4TabwinWidget::icon-size = 64
 
+	bg[NORMAL]	= @menu_bg_color
+	fg[NORMAL]	= @menu_fg_color
+
 	engine "murrine" {
 		focusstyle = 0
 	}
 }
 
 style "xfsm-logout" {
+	bg[NORMAL]	= @menu_bg_color
+	bg[ACTIVE]	= @menu_bg_color
+	bg[PRELIGHT]	= shade (1.1, @menu_bg_color)
+	bg[SELECTED]	= shade (0.5, @menu_bg_color)
+	bg[INSENSITIVE]	= shade (1.3, @menu_bg_color)
+
+	fg[NORMAL]	= @menu_fg_color
+	fg[PRELIGHT]	= @menu_fg_color
+
+	text[NORMAL]	= @menu_fg_color
 
 	engine "murrine" {
-		}	
+	}
+}
+
+style "xfsm-logout-button" {
+	bg[NORMAL]	= shade (1.2, @menu_bg_color)
+	bg[PRELIGHT]	= shade (1.4, @menu_bg_color)
+
+	engine "murrine" {
+	}
 }
 
 widget "*WnckPager*" style "workspace-switcher"
@@ -555,11 +572,23 @@ widget "*WnckPager*" style "workspace-switcher"
 widget "*Xfce*Panel*" style "murrine-panel"
 class "*Xfce*Panel*" style "murrine-panel"
 
-widget_class "*XfceHeading*" style "xfce-header"
-widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-widget "xfwm4-tabwin*" style "xfwm-tabwin"
-widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
+# Thunar Styles
+
+style "sidepane" {
+	base[NORMAL] = @bg_color
+	base[INSENSITIVE] = mix (0.4, shade (1.35, @selected_bg_color), shade (0.9, @base_color))
+	bg[NORMAL] = @bg_color
+	text[NORMAL] = mix (0.9, @fg_color, @bg_color)
+}
+
+widget_class "*ThunarShortcutsView*" style "sidepane"
+widget_class "*ThunarTreeView*" style "sidepane"
+widget_class "*ThunarLocationEntry*" style "murrine-entry"
+
+# Gtk2 Open-File Dialog
+
+widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
+widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
 
 # Google Chrome/Chromium Styles (requires 9.0.597 or newer)
 
@@ -592,7 +621,7 @@ class "ChromeGtkFrame" style "chrome-gtk-frame"
 
 widget_class "*Chrom*Button*" style "chromium-toolbar-button"
 
-# General Style Application
+# General Styles
 
 class "GtkWidget" style "murrine-default"
 
@@ -727,3 +756,10 @@ widget_class "*GimpToolbox*" style "performance-fix"
 widget_class "*GimpMenuDock*" style "performance-fix"
 widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
 widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
+
+widget_class "*XfceHeading*" style "xfce-header"
+widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
+widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
+widget "xfwm4-tabwin*" style "xfwm-tabwin"
+widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
+widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"

gtk-3.0/apps/gnome-applications.css

@@ -258,4 +258,4 @@ GeditFloatingSlider .not-found {
  ***********************/
 CcShellItemView.view {
     background-color: @theme_bg_color;
-}
+}

gtk-3.0/apps/granite-widgets.css

@@ -1,405 +0,0 @@
-/********************
- * dynamic notebook *
- ********************/
-.dynamic-notebook {
-    background-color: shade(@theme_bg_color, 1.08);
-    background-image: none;
-}
-
-.dynamic-notebook GtkLabel,
-.dynamic-notebook GtkImage {
-    color: alpha(@theme_fg_color, 0.5);
-}
-
-.dynamic-notebook .notebook {
-    -GtkNotebook-tab-overlap: 3px;
-    -GtkNotebook-initial-gap: 12px;
-
-    border-width: 1px 0 0 0;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0;
-    padding: 0;
-}
-
-.dynamic-notebook .notebook tab {
-    padding: 3px;
-    border-color: shade(@theme_bg_color, 0.85);
-    border-radius: 2px;
-    background-color: shade(@theme_bg_color, 0.9);
-    background-image: none;
-}
-
-.dynamic-notebook .notebook tab:nth-child(first) {
-    border-width: 0 1px 0 1px;
-}
-
-.dynamic-notebook .notebook tab:active {
-    border-width: 1px;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 2px;
-    background-color: shade(@theme_bg_color, 1.08);
-    color: @theme_fg_color;
-}
-
-.dynamic-notebook .notebook tab .entry {
-    border-radius: 2px;
-    padding: 4px 3px;
-}
-
-.dynamic-notebook .button:hover,
-.dynamic-notebook .button:hover:active,
-.dynamic-notebook .notebook .button,
-.dynamic-notebook .notebook .button:hover,
-.dynamic-notebook .notebook .button:hover:active {
-    border-color: shade(@theme_bg_color, 0.7);
-    background-color: shade(@theme_bg_color, 1.10);
-    background-image: none;
-}
-
-.dynamic-notebook .button:hover:active,
-.dynamic-notebook .notebook .button:hover:active {
-    border-color: shade(@theme_bg_color, 0.7);
-    color: shade(@theme_fg_color, 0.7);
-}
-
-/****************
- * content view *
- ****************/
-.content-view-window {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_base_color, 0.8);
-    border-radius: 2px;
-    background-color:@theme_base_color;
-    color: @theme_text_color;
-}
-
-.content-view,
-.content-view GtkViewport {
-    background-color: @theme_base_color;
-}
-
-.content-view * {
-    background-color: transparent;
-    background-image: none;
-}
-
-.content-view .entry {
-    background-color: @theme_base_color;
-    background-image: none;
-    color: @theme_text_color;
-}
-
-.content-view .button {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_base_color, 0.8);
-    border-radius: 2px;
-    background-color: shade(@theme_base_color, 1.08);
-    background-image: none;
-    color: @theme_text_color;
-}
-
-.content-view .button:hover {
-    border-color: shade(@theme_base_color, 0.7);
-    background-color: shade(@theme_base_color, 1.10);
-    background-image: none;
-}
-
-.content-view .button:active {
-    border-color: shade(@theme_base_color, 0.8);
-    background-color: shade(@theme_base_color, 0.95);
-    background-image: none;
-}
-
-.content-view .button:active:hover {
-    border-color: shade(@theme_base_color, 0.7);
-    color: shade(@theme_text_color, 0.7);
-}
-
-.content-view .button:insensitive {
-    background-color: shade(@theme_base_color, 0.9);
-    background-image: none;
-}
-
-.content-view .help_button * {
-    color: @theme_text_color;
-}   
-
-.content-view .toolbar {
-    -GtkWidget-window-dragging: true;
-
-    padding: 1px;
-    border-width: 0 0 1px 0;
-    border-style: solid;
-    border-color: shade(@theme_base_color, 0.8);
-    background-color: @theme_base_color;
-    background-image: none;
-}
-
-/**************
- * sourcelist *
- *************/
-.source-list,
-.source-list.view {
-    border-radius: 0;
-    background-color: @theme_bg_color;
-    color: mix(@theme_fg_color, @theme_bg_color, 0.1);
-}
-
-.source-list {
-    -GtkTreeView-horizontal-separator: 1;
-    -GtkTreeView-vertical-separator: 1;
-}
-
-.source-list.view:selected,
-.source-list.view:prelight:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-.source-list.view:prelight {
-    background-color: shade(@theme_bg_color, 1.08);
-}
-
-.source-list.badge,
-.source-list.badge:prelight,
-.source-list.badge:selected,
-.source-list.badge:prelight:selected {
-    margin: 0 3px;
-    padding: 0 6px;
-    border-width: 0;
-    border-radius: 10px;
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-/*************
- * statusbar *
- *************/
-GraniteWidgetsStatusBar {
-    padding: 1px;
-    background-color: @theme_bg_color;
-    background-image: none;
-    box-shadow: inset 0 1px shade(@theme_bg_color, 0.8);
-}
-
-/***********
- * popover *
- ***********/
-GraniteWidgetsPopOver {
-    -GraniteWidgetsPopOver-arrow-width: 21;
-    -GraniteWidgetsPopOver-arrow-height: 12;
-    -GraniteWidgetsPopOver-border-radius: 2px;
-    -GraniteWidgetsPopOver-border-width: 1;
-    -GraniteWidgetsPopOver-shadow-size: 12;
-
-    margin: 0;
-    border-style: solid;
-    border-color: shade(@menu_bg_color, 0.8);
-    color: @menu_fg_color;
-}
-
-.popover_bg {
-    background-color: transparent;
-    background-image: -gtk-gradient(linear,
-                     left top, left bottom,
-                     from (@menu_bg_color),
-                     to (@menu_bg_color));
-}
-
-GraniteWidgetsPopOver .sidebar.view,
-GraniteWidgetsPopOver * {
-    background-color: transparent;
-    color: @menu_fg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view:selected,
-GraniteWidgetsPopOver .sidebar.view:selected:focus,
-GraniteWidgetsPopOver *:selected,
-GraniteWidgetsPopOver *:selected:focus {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-GraniteWidgetsPopOver .button {
-    border-color: shade(@menu_bg_color, 0.8);
-    background-color: shade(@menu_bg_color, 1.08);
-    background-image: none;
-    color: @menu_fg_color;
-
-}
-
-GraniteWidgetsPopOver .button:hover {
-    border-color: shade(@menu_bg_color, 0.7);
-    background-color: shade(@menu_bg_color, 1.10);
-    background-image: none;
-    color: shade(@menu_fg_color, 0.7);
-}
-
-GraniteWidgetsPopOver .button:active {
-    border-color: shade(@menu_bg_color, 0.8);
-    background-color: shade(@menu_bg_color, 0.95);
-    background-image: none;
-}
-
-GraniteWidgetsPopOver .button:active:hover {
-    border-color: shade(@menu_bg_color, 0.7);
-    color: shade(@menu_fg_color, 0.7);
-}
-
-GraniteWidgetsPopOver .entry {
-    border-color: shade(@menu_bg_color, 0.7);
-    background-color: @menu_bg_color;
-    background-image: none;
-    color: @menu_fg_color;
-}
-
-GraniteWidgetsPopOver .entry:active,
-GraniteWidgetsPopOver .entry:focus {
-    border-color: shade(@menu_bg_color, 0.7);
-}
-
-GraniteWidgetsPopOver *.separator {
-    border-color: shade(@menu_bg_color, 0.9);
-    color: transparent;
-}
-
-.button.app {
-    border-width: 0;
-    border-radius: 2px;
-    background-color: transparent;
-}
-
-.button.app:hover {
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-.button.app:focus {
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
-}
-
-/********
- * gala *
- *******/
-.gala-workspaces-background {
-    border-width: 1px 0 0 0;
-    border-color: shade(@panel_bg_color, 0.8);
-    background-color: @panel_bg_color;
-    background-image: none;
-}
-
-.gala-workspace-selected {
-    border-width: 1px;
-    border-radius: 2px;
-    border-color: shade(@theme_selected_bg_color, 0.9);
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-}
-
-/*********
- * files *
- ********/
-.files-overlay-bar {
-    margin: 3px;
-    padding: 3px 6px;
-    border-width: 0;
-    border-radius: 2px;
-    background-color: @theme_tooltip_bg_color;
-}
-
-.files-overlay-bar* {
-    color: @theme_tooltip_fg_color;
-}
-
-/*********
- * noise *
- ********/
-.album-list-view,
-.album-list-view * {
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 0;
-    background-color: @theme_base_color;
-    color: @theme_fg_color;
-}
-
-.album-list-view GtkTreeView {
-    -GtkTreeView-vertical-separator: 1;
-    -GtkTreeView-grid-line-width: 0;
-
-    background-color: @theme_base_color;
-    color: @theme_fg_color;
-}
-
-.album-list-view GtkTreeView row:nth-child(even) {
-    border-width: 0;
-    border-style: none;
-    background-color: shade(@theme_base_color, 0.97);
-}
-
-
-.album-list-view GtkTreeView row:nth-child(odd) {
-    border-width: 0;
-    border-style: none;
-    background-color: shade(@theme_base_color, 1.0);
-}
-
-.album-list-view GtkTreeView row:selected {
-    background-color: @selected_bg_color;
-	color: @selected_fg_color;
-}
-
-/**********
- * notify *
- **********/
-.notify {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_base_color, 0.7);
-    border-radius: 2px;
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-.notify .low {
-}
-
-.notify .critical {
-}
-
-/*********
- * panel *
- ********/
-.panel {
-    background-color: @panel_bg_color;
-    color: @panel_fg_color;
-}
-
-.shadow {
-    background-color: transparent;
-    background-image: -gtk-gradient(linear,
-                     left top, left bottom,
-                     from (rgba(0, 0, 0, 0.3)),
-                     to (transparent));
-}
-
-.composited-indicator,
-.wingpanel-app-button, 
-.wingpanel-indicator-button {
-    padding: 0 2px;
-    background-color: transparent;
-    color: @panel_fg_color;
-}
-
-.composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
-    border-style: none;
-    background-image: none;
-}

gtk-3.0/apps/unity.css

@@ -8,8 +8,8 @@ UnityPanelWidget,
     color: @panel_fg_color;
 }
 
-.unity-panel.panel,
-.unity-panel .panel {
+.unity-panel.menubar,
+.unity-panel .menubar {
 }
 
 .unity-panel.menuitem,
@@ -18,10 +18,10 @@ UnityPanelWidget,
     color: @panel_fg_color;
 }
 
-.unity-panel.panel.menuitem:hover,
-.unity-panel.panel .menuitem *:hover {
+.unity-panel.menubar.menuitem:hover,
+.unity-panel.menubar .menuitem *:hover {
     border-color: mix(@panel_bg_color, @panel_fg_color, 0.23);
     background-color: mix(@panel_bg_color, @panel_fg_color, 0.21);
     background-image: none;
     color: shade(@panel_fg_color, 1.08);
-}
+}