Skip to content

Commit

Permalink
changed icons in footer: use fontawesom
Browse files Browse the repository at this point in the history
change image for smaller screens
  • Loading branch information
marcmo committed Oct 6, 2014
1 parent 4dda8a4 commit 5fd5410
Show file tree
Hide file tree
Showing 12 changed files with 2,246 additions and 22 deletions.
1,672 changes: 1,672 additions & 0 deletions css/font-awesome.css

Large diffs are not rendered by default.

42 changes: 26 additions & 16 deletions css/site.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ a img {
border: none;
}

p

p img {
&.left {
float: left;
Expand Down Expand Up @@ -202,19 +200,22 @@ html {
}

footer {

border-top: 1px solid $medium-grey;
margin-top: 1em;
p {
div {
text-align: center;
font-size: 0.8em;
line-height: 1.1em;
a {
color: $mouse-grey;
&:visited {
text-decoration: none;
color: $mouse-grey;
}
}
padding: 1em 0; }
}
} // footer

article {
margin-bottom: 1em;
Expand Down Expand Up @@ -244,7 +245,7 @@ article {
}
figure {
margin: 0 0 1em; }
}
} // article

.leftinfo {
float: left;
Expand Down Expand Up @@ -355,15 +356,15 @@ div {
margin-left: 10px;
}
}
}
} // div

section#page img {
float: left;
margin-left: 1.5em;
text-align: center; }

#htmltagcloud {
width: auto;
width: 250px;
font-family:"Lucida Sans","Lucida Grande","Lucida Sans Unicode",sans-serif;
margin: 0;
padding: 0em;
Expand All @@ -375,9 +376,9 @@ section#page img {
font-size: 0.7em;
a {
&:link {
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
border-radius: 20px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
border: 0 none;
background-color: $cloud-black;
color: #fff;
Expand Down Expand Up @@ -427,6 +428,19 @@ header.home {

//width less then 1030px
@media all and (max-width:64.375em) {
#htmltagcloud { width: 200px; }
header.home {
z-index: 90;
position: fixed;
left: 0;
margin-top: 0;
margin-left: 10px;
background: url("../images/mountainflake3.png") no-repeat;
background-size: 100% auto;
font-family: sans-serif;
width: 100px;
}
header h1 { a { height: 200px; } }
div {
&.information {
width: 100%;
Expand Down Expand Up @@ -500,6 +514,7 @@ header.home {

//width more then 1030px
@media screen and (min-width:64.375em) {//1030px
header h1 { a { height: 100px; } }
body {
font-size:130%;
max-width:95%;
Expand All @@ -516,7 +531,7 @@ header.home {
}
}
//width more then 1200px
@media screen and (min-width:75.000em) and (min-height:31.250em) {//1200x500px
@media screen and (min-width:75.000em) {
body {
font-size:135%;
max-width:75%;
Expand All @@ -533,7 +548,6 @@ header.home {

header h1 {
a {
height: 135px;
display: block;
line-height: 80px;
}
Expand Down Expand Up @@ -606,10 +620,6 @@ dt a {
background: $light-yellow none repeat scroll 0 0;
}

footer p a {
color: $mouse-grey;
}

section#page h1 {
margin: 0 0 1em;
font-weight: 500;
Expand Down
Binary file added fonts/FontAwesome.otf
Binary file not shown.
Binary file added fonts/fontawesome-webfont.eot
Binary file not shown.
520 changes: 520 additions & 0 deletions fonts/fontawesome-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file added fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file added images/mountainflake2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/mountainflake3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/programmerbychoice.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions rakefile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
sh "ghc --make #{input} -outputdir bin -o #{haky}"
end

desc 'guard site'
task :guard do
sh "bundle exec guard"
end

task :clean_hakyll do
begin
sh "./#{haky} clean"
Expand Down
29 changes: 23 additions & 6 deletions templates/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<![endif]-->
<link rel="stylesheet" type="text/css" media="all" href="/css/site.css">
<link rel="stylesheet" type="text/css" href="/css/syntax.css">
<link rel="stylesheet" type="text/css" href="/css/font-awesome.css">
<link rel="alternate" type="application/rss+xml" title="coldflake blog" href="http://blog.coldflake.com/rss.xml">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link href='http://fonts.googleapis.com/css?family=Bitter:400,700,400italic|Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
Expand Down Expand Up @@ -39,12 +40,28 @@ <h1><a href="/" title="back to post overview"></a></h1>
<div class="container">
$body$
<footer>
<p><a href="/about.html" title="About"><span class="icon-user"></span> About</a> &middot;
<a href="http://twitter.com/marcontwit" title="My Twitter"><span class="icon-twitter"></span> Twitter</a> &middot;
<a href="https://github.com/marcmo" title="My Github profile"><span class="icon-github"></span> Github</a> &middot;
<a href="/rss.xml" title="Feed"><span class="icon-feed2"></span> RSS</a> &middot;
<a href="mailto:&#111;&#108;&#105;&#118;&#101;&#114;&#046;&#109;&#117;&#101;&#108;&#108;&#101;&#114;&#064;&#103;&#109;&#097;&#105;&#108;&#046;&#099;&#111;&#109;" title="Send me an email"><span class="icon-envelope-alt"></span> Email</a>
</p>
<div>
<a href="/about.html" title="About">
<i class="fa fa-user fa-lg" style="margin: 0 5px 0 0"></i>
</a>
&middot;
<a href="http://twitter.com/marcontwit" title="Follow me on Twitter">
<i class="fa fa-twitter fa-lg" style="margin: 0 5px 0 5px"></i>
</a>
&middot;
<a href="https://github.com/marcmo" title="My Github profile">
<i class="fa fa-github-square fa-lg" style="margin: 0 5px 0 5px"></i>
</a>
&middot;
<a href="/rss.xml" title="Feed">
<i class="fa fa-rss-square fa-lg" style="margin: 0 5px 0 5px"></i>
</a>
&middot;
<a
href="mailto:&#111;&#108;&#105;&#118;&#101;&#114;&#046;&#109;&#117;&#101;&#108;&#108;&#101;&#114;&#064;&#103;&#109;&#097;&#105;&#108;&#046;&#099;&#111;&#109;" title="drop me a line">
<i class="fa fa-envelope fa-lg" style="margin: 0 0 0 5px"></i>
</a>
</div>
</footer>
</div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
Expand Down

0 comments on commit 5fd5410

Please sign in to comment.