git.iko.soy/unity8
on xenial help sign in
style the dropdown using a plain Rectangle, unify bg colors, remove grip asset (builtin icon already)
16386e0Lukáš Tinkl
qml/Notifications/Notification.qml+1−1
compare with xenial
unifiedsplit
@@ -312,7 +312,7 @@ StyledItem {
312 width: height
312 width: height
313 height: units.gu(1.5)
313 height: units.gu(1.5)
314 anchors.horizontalCenter: parent.horizontalCenter
314 anchors.horizontalCenter: parent.horizontalCenter
315− color: theme.palette.normal.backgroundTertiaryText
315+ color: theme.palette.normal.base
316 }
316 }
317
317
318 ShapedIcon {
318 ShapedIcon {
qml/Notifications/OptionToggle.qml+5−4
@@ -19,7 +19,7 @@ import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.3 as ListItem
19import Ubuntu.Components.ListItems 1.3 as ListItem
20import Ubuntu.Components.Popups 1.3
20import Ubuntu.Components.Popups 1.3
21
21
22−UbuntuShape {
22+Rectangle {
23 id: optionToggle
23 id: optionToggle
24
24
25 property bool expanded
25 property bool expanded
@@ -29,12 +29,13 @@ UbuntuShape {
29
29
30 signal triggered(string id)
30 signal triggered(string id)
31
31
32− backgroundColor: theme.palette.normal.base
32+ color: theme.palette.normal.background
33− aspect: UbuntuShape.Flat
34 height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
33 height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
35 width: parent.width
34 width: parent.width
36− radius: "medium"
35+ radius: itemHeight/4
37 clip: true
36 clip: true
37+ border.width: units.dp(1)
38+ border.color: theme.palette.normal.base
38
39
39 Column {
40 Column {
40 id: optionToggleContent
41 id: optionToggleContent
qml/Notifications/SwipeToAct.qml+2−2
@@ -37,7 +37,7 @@ Item {
37 readonly property double sliderHeight: units.gu(8)
37 readonly property double sliderHeight: units.gu(8)
38 readonly property double gap: units.gu(1)
38 readonly property double gap: units.gu(1)
39 readonly property color sliderMainColor: theme.palette.normal.base
39 readonly property color sliderMainColor: theme.palette.normal.base
40− readonly property color sliderBGColor: theme.palette.normal.foreground
40+ readonly property color sliderBGColor: theme.palette.normal.background
41 readonly property double halfWay: mouseArea.drag.maximumX / 2
41 readonly property double halfWay: mouseArea.drag.maximumX / 2
42
42
43 UbuntuNumberAnimation on opacityDelta {
43 UbuntuNumberAnimation on opacityDelta {
@@ -194,7 +194,7 @@ Item {
194 Icon {
194 Icon {
195 anchors.fill: parent
195 anchors.fill: parent
196 anchors.margins: units.gu(1.5)
196 anchors.margins: units.gu(1.5)
197− source: "grip-large.svg"
197+ name: "grip-large"
198 color: "white"
198 color: "white"
199 }
199 }
200 }
200 }
qml/Notifications/grip-large.svgdeleted−150
@@ -1,150 +0,0 @@
1−<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2−<!-- Created with Inkscape (http://www.inkscape.org/) -->
3−
4−<svg
5− xmlns:dc="http://purl.org/dc/elements/1.1/"
6− xmlns:cc="http://creativecommons.org/ns#"
7− xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8− xmlns:svg="http://www.w3.org/2000/svg"
9− xmlns="http://www.w3.org/2000/svg"
10− xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
11− xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
12− width="90"
13− height="90"
14− id="svg4874"
15− version="1.1"
16− inkscape:version="0.91+devel r"
17− viewBox="0 0 90 90.000001"
18− sodipodi:docname="grip-large01.svg">
19− <defs
20− id="defs4876" />
21− <sodipodi:namedview
22− id="base"
23− pagecolor="#ffffff"
24− bordercolor="#666666"
25− borderopacity="1.0"
26− inkscape:pageopacity="0.0"
27− inkscape:pageshadow="2"
28− inkscape:zoom="7.9580786"
29− inkscape:cx="13.632541"
30− inkscape:cy="49.591116"
31− inkscape:document-units="px"
32− inkscape:current-layer="g1708"
33− showgrid="true"
34− showborder="true"
35− fit-margin-top="0"
36− fit-margin-left="0"
37− fit-margin-right="0"
38− fit-margin-bottom="0"
39− inkscape:snap-bbox="true"
40− inkscape:bbox-paths="true"
41− inkscape:bbox-nodes="true"
42− inkscape:snap-bbox-edge-midpoints="true"
43− inkscape:snap-bbox-midpoints="true"
44− inkscape:object-paths="true"
45− inkscape:snap-intersection-paths="true"
46− inkscape:object-nodes="true"
47− inkscape:snap-smooth-nodes="true"
48− inkscape:snap-midpoints="true"
49− inkscape:snap-object-midpoints="true"
50− inkscape:snap-center="true"
51− showguides="true"
52− inkscape:guide-bbox="true">
53− <inkscape:grid
54− type="xygrid"
55− id="grid5451"
56− empspacing="6" />
57− <sodipodi:guide
58− orientation="1,0"
59− position="6,77"
60− id="guide4063" />
61− <sodipodi:guide
62− orientation="1,0"
63− position="3,78"
64− id="guide4065" />
65− <sodipodi:guide
66− orientation="0,1"
67− position="55,84"
68− id="guide4067" />
69− <sodipodi:guide
70− orientation="0,1"
71− position="53,87"
72− id="guide4069" />
73− <sodipodi:guide
74− orientation="0,1"
75− position="20,3"
76− id="guide4071" />
77− <sodipodi:guide
78− orientation="0,1"
79− position="20,6"
80− id="guide4073" />
81− <sodipodi:guide
82− orientation="1,0"
83− position="87,7"
84− id="guide4075" />
85− <sodipodi:guide
86− orientation="1,0"
87− position="84,7"
88− id="guide4077" />
89− <sodipodi:guide
90− orientation="0,1"
91− position="58,81"
92− id="guide4074" />
93− <sodipodi:guide
94− orientation="1,0"
95− position="9,74"
96− id="guide4076" />
97− <sodipodi:guide
98− orientation="0,1"
99− position="21,9"
100− id="guide4078" />
101− <sodipodi:guide
102− orientation="1,0"
103− position="81,4"
104− id="guide4080" />
105− </sodipodi:namedview>
106− <metadata
107− id="metadata4879">
108− <rdf:RDF>
109− <cc:Work
110− rdf:about="">
111− <dc:format>image/svg+xml</dc:format>
112− <dc:type
113− rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
114− <dc:title></dc:title>
115− </cc:Work>
116− </rdf:RDF>
117− </metadata>
118− <g
119− inkscape:label="Layer 1"
120− inkscape:groupmode="layer"
121− id="layer1"
122− transform="translate(67.857146,-84.50504)">
123− <g
124− transform="matrix(0,-1,-1,0,373.50506,516.50504)"
125− id="g4845"
126− style="display:inline">
127− <g
128− inkscape:label="Layer 1"
129− id="g1708"
130− transform="matrix(0,-1,-1,0,1394.3622,441.36221)"
131− inkscape:export-filename="add01.png"
132− inkscape:export-xdpi="90"
133− inkscape:export-ydpi="90">
134− <rect
135− style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
136− id="rect1710"
137− width="90"
138− height="90"
139− x="0"
140− y="962.36218" />
141− <path
142− style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
143− d="m 9.000004,971.3622 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m -72,16 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.79086 -4,4 0,2.20914 1.790861,4 4,4 2.209139,0 4,-1.79086 4,-4 0,-2.20914 -1.790861,-4 -4,-4 z m -72,16 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m -72,16 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m -72,16 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 18.199219,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z m 17.800781,0 c -2.209139,0 -4,1.7909 -4,4 0,2.2091 1.790861,4 4,4 2.209139,0 4,-1.7909 4,-4 0,-2.2091 -1.790861,-4 -4,-4 z"
144− id="path4169"
145− inkscape:connector-curvature="0"
146− sodipodi:nodetypes="sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss" />
147− </g>
148− </g>
149− </g>
150−</svg>