aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/animation/behaviors
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@digia.com>2014-09-17 15:14:14 +0300
committerTarja Sundqvist <tarja.sundqvist@digia.com>2014-09-19 14:43:59 +0200
commit0c17d92cdabda92d345b1c1c968a2a7bbe88aed2 (patch)
tree7009258233c8e0cea0dd49f7a56b6bf16a864531 /examples/quick/animation/behaviors
parentd0c58e6ad2fa188c96788575b13fede151ab98bd (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/behaviors')
-rw-r--r--examples/quick/animation/behaviors/tvtennis.qml18
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/quick/animation/behaviors/tvtennis.qml b/examples/quick/animation/behaviors/tvtennis.qml
index b5ad2e8667..46dd861fc8 100644
--- a/examples/quick/animation/behaviors/tvtennis.qml
+++ b/examples/quick/animation/behaviors/tvtennis.qml
@@ -43,7 +43,7 @@ import QtQuick 2.0
Rectangle {
id: page
width: 320; height: 480;
- color: "Black"
+ color: "#1e1b18"
// Make a ball to bounce
Rectangle {
@@ -53,7 +53,7 @@ Rectangle {
property variant direction : "right"
x: 20; width: 20; height: 20; z: 1
- color: "Lime"
+ color: "#80c342"
// Move the ball to the right and back to the left repeatedly
SequentialAnimation on x {
@@ -84,7 +84,7 @@ Rectangle {
// coordinates of the ball.
Rectangle {
id: leftBat
- color: "Lime"
+ color: "#328930"
x: 2; width: 20; height: 90
// ![0]
y: ball.direction == 'left' ? ball.y - 45 : page.height/2 -45;
@@ -93,19 +93,19 @@ Rectangle {
}
Rectangle {
id: rightBat
- color: "Lime"
+ color: "#328930"
x: page.width - 22; width: 20; height: 90
y: ball.direction == 'right' ? ball.y - 45 : page.height/2 -45;
Behavior on y { SpringAnimation{ velocity: 300 } }
}
// The rest, to make it look realistic, if neither ever scores...
- Rectangle { color: "Lime"; x: page.width/2-80; y: 0; width: 40; height: 60 }
- Rectangle { color: "Black"; x: page.width/2-70; y: 10; width: 20; height: 40 }
- Rectangle { color: "Lime"; x: page.width/2+40; y: 0; width: 40; height: 60 }
- Rectangle { color: "Black"; x: page.width/2+50; y: 10; width: 20; height: 40 }
+ Rectangle { color: "#328930"; x: page.width/2-80; y: 0; width: 40; height: 60 }
+ Rectangle { color: "#1e1b18"; x: page.width/2-70; y: 10; width: 20; height: 40 }
+ Rectangle { color: "#328930"; x: page.width/2+40; y: 0; width: 40; height: 60 }
+ Rectangle { color: "#1e1b18"; x: page.width/2+50; y: 10; width: 20; height: 40 }
Repeater {
model: page.height / 20
- Rectangle { color: "Lime"; x: page.width/2-5; y: index * 20; width: 10; height: 10 }
+ Rectangle { color: "#328930"; x: page.width/2-5; y: index * 20; width: 10; height: 10 }
}
}