Skip to content

Commit 7734c15

Browse files
author
Jesús Muriel
committed
Preparing projects section
1 parent 2ea0784 commit 7734c15

File tree

5 files changed

+53
-48
lines changed

5 files changed

+53
-48
lines changed

‎_includes/navbar.html‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<nav class="navbar navbar-default">
2-
<div class="container-fluid">
2+
<div class="container">
33
<!-- Brand and toggle get grouped for better mobile display -->
44
<div class="navbar-header">
55
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
@@ -8,19 +8,28 @@
88
<span class="icon-bar"></span>
99
<span class="icon-bar"></span>
1010
</button>
11-
<a class="navbar-brand" href="#">Brand</a>
11+
<a class="navbar-brand" href="{{ site.baseurl }}">
12+
<div class="header-logo">
13+
<div class="swirl">
14+
<img src="{{ site.baseurl }}/resources/img/scala-center-swirl.png">
15+
</div>
16+
<div class="swirl-text">
17+
<h1><b>scala</b>center</h1>
18+
<div>
19+
For open source. For education.
20+
</div>
21+
</div>
22+
</div>
23+
</a>
1224
</div>
13-
<ul class="nav navbar-nav navbar-left">
14-
<li><a href="{{ site.baseurl }}"><img src="{{ site.baseurl }}/resources/img/scala-center-logo.png"></a></li>
15-
</ul>
1625

1726
<!-- Collect the nav links, forms, and other content for toggling -->
1827
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
1928
<ul class="nav navbar-nav navbar-right">
20-
<li><a href="{{ site.baseurl }}/projects.html">Projects</a></li>
21-
<li><a href="{{ site.baseurl }}/team.html">Team</a></li>
22-
<li><a href="{{ site.baseurl }}/faqs.html">FAQs</a></li>
23-
<li><a href="{{ site.baseurl }}/individual-membership.html">Donate</a></li>
29+
<li {% if page.path == 'projects.html' %}class="active" {% endif %}><a href="{{ site.baseurl }}/projects.html">Projects</a></li>
30+
<li {% if page.path == 'team.html' %}class="active" {% endif %}><a href="{{ site.baseurl }}/team.html">Team</a></li>
31+
<li {% if page.path == 'faqs.html' %}class="active" {% endif %}><a href="{{ site.baseurl }}/faqs.html">FAQs</a></li>
32+
<li {% if page.path == 'donate.html' %}class="active" {% endif %}><a href="{{ site.baseurl }}/individual-membership.html">Donate</a></li>
2433
</ul>
2534
</div><!-- /.navbar-collapse -->
2635
</div><!-- /.container-fluid -->

‎_layouts/default.html‎

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,10 @@
55

66
<body>
77

8-
<div class="blue-stripe">
9-
<nav class="navbar navbar-default navbar-static-top">
10-
<div class="container">
11-
<div class="row">
12-
<div class="col-md-12">
13-
<div class="frontpage-nav">
14-
<ul>
15-
<li><a href="{{ site.baseurl }}/faqs.html" style="padding-top: 36px;">FAQs</a></li>
16-
<li><a href="{{ site.baseurl }}/individual-membership.html" style="padding-top: 36px;">Donate</a></li>
17-
</ul>
18-
<div class="social">
19-
<a href="https://twitter.com/scala_lang" style="border: none;"><img src="{{ site.baseurl }}/resources/img/twitter-logo-white.png"></a>
20-
&nbsp;
21-
<a href="https://github.com/scala/scala" style="border: none;"><img src="{{ site.baseurl }}/resources/img/github-logo.png"></a>
22-
</div>
23-
</div>
24-
<div class="navbar-header">
25-
<div class="navbar-brand scalacenter-logo" style="float: left;"><a href="{{ site.baseurl }}/" style="border: none;"><img src="{{ site.baseurl }}/resources/img/scala-center-logo-top.png"></a></div>
26-
<div class="tagline hidden-xs" style="float: left;">For open source. For education.</div>
27-
</div>
28-
</div>
29-
</div>
30-
</div>
31-
</nav>
32-
</div>
33-
34-
<div class="page-container">
35-
<div class="container" style="margin-top: -48px; min-height: 540px;">
36-
<div class="row">
37-
<div class="col-md-8 main-content">
38-
{{ content }}
39-
</div>
40-
<div class="col-md-4 sidebar">
41-
{% include sidebar.html %}
42-
</div>
43-
</div>
44-
</div>
8+
{% include navbar.html %}
9+
10+
<div class="container">
11+
{{ content }}
4512
</div>
4613

4714
{% include footer.html %}

‎gulpfile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ gulp.task('browser-sync', ['sass', 'jekyll-build'], function() {
3939
* Compile files from _scss into both _site/css (for live injecting) and site (for future jekyll builds)
4040
*/
4141
gulp.task('sass', function () {
42-
return gulp.src('_scss/main.scss')
42+
return gulp.src('resources/css/sass/main.scss')
4343
.pipe(sass({
4444
includePaths: ['scss'],
4545
onError: browserSync.notify
@@ -55,7 +55,7 @@ gulp.task('sass', function () {
5555
* Watch html/md files, run jekyll & reload BrowserSync
5656
*/
5757
gulp.task('watch', function () {
58-
gulp.watch('_scss/*.scss', ['sass']);
58+
gulp.watch('resources/css/sass/**/*.scss', ['sass']);
5959
gulp.watch(['index.html', '_layouts/*.html', '_posts/*'], ['jekyll-rebuild']);
6060
});
6161

‎projects.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
layout: page
3+
---

‎resources/css/main.scss‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,32 @@ $top-bar-height: 106px;
9999
}
100100
}
101101

102+
.header-logo {
103+
.swirl {
104+
display: inline-block;
105+
img {
106+
height: 50px;
107+
margin: auto;
108+
display: block;
109+
margin-right: 12px;
110+
}
111+
}
112+
113+
.swirl-text {
114+
display: inline-block;
115+
font-size: 14px;
116+
line-height: 17px;
117+
h1 {
118+
font-size: 36px;
119+
line-height: 42px;
120+
margin-top: 3px;
121+
margin-bottom: 0px;
122+
font-weight: normal;
123+
display: inline-block;
124+
}
125+
}
126+
}
127+
102128
h2 {
103129
font-size: 36px;
104130
font-weight: normal;

0 commit comments

Comments
 (0)