Merge lp:~ralsina/ubuntuone-control-panel/u1cp-windows-styling into lp:ubuntuone-control-panel

[Roberto Alsina]

Disable the focus hacks on windows, where they are not needed and have bad side-effects.

[lp:~ralsina/ubuntuone-control-panel/u1cp-windows-styling]

296. By Roberto Alsina on 2012-03-23

solved conflicts

[Natalia Bidart (nataliabidart)]

Proposed https://code.launchpad.net/~nataliabidart/ubuntuone-control-panel/u1cp-windows-styling/+merge/99525 to solve some code duplication from this branch (and because Roberto is in a meeting and we need this ASAP).

review: Resubmit

Unmerged revisions

=== modified file 'data/qt/linux.qss'
--- data/qt/linux.qss	2012-03-16 21:10:54 +0000
+++ data/qt/linux.qss	2012-03-23 19:21:19 +0000
@@ -1,2 +1,62 @@
 /* Styles specific to the linux platform */
 
+QPushButton:focus {
+    border-width: 2px;
+    /* reduce the padding since we have a 2px border now */
+    padding: 5px;
+    padding-left: 19px;
+    padding-right: 19px;
+    /* hack to make the mild-orange focused box dissapear */
+    padding-top: 100%;
+    padding-bottom: 100%;
+    /* end of hack */
+}
+
+GoToWebButton#help_button:focus {
+    border: 2px solid #dd4814;
+    /* hack to make the mild-orange focused box dissapear */
+    padding-top: 100%;
+    padding-bottom: 100%;
+    /* end of hack */
+    /* Compensate for border so text doesn't move */
+    padding-left: 0px;
+    padding-right: 13px;
+}
+
+GoToWebButton#share_publish_button:focus {
+    border: 2px solid #aea79f;
+    /* hack to make the mild-orange focused box dissapear */
+    padding-top: 100%;
+    padding-bottom: 100%;
+    /* end of hack */
+    /* Compensate for border so text doesn't move */
+    padding-left: 8px;
+    padding-right: 23px;
+}
+
+QTabBar::tab:selected {
+    background-color: white;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    border-style: solid;
+    padding: 12px;
+    border-top-color: #939389;
+    border-right-color: #939389;
+    border-left-color: white;
+    border-bottom-color: white;
+    border-width: 1px;
+}
+
+QTabBar::tab:hover,
+QTabBar::tab:focus {
+    text-decoration: underline;
+    /* hack to make the mild-orange focused box dissapear */
+    padding-left: 1000px;
+    padding-right: 1000px;
+    /* end of hack */
+}
+
+QPushButton#twitter_button:focus,
+QPushButton#facebook_button:focus {
+    border: 2px solid #dd4814;
+}

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-03-22 20:28:48 +0000
+++ data/qt/ubuntuone.qss	2012-03-23 19:21:19 +0000
@@ -75,18 +75,6 @@
     border-width: 1px;
 }
 
-QPushButton:focus {
-    border-width: 2px;
-    /* reduce the padding since we have a 2px border now */
-    padding: 5px;
-    padding-left: 19px;
-    padding-right: 19px;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-top: 100%;
-    padding-bottom: 100%;
-    /* end of hack */
-}
-
 QPushButton:disabled {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #eaeaea, stop: 1.0 #cacaca);
@@ -156,11 +144,6 @@
     border: none;
 }
 
-QPushButton#twitter_button:focus,
-QPushButton#facebook_button:focus {
-    border: 2px solid #dd4814;
-}
-
 GoToWebButton#help_button {
     background: transparent;
     border: none;
@@ -173,17 +156,6 @@
     background-origin: margin;
 }
 
-GoToWebButton#help_button:focus {
-    border: 2px solid #dd4814;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-top: 100%;
-    padding-bottom: 100%;
-    /* end of hack */
-    /* Compensate for border so text doesn't move */
-    padding-left: 0px;
-    padding-right: 13px;
-}
-
 GoToWebButton#share_publish_button {
     background: transparent;
     border: none;
@@ -197,17 +169,6 @@
     background-origin: margin;
 }
 
-GoToWebButton#share_publish_button:focus {
-    border: 2px solid #aea79f;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-top: 100%;
-    padding-bottom: 100%;
-    /* end of hack */
-    /* Compensate for border so text doesn't move */
-    padding-left: 8px;
-    padding-right: 23px;
-}
-
 GoToWebButton#edit_profile_button,
 GoToWebButton#edit_services_button,
 GoToWebButton#get_more_space_button {
@@ -266,15 +227,6 @@
     border-bottom-left-radius: 0px;
 }
 
-QTabBar::tab:hover,
-QTabBar::tab:focus {
-    text-decoration: underline;
-    /* hack to make the mild-orange focused box dissapear */
-    padding-left: 1000px;
-    padding-right: 1000px;
-    /* end of hack */
-}
-
 QGroupBox {
     padding-top: 30px;
     border: none;

=== modified file 'data/qt/windows.qss'
--- data/qt/windows.qss	2012-03-15 01:25:08 +0000
+++ data/qt/windows.qss	2012-03-23 19:21:19 +0000
@@ -3,3 +3,52 @@
 QWidget {
     font-family: "Ubuntu";
 }
+
+
+QPushButton:focus {
+    border-width: 2px;
+    /* reduce the padding since we have a 2px border now */
+    padding: 5px;
+    padding-left: 19px;
+    padding-right: 19px;
+}
+
+GoToWebButton#help_button:focus {
+    border: 2px solid #dd4814;
+    /* Compensate for border so text doesn't move */
+    padding-left: 0px;
+    padding-right: 13px;
+}
+
+GoToWebButton#share_publish_button:focus {
+    border: 2px solid #aea79f;
+    /* Compensate for border so text doesn't move */
+    padding-left: 8px;
+    padding-right: 23px;
+}
+
+QTabBar::tab:selected {
+    background-color: white;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    border-style: solid;
+    padding: 12px;
+    border-top-color: #939389;
+    border-right-color: #939389;
+    border-left-color: white;
+    border-bottom-color: white;
+    border-width: 1px;
+}
+
+QTabBar::tab:hover,
+QTabBar::tab:focus {
+    text-decoration: underline;
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
+QPushButton#twitter_button:focus,
+QPushButton#facebook_button:focus {
+    border: 2px solid #dd4814;
+    padding: 0px;
+}