Merge lp:~dashua/light-themes/fix.lp.1040710 into lp:~ubuntu-art-pkg/light-themes/trunk

[James Schriver]

Merge GtkLevel fixes

[Andrea Cimitan (cimi)]

Thanks, merge!

review: Approve

=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
--- Ambiance/gtk-3.0/gtk-main.css	2012-08-08 13:46:38 +0000
+++ Ambiance/gtk-3.0/gtk-main.css	2012-08-23 15:47:23 +0000
@@ -18,6 +18,7 @@
 @define-color error_fg_color rgb (166, 38, 38);
 @define-color error_bg_color rgb (237, 54, 54);
 @define-color link_color #4a90d9;
+@define-color success_color #4e9a06;
 @define-color error_color #cc0000;
 
 /* theme common colors */
@@ -41,4 +42,4 @@
 @import url("apps/nautilus.css");
 @import url("apps/gnome-panel.css");
 @import url("apps/gnome-terminal.css");
-@import url("apps/unity-greeter.css");
\ No newline at end of file
+@import url("apps/unity-greeter.css");

=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css	2012-08-09 16:56:13 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css	2012-08-23 15:47:23 +0000
@@ -1210,6 +1210,103 @@
                                      to (#e8e8e8));
 }
 
+/* level bars as used for password quality or remaining power */
+
+GtkLevelBar {
+    -GtkLevelBar-min-block-width: 34;
+    -GtkLevelBar-min-block-height: 3;
+}
+
+GtkLevelBar.vertical {
+    -GtkLevelBar-min-block-width: 3;
+    -GtkLevelBar-min-block-height: 34;
+}
+
+.level-bar.trough {
+    padding: 2px;
+}
+
+.level-bar.fill-block {
+    border-width: 1px;
+    border-style: solid;
+
+    border-color: @selected_bg_color;
+    background-color: #db6a3c;
+}
+
+.level-bar.indicator-continuous.fill-block {
+    padding: 2px;
+    border-radius: 2px;
+}
+
+.level-bar.fill-block:backdrop,
+.level-bar.fill-block.level-high:backdrop,
+.level-bar.fill-block.level-low:backdrop {
+    background-color: #b0b0b0;
+    border-color: #b0b0b0;
+    background-image: none;
+}
+
+
+.level-bar.indicator-discrete.fill-block.horizontal {
+    margin: 0 1px;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical {
+    margin: 1px 0;
+}
+
+/* discrete indicator border rounding,
+   uncomment when :nth-child will be working
+   on the widget
+
+.level-bar.indicator-discrete.fill-block.horizontal:first-child {
+    border-radius: 2px 0 0 2px;
+}
+
+.level-bar.indicator-discrete.fill-block.horizontal:last-child {
+    border-radius: 0 2px 2px 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:first-child {
+    border-radius: 2px 2px 0 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:last-child {
+    border-radius: 0 0 2px 2px;
+}
+
+*/
+
+.level-bar.fill-block.level-high {
+    border-color: shade(@success_color, 0.85);
+    background-image: linear-gradient(to bottom,
+                                      shade(@success_color, 1.2),
+                                      @success_color 75%,
+                                      shade(@success_color, 0.95)
+                                      );
+}
+
+.level-bar.fill-block.level-low {
+    border-color: shade(@warning_bg_color, 0.80);
+    background-image: linear-gradient(to bottom,
+                                      shade(@warning_bg_color, 1.3),
+                                      @warning_bg_color 75%,
+                                      shade(@warning_bg_color, 0.90)
+                                      );
+}
+
+.level-bar.fill-block.empty-fill-block {
+    background-color: transparent;
+    background-image: none;
+    border-color: alpha(@bg_color, 0.1);
+}
+
+.level-bar.fill-block.empty-fill-block:backdrop {
+    border-color: transparent;
+    background-color: transparent;
+}
+
 GtkScale {
     -GtkRange-slider-width: 18;
     -GtkRange-trough-border: 0;

=== modified file 'Radiance/gtk-3.0/gtk-main.css'
--- Radiance/gtk-3.0/gtk-main.css	2012-08-08 13:46:38 +0000
+++ Radiance/gtk-3.0/gtk-main.css	2012-08-23 15:47:23 +0000
@@ -18,6 +18,7 @@
 @define-color error_fg_color rgb (166, 38, 38);
 @define-color error_bg_color rgb (237, 54, 54);
 @define-color link_color #4a90d9;
+@define-color success_color #4e9a06;
 @define-color error_color #cc0000;
 
 /* theme common colors */
@@ -43,4 +44,4 @@
 @import url("apps/gedit.css");
 @import url("apps/nautilus.css");
 @import url("apps/gnome-panel.css");
-@import url("apps/gnome-terminal.css");
\ No newline at end of file
+@import url("apps/gnome-terminal.css");

=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css	2012-08-09 16:56:13 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css	2012-08-23 15:47:23 +0000
@@ -1210,6 +1210,103 @@
                                      to (#e8e8e8));
 }
 
+/* level bars as used for password quality or remaining power */
+
+GtkLevelBar {
+    -GtkLevelBar-min-block-width: 34;
+    -GtkLevelBar-min-block-height: 3;
+}
+
+GtkLevelBar.vertical {
+    -GtkLevelBar-min-block-width: 3;
+    -GtkLevelBar-min-block-height: 34;
+}
+
+.level-bar.trough {
+    padding: 2px;
+}
+
+.level-bar.fill-block {
+    border-width: 1px;
+    border-style: solid;
+
+    border-color: @selected_bg_color;
+    background-color: #db6a3c;
+}
+
+.level-bar.indicator-continuous.fill-block {
+    padding: 2px;
+    border-radius: 2px;
+}
+
+.level-bar.fill-block:backdrop,
+.level-bar.fill-block.level-high:backdrop,
+.level-bar.fill-block.level-low:backdrop {
+    background-color: #b0b0b0;
+    border-color: #b0b0b0;
+    background-image: none;
+}
+
+
+.level-bar.indicator-discrete.fill-block.horizontal {
+    margin: 0 1px;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical {
+    margin: 1px 0;
+}
+
+/* discrete indicator border rounding,
+   uncomment when :nth-child will be working
+   on the widget
+
+.level-bar.indicator-discrete.fill-block.horizontal:first-child {
+    border-radius: 2px 0 0 2px;
+}
+
+.level-bar.indicator-discrete.fill-block.horizontal:last-child {
+    border-radius: 0 2px 2px 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:first-child {
+    border-radius: 2px 2px 0 0;
+}
+
+.level-bar.indicator-discrete.fill-block.vertical:last-child {
+    border-radius: 0 0 2px 2px;
+}
+
+*/
+
+.level-bar.fill-block.level-high {
+    border-color: shade(@success_color, 0.85);
+    background-image: linear-gradient(to bottom,
+                                      shade(@success_color, 1.2),
+                                      @success_color 75%,
+                                      shade(@success_color, 0.95)
+                                      );
+}
+
+.level-bar.fill-block.level-low {
+    border-color: shade(@warning_bg_color, 0.80);
+    background-image: linear-gradient(to bottom,
+                                      shade(@warning_bg_color, 1.3),
+                                      @warning_bg_color 75%,
+                                      shade(@warning_bg_color, 0.90)
+                                      );
+}
+
+.level-bar.fill-block.empty-fill-block {
+    background-color: transparent;
+    background-image: none;
+    border-color: alpha(@bg_color, 0.1);
+}
+
+.level-bar.fill-block.empty-fill-block:backdrop {
+    border-color: transparent;
+    background-color: transparent;
+}
+
 GtkScale {
     -GtkRange-slider-width: 18;
     -GtkRange-trough-border: 0;