From: Jeremy Thomas Date: Tue, 21 Jan 2020 07:50:51 +0000 (+0100) Subject: Add directioner X-Git-Tag: 0.9.0~2^2~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ca264016b47784723937cdd0c595e9f50324bfa;p=thirdparty%2Fbulma.git Add directioner --- diff --git a/sass/components/breadcrumb.sass b/sass/components/breadcrumb.sass index 3d7f4eb3c..d4ec47601 100644 --- a/sass/components/breadcrumb.sass +++ b/sass/components/breadcrumb.sass @@ -24,7 +24,7 @@ $breadcrumb-item-separator-color: $border-hover !default align-items: center display: flex &:first-child a - padding-left: 0 + +directioner("padding", 0, false) &.is-active a color: $breadcrumb-item-active-color @@ -41,9 +41,9 @@ $breadcrumb-item-separator-color: $border-hover !default justify-content: flex-start .icon &:first-child - margin-right: 0.5em + +directioner("margin", 0.5em) &:last-child - margin-left: 0.5em + +directioner("margin", 0.5em, false) // Alignment &.is-centered ol, diff --git a/sass/components/dropdown.sass b/sass/components/dropdown.sass index bf26f3fff..4eea91245 100644 --- a/sass/components/dropdown.sass +++ b/sass/components/dropdown.sass @@ -62,7 +62,7 @@ $dropdown-divider-background-color: $border-light !default a.dropdown-item, button.dropdown-item - padding-right: 3rem + +directioner("padding", 3rem) text-align: inherit white-space: nowrap width: 100% diff --git a/sass/components/level.sass b/sass/components/level.sass index 608f291e7..696dc1c9d 100644 --- a/sass/components/level.sass +++ b/sass/components/level.sass @@ -20,7 +20,7 @@ $level-item-spacing: ($block-spacing / 2) !default .level-item &:not(:last-child) margin-bottom: 0 - margin-right: $level-item-spacing + +directioner("margin", $level-item-spacing) &:not(.is-narrow) flex-grow: 1 // Responsiveness @@ -57,7 +57,7 @@ $level-item-spacing: ($block-spacing / 2) !default // Responsiveness +tablet &:not(:last-child) - margin-right: $level-item-spacing + +directioner("margin", $level-item-spacing) .level-left align-items: center diff --git a/sass/components/message.sass b/sass/components/message.sass index f37bca382..4144dff6d 100644 --- a/sass/components/message.sass +++ b/sass/components/message.sass @@ -79,7 +79,7 @@ $message-colors: $colors !default .delete flex-grow: 0 flex-shrink: 0 - +margin-left(0.75em) + +directioner("margin", 0.75em, false) & + .message-body border-width: $message-header-body-border-width border-top-left-radius: 0 diff --git a/sass/components/panel.sass b/sass/components/panel.sass index 1748ccdfa..c00007394 100644 --- a/sass/components/panel.sass +++ b/sass/components/panel.sass @@ -88,7 +88,7 @@ $panel-colors: $colors !default justify-content: flex-start padding: 0.5em 0.75em input[type="checkbox"] - +margin-right(0.75em) + +directioner("margin", 0.75em) & > .control flex-grow: 1 flex-shrink: 1 @@ -113,7 +113,7 @@ label.panel-block .panel-icon +fa(14px, 1em) color: $panel-icon-color - +margin-right(0.75em) + +directioner("margin", 0.75em) .fa font-size: inherit line-height: inherit diff --git a/sass/components/tabs.sass b/sass/components/tabs.sass index 93722475b..1dc470413 100644 --- a/sass/components/tabs.sass +++ b/sass/components/tabs.sass @@ -78,9 +78,9 @@ $tabs-toggle-link-active-color: $link-invert !default padding-left: 0.75em .icon &:first-child - +margin-right(0.5em) + +directioner("margin", 0.5em) &:last-child - +margin-left(0.5em) + +directioner("margin", 0.5em, false) // Alignment &.is-centered ul @@ -122,7 +122,7 @@ $tabs-toggle-link-active-color: $link-invert !default z-index: 2 li & + li - margin-left: -#{$tabs-toggle-link-border-width} + +directioner("margin", -#{$tabs-toggle-link-border-width}, false) &:first-child a +ltr border-radius: $tabs-toggle-link-radius 0 0 $tabs-toggle-link-radius diff --git a/sass/elements/button.sass b/sass/elements/button.sass index 59a6d769a..eb7a29ac4 100644 --- a/sass/elements/button.sass +++ b/sass/elements/button.sass @@ -71,11 +71,11 @@ $button-static-border-color: $border !default height: 1.5em width: 1.5em &:first-child:not(:last-child) - +margin-left(calc(#{-1 / 2 * $button-padding-horizontal} - #{$button-border-width})) - +margin-right($button-padding-horizontal / 4) + +directioner("margin", calc(#{-1 / 2 * $button-padding-horizontal} - #{$button-border-width}), false) + +directioner("margin", $button-padding-horizontal / 4) &:last-child:not(:first-child) - +margin-left($button-padding-horizontal / 4) - +margin-right(calc(#{-1 / 2 * $button-padding-horizontal} - #{$button-border-width})) + +directioner("margin", $button-padding-horizontal / 4, false) + +directioner("margin", calc(#{-1 / 2 * $button-padding-horizontal} - #{$button-border-width})) &:first-child:last-child margin-left: calc(#{-1 / 2 * $button-padding-horizontal} - #{$button-border-width}) margin-right: calc(#{-1 / 2 * $button-padding-horizontal} - #{$button-border-width}) @@ -269,7 +269,7 @@ $button-static-border-color: $border !default .button margin-bottom: 0.5rem &:not(:last-child):not(.is-fullwidth) - +margin-right(0.5rem) + +directioner("margin", 0.5rem) &:last-child margin-bottom: -0.5rem &:not(:last-child) diff --git a/sass/elements/content.sass b/sass/elements/content.sass index d11bdda31..32867cd26 100644 --- a/sass/elements/content.sass +++ b/sass/elements/content.sass @@ -67,11 +67,11 @@ $content-table-foot-cell-color: $text-strong !default margin-bottom: 1em blockquote background-color: $content-blockquote-background-color - +border-left($content-blockquote-border-left) + +directioner("border", $content-blockquote-border-left, false) padding: $content-blockquote-padding ol list-style-position: outside - +margin-left(2em) + +directioner("margin", 2em, false) margin-top: 1em &:not([type]) list-style-type: decimal @@ -85,7 +85,7 @@ $content-table-foot-cell-color: $text-strong !default list-style-type: upper-roman ul list-style: disc outside - +margin-left(2em) + +directioner("margin", 2em, false) margin-top: 1em ul list-style-type: circle @@ -93,7 +93,7 @@ $content-table-foot-cell-color: $text-strong !default ul list-style-type: square dd - +margin-left(2em) + +directioner("margin", 2em, false) figure margin-left: 2em margin-right: 2em diff --git a/sass/form/tools.sass b/sass/form/tools.sass index ddb8c2a2d..7b143dc46 100644 --- a/sass/form/tools.sass +++ b/sass/form/tools.sass @@ -38,7 +38,7 @@ $help-size: $size-small !default justify-content: flex-start .control &:not(:last-child) - +margin-right(-1px) + +directioner("margin", -1px) &:not(:first-child):not(:last-child) .button, .input, @@ -96,7 +96,7 @@ $help-size: $size-small !default flex-shrink: 0 &:not(:last-child) margin-bottom: 0 - +margin-right(0.75rem) + +directioner("margin", 0.75rem) &.is-expanded flex-grow: 1 flex-shrink: 1 @@ -127,7 +127,7 @@ $help-size: $size-small !default flex-basis: 0 flex-grow: 1 flex-shrink: 0 - +margin-right(1.5rem) + +directioner("margin", 1.5rem) text-align: right &.is-small font-size: $size-small @@ -156,7 +156,7 @@ $help-size: $size-small !default &:not(.is-narrow) flex-grow: 1 &:not(:last-child) - +margin-right(0.75rem) + +directioner("margin", 0.75rem) .control box-sizing: border-box diff --git a/sass/utilities/mixins.sass b/sass/utilities/mixins.sass index 4a4623375..4af73d495 100644 --- a/sass/utilities/mixins.sass +++ b/sass/utilities/mixins.sass @@ -138,23 +138,15 @@ // $directions: ("left": "right", "right": "left") -=border-right($spacing) +=directioner($property, $spacing, $right: true) + $normal: if($right, "right", "left") + $opposite: if($right, "left", "right") @if $rtl - border-left: $spacing + /* RTL */ + #{$property}-#{$opposite}: $spacing @else - border-right: $spacing - -=border-left($spacing) - @if $rtl - border-right: $spacing - @else - border-left: $spacing - -=margin-right($spacing) - @if $rtl - margin-left: $spacing - @else - margin-right: $spacing + /* LTR */ + #{$property}-#{$normal}: $spacing =right($spacing) @if $rtl @@ -162,18 +154,6 @@ @else right: $spacing -=left($spacing) - @if $rtl - right: $spacing - @else - left: $spacing - -=margin-left($spacing) - @if $rtl - margin-right: $spacing - @else - margin-left: $spacing - // =directioner($spacing) // @supports (margin-inline-end: 1px) // margin-inline-end: $spacing