Skip to content

Commit 70e710d

Browse files
mrpromptmrprompt
committed
Merge pull request #23 from sergiors/master
[WIP] Reformulação para utilizar 100% do bootstrap
2 parents f3e7c18 + e737d4b commit 70e710d

17 files changed

+304
-220
lines changed

‎README.md

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ Site do Grupo de Usuários PHP de Santa Catarina
77
Se tem interesse em nos ajudar, dê uma olhada [neste conteúdo](https://github.com/PHPSC/phpsc.github.io/wiki/Contribuindo).
88

99

10+
## Todo
11+
[ ] Configurar para utilizar as variáveis do Bootstrap nos arquivos Sass
12+
1013
## Licença de uso
1114

1215
Copyright (c) 2015, Grupo de usuários de PHP de Santa Catarina (PHPSC)

‎_config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Site settings
2-
title: Grupo de Usuários de PHP de Santa Catarina
2+
title: PHPSC
3+
title_long: Grupo de Usuários de PHP de Santa Catarina
34
email: [email protected]
45
description: > # this means to ignore newlines until "baseurl:"
56
PHPSC - Grupo de Usuários de PHP de Santa catarina.

‎_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">
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

+30-25
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,35 @@
1-
<header class="site-header">
2-
1+
<nav class="navbar navbar-static-top navbar-purple">
32
<div class="container">
4-
5-
<a class="site-title" href="{{ site.baseurl }}/"><span>{{ site.title }}</span></a>
6-
7-
<nav class="site-nav">
8-
<a href="#" class="menu-icon">
9-
<svg viewBox="0 0 18 15">
10-
<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"/>
11-
<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"/>
12-
<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"/>
13-
</svg>
14-
</a>
15-
16-
<div class="trigger">
17-
<a class="page-link" href="{{ site.baseurl }}/">Início</a>
18-
{% for page in site.pages %}
19-
{% if page.title %}
20-
<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
21-
{% endif %}
22-
{% endfor %}
23-
<a class="page-link" href="http://www.meetup.com/pt/PHPSC-Floripa/" target="_blank">Reuniões</a>
24-
<a class="page-link" href="https://phpsc-slackin.herokuapp.com/" target="_blank">Slack</a>
3+
<div class="navbar-header">
4+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#collapse" aria-expanded="false">
5+
<span class="sr-only">Toggle navigation</span>
6+
<span class="icon-bar"></span>
7+
<span class="icon-bar"></span>
8+
<span class="icon-bar"></span>
9+
</button>
10+
<a class="navbar-brand" href="{{ site.baseurl }}/">{{ site.title }}</a>
2511
</div>
26-
</nav>
2712

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

29+
<header class="header">
30+
<div class="container">
31+
<a href="{{ site.baseurl }}/">
32+
<img src="{{ site.baseurl }}/img/logo_branca.png" class="logo" alt="{{ site.title }}">
33+
</a>
34+
</div><!-- /.container -->
3035
</header>

‎_layouts/default.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
{% include head.html %}
55

66
<body>
7-
<a class="fork-me-on-github" href="https://github.com/PHPSC/phpsc.github.io"><img src="https://sculpin.io/assets/[email protected]" alt="Fork me on GitHub"></a>
7+
<a class="fork-me-on-github" href="https://github.com/PHPSC/phpsc.github.io">
8+
<img src="https://sculpin.io/assets/[email protected]" alt="Fork me on GitHub">
9+
</a>
810

911
{% include header.html %}
1012

11-
<div class="page-content">
12-
<div class="container">
13-
{{ content }}
14-
</div>
13+
<div class="container">
14+
{{ content }}
1515
</div>
1616

1717
{% include footer.html %}

‎_layouts/page.html

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

107
<article class="post-content">
118
{{ content }}
129
</article>
13-
1410
</div>

‎_layouts/post.html

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

66
<div class="post">
7+
<header class="page-header">
8+
<h1 class="post-title">{{ page.title }}</h1>
9+
<p class="post-meta">
10+
{{ page.date | date: "%-d / %m / %Y" }}
11+
{% if page.author %} &bull; <a href="https://github.com/{{ author.github }}">{{ author.name }}</a>{% endif %}
12+
{% if page.meta %} &bull; {{ page.meta }}{% endif %}
13+
</p>
14+
</header>
715

8-
<div class="row">
9-
<header class="post-header">
10-
<h1 class="post-title">{{ page.title }}</h1>
11-
<p class="post-meta">{{ page.date | date: "%-d / %m / %Y" }}{% if page.author %} • <a href="https://github.com/{{ author.github }}">{{ author.name }}</a>{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
12-
</header>
13-
</div>
16+
<div id="share" class="pull-right"></div>
1417

15-
<div class="row">
16-
<div id="share" class="pull-right"></div>
17-
</div>
18+
<article class="post-content">
19+
{{ content }}
20+
</article>
1821

19-
<div class="row">
20-
<article class="post-content">
21-
{{ content }}
22-
</article>
23-
</div>
24-
25-
<div class="row">
26-
<div id="disqus_thread"></div>
27-
</div>
28-
</div>
22+
<div id="disqus_thread"></div>
23+
</div>

‎_posts/2010-06-19-phpsc-conf-2010.md

+1-9
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ Agradecemos à equipe da <a title="Girafa Comunicação Interativa" href="http:/
3535
* Banner 619 x 111 px (*clique para tamanho original*)
3636
[<img class="alignnone size-full wp-image-8" title="PHPSC Conf 2010" src="/uploads/2010/06/phpsc-619x111_exp.png" alt="PHPSC Conf 2010" width="433" height="78" />][3]
3737

38-
<div style='position: absolute;left: -3937px;'>
39-
<a href='http://www.mega-turnik.com.ua/mega-doska-dlya-pressa/'>http://mega-turnik.com.ua/</a>
40-
</div>
41-
42-
<div style='position: absolute;left: -3882px;'>
43-
<a href='http://maindress.com.ua/products/category/741740'>http://maindress.com.ua</a>
44-
</div>
45-
4638
[1]: http://www.phpsc.com.br/2010/06/phpsc-conf-2010/ "PHPSC Conf 2010, dias 27 e 28 de Agosto de 2010 em Joinville/SC"
4739
[2]: /uploads/2010/06/phpsc-270x175_exp1.png
48-
[3]: /uploads/2010/06/phpsc-619x111_exp.png
40+
[3]: /uploads/2010/06/phpsc-619x111_exp.png

‎_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

0 commit comments

Comments
 (0)