git.iko.soy/unity8
on xenial help sign in
use 120% linespacing
commit7940910279e6127269fe262a51a91afb378738dd authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 26 Nov 2015, 16:01 (11 years ago) parente7028ac
6 files changed+13−2
compare with xenial
unifiedsplit
qml/Wizard/CheckableSetting.qml+1 qml/Wizard/Pages/40-location.qml+2−1 qml/Wizard/Pages/60-account.qml+1 qml/Wizard/Pages/80-finished.qml+2 qml/Wizard/Pages/here-terms.qml+4 qml/Wizard/Pages/sim.qml+3−1
qml/Wizard/CheckableSetting.qml+1
@@ -83,6 +83,7 @@ ListItem.Empty {
8383 color: textColor
8484 font.weight: Font.Light
8585 fontSize: "small"
86+ lineHeight: 1.2
8687 onLinkActivated: listItem.linkActivated(link)
8788 }
8889
qml/Wizard/Pages/40-location.qml+2−1
@@ -64,7 +64,7 @@ LocalComponents.Page {
6464 leftMargin: leftMargin
6565 rightMargin: rightMargin/2
6666 }
67−
67+ lineHeight: 1.2
6868 wrapMode: Text.WordWrap
6969 color: textColor
7070 font.weight: checked ? Font.Normal : Font.Light
@@ -98,6 +98,7 @@ LocalComponents.Page {
9898 color: textColor
9999 font.weight: Font.Light
100100 fontSize: "small"
101+ lineHeight: 1.2
101102 linkColor: UbuntuColors.orange
102103 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
103104 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
qml/Wizard/Pages/60-account.qml+1
@@ -74,6 +74,7 @@ LocalComponents.Page {
7474 color: textColor
7575 fontSize: "small"
7676 font.weight: Font.Light
77+ lineHeight: 1.2
7778 width: content.width
7879 }
7980
qml/Wizard/Pages/80-finished.qml+2
@@ -84,6 +84,7 @@ LocalComponents.Page {
8484 wrapMode: Text.Wrap
8585 fontSize: "x-large"
8686 font.weight: Font.Light
87+ lineHeight: 1.2
8788 text: i18n.tr("Welcome to Ubuntu")
8889 }
8990
@@ -97,6 +98,7 @@ LocalComponents.Page {
9798 wrapMode: Text.Wrap
9899 fontSize: "large"
99100 font.weight: Font.Light
101+ lineHeight: 1.2
100102 text: i18n.tr("You are ready to use your device now")
101103 }
102104
qml/Wizard/Pages/here-terms.qml+4
@@ -65,6 +65,7 @@ LocalComponents.Page {
6565 color: textColor
6666 fontSize: "small"
6767 font.weight: Font.Light
68+ lineHeight: 1.2
6869 text: i18n.tr("Your device uses positioning technologies provided by HERE.")
6970 }
7071
@@ -76,6 +77,7 @@ LocalComponents.Page {
7677 color: textColor
7778 fontSize: "small"
7879 font.weight: Font.Light
80+ lineHeight: 1.2
7981 text: i18n.tr("To provide you with positioning services and to improve their quality, HERE collects " +
8082 "information about nearby cell towers and Wi-Fi hotspots around your current location " +
8183 "whenever your position is being found.")
@@ -89,6 +91,7 @@ LocalComponents.Page {
8991 color: textColor
9092 fontSize: "small"
9193 font.weight: Font.Light
94+ lineHeight: 1.2
9295 text: i18n.tr("The information collected is used to analyze the service and to " +
9396 "improve the use of service, but not to identify you personally.")
9497 }
@@ -101,6 +104,7 @@ LocalComponents.Page {
101104 color: textColor
102105 fontSize: "small"
103106 font.weight: Font.Light
107+ lineHeight: 1.2
104108 linkColor: UbuntuColors.orange
105109 text: i18n.tr("By continuing, you agree to the <a href=\"http://here.com/terms/service-terms\">HERE Platform Service Terms</a> " +
106110 "and <a href=\"http://here.com/privacy/privacy-policy\">Privacy Policy</a>.");
qml/Wizard/Pages/sim.qml+3−1
@@ -73,7 +73,7 @@ LocalComponents.Page {
7373 leftMargin: leftMargin
7474 rightMargin: rightMargin
7575 }
76− spacing: units.gu(4)
76+ spacing: units.gu(3)
7777
7878 Label {
7979 anchors.left: parent.left
@@ -82,6 +82,7 @@ LocalComponents.Page {
8282 text: i18n.tr("You won’t be able to make calls or use text messaging without a SIM.")
8383 fontSize: "small"
8484 font.weight: Font.Light
85+ lineHeight: 1.2
8586 color: restartDialog.visible ? theme.palette.normal.backgroundText : textColor
8687 }
8788
@@ -93,6 +94,7 @@ LocalComponents.Page {
9394 text: i18n.tr("To proceed with no SIM tap Skip.")
9495 fontSize: "small"
9596 font.weight: Font.Light
97+ lineHeight: 1.2
9698 color: restartDialog.visible ? theme.palette.normal.backgroundText : textColor
9799 }
98100 }