opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move content to partials

Browse source
This commit is contained in:
Oliver Davies 2015-05-28 17:58:07 +01:00
parent 30b702fa00
commit 66148bb245
3 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
source/_layouts/default.html.twig
View file

@ -23,28 +23,7 @@
{% block styles %}{% endblock %} {% block styles %}{% endblock %}
</head> </head>
<body{% if page.body_class %} class="{{ page.body_class }}"{% endif %}> <body{% if page.body_class %} class="{{ page.body_class }}"{% endif %}>
<nav class="navbar navbar-inverse navbar-fixed-top"> {% include 'navbar' %}
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav" role="navigation">
<li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
{% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %}
<li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li>
{% endfor %}
</ul>
</div>{# .nav-collapse #}
</div>
</nav>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -54,20 +33,7 @@
{% endblock %} {% endblock %}
</div> </div>
<div class="col-md-2"> {% include 'sidebar' %}
<section class="block block--da_member">
<h2>Drupal Association</h2>
<a href="https://assoc.drupal.org/membership" title="Become a Drupal Association member">
<img src="/assets/images/da-individual-member.png" alt="Drupal Association Individual Member">
</a>
</section>
<section class="block block--drupalcon_la">
<h2>DrupalCon LA</h2>
<img src="/assets/images/drupalcon-la-attending.png" alt="">
<img src="/assets/images/drupalcon-la-sprinter.png" alt="">
</section>
</div>
</div>{# .row #} </div>{# .row #}
</div>{# .container #} </div>{# .container #}

22
source/_partials/navbar.html.twig Normal file
View file

@ -0,0 +1,22 @@
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<ul class="nav navbar-nav" role="navigation">
<li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
{% for item in [ 'work', 'services', 'talks', 'blog', 'contact' ] %}
<li{% if page.nav == item %} class="active"{% endif %}><a href="{{ site.url }}/{{ item }}">{{ item|title }}</a></li>
{% endfor %}
</ul>
</div>{# .nav-collapse #}
</div>
</nav>

14
source/_partials/sidebar.html.twig Normal file
View file

@ -0,0 +1,14 @@
<div class="col-md-2">
<section class="block block--da_member">
<h2>Drupal Association</h2>
<a href="https://assoc.drupal.org/membership" title="Become a Drupal Association member">
<img src="/assets/images/da-individual-member.png" alt="Drupal Association Individual Member">
</a>
</section>
<section class="block block--drupalcon_la">
<h2>DrupalCon LA</h2>
<img src="/assets/images/drupalcon-la-attending.png" alt="">
<img src="/assets/images/drupalcon-la-sprinter.png" alt="">
</section>
</div>