← Back to branch summary

~themuso/ubuntu-ui-toolkit/add-accessibility-metadata

« back to all changes in this revision

Viewing changes to modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml

  • Committer: Luke Yelavich
  • Date: 2014-07-28 07:04:49 UTC
  • mfrom: (992.51.43 ubuntu-ui-toolkit)
  • Revision ID: luke.yelavich@canonical.com-20140728070449-30bfzhu758caz058
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml
58
58
                bottomMargin: switchStyle.thumbPadding
59
59
            }
60
60
 
61
 
            color: styledItem.checked ? Theme.palette.selected.foreground
62
 
                                      : Theme.palette.normal.foreground
 
61
            color: styledItem.checked ? UbuntuColors.green
 
62
                                      : Qt.rgba(0, 0, 0, 0.2)
63
63
 
64
64
            Behavior on x {
65
65
                UbuntuNumberAnimation {
117
117
                }
118
118
                progress: MathUtils.clamp((thumb.x - parent.x - x) / width, 0.0, 1.0)
119
119
                leftColor: "transparent"
120
 
                rightColor: Theme.palette.selected.foregroundText
 
120
                rightColor: Theme.palette.normal.foregroundText
121
121
            }
122
122
        }
123
123
 
138
138
                    source: "artwork/tick.png"
139
139
                }
140
140
                progress: MathUtils.clamp((thumb.x + thumb.width - parent.x - x) / width, 0.0, 1.0)
141
 
                leftColor: Theme.palette.selected.foregroundText
 
141
                leftColor: Theme.palette.normal.foregroundText
142
142
                rightColor: "transparent"
143
143
            }
144
144
        }