@@ -34,9 +34,9 @@ IndicatorDelegate {
3434 property bool selected: false
3535 property real iconHeight: units.gu(2)
3636 readonly property color color: {
37− if (!expanded) return "#CCCCCC";
37+ if (!expanded) return "#ededed";
3838 if (!selected) return "#4c4c4c";
39− return Theme.palette.normal.foregroundText;
39+ return "#ededed";
4040 }
4141
4242 signal clicked()
@@ -78,7 +78,7 @@ IndicatorDelegate {
7878 font.family: "Ubuntu"
7979 fontSize: "medium"
8080 color: root.color
81− Behavior on color { ColorAnimation { duration: UbuntuAnimation.SnapDuration } }
81+ Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
8282 }
8383
8484 Item {
@@ -91,6 +91,13 @@ IndicatorDelegate {
9191 verticalCenter: parent.verticalCenter
9292 }
9393
94+ opacity: {
95+ if (!expanded) return 1.0;
96+ if (!selected) return 0.6;
97+ return 1.0;
98+ }
99+ Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
100+
94101 Row {
95102 id: iconRow
96103 anchors.centerIn: iconsItem
@@ -108,7 +115,7 @@ IndicatorDelegate {
108115 source: modelData
109116 sets: ["status", "actions"]
110117 color: root.color
111− Behavior on color { ColorAnimation{ duration: UbuntuAnimation.SnapDuration } }
118+ Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
112119 }
113120 }
114121 }
@@ -129,7 +136,7 @@ IndicatorDelegate {
129136 font.family: "Ubuntu"
130137 fontSize: "medium"
131138 color: root.color
132− Behavior on color { ColorAnimation{ duration: UbuntuAnimation.SnapDuration } }
139+ Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
133140 }
134141 }
135142
@@ -147,7 +154,7 @@ IndicatorDelegate {
147154 horizontalAlignment: Text.AlignHCenter
148155 opacity: 0
149156 color: root.color
150− Behavior on color { ColorAnimation{ duration: UbuntuAnimation.SnapDuration } }
157+ Behavior on color { ColorAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing } }
151158 }
152159
153160 StateGroup {
@@ -223,12 +230,13 @@ IndicatorDelegate {
223230 transitions: [
224231 Transition {
225232 PropertyAction { target: d; property: "useFallbackIcon" }
233+ PropertyAction { target: iconsItem; property: "opacity" }
226234 AnchorAnimation {
227235 targets: [ mainItems, iconsItem, leftLabelItem, rightLabelItem ]
228236 duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing
229237 }
230238 PropertyAnimation {
231− targets: [ root, mainItems, iconsItem, leftLabelItem, rightLabelItem, indicatorName ]
239+ targets: [ root, mainItems, leftLabelItem, rightLabelItem, indicatorName ]
232240 properties: "width, opacity, anchors.verticalCenterOffset";
233241 duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing
234242 }