Merge gtk-3.0 css changes from BlueMenta

9.0/trisquel-gtk-theme/data/usr/share/themes/Trisquel/gtk-3.0/gnome-applications.css

@@ -16,40 +16,106 @@
 	color: @theme_text_color;
 }
 
-.nautilus-desktop.nautilus-canvas-item:selected {
+.nautilus-desktop.nautilus-canvas-item:selected,
+.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
 	color: @theme_selected_fg_color;
 }
 
 .nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:hover,
 .nautilus-desktop.nautilus-canvas-item:selected {
 	text-shadow: none;
 }
 
+/*
 .nautilus-desktop.nautilus-canvas-item:selected:backdrop {
 	color: @theme_unfocused_selected_fg_color;
 }
+*/
 
-/* gedit */
-.gedit-headerbar-paned:backdrop {
-	background-image: url("assets/null.png");
+/* workaround for jumping buttons in nautilus */
+.nautilus-window headerbar.titlebar .linked.path-bar > button,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle {
+    border: 1px;
+    border-radius: 4px;
+    margin: 0px -4px 0px 0px;
+    padding: 4px;
+	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
 }
 
-.gedit-search-slider * {
-	color: @theme_fg_color;
+.nautilus-window headerbar.titlebar .linked.path-bar > button:checked:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:checked:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button:checked,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:checked {
+	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button:hover:active,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:hover:active {
+	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:disabled,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:disabled {
+	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar> button:first-child widget {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:first-child {
+   margin: 0px -4px 0px 0px;
+   padding: 0px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:last-child widget {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
 }
 
-.gedit-document-panel {
-	background-color: @theme_bg_color;
+.nautilus-window headerbar.titlebar .linked.path-bar> button:last-child {
+   margin: 0px 0px 0px -4px;
+  padding: 0px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle {
+    margin: 0px -8px 0px 0px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle.toggle image {
+   padding: 0px 2px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle.toggle label {
+   padding: 0px 8px 0px 4px;
 }
 
 /*************
  * rhythmbox *
  *************/
 
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:active,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
-	padding: 0px 6px;
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat,
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat:hover,
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat:hover:active {
+	padding: 0px 8px;
+}
+
+/* gnome-weather */
+
+#weather-page frame.weather-clear .linked.stack-switcher.osd > button,
+#weather-page frame.weather-overcast .linked.stack-switcher.osd > button,
+#weather-page frame.weather-overcast stack > scrolledwindow > .frame label {
+    color: @theme_fg_color;
+    text-shadow: none;
+}
+
+#weather-page frame.weather-clear .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-overcast .linked.stack-switcher.osd > button:checked {
+    color: @osd_button_fg_active;
 }
 

9.0/trisquel-gtk-theme/data/usr/share/themes/Trisquel/gtk-3.0/gtk-fallback.css

-.menu {
+menu {
 	border-image: linear-gradient(to top,
 		alpha(@borders, 0.80),
 		alpha(@borders, 0.60) 33%,
@@ -6,7 +6,7 @@
 		alpha(@borders, 0.15)) 1 1 1 1/ 1px 1px 1px 1px;
 }
 
-.menubar .menu {
+menubar menu {
 	border-image: linear-gradient(to top,
 		alpha(@borders, 0.80),
 		alpha(@borders, 0.60) 33%,

9.0/trisquel-gtk-theme/data/usr/share/themes/Trisquel/gtk-3.0/gtk-main.css

@@ -31,7 +31,7 @@
 
 @define-color inactive_frame_color #ccc;
 
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
+@define-color sidebar_bg shade (@theme_bg_color, 1.08);
 @define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
 
 @define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
@@ -51,6 +51,9 @@
 @define-color button_hover_gradient_color_a shade(@button_gradient_color_a, 1.11);
 @define-color button_hover_gradient_color_b shade(@button_gradient_color_b, 1.06);
 
+@define-color button_default_border_color #6699CC;
+@define-color button_default_box_shadow_color #336699;
+
 @define-color insensitive_bg_color shade(@theme_bg_color, 0.95);
 @define-color insensitive_fg_color shade(@theme_bg_color, 0.6);
 @define-color insensitive_borders shade(@internal_element_color, 1.37);
@@ -97,6 +100,7 @@
 @define-color scale_trough_bg_b shade(@theme_bg_color, 0.76);
 @define-color scale_shadow alpha(white, 0.50);
 @define-color scale_progress_fill @theme_selected_bg_color;
+@define-color scale_trough_border shade(@borders, 0.83);
 @define-color scale_highlight_border @theme_selected_bg_color;
 @define-color scale_highlight_bg @theme_selected_bg_color;
 @define-color scale_highlight_shadow alpha(white, 0.50);
@@ -227,6 +231,9 @@
 /* csd border */
 @define-color wm_csd_solid_border_color shade (#3c3c3c, 1.2);
 
+/* inactive-pane caja */
+@define-color inactive-pane_bg_color #DEDEDE;
+
 @import url("gtk-main-common.css");
 @import url("gtk-widgets-backgrounds.css");
 @import url("gtk-widgets-borders.css");

9.0/trisquel-gtk-theme/data/usr/share/themes/Trisquel/gtk-3.0/gtk-widgets-assets.css

-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
 /*******************
  * Pane separators *
  *******************/
@@ -32,9 +23,7 @@
  * Header bar separator  *
  *************************/
 
-.header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1;
-	-GtkWidget-separator-width: 2px;
+headerbar > box > separator.vertical {
 	background: transparent;
 	border-width: 0 1px 0 1px;
 	border-style: solid;
@@ -47,243 +36,263 @@
  *************************/
 
 /* draw regular check and radio items using our SVG assets */
+/* old syntax is for broken firefox */
 
+check,
 .check,
-.view.cell.check {
+check .view.cell {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-.check:insensitive {
+check:disabled,
+.check {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
 }
 
-.check row:insensitive {
+check row:disabled {
 	background-color: transparent;
 }
 
-.check:active,
-.check:checked,
-.view.cell.check:active,
-.view.cell.check:checked {
+check:checked,
+.view.cell check:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
 }
 
-.check:active:insensitive,
-.check:checked:insensitive {
+check:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
 }
 
-.check:inconsistent {
+check:indeterminate {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png"));
 }
 
-.check:inconsistent:insensitive {
+check:indeterminate:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png"));
 }
 
+radio,
 .radio,
-.view.cell.radio {
+.view.cell radio {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-.radio:insensitive {
+radio:disabled,
+.radio {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
 }
 
-.radio row:insensitive {
+radio row:disabled {
 	background-color: transparent;
 }
 
-.radio:active,
-.view.cell.radio:active,
-.radio:checked,
-.view.cell.radio:checked {
+radio:checked,
+.view.cell radio:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
 }
 
-.radio:active:insensitive,
-.radio:checked:insensitive {
+radio:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
 }
 
-.radio:inconsistent {
+radio:indeterminate {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"));
 }
 
-.radio:inconsistent:insensitive {
+radio:indeterminate:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png"));
 }
 
-.sidebar .view.radio:active,
-.sidebar .view.radio:active:focus,
-.sidebar .view.radio:active:hover,
-.sidebar .view.radio:checked,
-.sidebar .view.radio:checked:focus,
-.sidebar .view.radio:checked:hover {
+.sidebar view radio:active,
+.sidebar view radio:active:focus,
+.sidebar view radio:active:hover,
+.sidebar view radio:checked,
+.sidebar view radio:checked:focus,
+.sidebar view radio:checked:hover {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked.svg"));
 }
 
-.sidebar .view.radio:hover {
+.sidebar view radio:hover {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg"));
 }
 
-.sidebar .view.radio:active:selected,
-.sidebar .view.radio:active:selected:focus,
-.sidebar .view.radio:checked:selected,
-.sidebar .view.radio:checked:selected:focus {
+.sidebar view radio:active:selected,
+.sidebar view radio:active:selected:focus,
+.sidebar view radio:checked:selected,
+.sidebar view radio:checked:selected:focus {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected.svg"));
 }
 
-.sidebar .view.radio:selected:hover,
-.sidebar .view.radio:selected:focus {
+.sidebar view radio:selected:hover,
+.sidebar view radio:selected:focus {
 	-gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected-prelight.svg"));	
 }
 
 /*************
  * GtkSwitch *
  *************/
-GtkSwitch.trough {
+
+switch {
  	background-image: url("assets/switch-off.png");
+    background-repeat: no-repeat;
 }
 
-GtkSwitch.trough:active {
+switch:checked {
 	background-image: url("assets/switch-on.png");
+    background-repeat: no-repeat;
 }
 
-GtkSwitch.trough:insensitive {
+switch:disabled {
 	background-image: url("assets/switch-off-ins.png");
+    background-repeat: no-repeat;
 }
 
-GtkSwitch.trough:active:insensitive {
+switch:checked:disabled {
 	background-image: url("assets/switch-on-ins.png");
+    background-repeat: no-repeat;
 }
 
 /*********************
  * GtkScale's slider *
  *********************/
-.scale.slider,
-.scale.slider.horizontal {
-	background-image: url("assets/slider.png");
-}
 
-.scale.slider:hover,
-.scale.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
+scale.horizontal contents:only-child > trough > slider,
+scale slider {
+	background-image: url("assets/slider.svg");
+    background-repeat: no-repeat;
 }
 
-.scale.slider:active,
-.scale.slider:active:hover,
-.scale.slider.horizontal:active,
-.scale.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
+scale slider:hover {
+	background-image: url("assets/slider-hover.svg");
+    background-repeat: no-repeat;
 }
 
-.scale.slider:insensitive,
-.scale.slider:insensitive:hover,
-.scale.slider.horizontal:insensitive,
-.scale.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
+scale slider:disabled,
+scale slider:disabled:hover {
+	background-image: url("assets/slider-ins.svg");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.horizontal {
-	background-image: url("assets/slider.png");
+scale.horizontal.color.marks-before slider,
+scale.horizontal.marks-before slider {
+	background-image: url("assets/scale-slider-marks-above-horizontal.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
+scale.horizontal.color.marks-before slider:hover,
+scale.horizontal.marks-before slider:hover {
+	background-image: url("assets/scale-slider-marks-above-horizontal-active.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.horizontal:active,
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
+scale.horizontal.color.marks-before slider:active,
+scale.horizontal.color.marks-before slider:active:hover,
+scale.horizontal.marks-before slider:active,
+scale.horizontal.marks-before slider:active:hover {
+	background-image: url("assets/scale-slider-marks-above-horizontal-active.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.horizontal:insensitive,
-.scale.scale-has-marks-above.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
+scale.horizontal.color.marks-before slider:disabled,
+scale.horizontal.marks-before slider:disabled {
+	background-image: url("assets/scale-slider-marks-above-horizontal-insensitive.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.vertical {
-	background-image: url("assets/slider.png");
+scale.vertical.marks-before slider {
+	background-image: url("assets/scale-slider-marks-above-vertical.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
+scale.vertical.marks-before slider:hover {
+	background-image: url("assets/scale-slider-marks-above-vertical-active.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
+scale.vertical.marks-before slider:active,
+scale.vertical.marks-before slider:active:hover {
+	background-image: url("assets/scale-slider-marks-above-vertical-active.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-above.slider.vertical:insensitive,
-.scale.scale-has-marks-above.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
+scale.vertical.marks-before slider:disabled,
+scale.vertical.marks-before slider:disabled:hover {
+	background-image: url("assets/scale-slider-marks-above-vertical-insensitive.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.horizontal {
-	background-image: url("assets/slider.png");
+scale.horizontal.marks-after slider {
+	background-image: url("assets/scale-slider-marks-below-horizontal.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.horizontal:hover {
-	background-image: url("assets/slider-hover.png");
+scale.horizontal.marks-after slider:hover {
+	background-image: url("assets/scale-slider-marks-below-horizontal-active.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
-	background-image: url("assets/slider-hover.png");
+scale.horizontal.marks-after slider:active,
+scale.horizontal.marks-after slider:active:hover {
+	background-image: url("assets/scale-slider-marks-below-horizontal-active.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.horizontal:insensitive,
-.scale.scale-has-marks-below.slider.horizontal:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
+scale.horizontal.marks-after slider:disabled:hover {
+	background-image: url("assets/scale-slider-marks-below-horizontal-active.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.vertical {
-	background-image: url("assets/slider.png");
+scale.vertical.marks-after slider {
+	background-image: url("assets/scale-slider-marks-below-vertical.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.vertical:hover {
-	background-image: url("assets/slider-hover.png");
+scale.vertical.marks-after slider:hover {
+	background-image: url("assets/scale-slider-marks-below-vertical-active.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
-	background-image: url("assets/slider-hover.png");
+scale.vertical.marks-after slider:active,
+scale.vertical.marks-after slider:active:hover {
+	background-image: url("assets/scale-slider-marks-below-vertical-active.png");
+    background-repeat: no-repeat;
 }
 
-.scale.scale-has-marks-below.slider.vertical:insensitive,
-.scale.scale-has-marks-below.slider.vertical:insensitive:hover {
-	background-image: url("assets/slider-ins.png");
+scale.vertical.marks-after slider:disabled,
+scale.vertical.marks-after slider:disabled:hover {
+	background-image: url("assets/scale-slider-marks-below-vertical-insensitive.png");
+    background-repeat: no-repeat;
 }
 
 /********************************
  * Touch text selection handles *
  ********************************/
-.cursor-handle.bottom {
+
+cursor-handle.bottom {
 	background-image: url("assets/slider.png");
 }
 
-.cursor-handle.top {
+cursor-handle.top {
 	background-image: url("assets/slider.png");
 }
 
-.entry.cursor-handle.top,
-.cursor-handle.top {
+entry cursor-handle.top,
+cursor-handle.top {
 	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
 }
-.entry.cursor-handle.bottom,
-.cursor-handle.bottom {
+
+entry cursor-handle.bottom,
+cursor-handle.bottom {
 	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
 }
 
 /****************
  * Content view *
  ****************/
+.view.content-view,
 .content-view.view {
 	/*background-image: url("assets/noise-texture-light.png");*/
 }

9.0/trisquel-gtk-theme/data/usr/share/themes/Trisquel/gtk-3.0/gtk-widgets-backgrounds.css

 /* Button background */
-.button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
+button,
+combobox button.combo,
+combobox button.combo:backdrop,
+toolbar .raised button,
+toolbar combobox button.combo,
+toolbar.primary-toolbar .linked button,
+toolbar.primary-toolbar .raised button {
 	background-image: linear-gradient(to bottom, 
 		@button_gradient_color_a,
 		@button_gradient_color_b);
 	background-color: transparent;
 }
 
-/* Pushed button and progressbar through background */
-.button:checked,
-.button:active,
-.button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover {
+/* Pushed button and progressbar through background (checked) */
+button:checked,
+button:focus:checked,
+toolbar