-
-
-
+
diff --git a/src/app/match-details/match-details.page.scss b/src/app/match-details/match-details.page.scss
index a53a278..9cc8d8a 100644
--- a/src/app/match-details/match-details.page.scss
+++ b/src/app/match-details/match-details.page.scss
@@ -1,7 +1,7 @@
@import '../colors';
-.field-container {
+.commentary-container {
position: sticky;
position: -webkit-sticky;
top: 0px;
@@ -11,27 +11,6 @@
margin-top: -80px;
}
-.field-image {
- display: block;
- width: 100%;
- height: 100%;
- z-index: 0;
- position: absolute;
- left: 0;
- top: 0;
- z-index: 0;
-
- img {
- width: 100%;
- height: 100%;
- object-fit: cover;
- object-position: center;
- animation: popOut 0.3s forwards linear;
- border-radius: 50%;
- transform: scale(0);
- }
-}
-
@keyframes popOut {
0% {
transform: scale(0);
@@ -48,187 +27,13 @@
}
}
-.field-setting {
- position: absolute;
- z-index: 1;
- list-style: none;
- padding: 0;
- margin: 0;
- top: 5%;
- left: 0%;
- width: 100%;
- height: 90%;
- overflow: visible;
- opacity: 0;
- transition: transform 0.5s, opacity 0.3s;
- transform: translateY(10%);
- pointer-events: none;
- transition-delay: 0.3s;
-
- &.active {
- transform: translateY(0%);
- opacity: 1;
- pointer-events: all;
- }
-
- li {
- position: absolute;
- left: 0;
- top: 0;
- z-index: 1;
-
- &::after {
- content: '';
- display: block;
- width: 50px;
- height: 10px;
- border-radius: 50%;
- background-color: lighten($blue-grey, 20%);
- box-shadow: 0px 2px 5px $dark-blue;
- margin-top: -5px;
- }
-
- img {
- display: block;
- margin: 0 auto;
- width: 50px;
- height: 50px;
- object-fit: cover;
- object-position: top;
- position: relative;
- }
-
- &:nth-child(1) {
- left: 10%;
- top: 90%;
- }
-
- &:nth-child(2) {
- left: 15%;
- top: 60%;
- }
-
- &:nth-child(3) {
- left: 15%;
- top: 30%;
- }
-
- &:nth-child(4) {
- left: 5%;
- top: 5%;
- }
-
- &:nth-child(5) {
- left: 40%;
- top: 20%;
- }
-
- &:nth-child(6) {
- left: 70%;
- top: 20%;
- }
-
- &:nth-child(7) {
- left: 80%;
- top: 40%;
- }
-
- &:nth-child(8) {
- left: 70%;
- top: 60%;
- }
-
- &:nth-child(9) {
- left: 40%;
- top: 80%;
- animation: bowlerMovement 1.5s forwards linear;
- }
-
- @keyframes bowlerMovement {
- 0% {
- transform: translate(0, 0);
- } 100% {
- transform: translate(0, -20vh);
- }
- }
-
- &:nth-child(10) {
- left: 80%;
- top: 90%;
- }
-
- &:nth-child(11) {
- left: 2%;
- top: 40%;
- }
-
- &:nth-child(12) {
- left: 50%;
- top: 52%;
- animation: runUp 1s forwards linear;
- animation-delay: 2.8s;
- }
-
- @keyframes runUp {
- 0% {
- transform: translate(0,0);
- } 100% {
- transform: translate(-5vw, -15vh);
- }
- }
-
- &:nth-child(13) {
- left: 42%;
- top: 33%;
-
- animation: runDown 1s forwards linear;
- animation-delay: 3s;
- }
-
- @keyframes runDown {
- 0% {
- transform: translate(0,0);
- } 100% {
- transform: translate(7vw, 15vh);
- }
- }
-
- &:nth-child(14) {
- left: 39%;
- top: 82%;
-
- img {
- width: 20px;
- height: 20px;
- }
-
- &::after {
- display: none;
- }
-
-
- animation: ballMovement 5s forwards linear;
- }
-
- @keyframes ballMovement {
- 0% {
- transform: translate(0, 0);
- } 50% {
- transform: translate(0, -35vh);
- } 100% {
- transform: translate(50vw, 10vh);
- }
- }
- }
-}
-
.player-details {
position: relative;
z-index: 2;
border-radius: 10px;
overflow: hidden;
- box-shadow: 0px 0px 5px $dark-blue;
- background-color: $dark-blue;
+ box-shadow: 0px 0px 5px darken($brand-blue, 30%);
+ background-color: darken($brand-blue, 30%);
left: 0;
top: 0;
@@ -241,16 +46,16 @@
height: 40px;
margin: 15px 5% 15px auto;
border-radius: 50%;
- border: 1px solid $blue-grey;
- background-color: rgba($blue-grey, 0.1);
+ border: 2px solid lighten($brand-blue, 10%);
+ background-color: rgba(lighten($brand-blue, 10%), 0.2);
display: flex;
align-items: center;
justify-content: center;
z-index: 2;
ion-icon {
- color: $blue-grey;
- font-size: 20px;
+ color: lighten($brand-blue, 10%);
+ font-size: 22px;
}
}
@@ -388,13 +193,13 @@
z-index: 1;
width: 100%;
padding: 20px 0;
- background-color: $dark-blue;
- box-shadow: 0px 0px 10px -2px darken($dark-blue, 10%);
+ background-color: darken($brand-blue, 20%);
+ box-shadow: 0px 0px 10px -2px darken($brand-blue, 20%);
transition: background-color 0.3s, box-shadow 0.3s;
&.no-bg {
background-color: transparent;
- box-shadow: 0px 0px 0px $dark-blue;
+ box-shadow: 0px 0px 0px $brand-blue;
}
}
@@ -407,8 +212,8 @@
display: flex;
justify-content: center;
overflow: hidden;
- background-color: lighten($dark-blue, 15%);
- box-shadow: 0px 0px 5px inset $dark-blue;
+ background-color: $brand-blue;
+ box-shadow: 0px 0px 5px inset $brand-blue;
&.active {
&::before {
@@ -460,7 +265,7 @@
.score-card {
background-color: white;
- box-shadow: 10px 10px 15px -7px darken($dark-blue, 10%);
+ box-shadow: 10px 10px 15px -7px darken($brand-blue, 10%);
border-radius: 7px;
overflow: hidden;
width: 90%;
diff --git a/src/app/match-details/match-details.page.ts b/src/app/match-details/match-details.page.ts
index 82755bf..c1016a0 100644
--- a/src/app/match-details/match-details.page.ts
+++ b/src/app/match-details/match-details.page.ts
@@ -33,8 +33,8 @@ export class MatchDetailsPage implements OnInit {
isPlayerSelected: boolean = false;
isHomeTeamSelected: boolean = true;
- selectedSegment: string = 'MATCH';
- selectedRoster: string = 'LIVE';
+ selectedSegment: 'MATCH' | 'SCORE' = 'MATCH';
+ selectedRoster: 'LIVE' | 'HOME' | 'AWAY' = 'LIVE';
roles = ['BOWLER', 'BATSMAN'];
diff --git a/src/app/player-stats/player-stats.page.scss b/src/app/player-stats/player-stats.page.scss
index df606a7..e62253a 100644
--- a/src/app/player-stats/player-stats.page.scss
+++ b/src/app/player-stats/player-stats.page.scss
@@ -1,9 +1,9 @@
-$dark-blue: #161e2d;
+$brand-blue: #161e2d;
$blue-grey: #949599;
ion-content {
--background: transparent;
- background-color: $dark-blue;
+ background-color: $brand-blue;
}
.content-container {
diff --git a/src/app/quiz/quiz.page.scss b/src/app/quiz/quiz.page.scss
index 7f1e4da..c1bec93 100644
--- a/src/app/quiz/quiz.page.scss
+++ b/src/app/quiz/quiz.page.scss
@@ -72,7 +72,7 @@
left: 0;
top: 0;
border-radius: 30px;
- background: linear-gradient(90deg, lighten($brand-red, 5%) 5%, lighten($dark-blue, 20%) 80%);
+ background: linear-gradient(90deg, lighten($brand-red, 5%) 5%, lighten($brand-blue, 20%) 80%);
width: 100%;
height: 100%;
transition: width 1s linear;
@@ -179,7 +179,7 @@
border-radius: 10px;
text-align: center;
background-color: lighten($blue-grey, 35%);
- box-shadow: 0px 3px 5px $dark-blue;
+ box-shadow: 0px 3px 5px $brand-blue;
h2 {
color: $green;
diff --git a/src/app/quiz/swipe-cards/swipe-cards.component.scss b/src/app/quiz/swipe-cards/swipe-cards.component.scss
index b0306f5..1e437f4 100644
--- a/src/app/quiz/swipe-cards/swipe-cards.component.scss
+++ b/src/app/quiz/swipe-cards/swipe-cards.component.scss
@@ -17,7 +17,7 @@
width: 100%;
background: #FFFFFF;
border-radius: 20px;
- box-shadow: 0px 0px 15px -2px $dark-blue;
+ box-shadow: 0px 0px 15px -2px $brand-blue;
overflow: hidden;
position: absolute;
will-change: transform;
@@ -58,7 +58,7 @@
justify-content: space-between;
height: 50px;
background-color: white;
- box-shadow: 0px 0px 10px 0px $dark-blue;
+ box-shadow: 0px 0px 10px 0px $brand-blue;
button {
width: 70px;
@@ -75,13 +75,13 @@
&:first-child {
margin-left: -30px;
color: $pink;
- box-shadow: -5px 0px 10px 0px $dark-blue;
+ box-shadow: -5px 0px 10px 0px $brand-blue;
}
&:last-child {
margin-right: -30px;
color: $green;
- box-shadow: 5px 0px 10px 0px $dark-blue;
+ box-shadow: 5px 0px 10px 0px $brand-blue;
}
}
}
\ No newline at end of file
diff --git a/src/app/shop/shop.page.scss b/src/app/shop/shop.page.scss
index 9160bc8..8fa9f70 100644
--- a/src/app/shop/shop.page.scss
+++ b/src/app/shop/shop.page.scss
@@ -106,8 +106,8 @@
height: 70px;
display: flex;
align-items: stretch;
- background-color: $dark-blue;
- box-shadow: 0px 0px 5px $dark-blue;
+ background-color: $brand-blue;
+ box-shadow: 0px 0px 5px $brand-blue;
overflow: hidden;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
@@ -185,7 +185,7 @@
margin: 10px 0;
font-size: 1rem;
font-weight: 500;
- color: $dark-blue;
+ color: $brand-blue;
}
}
}
@@ -202,7 +202,7 @@
justify-content: center;
button {
- color: $dark-blue;
+ color: $brand-blue;
border: none;
border-radius: 30px;
height: 40px;
diff --git a/src/app/tabs/tabs.page.html b/src/app/tabs/tabs.page.html
index 892eae0..7d14890 100644
--- a/src/app/tabs/tabs.page.html
+++ b/src/app/tabs/tabs.page.html
@@ -1,7 +1,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
diff --git a/src/app/tabs/tabs.page.scss b/src/app/tabs/tabs.page.scss
index 485dfbc..23c467f 100644
--- a/src/app/tabs/tabs.page.scss
+++ b/src/app/tabs/tabs.page.scss
@@ -2,19 +2,18 @@
ion-tab-bar {
--background: transparent;
- background-color: $dark-blue;
+ background: linear-gradient(to right, darken($brand-blue, 10%), $brand-blue);
--border: none;
margin-top: -2px;
- box-shadow: 0px 0px 15px -2px darken($dark-blue, 10%);
- --color: var(--blue-grey);
- --color-selected: #01b868;
-
+ box-shadow: 0px 0px 15px -2px darken($brand-blue, 20%);
+
ion-tab-button {
ion-icon {
font-size: 25px;
&:nth-child(1) {
display: block;
+ color: lighten($brand-blue, 30%);
}
&:nth-child(2) {
@@ -26,6 +25,7 @@ ion-tab-bar {
ion-icon {
&:nth-child(2) {
display: block;
+ color: $brand-gold;
}
&:nth-child(1) {
diff --git a/src/global.scss b/src/global.scss
index 08aee3e..4e1d4f0 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -38,7 +38,7 @@
ion-content {
--background: transparent;
- background: linear-gradient(0deg, lighten($dark-blue, 10%), $dark-blue 80%);
+ background: linear-gradient(to bottom, darken($brand-blue, 20%), $brand-blue 80%);
}
.header-with-action-buttons {
@@ -51,11 +51,11 @@ ion-content {
position: -webkit-sticky;
left: 0;
top: 0;
- background-color: lighten($dark-blue, 5%);
+ background-color: darken($brand-blue, 10%);
z-index: 2;
width: 100%;
align-items: center;
- box-shadow: 0px 0px 5px $dark-blue;
+ box-shadow: 0px 0px 5px darken($brand-blue, 20%);
button {
background-color: transparent;
@@ -63,7 +63,7 @@ ion-content {
}
.nav button {
- color: lighten($blue-grey, 10%);
+ color: lighten($brand-blue, 20%);
display: flex;
align-items: center;
justify-content: flex-start;
@@ -81,8 +81,8 @@ ion-content {
flex-grow: 1;
padding: 0 15px;
font-size: 14px;
- color: lighten($blue-grey, 50%);
- font-weight: 500;
+ color: white;
+ font-weight: 600;
text-align: left;
white-space: nowrap;
overflow: hidden;
@@ -90,7 +90,7 @@ ion-content {
span {
font-weight: 500;
- color: lighten($blue-grey, 10%);
+ color: lighten($brand-blue, 20%);
font-size: 12px;
}
}
@@ -103,8 +103,8 @@ ion-content {
.action button {
width: 40px;
height: 40px;
- border: 2px solid darken($green, 10%);
- background-color: rgba($green, 0.1);
+ border: 2px solid $green;
+ background-color: rgba($green, 0.2);
border-radius: 50%;
display: flex;
align-items: center;
@@ -112,7 +112,7 @@ ion-content {
margin-left: 15px;
ion-icon {
- color: darken($green, 10%);
+ color: $green;
font-size: 20px;
}
}
@@ -121,26 +121,4 @@ ion-content {
figure {
margin: 0;
-}
-
-
-.chat-button {
- --background: transparent;
- background-color: lighten($brand-red, 10%);
- border-radius: 50%;
- position: relative;
- overflow: visible;
- width: 60px;
- height: 60px;
-
- ion-icon {
- font-size: 25px;
- }
-
- ion-badge {
- position: absolute;
- right: 7px;
- top: 7px;
- font-size: 10px;
- }
}
\ No newline at end of file
--
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-