Skip to content

Commit

Permalink
Fix code
Browse files Browse the repository at this point in the history
  • Loading branch information
@oawu
oawu committed Feb 10, 2016
1 parent 0cfb96a commit 4545a49
Show file tree
Hide file tree
Showing 15 changed files with 96 additions and 20 deletions.
2 changes: 1 addition & 1 deletion css/public.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions font/icomoon/demo-files/demo.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ p {
font-size: 32px;
}
.fs2 {
font-size: 24px;
}
.fs3 {
font-size: 20px;
}

23 changes: 21 additions & 2 deletions font/icomoon/demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="style.css"></head>
<body>
<div class="bgc1 clearfix">
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;2)</small></h1>
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;3)</small></h1>
</div>
<div class="clearfix mhl ptl">
<h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
Expand All @@ -31,8 +31,27 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
</div>
</div>
<div class="clearfix mhl ptl">
<h1 class="mvm mtn fgc1">Grid Size: 20</h1>
<h1 class="mvm mtn fgc1">Grid Size: 24</h1>
<div class="glyph fs2">
<div class="clearfix bshadow0 pbs">
<span class="icon-access_time">

</span>
<span class="mls"> icon-access_time</span>
</div>
<fieldset class="fs0 size1of1 clearfix hidden-false">
<input type="text" readonly value="e192" class="unit size1of2" />
<input type="text" maxlength="1" readonly value="&#xe192;" class="unitRight size1of2 talign-right" />
</fieldset>
<div class="fs0 bshadow0 clearfix hidden-true">
<span class="unit pvs fgc1">liga: </span>
<input type="text" readonly value="access_time" class="liga unitRight" />
</div>
</div>
</div>
<div class="clearfix mhl ptl">
<h1 class="mvm mtn fgc1">Grid Size: 20</h1>
<div class="glyph fs3">
<div class="clearfix bshadow0 pbs">
<span class="icon-old-phone">

Expand Down
Binary file modified font/icomoon/fonts/icomoon.eot
View file
Binary file not shown.
1 change: 1 addition & 0 deletions font/icomoon/fonts/icomoon.svg
View file
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 font/icomoon/fonts/icomoon.ttf
View file
Binary file not shown.
Binary file modified font/icomoon/fonts/icomoon.woff
View file
Binary file not shown.
Binary file modified font/icomoon/icomoon.eot
View file
Binary file not shown.
1 change: 1 addition & 0 deletions font/icomoon/icomoon.svg
View file
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 font/icomoon/icomoon.ttf
View file
Binary file not shown.
Binary file modified font/icomoon/icomoon.woff
View file
Binary file not shown.
26 changes: 26 additions & 0 deletions font/icomoon/selection.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,32 @@
"setId": 19,
"iconIdx": 6
},
{
"icon": {
"paths": [
"M534 298v224l192 114-32 54-224-136v-256h64zM512 854q140 0 241-101t101-241-101-241-241-101-241 101-101 241 101 241 241 101zM512 86q176 0 301 125t125 301-125 301-301 125-301-125-125-301 125-301 301-125z"
],
"attrs": [],
"isMulticolor": false,
"tags": [
"access_time"
],
"defaultCode": 57746,
"grid": 24
},
"attrs": [],
"properties": {
"order": 97,
"prevSize": 24,
"name": "access_time",
"ligatures": "access_time",
"id": 167,
"code": 57746
},
"setIdx": 9,
"setId": 10,
"iconIdx": 167
},
{
"icon": {
"paths": [
Expand Down
13 changes: 8 additions & 5 deletions font/icomoon/style.css
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {
font-family: 'icomoon';
src: url('fonts/icomoon.eot?rds54f');
src: url('fonts/icomoon.eot?rds54f#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?rds54f') format('truetype'),
url('fonts/icomoon.woff?rds54f') format('woff'),
url('fonts/icomoon.svg?rds54f#icomoon') format('svg');
src: url('fonts/icomoon.eot?eel4s3');
src: url('fonts/icomoon.eot?eel4s3#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?eel4s3') format('truetype'),
url('fonts/icomoon.woff?eel4s3') format('woff'),
url('fonts/icomoon.svg?eel4s3#icomoon') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -27,6 +27,9 @@
.icon-search:before {
content: "\e604";
}
.icon-access_time:before {
content: "\e192";
}
.icon-old-phone:before {
content: "\e901";
}
Expand Down
7 changes: 5 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@
<div class='search'>
<img src='img/like.png'>
<div class='r'>
<div class='search_desc'>臉書立即搜尋按讚！</div>
<div class='search_desc'>搜尋臉書．立即按讚！</div>
<div class='bar'>阿杏湯包<div class='icon-search'></div></div>
<div class='icon-old-phone phone'>0939-665-451</div>
<div class='info'>
<div class='icon-access_time'>下午2點～晚上8點半</div>
<div class='icon-old-phone'>0939-665-451</div>
</div>
</div>
</div>
</div>
Expand Down
40 changes: 30 additions & 10 deletions scss/public.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,20 @@
}



.icon-search:before {
content: "\e604";
}
.icon-access_time:before {
content: "\e192";
}
.icon-old-phone:before {
content: "\e901";
}




* {
&, &:after, &:before {
vertical-align: top;
Expand Down Expand Up @@ -95,6 +100,9 @@ html {
padding-left: 50px;
margin-top: 10px;
}
.title {
@include text-shadow(0 0 5px rgba(25, 47, 109, 1));
}
.desc {
font-size: 50px;
color: rgba(255, 255, 255, .7);
Expand Down Expand Up @@ -124,6 +132,9 @@ html {
float: left;
&.b {
background-color: rgba(18, 18, 17, 1);
@include scale(1.1);
@include border-radius(1px);

}
}
}
Expand All @@ -137,9 +148,9 @@ html {
// height: 50px;
@include split-left(200px, 'img', '.r');

// img {
// width:
// }
img {
margin-top: 5px;
}
.r {
padding-left: 20px;

Expand All @@ -148,7 +159,7 @@ html {
// color: rgba(25, 47, 109, 1);
color: rgba(255, 255, 255, .8);
padding-left: 10px;
margin-top: 10px;
margin-top: 5px;
}
.bar {
margin-top: 20px;
Expand All @@ -174,14 +185,23 @@ html {

}
}
.phone {
margin-top: 15px;
text-align: right;
.info {
margin-top: 20px;
color: rgba(255, 255, 255, .8);
font-size: 25px;
font-size: 23px;
@include split-left(50%, '.icon-access_time', '.icon-old-phone');

.icon-old-phone {
text-align: right;
}

> div {
@include text-shadow(0 0 5px rgba(25, 47, 109, 1));

&:before {
margin-right: 10px;
&:before {
margin-right: 10px;
color: rgba(255, 255, 255, .6);
}
}
}
}
Expand Down

0 comments on commit 4545a49

Please sign in to comment.