library-mirrors/bulma
1
0
Fork 0
mirror of https://github.com/jgthms/bulma.git synced 2025-01-09 15:44:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix rebase

Browse Source
This commit is contained in:
Jeremy Thomas 2017-10-10 10:22:28 +01:00
parent 2c11a76707
commit 465ad931e6
6 changed files with 2124 additions and 679 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/_javascript/main.js
View File

@ -143,11 +143,11 @@ document.addEventListener('DOMContentLoaded', () => {
});
});
const $highlightShows = getAll('.bd-highlight-clipped .bd-show');
const $highlightShows = getAll('.highlight .bd-show');
$highlightShows.forEach($el => {
$el.addEventListener('click', () => {
$el.parentNode.classList.remove('bd-is-clipped');
$el.parentNode.parentNode.classList.remove('bd-is-more-clipped');
});
});
}

22
docs/_sass/example.sass
View File

@ -210,28 +210,6 @@ $structure-invert: $danger-invert
pre
white-space: pre-wrap
.bd-highlight-clipped
.bd-show
+overlay
align-items: center
background-color: rgba($background, 0.7)
border: none
color: rgba(#000, 0.5)
cursor: pointer
display: none
font-size: $size-small
justify-content: center
width: 100%
strong
color: currentColor
font-weight: $weight-semibold
&:hover
background-color: rgba($yellow, 0.8)
color: rgba(#000, 0.7)
+tablet
pre
white-space: pre-wrap
+tablet
.section:not(.is-fullwidth) > .bd-example:not(.is-fullwidth)
margin-left: 1.5rem

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

File diff suppressed because it is too large Load Diff

9
docs/css/bulma-docs.css.map
View File

File diff suppressed because one or more lines are too long

5
docs/documentation/components/navbar.html
View File

@ -1018,6 +1018,7 @@ document.addEventListener('DOMContentLoaded', function () {
</p>
<ul>
<li><code>is-primary</code></li>
<li><code>is-link</code></li>
<li><code>is-info</code></li>
<li><code>is-success</code></li>
<li><code>is-warning</code></li>
@ -1035,6 +1036,10 @@ document.addEventListener('DOMContentLoaded', function () {
{% include examples/navbar-color.html color="primary" %}
</div>
<div class="bd-example is-paddingless">
{% include examples/navbar-color.html color="link" %}
</div>
<div class="bd-example is-paddingless">
{% include examples/navbar-color.html color="info" %}
</div>

23
docs/lib/main.js
View File

@ -115,6 +115,7 @@ document.addEventListener('DOMContentLoaded', function () {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Add show code
=======
@ -122,17 +123,22 @@ document.addEventListener('DOMContentLoaded', function () {
=======
>>>>>>> Improve snippet
=======
>>>>>>> Fix rebase
=======
=======
>>>>>>> Add show code
>>>>>>> Add show code
=======
>>>>>>> Improve snippet
=======
>>>>>>> Fix rebase
var $parent = $el.parentNode;
if ($parent && $parent.classList.contains('bd-is-more')) {
var showEl = '<button class="bd-show"><div><span class="icon"><i class="fa fa-code"></i></span> <strong>Show code</strong></div></button>';
$el.insertAdjacentHTML('beforeend', showEl);
} else if ($el.firstElementChild.scrollHeight > 480 && $el.firstElementChild.clientHeight <= 480) {
$el.insertAdjacentHTML('beforeend', expandEl);
<<<<<<< HEAD
=======
if ($el.firstElementChild.scrollHeight > 480 && $el.firstElementChild.clientHeight <= 480) {
$el.insertAdjacentHTML('beforeend', expandEl);
@ -179,6 +185,7 @@ document.addEventListener('DOMContentLoaded', function () {
>>>>>>> Improve snippet
>>>>>>> Improve snippet
=======
<<<<<<< HEAD
=======
=======
>>>>>>> Improve snippet
@ -201,6 +208,9 @@ document.addEventListener('DOMContentLoaded', function () {
>>>>>>> Improve snippet
>>>>>>> Improve snippet
>>>>>>> Improve snippet
=======
>>>>>>> Fix rebase
>>>>>>> Fix rebase
}
itemsProcessed++;
@ -237,12 +247,15 @@ document.addEventListener('DOMContentLoaded', function () {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Improve snippet
=======
>>>>>>> Add show code
=======
=======
>>>>>>> Fix rebase
=======
>>>>>>> Improve snippet
>>>>>>> Improve snippet
var $highlightShows = getAll('.highlight .bd-show');
@ -274,7 +287,12 @@ document.addEventListener('DOMContentLoaded', function () {
>>>>>>> Add show code
=======
>>>>>>> Improve snippet
<<<<<<< HEAD
>>>>>>> Improve snippet
=======
=======
>>>>>>> Fix rebase
>>>>>>> Fix rebase
var $highlightShows = getAll('.highlight .bd-show');
$highlightShows.forEach(function ($el) {
@ -284,6 +302,7 @@ document.addEventListener('DOMContentLoaded', function () {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> Improve snippet
=======
=======
@ -300,6 +319,8 @@ document.addEventListener('DOMContentLoaded', function () {
>>>>>>> Add show code
=======
>>>>>>> Improve snippet
=======
>>>>>>> Fix rebase
>>>>>>> Improve snippet
=======
=======
@ -313,6 +334,8 @@ document.addEventListener('DOMContentLoaded', function () {
=======
>>>>>>> Improve snippet
>>>>>>> Improve snippet
=======
>>>>>>> Fix rebase
});
});
}