Skip to content

Commit e6ea5d4

Browse files
committed
Finalizado rodapé
1 parent e966a51 commit e6ea5d4

11 files changed

+230
-181
lines changed

_includes/footer.html

+56-51
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,8 @@
11
<footer class="site-footer">
2-
<div class="container">
3-
<div class="row">
4-
<div class="col-sm-4">
5-
<ul class="social-media-list list-inline">
6-
{% if site.github_username %}
7-
<li>
8-
<a href="https://github.com/{{ site.github_username }}" title="Github">
9-
<i class="fa fa-github"></i> <span>{{ site.github_username }}</span>
10-
</a>
11-
</li>
12-
{% endif %}
13-
14-
{% if site.twitter_username %}
15-
<li>
16-
<a href="https://twitter.com/{{ site.twitter_username }}" title="Twitter">
17-
<i class="fa fa-twitter"></i> <span>{{ site.twitter_username }}</span>
18-
</a>
19-
</li>
20-
{% endif %}
21-
22-
{% if site.linkedin_id %}
23-
<li>
24-
<a href="https://www.linkedin.com/company/{{ site.linkedin_id }}" title="Linkedin">
25-
<i class="fa fa-linkedin"></i> <span>{{ site.linkedin_id }}</span>
26-
</a>
27-
</li>
28-
{% endif %}
29-
30-
{% if site.facebook_username %}
31-
<li>
32-
<a href="https://www.facebook.com/{{ site.facebook_username }}" title="Facebook">
33-
<i class="fa fa-facebook"></i> <span>{{ site.facebook_username }}</span>
34-
</a>
35-
</li>
36-
{% endif %}
37-
38-
<li>
39-
<a href="{{ "/feed.xml" | prepend: site.baseurl }}" title="RSS">
40-
<i class="fa fa-rss"></i> <span>subscribe via RSS</span>
41-
</a>
42-
</li>
43-
</ul>
44-
</div>
45-
46-
<div class="col-sm-8 text-right">
47-
{{ site.description }}
48-
</div>
49-
</div>
50-
51-
</div>
52-
532
<div class="container">
543
<div class="row">
554
<div id="facebook" class="col-md-6">
5+
<div class="social-box">
566
<div id="fb-root"></div>
577
<div class="fb-page" data-href="https://www.facebook.com/santa.catarina.elephants" data-width="360" data-height="607" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true" data-show-posts="true">
588
<div class="fb-xfbml-parse-ignore">
@@ -61,9 +11,64 @@
6111
</blockquote>
6212
</div>
6313
</div>
14+
</div><!-- /.social-box-->
6415
</div>
6516
<div id="twitter" class="col-md-6">
17+
<div class="social-box">
6618
<a class="twitter-timeline" href="https://twitter.com/PHP_SC" data-widget-id="671777378184638464">Tweets by @PHP_SC</a>
19+
</div><!-- /.social-box-->
20+
</div>
21+
</div>
22+
</div>
23+
24+
<div class="copy">
25+
<div class="container">
26+
<div class="row">
27+
<div class="col-sm-4">
28+
<ul class="social-media-list list-inline">
29+
{% if site.github_username %}
30+
<li>
31+
<a href="https://github.com/{{ site.github_username }}" title="Github">
32+
<i class="fa fa-github"></i> <span>{{ site.github_username }}</span>
33+
</a>
34+
</li>
35+
{% endif %}
36+
37+
{% if site.twitter_username %}
38+
<li>
39+
<a href="https://twitter.com/{{ site.twitter_username }}" title="Twitter">
40+
<i class="fa fa-twitter"></i> <span>{{ site.twitter_username }}</span>
41+
</a>
42+
</li>
43+
{% endif %}
44+
45+
{% if site.linkedin_id %}
46+
<li>
47+
<a href="https://www.linkedin.com/company/{{ site.linkedin_id }}" title="Linkedin">
48+
<i class="fa fa-linkedin"></i> <span>{{ site.linkedin_id }}</span>
49+
</a>
50+
</li>
51+
{% endif %}
52+
53+
{% if site.facebook_username %}
54+
<li>
55+
<a href="https://www.facebook.com/{{ site.facebook_username }}" title="Facebook">
56+
<i class="fa fa-facebook"></i> <span>{{ site.facebook_username }}</span>
57+
</a>
58+
</li>
59+
{% endif %}
60+
61+
<li>
62+
<a href="{{ "/feed.xml" | prepend: site.baseurl }}" title="RSS">
63+
<i class="fa fa-rss"></i> <span>subscribe via RSS</span>
64+
</a>
65+
</li>
66+
</ul>
67+
</div>
68+
69+
<div class="col-sm-8 text-md-right">
70+
{{ site.description }}
71+
</div>
6772
</div>
6873
</div>
6974
</div>

