Skip to content

Commit 377b013

Browse files
haslingerhaslinger
committed
switch to bootstrap3
1 parent e249fcf commit 377b013

24 files changed

+1641
-614
lines changed

‎_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ description: > # this means to ignore newlines until "baseurl:"
1212
Aim for RubyStarters project is to make getting started with Ruby easy and awesome.
1313
baseurl: "" # the subpath of your site, e.g. /blog
1414
url: "http://rubystarters.github.io" # the base hostname & protocol for your site
15+
url: "//localhost:4000"
1516
twitter_username: none yet
1617
github_username: RubyStarters
1718

‎_includes/footer.html

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<footer class="site-footer">
1+
<footer id="footer" class="row site-footer">
22

33
<div class="wrapper">
44

@@ -15,24 +15,19 @@ <h2 class="footer-heading">{{ site.title }}</h2>
1515
<div class="footer-col footer-col-2">
1616
<ul class="social-media-list">
1717
{% if site.github_username %}
18-
<li>
19-
{% include icon-github.html username=site.github_username %}
20-
</li>
18+
<li> <a href="https:/github.com/{{ site.github_username }}"<i class="fa fa-github"></i> </li>
2119
{% endif %}
2220

2321
{% if site.twitter_username %}
24-
<li>
25-
{% include icon-twitter.html username=site.twitter_username %}
26-
</li>
22+
<li> <a href="https:/github.com/{{ site.twitter_username }}"<i class="fa fa-twitter"></i> </li>
2723
{% endif %}
2824
</ul>
2925
</div>
3026

3127
<div class="footer-col footer-col-3">
3228
<p>{{ site.description }}</p>
29+
<small class="pull-right">Powered by <a href="http://jekyllrb.com/">Jekyll</a>.</small>
3330
</div>
3431
</div>
35-
3632
</div>
37-
3833
</footer>

‎_includes/head.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@
55

66
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
77
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
8+
{% if site.author %}<meta name="author" content="{{ site.author }}">{% endif %}
9+
10+
11+
<link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | prepend: site.baseurl }}">
12+
<link rel="stylesheet" href="{{ "/css/custom_styles.css" | prepend: site.baseurl }}">
13+
<link rel="stylesheet" href="{{ "/css/font-awesome.min.css" | prepend: site.baseurl }}">
14+
15+
<script type='text/javascript' src="{{ "/js/jquery.min.js" | prepend: site.baseurl }}"></script>
16+
<script type='text/javascript' src="{{ "/js/bootstrap.min.js" | prepend: site.baseurl }}"></script>
17+
<script type='text/javascript' src="{{ "/js/custom.js" | prepend: site.baseurl }}"></script>
818

9-
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
1019
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
1120
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
1221
</head>

‎_includes/header.html

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
1-
<header class="site-header">
2-
3-
<div class="wrapper">
4-
5-
<a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</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-
1+
<nav class="navbar navbar-default">
2+
<div class="container-fluid">
3+
<div class="navbar-header">
4+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
5+
<span class="sr-only">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.url }}">{{ site.title }}</a>
11+
</div>
12+
<div id="navbar" class="collapse navbar-collapse">
1613
<div class="trigger">
1714
{% for my_page in site.pages %}
1815
{% if my_page.title %}
1916
<a class="page-link" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
2017
{% endif %}
2118
{% endfor %}
2219
</div>
23-
</nav>
24-
20+
<form class="navbar-form navbar-right" action="https://google.com/search" method="get" role="search">
21+
<div class="form-group">
22+
<input type="text" class="form-control" placeholder="Suchbegriff">
23+
<input type="hidden" name="q" value="site:{{ site.url | host_from_url }}" />
24+
</div>
25+
<button type="submit" class="btn btn-default">Absenden</button>
26+
</form>
27+
</div><!--/.nav-collapse -->
2528
</div>
26-
27-
</header>
29+
</nav>

‎_includes/sidebar.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<div class="page-header">
2+
<h3>
3+
{{ site.title }}
4+
{% if site.subtitle %}<br/><small>{{ site.subtitle }}</small>{% endif %}
5+
</h3>
6+
</div>
7+
<hr>
8+
<p>
9+
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
10+
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
11+
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
12+
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
13+
</p>

‎_layouts/default.html

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
11
<!DOCTYPE html>
2-
<html>
3-
4-
{% include head.html %}
5-
6-
<body>
2+
{% include head.html %}
3+
<html lang="{{ site.language }}">
74

5+
<body>
6+
<div class="container-fluid">
87
{% include header.html %}
98

10-
<div class="page-content">
11-
<div class="wrapper">
12-
{{ content }}
9+
<div class="container">
10+
<div class="row ">
11+
<div class="col-sm-8">
12+
<div class="content">
13+
{{ content }}
14+
</div>
15+
</div>
16+
<div id="sidebar" class="col-sm-4">
17+
<div class="well">
18+
{% include sidebar.html %}
19+
</div>
20+
</div>
1321
</div>
14-
</div>
15-
16-
{% include footer.html %}
17-
18-
</body>
22+
{% include footer.html %}
23+
</div><!-- /.container -->
24+
</div><!-- /.container -->
1925

26+
<script>
27+
!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
28+
</script>
2029
</html>

‎_sass/_base.scss

Lines changed: 0 additions & 206 deletions
This file was deleted.

0 commit comments

Comments
 (0)