Ubuntu One Control Panel

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

  1. u1cp-windows-styling
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Rejected
Rejected by: Natalia Bidart
Proposed branch: lp:~ralsina/ubuntuone-control-panel/u1cp-windows-styling
Merge into: lp:ubuntuone-control-panel
Diff against target: 210 lines (+109/-48)
3 files modified
data/qt/linux.qss (+60/-0)
data/qt/ubuntuone.qss (+0/-48)
data/qt/windows.qss (+49/-0)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-control-panel/u1cp-windows-styling
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Needs Resubmitting
Review via email: mp+98704@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~ralsina/ubuntuone-control-panel/u1cp-windows-styling updated
296. By Roberto Alsina

solved conflicts

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

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: Needs Resubmitting

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1/* Styles specific to the linux platform */1/* Styles specific to the linux platform */
22
3QPushButton:focus {
4 border-width: 2px;
5 /* reduce the padding since we have a 2px border now */
6 padding: 5px;
7 padding-left: 19px;
8 padding-right: 19px;
9 /* hack to make the mild-orange focused box dissapear */
10 padding-top: 100%;
11 padding-bottom: 100%;
12 /* end of hack */
13}
14
15GoToWebButton#help_button:focus {
16 border: 2px solid #dd4814;
17 /* hack to make the mild-orange focused box dissapear */
18 padding-top: 100%;
19 padding-bottom: 100%;
20 /* end of hack */
21 /* Compensate for border so text doesn't move */
22 padding-left: 0px;
23 padding-right: 13px;
24}
25
26GoToWebButton#share_publish_button:focus {
27 border: 2px solid #aea79f;
28 /* hack to make the mild-orange focused box dissapear */
29 padding-top: 100%;
30 padding-bottom: 100%;
31 /* end of hack */
32 /* Compensate for border so text doesn't move */
33 padding-left: 8px;
34 padding-right: 23px;
35}
36
37QTabBar::tab:selected {
38 background-color: white;
39 border-top-left-radius: 5px;
40 border-top-right-radius: 5px;
41 border-style: solid;
42 padding: 12px;
43 border-top-color: #939389;
44 border-right-color: #939389;
45 border-left-color: white;
46 border-bottom-color: white;
47 border-width: 1px;
48}
49
50QTabBar::tab:hover,
51QTabBar::tab:focus {
52 text-decoration: underline;
53 /* hack to make the mild-orange focused box dissapear */
54 padding-left: 1000px;
55 padding-right: 1000px;
56 /* end of hack */
57}
58
59QPushButton#twitter_button:focus,
60QPushButton#facebook_button:focus {
61 border: 2px solid #dd4814;
62}
363
=== 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 @@
75 border-width: 1px;75 border-width: 1px;
76}76}
7777
78QPushButton:focus {
79 border-width: 2px;
80 /* reduce the padding since we have a 2px border now */
81 padding: 5px;
82 padding-left: 19px;
83 padding-right: 19px;
84 /* hack to make the mild-orange focused box dissapear */
85 padding-top: 100%;
86 padding-bottom: 100%;
87 /* end of hack */
88}
89
90QPushButton:disabled {78QPushButton:disabled {
91 background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,79 background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
92 stop: 0 #eaeaea, stop: 1.0 #cacaca);80 stop: 0 #eaeaea, stop: 1.0 #cacaca);
@@ -156,11 +144,6 @@
156 border: none;144 border: none;
157}145}
158146
159QPushButton#twitter_button:focus,
160QPushButton#facebook_button:focus {
161 border: 2px solid #dd4814;
162}
163
164GoToWebButton#help_button {147GoToWebButton#help_button {
165 background: transparent;148 background: transparent;
166 border: none;149 border: none;
@@ -173,17 +156,6 @@
173 background-origin: margin;156 background-origin: margin;
174}157}
175158
176GoToWebButton#help_button:focus {
177 border: 2px solid #dd4814;
178 /* hack to make the mild-orange focused box dissapear */
179 padding-top: 100%;
180 padding-bottom: 100%;
181 /* end of hack */
182 /* Compensate for border so text doesn't move */
183 padding-left: 0px;
184 padding-right: 13px;
185}
186
187GoToWebButton#share_publish_button {159GoToWebButton#share_publish_button {
188 background: transparent;160 background: transparent;
189 border: none;161 border: none;
@@ -197,17 +169,6 @@
197 background-origin: margin;169 background-origin: margin;
198}170}
199171
200GoToWebButton#share_publish_button:focus {
201 border: 2px solid #aea79f;
202 /* hack to make the mild-orange focused box dissapear */
203 padding-top: 100%;
204 padding-bottom: 100%;
205 /* end of hack */
206 /* Compensate for border so text doesn't move */
207 padding-left: 8px;
208 padding-right: 23px;
209}
210
211GoToWebButton#edit_profile_button,172GoToWebButton#edit_profile_button,
212GoToWebButton#edit_services_button,173GoToWebButton#edit_services_button,
213GoToWebButton#get_more_space_button {174GoToWebButton#get_more_space_button {
@@ -266,15 +227,6 @@
266 border-bottom-left-radius: 0px;227 border-bottom-left-radius: 0px;
267}228}
268229
269QTabBar::tab:hover,
270QTabBar::tab:focus {
271 text-decoration: underline;
272 /* hack to make the mild-orange focused box dissapear */
273 padding-left: 1000px;
274 padding-right: 1000px;
275 /* end of hack */
276}
277
278QGroupBox {230QGroupBox {
279 padding-top: 30px;231 padding-top: 30px;
280 border: none;232 border: none;
281233
=== 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 @@
3QWidget {3QWidget {
4 font-family: "Ubuntu";4 font-family: "Ubuntu";
5}5}
6
7
8QPushButton:focus {
9 border-width: 2px;
10 /* reduce the padding since we have a 2px border now */
11 padding: 5px;
12 padding-left: 19px;
13 padding-right: 19px;
14}
15
16GoToWebButton#help_button:focus {
17 border: 2px solid #dd4814;
18 /* Compensate for border so text doesn't move */
19 padding-left: 0px;
20 padding-right: 13px;
21}
22
23GoToWebButton#share_publish_button:focus {
24 border: 2px solid #aea79f;
25 /* Compensate for border so text doesn't move */
26 padding-left: 8px;
27 padding-right: 23px;
28}
29
30QTabBar::tab:selected {
31 background-color: white;
32 border-top-left-radius: 5px;
33 border-top-right-radius: 5px;
34 border-style: solid;
35 padding: 12px;
36 border-top-color: #939389;
37 border-right-color: #939389;
38 border-left-color: white;
39 border-bottom-color: white;
40 border-width: 1px;
41}
42
43QTabBar::tab:hover,
44QTabBar::tab:focus {
45 text-decoration: underline;
46 padding-left: 0px;
47 padding-right: 0px;
48}
49
50QPushButton#twitter_button:focus,
51QPushButton#facebook_button:focus {
52 border: 2px solid #dd4814;
53 padding: 0px;
54}

Subscribers

People subscribed via source and target branches