_includes/header.html

+26-52
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,29 @@
11
<header>
2-
<!--<div class="container">-->
3-
<!--<a class="site-title" href="{{ site.baseurl }}/"><span>{{ site.title }}</span></a>-->
4-
5-
<!--<nav class="site-nav">-->
6-
<!--<a href="#" class="menu-icon">-->
7-
<!--<svg viewBox="0 0 18 15">-->
8-
<!--<path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>-->
9-
<!--<path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>-->
10-
<!--<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>-->
11-
<!--</svg>-->
12-
<!--</a>-->
13-
14-
<!--<div class="trigger">-->
15-
<!--<a class="page-link" href="{{ site.baseurl }}/">Início</a>-->
16-
<!--{% for page in site.pages %}-->
17-
<!--{% if page.title %}-->
18-
<!--<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>-->
19-
<!--{% endif %}-->
20-
<!--{% endfor %}-->
21-
<!--<a class="page-link" href="http://www.meetup.com/pt/PHPSC-Floripa/" target="_blank">Reuniões</a>-->
22-
<!--<a class="page-link" href="https://phpsc-slackin.herokuapp.com/" target="_blank">Slack</a>-->
23-
<!--</div>-->
24-
<!--</nav>-->
25-
26-
<nav class="navbar navbar-default">
27-
<div class="container">
28-
<div class="navbar-header">
29-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
30-
<span class="sr-only">Toggle navigation</span>
31-
<span class="icon-bar"></span>
32-
<span class="icon-bar"></span>
33-
<span class="icon-bar"></span>
34-
</button>
35-
<a class="navbar-brand" href="{{ site.baseurl }}/">{{ site.title }}</a>
36-
</div>
37-
38-
<!-- Collect the nav links, forms, and other content for toggling -->
39-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
40-
<ul class="nav navbar-nav">
41-
{% for page in site.pages %}
42-
{% if page.title %}
43-
<li><a href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a></li>
44-
{% endif %}
45-
{% endfor %}
46-
</ul>
47-
<ul class="nav navbar-nav navbar-right">
48-
<li><a href="http://www.meetup.com/pt/PHPSC-Floripa/">Reuniões</a></li>
49-
<li><a href="https://phpsc-slackin.herokuapp.com/">Slack</a></li>
50-
</ul>
51-
</div><!-- /.navbar-collapse -->
52-
</div><!-- /.container-fluid -->
53-
</nav>
2+
<nav class="navbar navbar-static-top navbar-purple">
3+
<div class="container">
4+
<div class="navbar-header">
5+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#collapse" aria-expanded="false">
6+
<span class="sr-only">Toggle navigation</span>
7+
<span class="icon-bar"></span>
8+
<span class="icon-bar"></span>
9+
<span class="icon-bar"></span>
10+
</button>
11+
<a class="navbar-brand" href="{{ site.baseurl }}/">{{ site.title }}</a>
12+
</div>
5413

14+
<div class="collapse navbar-collapse" id="collapse">
15+
<ul class="nav navbar-nav">
16+
{% for page in site.pages %}
17+
{% if page.title %}
18+
<li><a href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a></li>
19+
{% endif %}
20+
{% endfor %}
21+
</ul>
22+
<ul class="nav navbar-nav navbar-right">
23+
<li><a href="http://www.meetup.com/pt/PHPSC-Floripa/">Reuniões</a></li>
24+
<li><a href="https://phpsc-slackin.herokuapp.com/">Slack</a></li>
25+
</ul>
26+
</div><!-- /.navbar-collapse -->
27+
</div><!-- /.container -->
28+
</nav>
5529
</header>

_layouts/page.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
layout: default
33
---
44
<div class="post">
5-
<header class="post-header">
6-
<h1 class="post-title">{{ page.title }}</h1>
7-
</header>
5+
<h1 class="page-header">{{ page.title }}</h1>
86

97
<article class="post-content">
108
{{ content }}

