Skip to content

Commit

Permalink
Merge pull request #61 from gdgistanbul/fix/margin-right-buttons
Browse files Browse the repository at this point in the history
Right nav buttons margin fix.
  • Loading branch information
ozasadnyy committed Feb 27, 2015
2 parents eb90824 + 908bf4d commit bc1d6c7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion _includes/navigation.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{% endfor %}
</ul>
{% for rightNavigationButton in site.rightNavigationButtons %}
<a href="{% if rightNavigationButton.permalink != null %} {{ rightNavigationButton.permalink | prepend: site.baseurl }} {% else %} {{ rightNavigationButton.link }} {% endif %}" class="right-nav-button right-nav-button-hidden btn btn-primary waves-effect waves-button waves-light waves-float pull-right hidden-xs hidden-sm" {% if rightNavigationButton.link != null %}target="_blank"{% endif %}>
<a href="{% if rightNavigationButton.permalink != null %} {{ rightNavigationButton.permalink | prepend: site.baseurl }} {% else %} {{ rightNavigationButton.link }} {% endif %}" class="{% if forloop.index == 1 %}right-nav-button-rightest {% endif %}right-nav-button right-nav-button-hidden btn btn-primary waves-effect waves-button waves-light waves-float pull-right hidden-xs hidden-sm" {% if rightNavigationButton.link != null %}target="_blank"{% endif %}>
{{ rightNavigationButton.text }}
</a>
{% endfor %}
Expand Down
5 changes: 4 additions & 1 deletion _sass/partials/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ nav {
}
}
.right-nav-button {
margin: 11px 65px 0 0;
margin: 11px 11px 0 0;
transition: $base-transition;
opacity: 1;
display: block;
Expand All @@ -151,6 +151,9 @@ nav {
transform: translateY(-50px);
}
}
.right-nav-button-rightest {
margin: 11px 65px 0 0;
}
.icon-menu {
width: 20px;
height: 20px;
Expand Down
2 changes: 1 addition & 1 deletion css/main.css

Large diffs are not rendered by default.

0 comments on commit bc1d6c7

Please sign in to comment.