Skip to content

申请更新 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lonuo wants to merge 20 commits into
base: gh-pages
Choose a base branch
from
Open

申请更新 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8183e95
Merge pull request #2 from mrsup/gh-pages
Heepo Jul 19, 2015
f13499f
Adapting team changing
Heepo Jul 19, 2015
c439ead
Merge pull request #17 from Heepo/gh-pages
mrsup Jul 19, 2015
d4dc899
Update hxl.css
lonuo Jul 21, 2015
190bc3f
Merge pull request #18 from lonuo/patch-2
mrsup Jul 21, 2015
9e45063
小位置移动
lonuo Jul 21, 2015
ef7633f
Merge pull request #19 from lonuo/patch-3
mrsup Jul 21, 2015
e4748bc
Make it responsive
Heepo Jul 22, 2015
6ff55e5
Fixed some of the the display issues
Heepo Jul 22, 2015
baabb3e
Fixed some of the the display issues_1
Heepo Jul 22, 2015
dd4d543
Fixed some of the the display issues_2
Heepo Jul 22, 2015
9838333
Fixed some of the the display issues_3
Heepo Jul 22, 2015
2f83388
Fixed some of the the display issues_4
Heepo Jul 22, 2015
68c0a08
Fixed navbar displaying issue
Heepo Jul 22, 2015
4ecfe50
Add some transitions
Heepo Jul 22, 2015
d3e6656
Some beautifying changing
Heepo Jul 23, 2015
c2a1b9b
Change Name
Heepo Jul 23, 2015
95c0ea0
change logo color
Heepo Jul 23, 2015
b0e5aea
Adapting varifying models
Heepo Jul 25, 2015
c22fd4a
Merge pull request #20 from Heepo/gh-pages
mrsup Jul 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
258 changes: 216 additions & 42 deletions css/heepo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,232 @@
.heepo, article, section, header, p{
margin: 0 ;
padding: 0 ;
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
-webkit-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.heepo{ position: relative;
overflow: hidden;
font-family: Georgia, "Times New Roman", "Microsoft YaHei",
.heepo {
margin: 0 auto;
text-align: center;
font-family: Georgia, "Microsoft YaHei",
"微软雅黑", STXihei, "华文细黑", serif;
}
.about{
width: 100%;
height: 14px;
font-size: 25px;
color: black;
background-color: white;
position: relative;
overflow: hidden;
padding: 18px;
}
.about {
background-color: #C7C2B8;
font-weight: bold;
}
.about .teamName {
width: 6em;
height: 1em;
}
.logo img {
width: 2em;
height: 2em;
}

.about .teamName{position: absolute;left: 20px;top: 10px;font-weight: bold;}
.about .logo{position: absolute;right: 57px;top: 12px;}
.about .logo a{text-decoration: none;}

.under{
width: 360px;
padding: 20px;
font-size: 20px;
.heepo section{
background-color: #5DB2A2;
border: 1px solid #ccc;
border-radius: 20px;
margin-left: 200px;
margin-top: 70px;
margin-bottom: 20px;
line-height: 1.5em;
width: 75%;
line-height: 2em;
padding: 0.7em;
border-radius: 1.5em;
color: #765555;
}
.under {
margin: 5em 0 0 17%;
}
.under img{
float: left;
margin: -3.3em 0 0 -4.5em;
}
.clearfix:after {
content:" ";
display:block;
height:0;
visibility:hidden;
clear:both;
}
.clearfix {
*zoom:1;
}
.post {
position: absolute;
right: 17%;
margin-top: 5em;
}
.post img{
float: right;
margin: -3em -4.5em 0 0;
}
.under img, .post img {
width: 3em;
height: 3em;
}


.under img{float: left; margin: -50px 0 0 -100px;}
@media only screen and (min-width: 20em) {

.about .teamName {
margin: 3em 0 1.5em;
width: 18em;
height: 3em;
}
.about {
height: 11em;
}
.heepo section{
font-size: 1em;
line-height: 2em;
padding: 1.5em 0.7em;
background-color: #77757E;
-webkit-transition: all 1s ease-in-out;
transiton: all 1s ease-in-out;
}
.under {
margin: 2.5em 0 0 55%;
-webkit-transition: all 1s ease-in-out;
transiton: all 1s ease-in-out;
}
.under p, .post p {
opacity: 0;
-webkit-transition: all 1s ease-in-out;
transiton: all 1s ease-in-out;
}
.under img, .post img {
width: 6em;
height: 6em;
-webkit-transition: all 1s ease-in-out;
transiton: all 1s ease-in-out;
}
.under:hover{
margin: 2.5em 0 0 17%;
background-color: #C7C2B8;
}

.under:hover p, .post:hover p {
opacity: 1;
}
.under:hover img {
width: 3em;
height: 3em;
}
.post {
margin-top: 2.5em;
right: 52%;
}

.post:hover {
right: 17%;
background-color: #C7C2B8;
}
.post:hover img {
width: 3em;
height: 3em;
}

.post{
width: 360px;
padding: 20px;
font-size: 20px;
background-color: #5DB2A2;
border: 1px solid #ccc;
border-radius: 20px;
margin-right: 200px;
float: right;
margin-top: 50px;
margin-bottom: 50px;
line-height: 1.5em;
}

@media only screen and (min-width: 30em) {
.about {
height: 3em;
}
.about .teamName {
margin: 0;
padding: 0;
width: 12em;
height: 2em;
font-size: 1em;
position: absolute;
left: 1.5em;
top: 0.5em;
}
.about .logo {
position: absolute;
right: 1.5em;
top: 0.6em;
}
.heepo section{
background-color: #77757E;
font-size: 0.8em;
margin: 3em 0 0 0;
padding: 0;
width: 39%;
position: absolute;
-webkit-transition: all 1s ease-in-out;
transiton: all 1s ease-in-out;
}
.under {
left: 8%;
}
.post {
right: 8%;
}
.under img {
float: none;
margin: 0;
padding: 0;
}
.under:hover, .post:hover {
margin: 5em 0 0 0;
padding: 2em 2em 0 2em;
}
.under:hover {

}
.post:hover {
right: 8%;
}
.under:hover img{
margin: 0 0 0 -105%;
width: 2em;
height: 2em;
}
.post img {
float: none;
margin: 0;
padding: 0;
}
.post:hover img{
margin: 0 -105% 0 0;
width: 2em;
height: 2em;
}


.post img{float: right; margin: -50px -100px 0 0;}
}

@media only screen and (min-width: 48em) {
.about {
margin-top: 3em;
height: 3.5em;
}
.about .teamName {
top: 0.8em;
}
.about img {
margin-top: 0.3em;
}
.heepo section{
top: 8em;
font-size: 1em;
}
.under img, .post img {
width: 7em;
height: 7em;
-webkit-transition: all 1s ease-in-out;
transiton: all 1s ease-in-out;
}
.under:hover, .post:hover {
width: 33%;

}
.under:hover img, .post:hover img {
width: 2em;
height: 2em;
}
}
4 changes: 2 additions & 2 deletions css/hxl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ a:hover{ text-decoration:underline;}
width:410px;
position:absolute;
left: 210px;
top: 85px;
top: 75px;
}
.mainbody{
text-align:left;
Expand Down Expand Up @@ -39,5 +39,5 @@ li span{
display:block;
overflow:hidden;
position: relative;
left:35px;
left:-55px;
}
25 changes: 13 additions & 12 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ ul {
background: #992211;
}
.page4 {
background: #ff00ff;
background: #CED9DB;
}
.page5 {
background: #00ff00;
background: #77757E;
}
.page6 {
background: #ff00ff;
Expand All @@ -109,21 +109,22 @@ ul {
#navBar {
z-index: 3;
position: absolute;
top: 10%;
right: 3%;
top: 25%;
right: 2%;
}
#navBar .active {
background: #ccc;
background: black;
}
#navBar li {
cursor: pointer;
margin-bottom: 10px;
transition: all .7s ease;
border-radius: 50%;
line-height: 40px;
text-align: center;
width: 40px;
height: 40px;
margin: 1.5em 0;
transition: all .7s ease;
background-color: #92918A;
border-radius: 50%;

text-align: center;
width: 10px;
height: 10px;
}
.main{
margin: 15% auto;
Expand Down
Binary file added images/Name.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/au.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/bupt.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 19 additions & 19 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,28 +73,28 @@ <h2>My Photo</h2>
<div class="contain">
<div class="heepo">
<header class="about">
<p class="teamName">队不队－拉木</p>
<img class="teamName" src="images/Name.jpg">
<div class="logo">
<a class="gitlogo" href="https://github.com/Heepo" target="_blank">
<img src="images/githublogo.gif" width="30px" height="30px">
<img src="images/githublogo.gif">
</a>
<a class="weibologo" href="http://weibo.com/everleu" target="_blank">
<img src="images/weibologo.png" width="30px" height="30px">
<img src="images/weibologo.png">
</a>
<a class="blog" href="http://heepo.github.io/testblog/" target="_blank">
<img src="images/blog.gif" width="30px" height="30px">
<a class="blog" href="http://heepo.github.io" target="_blank">
<img src="images/blog.gif" >
</a>
</div>
</header>
<section class="under">
<p>那时年少轻狂，总以为可以仗剑肆意他乡</p>
<p>殊不知天大地大，浮尘迷乱方向</p>
<img src="images/au.gif" width="50px" height="50px">
<section class="under" "clearfix">
<p>通信小兵，信号处理</p>
<p>FPGA/单片机开发，PCB设计制作</p>
<img src="images/au.gif">
</section>
<section class="post">
<p>非对错，只知道自己几斤几两</p>
<p>掌起舵，不愿再彷徨</p>
<img src="images/bupt.gif" width="50px" height="50px">
<p>CS Rookie， 信安方向</p>
<p>热爱Linux/Web等技术，兴趣广泛</p>
<img src="images/bupt.gif">
</section>
</div>
</div>
Expand All @@ -120,13 +120,13 @@ <h2>结束语</h2>
</div>
</div>
<ul id="navBar">
<li>1</li>
<li>2</li>
<li>3</li>
<li>4</li>
<li>5</li>
<li>6</li>
<li>7</li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
</ul>
<script src="js/jquery.min.js"></script>
<script src="js/fullPage.min.js"></script>
Expand Down