Skip to content
This repository has been archived by the owner on Mar 20, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/2.5.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonifisler
tonifisler committed Aug 31, 2015
2 parents fe4e556 + 42fb8e6 commit 8989a9a
Show file tree
Hide file tree
Showing 37 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion assets/pages/layout.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/layout/footer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ On smartphones, some of the functions from the header, e.g. service navigation o
<select name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/README.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/base_layout_-_forms_elements.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/base_layout_-_general.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/base_layout_-_tables.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/base_layout_-_typography.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/content_modules_-_content_containers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/content_modules_-_functions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/content_modules_-_multimedia.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/content_modules_-_ordering_and_check-out.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/content_modules_-_search.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/content_modules_-_standard_elements.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/content_modules_-_teaser.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/content_modules_-_widgets.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/design_principles_-_barrier-free_accessibility.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/design_principles_-_basic_grid_and_page_types.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/design_principles_-_cd_elements.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/design_principles_-_glossary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/design_principles_-_guidelines.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/design_principles_-_header_and_footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/design_principles_-_output_across_a_range_of_end_devices.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/design_principles_-_sample_pages.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/navigation_modules_-_content_navigation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions styleguide/navigation_modules_-_footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down Expand Up @@ -8511,7 +8511,7 @@ <h3>DEZA – Weltweit vor Ort</h3>
<select name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down Expand Up @@ -8660,7 +8660,7 @@ <h3>DEZA – Weltweit vor Ort</h3>
<span class="nt">&lt;select</span> <span class="na">name=</span><span class="s">"country"</span><span class="nt">&gt;</span>
<span class="nt">&lt;option</span> <span class="na">value=</span><span class="s">"Switzerland"</span><span class="nt">&gt;</span>Switzerland<span class="nt">&lt;/option&gt;</span>
<span class="nt">&lt;option</span> <span class="na">value=</span><span class="s">"France"</span><span class="nt">&gt;</span>France<span class="nt">&lt;/option&gt;</span>
<span class="nt">&lt;option</span> <span class="na">value=</span><span class="s">"Deutchland"</span><span class="nt">&gt;</span>Deutchland<span class="nt">&lt;/option&gt;</span>
<span class="nt">&lt;option</span> <span class="na">value=</span><span class="s">"Germany"</span><span class="nt">&gt;</span>Germany<span class="nt">&lt;/option&gt;</span>
<span class="nt">&lt;option</span> <span class="na">value=</span><span class="s">"..."</span><span class="nt">&gt;</span>...<span class="nt">&lt;/option&gt;</span>
<span class="nt">&lt;/select&gt;</span>
<span class="nt">&lt;/p&gt;</span>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/navigation_modules_-_header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/navigation_modules_-_hierarchical_navigation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h2>Styleguide</h2>
<nav class="pull-right">
<ul class="download-link">
<li>
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.4
<a class="btn btn-secondary" href="https://github.com/swiss/styleguide/releases/latest">Styleguide version 2.5.5
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/pages/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ <h3 class="border-bottom">DEZA – Weltweit vor Ort</h3>
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/pages/forms.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ <h3 class="border-bottom">DEZA – Weltweit vor Ort</h3>
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/pages/home-without-nav.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ <h3 class="border-bottom">DEZA – Weltweit vor Ort</h3>
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/pages/homepage-global-nav.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ <h3 class="border-bottom">DEZA – Weltweit vor Ort</h3>
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/pages/preview-without-nav.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ <h3 class="border-bottom">DEZA – Weltweit vor Ort</h3>
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/pages/preview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ <h3 class="border-bottom">DEZA – Weltweit vor Ort</h3>
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/pages/publications.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ <h3 class="border-bottom">DEZA – Weltweit vor Ort</h3>
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/pages/results.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ <h3 class="border-bottom">DEZA – Weltweit vor Ort</h3>
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion styleguide/pages/subpage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ <h3 class="border-bottom">DEZA – Weltweit vor Ort</h3>
<select id="country" name="country">
<option value="Switzerland">Switzerland</option>
<option value="France">France</option>
<option value="Deutchland">Deutchland</option>
<option value="Germany">Germany</option>
<option value="...">...</option>
</select>
</p>
Expand Down

0 comments on commit 8989a9a

Please sign in to comment.