Ark/bulma
1
0
Fork 0
mirror of https://github.com/jgthms/bulma synced 2026-03-15 02:04:29 -07:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files

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
});
});
}