git.iko.soy/unity8
on xenial help sign in
use 120% linespacing
7940910Lukáš Tinkl
qml/Wizard/CheckableSetting.qml+1
compare with xenial
unifiedsplit
@@ -83,6 +83,7 @@ ListItem.Empty {
83 color: textColor
83 color: textColor
84 font.weight: Font.Light
84 font.weight: Font.Light
85 fontSize: "small"
85 fontSize: "small"
86+ lineHeight: 1.2
86 onLinkActivated: listItem.linkActivated(link)
87 onLinkActivated: listItem.linkActivated(link)
87 }
88 }
88
89
qml/Wizard/Pages/40-location.qml+2−1
@@ -64,7 +64,7 @@ LocalComponents.Page {
64 leftMargin: leftMargin
64 leftMargin: leftMargin
65 rightMargin: rightMargin/2
65 rightMargin: rightMargin/2
66 }
66 }
67−
67+ lineHeight: 1.2
68 wrapMode: Text.WordWrap
68 wrapMode: Text.WordWrap
69 color: textColor
69 color: textColor
70 font.weight: checked ? Font.Normal : Font.Light
70 font.weight: checked ? Font.Normal : Font.Light
@@ -98,6 +98,7 @@ LocalComponents.Page {
98 color: textColor
98 color: textColor
99 font.weight: Font.Light
99 font.weight: Font.Light
100 fontSize: "small"
100 fontSize: "small"
101+ lineHeight: 1.2
101 linkColor: UbuntuColors.orange
102 linkColor: UbuntuColors.orange
102 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
103 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
103 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
104 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
qml/Wizard/Pages/60-account.qml+1
@@ -74,6 +74,7 @@ LocalComponents.Page {
74 color: textColor
74 color: textColor
75 fontSize: "small"
75 fontSize: "small"
76 font.weight: Font.Light
76 font.weight: Font.Light
77+ lineHeight: 1.2
77 width: content.width
78 width: content.width
78 }
79 }
79
80
qml/Wizard/Pages/80-finished.qml+2
@@ -84,6 +84,7 @@ LocalComponents.Page {
84 wrapMode: Text.Wrap
84 wrapMode: Text.Wrap
85 fontSize: "x-large"
85 fontSize: "x-large"
86 font.weight: Font.Light
86 font.weight: Font.Light
87+ lineHeight: 1.2
87 text: i18n.tr("Welcome to Ubuntu")
88 text: i18n.tr("Welcome to Ubuntu")
88 }
89 }
89
90
@@ -97,6 +98,7 @@ LocalComponents.Page {
97 wrapMode: Text.Wrap
98 wrapMode: Text.Wrap
98 fontSize: "large"
99 fontSize: "large"
99 font.weight: Font.Light
100 font.weight: Font.Light
101+ lineHeight: 1.2
100 text: i18n.tr("You are ready to use your device now")
102 text: i18n.tr("You are ready to use your device now")
101 }
103 }
102
104
qml/Wizard/Pages/here-terms.qml+4
@@ -65,6 +65,7 @@ LocalComponents.Page {
65 color: textColor
65 color: textColor
66 fontSize: "small"
66 fontSize: "small"
67 font.weight: Font.Light
67 font.weight: Font.Light
68+ lineHeight: 1.2
68 text: i18n.tr("Your device uses positioning technologies provided by HERE.")
69 text: i18n.tr("Your device uses positioning technologies provided by HERE.")
69 }
70 }
70
71
@@ -76,6 +77,7 @@ LocalComponents.Page {
76 color: textColor
77 color: textColor
77 fontSize: "small"
78 fontSize: "small"
78 font.weight: Font.Light
79 font.weight: Font.Light
80+ lineHeight: 1.2
79 text: i18n.tr("To provide you with positioning services and to improve their quality, HERE collects " +
81 text: i18n.tr("To provide you with positioning services and to improve their quality, HERE collects " +
80 "information about nearby cell towers and Wi-Fi hotspots around your current location " +
82 "information about nearby cell towers and Wi-Fi hotspots around your current location " +
81 "whenever your position is being found.")
83 "whenever your position is being found.")
@@ -89,6 +91,7 @@ LocalComponents.Page {
89 color: textColor
91 color: textColor
90 fontSize: "small"
92 fontSize: "small"
91 font.weight: Font.Light
93 font.weight: Font.Light
94+ lineHeight: 1.2
92 text: i18n.tr("The information collected is used to analyze the service and to " +
95 text: i18n.tr("The information collected is used to analyze the service and to " +
93 "improve the use of service, but not to identify you personally.")
96 "improve the use of service, but not to identify you personally.")
94 }
97 }
@@ -101,6 +104,7 @@ LocalComponents.Page {
101 color: textColor
104 color: textColor
102 fontSize: "small"
105 fontSize: "small"
103 font.weight: Font.Light
106 font.weight: Font.Light
107+ lineHeight: 1.2
104 linkColor: UbuntuColors.orange
108 linkColor: UbuntuColors.orange
105 text: i18n.tr("By continuing, you agree to the <a href=\"http://here.com/terms/service-terms\">HERE Platform Service Terms</a> " +
109 text: i18n.tr("By continuing, you agree to the <a href=\"http://here.com/terms/service-terms\">HERE Platform Service Terms</a> " +
106 "and <a href=\"http://here.com/privacy/privacy-policy\">Privacy Policy</a>.");
110 "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 {
73 leftMargin: leftMargin
73 leftMargin: leftMargin
74 rightMargin: rightMargin
74 rightMargin: rightMargin
75 }
75 }
76− spacing: units.gu(4)
76+ spacing: units.gu(3)
77
77
78 Label {
78 Label {
79 anchors.left: parent.left
79 anchors.left: parent.left
@@ -82,6 +82,7 @@ LocalComponents.Page {
82 text: i18n.tr("You won’t be able to make calls or use text messaging without a SIM.")
82 text: i18n.tr("You won’t be able to make calls or use text messaging without a SIM.")
83 fontSize: "small"
83 fontSize: "small"
84 font.weight: Font.Light
84 font.weight: Font.Light
85+ lineHeight: 1.2
85 color: restartDialog.visible ? theme.palette.normal.backgroundText : textColor
86 color: restartDialog.visible ? theme.palette.normal.backgroundText : textColor
86 }
87 }
87
88
@@ -93,6 +94,7 @@ LocalComponents.Page {
93 text: i18n.tr("To proceed with no SIM tap Skip.")
94 text: i18n.tr("To proceed with no SIM tap Skip.")
94 fontSize: "small"
95 fontSize: "small"
95 font.weight: Font.Light
96 font.weight: Font.Light
97+ lineHeight: 1.2
96 color: restartDialog.visible ? theme.palette.normal.backgroundText : textColor
98 color: restartDialog.visible ? theme.palette.normal.backgroundText : textColor
97 }
99 }
98 }
100 }