Commit 5fa5b6b4 authored by Nikolay Gromov's avatar Nikolay Gromov

Переделка представления кода, примесей модульных сеток

parent db58d26a
...@@ -3,12 +3,6 @@ ...@@ -3,12 +3,6 @@
<pre class="code"> <pre class="code">
<code class="code__syntax css"> <code class="code__syntax css">
<span class="code__line">/* Родитель: */</span> <span class="code__line">/* Родитель: */</span>
<span class="code__line">.block-name {</span>
<span class="code__line"> display: flex;</span>
<span class="code__line"> flex-wrap: wrap;</span>
<span class="code__line"> margin-left: -1.5rem;</span>
<span class="code__line"> margin-right: -1.5rem;</span>
<span class="code__line">}</span>
</code> </code>
</pre> </pre>
......
This diff is collapsed.
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// @xl-grid-gutter: @grid-gutter-width - промежуток между ячейками XL-сетки // @xl-grid-gutter: @grid-gutter-width - промежуток между ячейками XL-сетки
// @xxl-grid-gutter: @grid-gutter-width - промежуток между ячейками XXL-сетки // @xxl-grid-gutter: @grid-gutter-width - промежуток между ячейками XXL-сетки
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Примеры: http://codepen.io/nicothin/pen/obRMgx?editors=1100 // Тестирование: http://codepen.io/nicothin/pen/NNggVx?editors=0100
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
.row(@xs-grid-gutter: @grid-gutter-width; @sm-grid-gutter: @grid-gutter-width; @md-grid-gutter: @grid-gutter-width; @lg-grid-gutter: @grid-gutter-width; @xl-grid-gutter: @grid-gutter-width; @xxl-grid-gutter: @grid-gutter-width;) { .row(@xs-grid-gutter: @grid-gutter-width; @sm-grid-gutter: @grid-gutter-width; @md-grid-gutter: @grid-gutter-width; @lg-grid-gutter: @grid-gutter-width; @xl-grid-gutter: @grid-gutter-width; @xxl-grid-gutter: @grid-gutter-width;) {
...@@ -54,9 +54,12 @@ ...@@ -54,9 +54,12 @@
& > * { & > * {
display: block; display: block;
width: 100%; width: 100%;
padding-left: (@grid-gutter-width / 2);
padding-right: (@grid-gutter-width / 2);
} }
& when not (@xs-grid-gutter = false) { // Если первая переданная переменная ноль — не выводим margin-ы по умолчанию
& when not (@xs-grid-gutter = 0) {
margin-left: (@xs-grid-gutter / -2); margin-left: (@xs-grid-gutter / -2);
margin-right: (@xs-grid-gutter / -2); margin-right: (@xs-grid-gutter / -2);
} }
...@@ -68,28 +71,28 @@ ...@@ -68,28 +71,28 @@
} }
} }
& when not (@md-grid-gutter = @xs-grid-gutter) { & when not (@md-grid-gutter = @sm-grid-gutter) {
@media (min-width: @screen-md) { @media (min-width: @screen-md) {
margin-left: (@md-grid-gutter / -2); margin-left: (@md-grid-gutter / -2);
margin-right: (@md-grid-gutter / -2); margin-right: (@md-grid-gutter / -2);
} }
} }
& when not (@lg-grid-gutter = @xs-grid-gutter) { & when not (@lg-grid-gutter = @md-grid-gutter) {
@media (min-width: @screen-lg) { @media (min-width: @screen-lg) {
margin-left: (@lg-grid-gutter / -2); margin-left: (@lg-grid-gutter / -2);
margin-right: (@lg-grid-gutter / -2); margin-right: (@lg-grid-gutter / -2);
} }
} }
& when not (@xl-grid-gutter = @xs-grid-gutter) { & when not (@xl-grid-gutter = @lg-grid-gutter) {
@media (min-width: @screen-xl) { @media (min-width: @screen-xl) {
margin-left: (@xl-grid-gutter / -2); margin-left: (@xl-grid-gutter / -2);
margin-right: (@xl-grid-gutter / -2); margin-right: (@xl-grid-gutter / -2);
} }
} }
& when not (@xxl-grid-gutter = @xs-grid-gutter) { & when not (@xxl-grid-gutter = @xl-grid-gutter) {
@media (min-width: @screen-xxl) { @media (min-width: @screen-xxl) {
margin-left: (@xxl-grid-gutter / -2); margin-left: (@xxl-grid-gutter / -2);
margin-right: (@xxl-grid-gutter / -2); margin-right: (@xxl-grid-gutter / -2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment