Skip to content

Commit e776798

Browse files
committed
Dev (#64)
* Fix #56 * Fixed twitter sharing message: more mixins :) (#58) * Update file weight * Remove each-after() mixin; See #37 & #61 * Remove each-after() mixin; See #37 & #61
1 parent 1188e95 commit e776798

File tree

4 files changed

+20
-42
lines changed

4 files changed

+20
-42
lines changed

index.html

+7-31
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
<div aria-hidden id='pattern'></div>
1919
<section class='hero-container'>
2020
<h1>Family.scss</h1>
21-
<p><strong>Family.scss</strong> is a set of <strong><span id="amount"></span></strong> smart Sass mixins which will help you to manage the style of <code>:nth-child</code>’ified elements, in an easy and classy way.</p>
21+
<p><strong>Family.scss</strong> is a set of <strong><span id="amount">26</span></strong> smart Sass mixins which will help you to manage the style of <code>:nth-child</code>’ified elements, in an easy and classy way.</p>
2222
<div class='container-link'>
2323
<a class='btn cta w-icon' download='download' href='https://raw.githubusercontent.com/LukyVj/family.scss/master/source/src/family.scss'><svg aria-label="Reset" role="img"><use xlink:href="#icon-download" xmlns:xlink="http://www.w3.org/1999/xlink"></use></svg> Download (4kb)</a>
24+
2425
<a class='btn cta w-icon' href='https://github.com/LukyVj/family.scss'><svg aria-label="Reset" role="img"><use xlink:href="#icon-github" xmlns:xlink="http://www.w3.org/1999/xlink"></use></svg> Github</a>
2526
</div>
2627
<script async='' id='_carbonads_js' src='//cdn.carbonads.com/carbon.js?zoneid=1673&amp;serve=C6AILKT&amp;placement=lukyvjgithubiofamilyscss' type='text/javascript'></script>
@@ -36,7 +37,6 @@ <h1>Family.scss</h1>
3637
<style id='style-n-between'></style>
3738
<style id='style-all-but'></style>
3839
<style id='style-each'></style>
39-
<style id='style-each-after'></style>
4040
<style id='style-from-first-last'></style>
4141
<style id='style-middle'></style>
4242
<style id='style-all-but-first-last'></style>
@@ -289,34 +289,6 @@ <h3>each</h3>
289289
<li>10</li>
290290
</ul>
291291
</div>
292-
<div class='row mixin'>
293-
<header>
294-
<h3>each-after</h3>
295-
</header>
296-
<pre><code id='each-after'><span class="param"> @include</span> each-after(<span class="num" contenteditable id="each-after-a">3</span>,<span class="num" contenteditable id="each-after-b">6</span>)&#x000A;</code></pre>
297-
<ul class='each-after'>
298-
<li>1</li>
299-
<li>2</li>
300-
<li>3</li>
301-
<li>4</li>
302-
<li>5</li>
303-
<li>6</li>
304-
<li>7</li>
305-
<li>8</li>
306-
<li>9</li>
307-
<li>10</li>
308-
<li>11</li>
309-
<li>12</li>
310-
<li>13</li>
311-
<li>14</li>
312-
<li>15</li>
313-
<li>16</li>
314-
<li>17</li>
315-
<li>18</li>
316-
<li>19</li>
317-
<li>20</li>
318-
</ul>
319-
</div>
320292
<div class='row mixin'>
321293
<header>
322294
<h3>from-first-last</h3>
@@ -629,12 +601,16 @@ <h2 class='title'>Playground</h2>
629601
<footer class='footer-section' role='contentinfo'>
630602
<p class='text-center'>Made with &lt;<a href="https://github.com/LukyVj/family.scss">code</a>&gt; by <a href="http://twitter.com/LukyVj">@LukyVj</a> - <a href="#about" data-toggle-modal>About</a></p>
631603
<div class='share'>
604+
<<<<<<< HEAD
632605
<a href='https://twitter.com/intent/tweet?text=Family.scss%20-%20A%20set%20of%2027%20Sass%20mixins%20which%20will%20help%20you%20to%20manage%20your%20%3Anth-child%27ified%20elements%20http%3A%2F%2Flukyvj.github.io%2Ffamily.scss%2F%20via%20%40lukyvj'>
606+
=======
607+
<a href='https://twitter.com/intent/tweet?text=Family.scss%20-%20A%20set%20of%20%20Sass%20mixins%20which%20will%20help%20you%20to%20manage%20your%20%3Anth-child%27ified%20elements%20http%3A%2F%2Flukyvj.github.io%2Ffamily.scss%2F%20via%20%40lukyvj'>
608+
>>>>>>> 45075dd4c0066a037a1b5277140287cbdea7005e
633609
<img alt='Twitter logo' src='images/twitter-icon.svg'>
634610
</a>
635611
</div>
636612
<p class='version'>
637-
Version: <a href="https://github.com/LukyVj/family.scss/releases/">1.0.5</a>
613+
Version: <a href="https://github.com/LukyVj/family.scss/releases/">1.0.6</a>
638614
</p>
639615
</footer>
640616
<div class='about-section'>

javascripts/all.js

-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
window.onload = function(){
4-
getNbSamples()
54
childManager()
65
childIndex();
76
modalizer();
@@ -48,11 +47,6 @@ function mixPattern(num) {
4847
}
4948
}
5049

51-
function getNbSamples(){
52-
var n = document.getElementById('amount');
53-
var ex = document.querySelectorAll('.doc ul').length;
54-
n.textContent = ex;
55-
}
5650

5751
// Generate li incrementer
5852
function childManager(){

javascripts/demo.js

+12-4
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,18 @@ document.getElementById('each').addEventListener('keyup', function(){
234234
function eachAfter(numa, numb) {
235235
function injectStyle(numa, numb){
236236
document.getElementById('style-each-after').innerHTML = `ul.each-after li { ${preStyle} }`;
237-
document.getElementById('style-each-after').innerHTML += `.each-after li:nth-child(${numb}n) ~ li:nth-child(${numa}n){
238-
${selectedStyle}
239-
}
240-
`
237+
// if (numb < numa ) {
238+
document.getElementById('style-each-after').innerHTML += `.each-after li:nth-child(${numb - numa}n) ~ :nth-child(${numa}n){
239+
${selectedStyle}
240+
}
241+
`
242+
// }
243+
// else {
244+
// document.getElementById('style-each-after').innerHTML += `.each-after li:nth-child(${numb}n) ~ :nth-child(${numa}n){
245+
// ${selectedStyle}
246+
// }
247+
// `
248+
// }
241249
}
242250

243251
var newStyle = injectStyle(numa, numb);

stylesheets/site.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)