Improve snippet

This commit is contained in:
Jeremy Thomas 2017-10-09 15:38:12 +01:00
parent 02f7b216f1
commit 1f5f9dc54b
5 changed files with 53 additions and 73 deletions

View File

@ -107,24 +107,12 @@ document.addEventListener('DOMContentLoaded', () => {
const expandEl = '<button class="button is-small bd-expand">Expand</button>'; const expandEl = '<button class="button is-small bd-expand">Expand</button>';
$el.insertAdjacentHTML('beforeend', copyEl); $el.insertAdjacentHTML('beforeend', copyEl);
<<<<<<< HEAD
const $parent = $el.parentNode; const $parent = $el.parentNode;
if ($parent && $parent.classList.contains('bd-is-more')) { if ($parent && $parent.classList.contains('bd-is-more')) {
const showEl = '<button class="bd-show"><div><span class="icon"><i class="fa fa-code"></i></span> <strong>Show code</strong></div></button>'; const 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); $el.insertAdjacentHTML('beforeend', showEl);
} else if ($el.firstElementChild.scrollHeight > 480 && $el.firstElementChild.clientHeight <= 480) { } else if ($el.firstElementChild.scrollHeight > 480 && $el.firstElementChild.clientHeight <= 480) {
$el.insertAdjacentHTML('beforeend', expandEl); $el.insertAdjacentHTML('beforeend', expandEl);
=======
if ($el.firstElementChild.scrollHeight > 480 && $el.firstElementChild.clientHeight <= 480) {
$el.insertAdjacentHTML('beforeend', expandEl);
}
const $parent = $el.parentNode;
if ($parent && $parent.className == 'bd-highlight-clipped') {
const showEl = '<button class="bd-show"><div><span class="icon"><i class="fa fa-code"></i></span> <strong>Show code</strong></div></button>';
$el.classList.add('bd-is-clipped');
$el.insertAdjacentHTML('beforeend', showEl);
>>>>>>> Add show code
} }
itemsProcessed++; itemsProcessed++;
@ -159,7 +147,7 @@ document.addEventListener('DOMContentLoaded', () => {
$highlightShows.forEach($el => { $highlightShows.forEach($el => {
$el.addEventListener('click', () => { $el.addEventListener('click', () => {
$el.parentNode.classList.remove('bd-is-clipped'); $el.parentNode.parentNode.classList.remove('bd-is-more-clipped');
}); });
}); });
} }

View File

@ -42,10 +42,6 @@
margin-top: -1.5rem margin-top: -1.5rem
&:not(:last-child) &:not(:last-child)
margin-bottom: 1.5rem margin-bottom: 1.5rem
& + .bd-highlight-clipped
margin-top: -1.5rem
&:not(:last-child)
margin-bottom: 1.5rem
// Snippet // Snippet
.bd-snippet .bd-snippet
@ -214,33 +210,6 @@ $structure-invert: $danger-invert
pre pre
white-space: pre-wrap white-space: pre-wrap
.bd-highlight-clipped
.bd-show
+overlay
align-items: center
background-color: rgba(#000, 0.9)
background-image: linear-gradient(rgba(#000, 0), rgba(#000, 0) 90%, rgba(#000, 1))
border: none
color: $white
cursor: pointer
display: none
font-size: $size-6
justify-content: center
opacity: 0.7
width: 100%
strong
color: currentColor
font-weight: $weight-semibold
&:hover
opacity: 0.8
.highlight.bd-is-clipped
height: 4em
overflow: hidden
pre
overflow: hidden
.bd-show
display: flex
+tablet +tablet
.section:not(.is-fullwidth) > .bd-example:not(.is-fullwidth) .section:not(.is-fullwidth) > .bd-example:not(.is-fullwidth)
margin-left: 1.5rem margin-left: 1.5rem

View File

@ -10565,14 +10565,6 @@ html.route-index #carbon {
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
} }
.bd-example + .bd-highlight-clipped {
margin-top: -1.5rem;
}
.bd-example + .bd-highlight-clipped:not(:last-child) {
margin-bottom: 1.5rem;
}
.bd-snippet { .bd-snippet {
border: 1px solid #ffdd57; border: 1px solid #ffdd57;
margin-top: 2rem; margin-top: 2rem;
@ -10607,8 +10599,11 @@ html.route-index #carbon {
} }
.bd-snippet-code.bd-is-more.bd-is-more-clipped .highlight .bd-show { .bd-snippet-code.bd-is-more.bd-is-more-clipped .highlight .bd-show {
<<<<<<< HEAD
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
=======
>>>>>>> Improve snippet
display: flex; display: flex;
} }
@ -10661,7 +10656,12 @@ html.route-index #carbon {
>>>>>>> Use link instead of primary >>>>>>> Use link instead of primary
======= =======
align-items: stretch; align-items: stretch;
<<<<<<< HEAD
>>>>>>> Add love data >>>>>>> Add love data
=======
border-radius: 5px;
border-top-left-radius: 0;
>>>>>>> Improve snippet
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
@ -10685,6 +10685,7 @@ html.route-index #carbon {
display: -ms-flexbox; display: -ms-flexbox;
======= =======
align-items: stretch; align-items: stretch;
<<<<<<< HEAD
>>>>>>> Use link instead of primary >>>>>>> Use link instead of primary
======= =======
-webkit-box-align: stretch; -webkit-box-align: stretch;
@ -10706,6 +10707,9 @@ html.route-index #carbon {
======= =======
align-items: stretch; align-items: stretch;
>>>>>>> Add love data >>>>>>> Add love data
=======
border-radius: 0 5px 5px 0;
>>>>>>> Improve snippet
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
@ -10837,6 +10841,7 @@ html.route-index #carbon {
} }
.highlight .bd-show { .highlight .bd-show {
<<<<<<< HEAD
bottom: 0; bottom: 0;
left: 0; left: 0;
position: absolute; position: absolute;
@ -10874,44 +10879,38 @@ html.route-index #carbon {
} }
.bd-highlight-clipped .bd-show { .bd-highlight-clipped .bd-show {
=======
>>>>>>> Improve snippet
bottom: 0; bottom: 0;
left: 0; left: 0;
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
align-items: center; align-items: center;
background-color: rgba(0, 0, 0, 0.9); background-color: rgba(245, 245, 245, 0.7);
background-image: linear-gradient(transparent, transparent 90%, black);
border: none; border: none;
color: white; color: rgba(0, 0, 0, 0.5);
cursor: pointer; cursor: pointer;
display: none; display: none;
font-size: 1rem; font-size: 0.75rem;
justify-content: center; justify-content: center;
opacity: 0.7;
width: 100%; width: 100%;
} }
.bd-highlight-clipped .bd-show strong { .highlight .bd-show strong {
color: currentColor; color: currentColor;
font-weight: 600; font-weight: 600;
} }
.bd-highlight-clipped .bd-show:hover { .highlight .bd-show:hover {
opacity: 0.8; background-color: rgba(255, 221, 87, 0.8);
color: rgba(0, 0, 0, 0.7);
} }
.bd-highlight-clipped .highlight.bd-is-clipped { @media screen and (min-width: 769px), print {
height: 4em; .highlight pre {
overflow: hidden; white-space: pre-wrap;
} }
.bd-highlight-clipped .highlight.bd-is-clipped pre {
overflow: hidden;
}
.bd-highlight-clipped .highlight.bd-is-clipped .bd-show {
display: flex;
} }
@media screen and (min-width: 769px), print { @media screen and (min-width: 769px), print {

File diff suppressed because one or more lines are too long

View File

@ -109,6 +109,7 @@ document.addEventListener('DOMContentLoaded', function () {
var expandEl = '<button class="button is-small bd-expand">Expand</button>'; var expandEl = '<button class="button is-small bd-expand">Expand</button>';
$el.insertAdjacentHTML('beforeend', copyEl); $el.insertAdjacentHTML('beforeend', copyEl);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
var $parent = $el.parentNode; var $parent = $el.parentNode;
if ($parent && $parent.classList.contains('bd-is-more')) { if ($parent && $parent.classList.contains('bd-is-more')) {
@ -121,12 +122,18 @@ document.addEventListener('DOMContentLoaded', function () {
$el.insertAdjacentHTML('beforeend', expandEl); $el.insertAdjacentHTML('beforeend', expandEl);
} }
=======
>>>>>>> Improve snippet
var $parent = $el.parentNode; var $parent = $el.parentNode;
if ($parent && $parent.className == 'bd-highlight-clipped') { 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>'; var showEl = '<button class="bd-show"><div><span class="icon"><i class="fa fa-code"></i></span> <strong>Show code</strong></div></button>';
$el.classList.add('bd-is-clipped');
$el.insertAdjacentHTML('beforeend', showEl); $el.insertAdjacentHTML('beforeend', showEl);
<<<<<<< HEAD
>>>>>>> Add show code >>>>>>> Add show code
=======
} else if ($el.firstElementChild.scrollHeight > 480 && $el.firstElementChild.clientHeight <= 480) {
$el.insertAdjacentHTML('beforeend', expandEl);
>>>>>>> Improve snippet
} }
itemsProcessed++; itemsProcessed++;
@ -157,6 +164,7 @@ document.addEventListener('DOMContentLoaded', function () {
}); });
}); });
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
var $highlightShows = getAll('.highlight .bd-show'); var $highlightShows = getAll('.highlight .bd-show');
@ -170,6 +178,13 @@ document.addEventListener('DOMContentLoaded', function () {
$el.addEventListener('click', function () { $el.addEventListener('click', function () {
$el.parentNode.classList.remove('bd-is-clipped'); $el.parentNode.classList.remove('bd-is-clipped');
>>>>>>> Add show code >>>>>>> Add show code
=======
var $highlightShows = getAll('.highlight .bd-show');
$highlightShows.forEach(function ($el) {
$el.addEventListener('click', function () {
$el.parentNode.parentNode.classList.remove('bd-is-more-clipped');
>>>>>>> Improve snippet
}); });
}); });
} }