_layouts/post.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% assign author = site.data.members[page.author] %}
55

66
<div class="post">
7-
<header class="post-header">
7+
<header class="page-header">
88
<h1 class="post-title">{{ page.title }}</h1>
99
<p class="post-meta">
1010
{{ page.date | date: "%-d / %m / %Y" }}

_sass/_base.scss

+10-37
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,3 @@
1-
/**
2-
* Reset some basic elements
3-
*/
4-
body, h1, h2, h3, h4, h5, h6,
5-
p, blockquote, pre, hr,
6-
dl, dd, ol, ul, figure {
7-
margin: 0;
8-
padding: 0;
9-
}
10-
11-
12-
13-
/**
14-
* Basic styling
15-
*/
16-
body {
17-
font-family: $base-font-family;
18-
font-size: $base-font-size;
19-
line-height: $base-line-height;
20-
font-weight: 300;
21-
color: $text-color;
22-
background-color: $background-color;
23-
-webkit-text-size-adjust: 100%;
24-
}
25-
26-
27-
281
/**
292
* Set `margin-bottom` to maintain vertical rhythm
303
*/
@@ -63,16 +36,16 @@ figcaption {
6336
/**
6437
* Lists
6538
*/
66-
ul, ol {
67-
margin-left: $spacing-unit;
68-
}
69-
70-
li {
71-
> ul,
72-
> ol {
73-
margin-bottom: 0;
74-
}
75-
}
39+
//ul, ol {
40+
// margin-left: $spacing-unit;
41+
//}
42+
//
43+
//li {
44+
// > ul,
45+
// > ol {
46+
// margin-bottom: 0;
47+
// }
48+
//}
7649

7750

7851

_sass/_layout.scss

+35-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@import "vars";
2+
@import "utilities";
3+
14
/**
25
* Site header
36
*/
@@ -109,8 +112,19 @@
109112
* Site footer
110113
*/
111114
.site-footer {
112-
border-top: 1px solid $grey-color-light;
113-
padding: $spacing-unit 0;
115+
background: {
116+
image: url("../img/php_pattern.png");
117+
color: $purple;
118+
}
119+
120+
.social-box {
121+
margin: $spacing-unit 0;
122+
}
123+
124+
.copy {
125+
padding: $spacing-unit 0;
126+
background-color: #fff;
127+
}
114128
}
115129

116130
.footer-heading {
@@ -121,7 +135,8 @@
121135
.contact-list,
122136
.social-media-list {
123137
list-style: none;
124-
margin-left: 0;
138+
margin: 0;
139+
padding: 0;
125140
}
126141
.social-media-list li span {
127142
display: none;
@@ -190,7 +205,8 @@
190205
}
191206

192207
.post-list {
193-
margin-left: 0;
208+
margin: 0;
209+
padding: 0;
194210
list-style: none;
195211

196212
> li {
@@ -257,7 +273,7 @@
257273
}
258274

259275
.fork-me-on-github {
260-
display: none;
276+
display: none;
261277
}
262278

263279
@media only screen and (min-width: 992px) {
@@ -275,3 +291,17 @@
275291
height: 149px;
276292
}
277293
}
294+
295+
.navbar-purple {
296+
background-color: #fff;
297+
298+
.navbar-nav > li {
299+
> a {
300+
color: $purple;
301+
302+
&:hover {
303+
background-color: inherit;
304+
}
305+
}
306+
}
307+
}

_sass/_utilities.scss

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Text
2+
// Alignment
3+
4+
// Responsive alignment
5+
.text-xs-left { text-align: left; }
6+
.text-xs-right { text-align: right; }
7+
.text-xs-center { text-align: center; }
8+
9+
@media (min-width: $screen-sm-min) {
10+
.text-sm-left { text-align: left; }
11+
.text-sm-right { text-align: right; }
12+
.text-sm-center { text-align: center; }
13+
}
14+
15+
@media (min-width: $screen-md-min) {
16+
.text-md-left { text-align: left; }
17+
.text-md-right { text-align: right; }
18+
.text-md-center { text-align: center; }
19+
}
20+
21+
@media (min-width: $screen-lg-min) {
22+
.text-lg-left { text-align: left; }
23+
.text-lg-right { text-align: right; }
24+
.text-lg-center { text-align: center; }
25+
}

0 commit comments

Comments
 (0)