diff options
| author | Tarja Sundqvist <tarja.sundqvist@digia.com> | 2014-09-17 15:14:14 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@digia.com> | 2014-09-19 14:43:59 +0200 |
| commit | 0c17d92cdabda92d345b1c1c968a2a7bbe88aed2 (patch) | |
| tree | 7009258233c8e0cea0dd49f7a56b6bf16a864531 /examples/quick/animation/basics | |
| parent | d0c58e6ad2fa188c96788575b13fede151ab98bd (diff) | |
Update used colors on basis of the recommended color palette.
qtdeclarative/examples/quick/animation uses some colors which are not
mentioned on the recommended color palette. They are replaced with
recommended colors.
Task-number: QTBUG-41368
Change-Id: I6f07340735333c5da319fdc59ecf8aa7388ad2a5
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'examples/quick/animation/basics')
| -rw-r--r-- | examples/quick/animation/basics/animators.qml | 8 | ||||
| -rw-r--r-- | examples/quick/animation/basics/color-animation.qml | 14 | ||||
| -rw-r--r-- | examples/quick/animation/basics/property-animation.qml | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/examples/quick/animation/basics/animators.qml b/examples/quick/animation/basics/animators.qml index 3454eca13c..df1bd55be7 100644 --- a/examples/quick/animation/basics/animators.qml +++ b/examples/quick/animation/basics/animators.qml @@ -48,10 +48,10 @@ Item { Rectangle { anchors.fill: parent gradient: Gradient { - GradientStop { position: 0.0; color: "DeepSkyBlue" } - GradientStop { position: 0.499; color: "LightSkyBlue" } - GradientStop { position: 0.5; color: "ForestGreen" } - GradientStop { position: 1.0; color: "DarkGreen" } + GradientStop { position: 0.0; color: "#14148c" } + GradientStop { position: 0.499; color: "#14aaff" } + GradientStop { position: 0.5; color: "#80c342" } + GradientStop { position: 1.0; color: "#006325" } } } diff --git a/examples/quick/animation/basics/color-animation.qml b/examples/quick/animation/basics/color-animation.qml index 0de4177a9f..a4a149df5c 100644 --- a/examples/quick/animation/basics/color-animation.qml +++ b/examples/quick/animation/basics/color-animation.qml @@ -54,16 +54,16 @@ Item { position: 0.0 SequentialAnimation on color { loops: Animation.Infinite - ColorAnimation { from: "DeepSkyBlue"; to: "#0E1533"; duration: 5000 } - ColorAnimation { from: "#0E1533"; to: "DeepSkyBlue"; duration: 5000 } + ColorAnimation { from: "#14148c"; to: "#0E1533"; duration: 5000 } + ColorAnimation { from: "#0E1533"; to: "#14148c"; duration: 5000 } } } GradientStop { position: 1.0 SequentialAnimation on color { loops: Animation.Infinite - ColorAnimation { from: "SkyBlue"; to: "#437284"; duration: 5000 } - ColorAnimation { from: "#437284"; to: "SkyBlue"; duration: 5000 } + ColorAnimation { from: "#14aaff"; to: "#437284"; duration: 5000 } + ColorAnimation { from: "#437284"; to: "#14aaff"; duration: 5000 } } } } @@ -113,11 +113,11 @@ Item { position: 0.0 SequentialAnimation on color { loops: Animation.Infinite - ColorAnimation { from: "ForestGreen"; to: "#001600"; duration: 5000 } - ColorAnimation { from: "#001600"; to: "ForestGreen"; duration: 5000 } + ColorAnimation { from: "#80c342"; to: "#001600"; duration: 5000 } + ColorAnimation { from: "#001600"; to: "#80c342"; duration: 5000 } } } - GradientStop { position: 1.0; color: "DarkGreen" } + GradientStop { position: 1.0; color: "#006325" } } } } diff --git a/examples/quick/animation/basics/property-animation.qml b/examples/quick/animation/basics/property-animation.qml index ae808ba2fe..d237bb1f87 100644 --- a/examples/quick/animation/basics/property-animation.qml +++ b/examples/quick/animation/basics/property-animation.qml @@ -48,8 +48,8 @@ Item { Rectangle { anchors { left: parent.left; top: parent.top; right: parent.right; bottom: parent.verticalCenter } gradient: Gradient { - GradientStop { position: 0.0; color: "DeepSkyBlue" } - GradientStop { position: 1.0; color: "LightSkyBlue" } + GradientStop { position: 0.0; color: "#14148c" } + GradientStop { position: 1.0; color: "#14aaff" } } } @@ -57,8 +57,8 @@ Item { Rectangle { anchors { left: parent.left; top: parent.verticalCenter; right: parent.right; bottom: parent.bottom } gradient: Gradient { - GradientStop { position: 0.0; color: "ForestGreen" } - GradientStop { position: 1.0; color: "DarkGreen" } + GradientStop { position: 0.0; color: "#80c342" } + GradientStop { position: 1.0; color: "#006325" } } } |