Merge lp:~aacid/unity8/dashSectionLinkIconAfterText into lp:unity8
- dashSectionLinkIconAfterText
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Andrea Cimitan |
Approved revision: | 2663 |
Merged at revision: | 2678 |
Proposed branch: | lp:~aacid/unity8/dashSectionLinkIconAfterText |
Merge into: | lp:unity8 |
Prerequisite: | lp:~aacid/unity8/killOurListItems |
Diff against target: |
75 lines (+26/-26) 2 files modified
qml/Dash/DashSectionHeader.qml (+25/-25) qml/Dash/GenericScopeView.qml (+1/-1) |
To merge this branch: | bzr merge lp:~aacid/unity8/dashSectionLinkIconAfterText |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Cimitan (community) | Approve | ||
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Review via email: mp+307537@code.launchpad.net |
Commit message
Make the > in Dash Section Header be after text
Instead than at the right of the view
Description of the change
* Are there any related MPs required for this MP to build/function as expected?
Prerequisite
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
It's a design requested change
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
- 2658. By Albert Astals Cid
-
Use new asset
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2658
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) : | # |
Albert Astals Cid (aacid) wrote : | # |
Tried 1, 1.25, 1.5, 1.75 and 2
1.25 seemed to me the closest to the mockups
Andrea Cimitan (cimi) wrote : | # |
http://
- the chevron in the mockups looks different, thinner (lighter)
- in the mockups there's a bit more padding between the chevron and the text
- the chevron should be vertically centered with the text, now is a bit more up (baseline?)
- 2659. By Albert Astals Cid
-
Increase spacing
Albert Astals Cid (aacid) wrote : | # |
> http://
> mockups:
> - the chevron in the mockups looks different, thinner (lighter)
Magic, i'm using toolkit_
> - in the mockups there's a bit more padding between the chevron and the text
Ok, added 0.5gu spacing
> - the chevron should be vertically centered with the text, now is a bit more
> up (baseline?)
There's not much we can do there as far as i can see. The boxes are aligned http://
- 2660. By Albert Astals Cid
-
Use the old spacing
- 2661. By Albert Astals Cid
-
Make the > and text aligning a bit "better"
Albert Astals Cid (aacid) wrote : | # |
I've reshuffled the code a bit, now the boxes are not aligned and may be to your better liking
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2659
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2661
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2662. By Albert Astals Cid
-
Make Cimi happy with the vertical alignment
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2662
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2663. By Albert Astals Cid
-
More pixel pusihng
Andrea Cimitan (cimi) wrote : | # |
Thank you so much albert! Design approved
* Did you perform an exploratory manual test run of the code change and any related functionality?
y
* Did CI run pass? If not, please explain why.
unrelated
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2663
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2664. By Albert Astals Cid
-
Move the dash section header 1 gu to the rigth
Andrea Cimitan (cimi) : | # |
Preview Diff
1 | === modified file 'qml/Dash/DashSectionHeader.qml' |
2 | --- qml/Dash/DashSectionHeader.qml 2015-07-15 15:13:18 +0000 |
3 | +++ qml/Dash/DashSectionHeader.qml 2016-11-04 10:39:22 +0000 |
4 | @@ -27,33 +27,33 @@ |
5 | |
6 | height: units.gu(5) |
7 | |
8 | - RowLayout { |
9 | - spacing: units.gu(.5) |
10 | + Label { |
11 | + id: label |
12 | + |
13 | anchors { |
14 | left: parent.left |
15 | - right: parent.right |
16 | - verticalCenter: parent.verticalCenter |
17 | - margins: units.gu(1) |
18 | - } |
19 | - |
20 | - Label { |
21 | - id: label |
22 | - Layout.fillWidth: true |
23 | - |
24 | - font.family: "Ubuntu" |
25 | - fontSize: "medium" |
26 | - elide: Text.ElideRight |
27 | - maximumLineCount: 1 |
28 | - textFormat: Text.PlainText |
29 | - width: Math.min(parent.width - units.gu(4), implicitWidth) |
30 | - } |
31 | - |
32 | - Icon { |
33 | - id: icon |
34 | - visible: name != "" |
35 | - height: units.gu(2) |
36 | - width: height |
37 | - color: label.color |
38 | + leftMargin: units.gu(2) |
39 | + verticalCenter: parent.verticalCenter |
40 | + } |
41 | + |
42 | + font.family: "Ubuntu" |
43 | + fontSize: "medium" |
44 | + elide: Text.ElideRight |
45 | + maximumLineCount: 1 |
46 | + textFormat: Text.PlainText |
47 | + width: Math.min(parent.width - units.gu(4), implicitWidth) |
48 | + } |
49 | + |
50 | + Icon { |
51 | + id: icon |
52 | + visible: name != "" |
53 | + height: units.gu(1.25) |
54 | + width: height |
55 | + color: label.color |
56 | + anchors { |
57 | + left: label.right |
58 | + leftMargin: units.gu(0.25) |
59 | + verticalCenter: parent.verticalCenter |
60 | } |
61 | } |
62 | |
63 | |
64 | === modified file 'qml/Dash/GenericScopeView.qml' |
65 | --- qml/Dash/GenericScopeView.qml 2016-11-04 10:39:21 +0000 |
66 | +++ qml/Dash/GenericScopeView.qml 2016-11-04 10:39:22 +0000 |
67 | @@ -627,7 +627,7 @@ |
68 | width: categoryView.width |
69 | height: text != "" ? units.gu(5) : 0 |
70 | color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText |
71 | - iconName: delegate && delegate.headerLink ? "go-next" : "" |
72 | + iconName: delegate && delegate.headerLink ? "toolkit_chevron-ltr_1gu" : "" |
73 | onClicked: { |
74 | if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink); |
75 | } |
PASSED: Continuous integration, rev:2657 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/2307/ /unity8- jenkins. ubuntu. com/job/ build/3041 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= vivid+overlay, testname= qmluitests. sh/1689 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= xenial+ overlay, testname= qmluitests. sh/1689 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= yakkety, testname= qmluitests. sh/1689 /unity8- jenkins. ubuntu. com/job/ build-0- fetch/3069 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2926 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2926/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2926 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2926/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 2926 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 2926/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2926 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2926/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2926 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2926/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 2926 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 2926/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2926 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2926/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2926 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2926/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= yakkety/ 2926 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= yakkety/ 2926/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/2307/ rebuild
https:/