浏览代码

More page UI enhancements

master
kj1352 5 年前
父节点
当前提交
f98803ad74
共有 2 个文件被更改,包括 24 次插入63 次删除
  1. +3
    -9
      src/app/tabs/more/more.component.html
  2. +21
    -54
      src/app/tabs/more/more.component.scss

+ 3
- 9
src/app/tabs/more/more.component.html 查看文件

@@ -28,7 +28,7 @@
</button> </button>
</div> </div>


<section *ngIf="profileDetails">
<section *ngIf="profileDetails" class="profile-details-holder">
<section class="segment-buttons"> <section class="segment-buttons">
<button (click)="selectedSegment='badges'" <button (click)="selectedSegment='badges'"
[ngClass]="{'active': selectedSegment === 'badges'}"> Badges </button> [ngClass]="{'active': selectedSegment === 'badges'}"> Badges </button>
@@ -39,7 +39,7 @@
</section> </section>


<div class="segment-holder"> <div class="segment-holder">
<ul class="badge-list" *ngIf="selectedSegment === 'badges'">
<ul class="segment-list" *ngIf="selectedSegment === 'badges'">
<li> <li>
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/star-medal.svg"></svg-icon> <svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/star-medal.svg"></svg-icon>
<div class="content"> <div class="content">
@@ -73,8 +73,7 @@
</li> </li>
</ul> </ul>



<ul class="friend-list" *ngIf="selectedSegment === 'friends'">
<ul class="segment-list" *ngIf="selectedSegment === 'friends'">
<li> <li>
<img src="https://pbs.twimg.com/profile_images/3478244961/01ebfc40ecc194a2abc81e82ab877af4.jpeg"> <img src="https://pbs.twimg.com/profile_images/3478244961/01ebfc40ecc194a2abc81e82ab877af4.jpeg">
<div class="content"> <div class="content">
@@ -122,11 +121,6 @@
<h4> My Class </h4> <h4> My Class </h4>
</li> </li>


<li>
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/missed-class.svg"></svg-icon>
<h4> Missed Classes </h4>
</li>

<li> <li>
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/duel.svg"></svg-icon> <svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/duel.svg"></svg-icon>
<h4> Duel </h4> <h4> Duel </h4>


+ 21
- 54
src/app/tabs/more/more.component.scss 查看文件

@@ -7,9 +7,9 @@
align-items: center; align-items: center;
padding: 0 5%; padding: 0 5%;
height: 60px; height: 60px;
position: absolute;
position: fixed;
top: 0; top: 0;
z-index: 1;
z-index: 2;
width: 100%; width: 100%;


button { button {
@@ -103,14 +103,20 @@
} }
} }


.profile-details-holder {
width: 100%;
background-color: var(--ash-black);
padding: 30px 0;
}

.segment-buttons { .segment-buttons {
display: flex; display: flex;
align-items: stretch; align-items: stretch;
height: 35px;
height: 40px;
border-radius: 7px; border-radius: 7px;
overflow: hidden; overflow: hidden;
width: 90%; width: 90%;
margin: 20px auto;
margin: 0px auto 20px;
background-color: var(--dark-grey); background-color: var(--dark-grey);
padding: 1px; padding: 1px;


@@ -123,8 +129,8 @@
border: 0px; border: 0px;


&.active { &.active {
background-color: white;
color: var(--teal);
background-color: var(--teal-green);
color: white;
font-weight: 500; font-weight: 500;
} }
} }
@@ -135,7 +141,7 @@
align-items: stretch; align-items: stretch;
flex-wrap: wrap; flex-wrap: wrap;
width: 90%; width: 90%;
margin: 20px 4% 20px auto;
margin: 30px 4% 0 auto;
list-style: none; list-style: none;


li { li {
@@ -175,16 +181,11 @@
font-size: 16px; font-size: 16px;
} }


.segment-holder {
margin-bottom: 40px;
}

.badge-list {
.segment-list {
list-style: none; list-style: none;
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
border-radius: 10px; border-radius: 10px;
padding: 0px 10px;


li { li {
display: flex; display: flex;
@@ -192,10 +193,13 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 15px 10px; padding: 15px 10px;
background-color: white;
box-shadow: 1px 1px 5px var(--light-grey);
background-color: var(--black);
border-radius: 15px; border-radius: 15px;
margin-bottom: 15px; margin-bottom: 15px;

&:last-child {
margin-bottom: 0;
}
} }


.icon { .icon {
@@ -203,43 +207,6 @@
height: 40px; height: 40px;
} }


.content {
width: calc(100% - 60px);
}

label {
display: block;
font-size: 16px;
color: var(--ash-black);
font-weight: 500;
}

p {
font-size: 14px;
color: var(--light-grey);
}
}


.friend-list {
list-style: none;
width: 90%;
margin: 0 auto;
border-radius: 10px;
padding: 0px 10px;

li {
display: flex;
width: 100%;
align-items: center;
justify-content: space-between;
padding: 15px 10px;
background-color: white;
box-shadow: 1px 1px 5px var(--light-grey);
border-radius: 15px;
margin-bottom: 15px;
}

img { img {
width: 50px; width: 50px;
height: 50px; height: 50px;
@@ -250,13 +217,13 @@
} }


.content { .content {
width: calc(100% - 70px);
width: calc(100% - 60px);
} }


label { label {
display: block; display: block;
font-size: 16px; font-size: 16px;
color: var(--ash-black);
color: var(--light-grey);
font-weight: 500; font-weight: 500;
} }