flow/datamad2017
1
0
Fork 0
mirror of https://github.com/medialab-prado/datamad2017.git synced 2024-12-27 13:11:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61 from gdgistanbul/fix/margin-right-buttons

Browse source 
Right nav buttons margin fix.
This commit is contained in:
Oleh Zasadnyy 2015-02-27 23:08:35 +02:00
commit bc1d6c7da0
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
_includes/navigation.html
View file

@ -23,7 +23,7 @@
{% endfor %} {% endfor %}
</ul> </ul>
{% for rightNavigationButton in site.rightNavigationButtons %} {% 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 }} {{ rightNavigationButton.text }}
</a> </a>
{% endfor %} {% endfor %}

5
_sass/partials/_navigation.scss
View file

@ -139,7 +139,7 @@ nav {
} }
} }
.right-nav-button { .right-nav-button {
margin: 11px 65px 0 0; margin: 11px 11px 0 0;
transition: $base-transition; transition: $base-transition;
opacity: 1; opacity: 1;
display: block; display: block;
@ -151,6 +151,9 @@ nav {
transform: translateY(-50px); transform: translateY(-50px);
} }
} }
.right-nav-button-rightest {
margin: 11px 65px 0 0;
}
.icon-menu { .icon-menu {
width: 20px; width: 20px;
height: 20px; height: 20px;

2
css/main.css
View file

File diff suppressed because one or more lines are too long