浏览代码

Added common header styles, fanzone page changes according to delivery of phase 1

master
kj1352 4 年前
父节点
当前提交
dd82745e82
共有 7 个文件被更改,包括 46 次插入53 次删除
  1. +10
    -3
      src/app/fan-zone/fan-zone.page.html
  2. +11
    -25
      src/app/fan-zone/fan-zone.page.scss
  3. +1
    -1
      src/app/live/live.page.html
  4. +0
    -22
      src/app/live/live.page.scss
  5. +1
    -1
      src/app/tabs/tabs.page.html
  6. +1
    -1
      src/app/tabs/tabs.page.scss
  7. +22
    -0
      src/global.scss

+ 10
- 3
src/app/fan-zone/fan-zone.page.html 查看文件

@@ -15,7 +15,7 @@
<p> {{ googleUserData.name }} </p> <p> {{ googleUserData.name }} </p>
</section> </section>


<div class="heading-holder">
<div class="common-heading-holder">
<h2 class="main-header"> <h2 class="main-header">
#FanZone #FanZone
</h2> </h2>
@@ -45,7 +45,14 @@
<label> Fan Cam </label> <label> Fan Cam </label>
</div> </div>
</li> </li>
<li [routerLink]="['/collections']">
<li (click)="presentCamModal()">
<div>
<ion-icon name="bookmarks-outline"></ion-icon>

<label> Bookmarks </label>
</div>
</li>
<!-- <li [routerLink]="['/collections']">
<div> <div>
<ion-icon name="trophy-outline"></ion-icon> <ion-icon name="trophy-outline"></ion-icon>


@@ -81,7 +88,7 @@


<label> Polls </label> <label> Polls </label>
</div> </div>
</li>
</li> -->
</ul> </ul>
</div> </div>




+ 11
- 25
src/app/fan-zone/fan-zone.page.scss 查看文件

@@ -4,25 +4,8 @@
padding-bottom: 50px; padding-bottom: 50px;
} }


.heading-holder {
padding: 0px 7%;

.main-header {
background: linear-gradient(90deg, lighten($brand-red, 0%), lighten($brand-red, 10%) 50%);
-webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent;
font-size: 2.3rem;
font-weight: 700;
letter-spacing: 1px;
margin: 5% 0%;
}

p {
color: $blue-grey;
font-size: 1.2rem;
font-weight: 500;
}
.common-heading-holder {
margin-bottom: 2rem;
} }


.fan-feature-list { .fan-feature-list {
@@ -36,9 +19,9 @@
li { li {
border-radius: 7px; border-radius: 7px;
background-color: rgba(white, 0.1);
box-shadow: 5px 5px 10px -5px darken($brand-blue, 5%);
color: $blue-grey;
background-color: darken($brand-blue, 20%);
box-shadow: 5px 5px 10px -5px darken($brand-blue, 30%);
color: $brand-gold;
width: 25vw; width: 25vw;
height: 25vw; height: 25vw;
display: flex; display: flex;
@@ -54,12 +37,14 @@
display: block; display: block;
font-size: 0.9rem; font-size: 0.9rem;
margin-top: 10px; margin-top: 10px;
opacity: 0.8;
} }


ion-icon { ion-icon {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
font-size: 1.8rem; font-size: 1.8rem;
opacity: 0.8;
} }
} }


@@ -71,6 +56,8 @@
white-space: nowrap; white-space: nowrap;
overflow-x: auto; overflow-x: auto;
overflow-y: hidden; overflow-y: hidden;
display: none;


li { li {
margin-right: 15px; margin-right: 15px;
@@ -266,7 +253,7 @@


.social-login { .social-login {
width: 100%; width: 100%;
height: calc(100vh - 55px);
height: calc(100vh - 50px);
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
@@ -289,7 +276,7 @@
box-shadow: 0px 0px 5px $brand-blue; box-shadow: 0px 0px 5px $brand-blue;
border-top-left-radius: 40px; border-top-left-radius: 40px;
border-top-right-radius: 40px; border-top-right-radius: 40px;
background-color: white;
background-color: darken($brand-blue, 10%);
padding: 20px; padding: 20px;


button { button {
@@ -303,7 +290,6 @@
background-color: lighten($light-grey, 45%); background-color: lighten($light-grey, 45%);
width: 100%; width: 100%;
border-radius: 30px; border-radius: 30px;
box-shadow: 2px 2px 5px $blue-grey;


img { img {
margin-left: 10px; margin-left: 10px;


+ 1
- 1
src/app/live/live.page.html 查看文件

@@ -2,7 +2,7 @@


<div class="content-container"> <div class="content-container">


<div class="heading-holder">
<div class="common-heading-holder">
<h2 class="main-header"> <h2 class="main-header">
#Live #Live
</h2> </h2>


+ 0
- 22
src/app/live/live.page.scss 查看文件

@@ -4,28 +4,6 @@
padding-bottom: 50px; padding-bottom: 50px;
} }


.heading-holder {
margin-bottom: 2.7rem;
padding: 0px 7%;

.main-header {
background: linear-gradient(to right, darken($brand-red, 10%), lighten($brand-red, 30%) 50%);
-webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent;
font-size: 2.3rem;
font-weight: 700;
letter-spacing: 1px;
margin: 5% 0%;
}

p {
color: lighten($brand-blue, 20%);
font-size: 1.2rem;
font-weight: 500;
}
}

.match-card { .match-card {
width: 86%; width: 86%;
margin: 0 auto; margin: 0 auto;


+ 1
- 1
src/app/tabs/tabs.page.html 查看文件

@@ -11,7 +11,7 @@
<ion-icon name="play-circle"></ion-icon> <ion-icon name="play-circle"></ion-icon>
</ion-tab-button> </ion-tab-button>


<ion-tab-button tab="fan-zone" disabled="true">
<ion-tab-button tab="fan-zone">
<ion-icon name="game-controller-outline"></ion-icon> <ion-icon name="game-controller-outline"></ion-icon>
<ion-icon name="game-controller"></ion-icon> <ion-icon name="game-controller"></ion-icon>
</ion-tab-button> </ion-tab-button>


+ 1
- 1
src/app/tabs/tabs.page.scss 查看文件

@@ -25,7 +25,7 @@ ion-tab-bar {
ion-icon { ion-icon {
&:nth-child(2) { &:nth-child(2) {
display: block; display: block;
color: $brand-gold;
color: lighten($green, 10%);
} }
&:nth-child(1) { &:nth-child(1) {


+ 22
- 0
src/global.scss 查看文件

@@ -41,6 +41,28 @@ ion-content {
background: linear-gradient(to bottom, darken($brand-blue, 20%), $brand-blue 80%); background: linear-gradient(to bottom, darken($brand-blue, 20%), $brand-blue 80%);
} }


.common-heading-holder {
margin-bottom: 2.7rem;
padding: 0px 7%;

.main-header {
background: linear-gradient(to right, darken($brand-red, 10%), lighten($brand-red, 15%) 50%);
-webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent;
font-size: 2.3rem;
font-weight: 700;
letter-spacing: 1px;
margin: 5% 0%;
}

p {
color: lighten($brand-blue, 20%);
font-size: 1.2rem;
font-weight: 500;
}
}

.header-with-action-buttons { .header-with-action-buttons {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;


正在加载...
取消
保存