Skip to content

Commit 978d7af

Browse files
committed
fix index layout
1 parent c4db93e commit 978d7af

File tree

4 files changed

+37
-29
lines changed

4 files changed

+37
-29
lines changed

index.html

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<div class="row position-relative">
4242
<div class="sidebar-team col-3">
4343
<h5 class="font-weight-bold font-italic text-white team-tag">TEAM</h5>
44-
<div class="team-member-list list-group py-5" id="list-tab" role="tablist">
44+
<div class="team-member-list list-group" id="list-tab" role="tablist">
4545

4646
<!-- Etrex -->
4747
<a class="team-member-item text-center mb-4 active"
@@ -89,26 +89,25 @@ <h5 class="font-weight-bold font-italic text-white team-tag">TEAM</h5>
8989
</div>
9090

9191
<!-- project folder - content -->
92-
<div class="project-folder-content col-9">
92+
<div class="project-folder-content col-9 mt-5">
9393
<div class="row">
9494

9595
<!-- intro -->
96-
<div class="col-6 d-flex align-items-center"><span class="h3">[</span>
97-
<p class="mb-2">
98-
<span class="text-white pl-3 mb-1">OUR MISSION :</span>
99-
<span class="pr-3 text-primary">教你如何 30 天內放棄 JS</span>
96+
<div class="col-6 d-flex align-items-center">
97+
<span class="h3">[</span>
98+
<p class="d-inline-block px-2 mb-1">
99+
<span class="text-white">OUR MISSION :</span>
100+
<span class="text-primary">教你如何 30 天內放棄 JS</span>
100101
</p>
101102
<span class="h3">]</span>
102103
</div>
103104

104-
<div class="col-6 d-flex align-items-center">
105-
<p class="text-warning mb-2">
106-
<span class="custom-alerts p-2">! WARNING : JavaScript is dangerous !!</span>
107-
</p>
105+
<div class="col-6 text-right">
106+
<p class="custom-alerts py-2 px-3 d-inline-block">! WARNING : JavaScript is dangerous !!</p>
108107
</div>
109108
</div>
110109

111-
<div class="project-folders tab-content" id="nav-tabContent">
110+
<div class="project-folders tab-content mt-3" id="nav-tabContent">
112111

113112
<!-- Etrex -->
114113
<div class="project-folder-item tab-pane fade show active" id="etrex-folder" role="tabpanel" aria-labelledby="member-etrex">
@@ -1053,6 +1052,10 @@ <h5 class="font-weight-bold font-italic text-white team-tag">TEAM</h5>
10531052
</div>
10541053

10551054
</div>
1055+
1056+
<div class="powered-info mt-4">
1057+
<small class="text-secondary text-right d-block">Powered by 放棄人森ㄉ JS 黑人問號社</small>
1058+
</div>
10561059
</div>
10571060

10581061
</div>
@@ -1073,15 +1076,6 @@ <h4 class="text-center font-italic">Not available on mobile devices!!</h4>
10731076
</div>
10741077
</div>
10751078

1076-
<footer class="fixed-bottom">
1077-
<div class="containter">
1078-
<div class="row">
1079-
<div class="col">
1080-
<p class="text-center text-secondary">Powered by 放棄人森ㄉ JS 黑人問號社</p>
1081-
</div>
1082-
</div>
1083-
</div>
1084-
</footer>
10851079

10861080
<!-- Optional JavaScript -->
10871081
<!-- jQuery first, then Popper.js, then Bootstrap JS -->

stylesheets/_sass/config/varibles.sass

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@ $dark: $dark-blue !default
1818
.bg-primary
1919
background-color: $primary
2020

21+
.custom-alerts
22+
background-color: rgba(255, 184, 47, .1)
23+
color: $yellow
24+
border-radius: 4px
25+

stylesheets/_sass/pages/index.sass

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
.rwd-close-mobile
55
margin-top: 130px
66
.custom-alerts
7-
background-color: rgba(255, 184, 47, .1)
8-
border-radius: 4px
97
display: inline-block
108
margin: auto 0
119

1210
// index main
1311
.page-home
12+
position: relative
1413
.project-folders
1514
background-color: #191F33
1615
border: 1px solid rgba(43, 238, 238, .2)
@@ -70,7 +69,7 @@
7069
position: absolute
7170
top: 0
7271
left: 15px
73-
height: 130px
72+
height: 110px
7473
width: calc(100% - 30px)
7574
z-index: 1
7675

@@ -94,6 +93,7 @@
9493
border-left: 1px solid rgba(43, 238, 238, .2)
9594
border-right: 1px solid rgba(43, 238, 238, .2)
9695
box-shadow: 0px 0px 30px #0C1431
96+
padding: 70px 0px 50px 0px
9797

9898
.team-member-item
9999
display: block
@@ -135,11 +135,11 @@
135135
.active.team-member-item
136136
opacity: 1
137137
p
138-
color: $yellow
138+
color: $primary
139139
transform: translatey(0px)
140140
&:before
141141
bottom: -5px
142142
opacity: 1
143143
.team-member-avatar
144+
transform: scale(1)
144145
box-shadow: 0 0 0 4px #ffc107a1, 0 0 0 15px #ffc10738
145-

stylesheets/style.css

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
background-color: #2BEEEE;
1212
}
1313

14+
.custom-alerts {
15+
background-color: rgba(255, 184, 47, 0.1);
16+
color: #FFB82F;
17+
border-radius: 4px;
18+
}
19+
1420
body {
1521
font-family: "Exo 2", "Noto Sans TC", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
1622
background-color: #161B2D;
@@ -83,12 +89,13 @@ a:hover {
8389
margin-top: 130px;
8490
}
8591
.rwd-close-mobile .custom-alerts {
86-
background-color: rgba(255, 184, 47, 0.1);
87-
border-radius: 4px;
8892
display: inline-block;
8993
margin: auto 0;
9094
}
9195

96+
.page-home {
97+
position: relative;
98+
}
9299
.page-home .project-folders {
93100
background-color: #191F33;
94101
border: 1px solid rgba(43, 238, 238, 0.2);
@@ -150,7 +157,7 @@ a:hover {
150157
position: absolute;
151158
top: 0;
152159
left: 15px;
153-
height: 130px;
160+
height: 110px;
154161
width: calc(100% - 30px);
155162
z-index: 1;
156163
}
@@ -173,6 +180,7 @@ a:hover {
173180
border-left: 1px solid rgba(43, 238, 238, 0.2);
174181
border-right: 1px solid rgba(43, 238, 238, 0.2);
175182
box-shadow: 0px 0px 30px #0C1431;
183+
padding: 70px 0px 50px 0px;
176184
}
177185
.page-home .sidebar-team .team-member-list .team-member-item {
178186
display: block;
@@ -220,14 +228,15 @@ a:hover {
220228
opacity: 1;
221229
}
222230
.page-home .sidebar-team .team-member-list .active.team-member-item p {
223-
color: #FFB82F;
231+
color: #2BEEEE;
224232
transform: translatey(0px);
225233
}
226234
.page-home .sidebar-team .team-member-list .active.team-member-item p:before {
227235
bottom: -5px;
228236
opacity: 1;
229237
}
230238
.page-home .sidebar-team .team-member-list .active.team-member-item .team-member-avatar {
239+
transform: scale(1);
231240
box-shadow: 0 0 0 4px #ffc107a1, 0 0 0 15px #ffc10738;
232241
}
233242

0 commit comments

Comments
 (0)