library-mirrors/bulma
1
0
Fork 0
mirror of https://github.com/jgthms/bulma.git synced 2024-11-14 11:14:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #512

Browse Source
This commit is contained in:
Jeremy Thomas 2017-04-02 16:41:05 +01:00
parent ca20384d9e
commit 410fd187be
4 changed files with 27 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@
* Fix #484 icon alignment * Fix #484 icon alignment
* Fix #506 bold nav menu * Fix #506 bold nav menu
* Fix #581 nav container * Fix #581 nav container
* Fix #512 nav grouped buttons
## 0.4.0 ## 0.4.0

67
docs/_includes/header.html
View File

@ -39,46 +39,31 @@
Blog Blog
</a> </a>
{% if page.route != 'nothing' %} <div class="nav-item">
<span class="nav-item"> <div class="field is-grouped">
<a id="twitter" <p class="control">
class="button" <a id="twitter"
data-social-network="Twitter" class="button"
data-social-action="tweet" data-social-network="Twitter"
data-social-target="{{ site.url }}" data-social-action="tweet"
target="_blank" data-social-target="{{ site.url }}"
href="https://twitter.com/intent/tweet?text={{ site.title | urlencode }}&url={{ site.url }}&via=jgthms"> target="_blank"
<span class="icon"> href="https://twitter.com/intent/tweet?text={{ site.title | urlencode }}&url={{ site.url }}&via=jgthms">
<i class="fa fa-twitter"></i> <span class="icon">
</span> <i class="fa fa-twitter"></i>
<span>Tweet</span> </span>
</a> <span>Tweet</span>
<a class="button is-primary" href="{{ site.download }}"> </a>
<span class="icon"> </p>
<i class="fa fa-download"></i> <p class="control">
</span> <a class="button is-primary" href="{{ site.download }}">
<span>Download</span> <span class="icon">
</a> <i class="fa fa-download"></i>
</span> </span>
{% else %} <span>Download</span>
<span class="nav-item"> </a>
<a class="button is-primary is-inverted is-outlined" </p>
data-social-network="Twitter" </div>
data-social-action="tweet" </div>
data-social-target="http://bulma.io/"
href="https://twitter.com/intent/tweet?text={{ 'Bulma: a modern CSS framework based on Flebox' | urlencode }}&url=http://bulma.io/&via=jgthms">
<span class="icon">
<i class="fa fa-twitter"></i>
</span>
<span>Tweet</span>
</a>
<a class="button is-primary is-inverted" href="{{ site.download }}">
<span class="icon">
<i class="fa fa-download"></i>
</span>
<span>Download</span>
</a>
</span>
{% endif %}
</div> </div>
</nav> </nav>

4
docs/css/bulma-docs.css
View File

@ -4174,10 +4174,6 @@ input[type="submit"].button {
max-height: 1.75rem; max-height: 1.75rem;
} }
.nav-item .button + .button {
margin-left: 0.75rem;
}
.nav-item .tag:first-child:not(:last-child) { .nav-item .tag:first-child:not(:last-child) {
margin-right: 0.5rem; margin-right: 0.5rem;
} }

2
sass/components/nav.sass
View File

@ -22,8 +22,6 @@ $nav-height: 3.25rem !default
flex-shrink: 0 flex-shrink: 0
img img
max-height: 1.75rem max-height: 1.75rem
.button + .button
margin-left: 0.75rem
.tag .tag
&:first-child:not(:last-child) &:first-child:not(:last-child)
margin-right: 0.5rem margin-right: 0.5rem