FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-12-28 22:41:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

updating sticky footer, finishing off doc update sans responsive layout

Browse Source
This commit is contained in:
davegandy 2013-10-05 20:57:23 -04:00
parent 4ad04663f8
commit daa478d346
5 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/_includes/examples/new.html
View File

@ -14,22 +14,24 @@
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<h4><a href="#stacked">Stacked Icons</a></h4> <h4><a href="#stacked">Stacked Icons</a></h4>
<div class="well well-transparent stacked"> <div class="well well-transparent">
<span class="fa-stack"> <div class="margin-top margin-bottom">
<i class="fa fa-unchecked fa-stack-base"></i> <span class="fa-stack">
<i class="fa fa-twitter"></i> <i class="fa fa-unchecked fa-stack-base"></i>
</span> <i class="fa fa-twitter"></i>
fa-twitter on fa-check-empty<br> </span>
<span class="fa-stack"> fa-twitter on fa-check-empty<br>
<i class="fa fa-circle fa-stack-base"></i> <span class="fa-stack">
<i class="fa fa-flag fa-light"></i> <i class="fa fa-circle fa-stack-base"></i>
</span> <i class="fa fa-flag fa-light"></i>
fa-flag on fa-circle<br> </span>
<span class="fa-stack"> fa-flag on fa-circle<br>
<i class="fa fa-sign-blank fa-stack-base"></i> <span class="fa-stack">
<i class="fa fa-terminal fa-light"></i> <i class="fa fa-sign-blank fa-stack-base"></i>
</span> <i class="fa fa-terminal fa-light"></i>
fa-terminal on fa-sign-blank </span>
fa-terminal on fa-sign-blank
</div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">

3
src/_layouts/base.html
View File

@ -45,12 +45,11 @@
})(); })();
</script> </script>
</head> </head>
<body data-spy="scroll" data-target=".navbar"> <body>
<div id="wrap"> <!-- necessary for sticky footer. wrap all content except footer --> <div id="wrap"> <!-- necessary for sticky footer. wrap all content except footer -->
{% include navbar.html %} {% include navbar.html %}
{{ content }} {{ content }}
<div class="push"><!-- necessary for sticky footer --></div>
</div> </div>
{% include footer.html %} {% include footer.html %}

14
src/assets/less/site/footer.less
View File

@ -11,9 +11,12 @@
} }
.container {
padding-top: 40px;
}
color: mix(@red, #fff, 35%); color: mix(@red, #fff, 35%);
text-shadow: 0 -1px 0 rgba(0,0,0,.25); text-shadow: 0 -1px 0 rgba(0,0,0,.25);
margin-top: 60px;
.project { margin-top: 10px; } .project { margin-top: 10px; }
} }
@ -21,10 +24,8 @@
// Sticky Footer Styles // Sticky Footer Styles
// -------------------- // --------------------
@footer-height: 160px; @footer-height: 165px;
@footer-padding-top: 40px; @footer-margin: 60px;
@footer-padding-bottom: 40px;
@wrap-padding-bottom: 60px; // also known as the margin above the footer
html, body { height: 100%; } html, body { height: 100%; }
@ -33,10 +34,9 @@ html, body { height: 100%; }
height: auto !important; height: auto !important;
height: 100%; height: 100%;
margin: 0 auto -(@footer-height); margin: 0 auto -(@footer-height);
padding: 0 0 (@footer-height + @wrap-padding-bottom); padding: 0 0 (@footer-height + @footer-margin);
} }
#footer { #footer {
height: @footer-height; height: @footer-height;
padding: @footer-padding-top 0 @footer-padding-bottom;
} }

8
src/assets/less/site/navbar.less
View File

@ -10,10 +10,10 @@
//.navbar .nav > li > a { padding: 12px 10px 9px; } //.navbar .nav > li > a { padding: 12px 10px 9px; }
.navbar-nav > li > a { //.navbar-nav > li > a {
padding-top: 16px; // padding-top: 16px;
padding-bottom: 14px; // padding-bottom: 14px;
} //}
// makes dropdowns closer for split dropdown // makes dropdowns closer for split dropdown
.navbar-nav > li { .navbar-nav > li {

4
src/assets/less/site/variables.less
View File

@ -30,6 +30,10 @@
@state-info-bg: @blue-lighter; @state-info-bg: @blue-lighter;
@state-info-border: darken(spin(@state-info-bg, -10), 7%); @state-info-border: darken(spin(@state-info-bg, -10), 7%);
// Navbar
@navbar-height: 40px;
@navbar-inverse-brand-color: #fff;
// SITE VARIABLES // SITE VARIABLES