Merge lp:~l-admin-3/egtk/non-transparent-buttons into lp:~elementary-design/egtk/trunk

[Marcus Wichelmann]

I've added a new class to create non-transparent buttons to solve the indication problem in pantheon-greeter.

[Marcus Wichelmann (l-admin-3)]

Sorry, i did not know, how to solve the problem with the blank line at the end of the file. I have tried some editors, but nothing works.

[Raphael Isemann (teemperor)]

See the comment on
https://code.launchpad.net/~l-admin-3/pantheon-greeter/login-button-fix/+merge/229323

[Raphael Isemann (teemperor)]

Same status as the other merge.

review: Needs Fixing

[Raphael Isemann (teemperor)]

About the blank like at the end of the file: Depends on the editor, but as long as you don't do languages like C/C++ that kind of just cat file together with #include you don't need to care about it too much. I think a \n at the end is the better way, but it really doesn't matter that much :)

[Marcus Wichelmann (l-admin-3)]

I would not break the code consistency of the elementary project. Im using scratch and the line at the end of the file will be removed automatically.

[Raphael Isemann (teemperor)]

It works in connection with the greeter-branch and fixes the issue in a clean way. Just commenting that Dan doesn't have to test both branches and we can merge this fast.

I approve, but Dan has the last word before this gets merged.

[Raphael Isemann (teemperor)]

review: Approve (testing)

[Cody Garver (codygarver)]

Propose again if this is still intended for merge

review: Needs Resubmitting

Unmerged revisions

331. By Marcus Wichelmann on 2014-08-02

Added class to create non-transparent buttons

=== modified file 'gtk-3.0/gtk-widgets.css'
--- gtk-3.0/gtk-widgets.css	2014-08-02 06:15:01 +0000
+++ gtk-3.0/gtk-widgets.css	2014-08-02 12:27:52 +0000
@@ -853,6 +853,26 @@
     box-shadow: inset -1px 0 alpha (#000, 0.10);
 }
 
+/****************************
+* Non-Transparent Button *
+****************************/
+
+.non-transparent.button {
+    background-image: linear-gradient(to bottom,
+                                  shade (@base_color, 0.93),
+                                  shade (@base_color, 0.97)
+                                  );
+}
+
+.non-transparent.button:active,
+.non-transparent.button:hover:active,
+.non-transparent.button:focus:active {
+    background-image: linear-gradient(to bottom,
+                                  shade (@base_color, 0.93),
+                                  shade (@base_color, 0.97)
+                                  );
+}
+
 /*********
 * Linked *
 *********/
@@ -2673,4 +2693,4 @@
 .h3 { font: open sans 12; }
 
 @import url("granite-widgets.css");
-@import url("apps.css");
\ No newline at end of file
+@import url("apps.css");