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 | 27 | 27 | ||
6 | 28 | height: units.gu(5) | 28 | height: units.gu(5) |
7 | 29 | 29 | ||
10 | 30 | RowLayout { | 30 | Label { |
11 | 31 | spacing: units.gu(.5) | 31 | id: label |
12 | 32 | |||
13 | 32 | anchors { | 33 | anchors { |
14 | 33 | left: parent.left | 34 | left: parent.left |
38 | 34 | right: parent.right | 35 | leftMargin: units.gu(2) |
39 | 35 | verticalCenter: parent.verticalCenter | 36 | verticalCenter: parent.verticalCenter |
40 | 36 | margins: units.gu(1) | 37 | } |
41 | 37 | } | 38 | |
42 | 38 | 39 | font.family: "Ubuntu" | |
43 | 39 | Label { | 40 | fontSize: "medium" |
44 | 40 | id: label | 41 | elide: Text.ElideRight |
45 | 41 | Layout.fillWidth: true | 42 | maximumLineCount: 1 |
46 | 42 | 43 | textFormat: Text.PlainText | |
47 | 43 | font.family: "Ubuntu" | 44 | width: Math.min(parent.width - units.gu(4), implicitWidth) |
48 | 44 | fontSize: "medium" | 45 | } |
49 | 45 | elide: Text.ElideRight | 46 | |
50 | 46 | maximumLineCount: 1 | 47 | Icon { |
51 | 47 | textFormat: Text.PlainText | 48 | id: icon |
52 | 48 | width: Math.min(parent.width - units.gu(4), implicitWidth) | 49 | visible: name != "" |
53 | 49 | } | 50 | height: units.gu(1.25) |
54 | 50 | 51 | width: height | |
55 | 51 | Icon { | 52 | color: label.color |
56 | 52 | id: icon | 53 | anchors { |
57 | 53 | visible: name != "" | 54 | left: label.right |
58 | 54 | height: units.gu(2) | 55 | leftMargin: units.gu(0.25) |
59 | 55 | width: height | 56 | verticalCenter: parent.verticalCenter |
37 | 56 | color: label.color | ||
60 | 57 | } | 57 | } |
61 | 58 | } | 58 | } |
62 | 59 | 59 | ||
63 | 60 | 60 | ||
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 | 627 | width: categoryView.width | 627 | width: categoryView.width |
69 | 628 | height: text != "" ? units.gu(5) : 0 | 628 | height: text != "" ? units.gu(5) : 0 |
70 | 629 | color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText | 629 | color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText |
72 | 630 | iconName: delegate && delegate.headerLink ? "go-next" : "" | 630 | iconName: delegate && delegate.headerLink ? "toolkit_chevron-ltr_1gu" : "" |
73 | 631 | onClicked: { | 631 | onClicked: { |
74 | 632 | if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink); | 632 | if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink); |
75 | 633 | } | 633 | } |
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:/