From: Jeremy Thomas Date: Wed, 29 Jun 2016 22:25:27 +0000 (+0100) Subject: Fix #228, Fix #245 X-Git-Tag: 0.1.0~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c0508d4266b51649efa92802034e2c9380fb60;p=thirdparty%2Fbulma.git Fix #228, Fix #245 --- diff --git a/sass/components/card.sass b/sass/components/card.sass index f5d33411a..2ea032e86 100644 --- a/sass/components/card.sass +++ b/sass/components/card.sass @@ -55,4 +55,4 @@ &.is-fullwidth width: 100% &.is-rounded - border-radius: 5px + border-radius: $radius-large diff --git a/sass/components/menu.sass b/sass/components/menu.sass index b8040db2f..402986c3e 100644 --- a/sass/components/menu.sass +++ b/sass/components/menu.sass @@ -5,7 +5,7 @@ .menu-list a - border-radius: 2px + border-radius: $radius-small color: $text display: block padding: 5px 10px diff --git a/sass/components/modal.sass b/sass/components/modal.sass index f9c2cefc7..e1d436003 100644 --- a/sass/components/modal.sass +++ b/sass/components/modal.sass @@ -26,7 +26,7 @@ .modal-card @extend .modal-content background: $white - border-radius: 5px + border-radius: $radius-large display: flex flex-direction: column max-height: calc(100vh - 40px) diff --git a/sass/components/panel.sass b/sass/components/panel.sass index f66dd3cef..31ccea38d 100644 --- a/sass/components/panel.sass +++ b/sass/components/panel.sass @@ -52,6 +52,6 @@ a.panel-block .panel border: 1px solid $border - border-radius: 5px + border-radius: $radius-large &:not(:last-child) margin-bottom: 20px diff --git a/sass/elements/box.sass b/sass/elements/box.sass index 23f02e517..eeef09a4b 100644 --- a/sass/elements/box.sass +++ b/sass/elements/box.sass @@ -1,7 +1,7 @@ .box @extend .block background: $white - border-radius: 5px + border-radius: $radius-large box-shadow: 0 2px 3px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1) display: block padding: 20px diff --git a/sass/elements/button.sass b/sass/elements/button.sass index 5388648a0..f05247f1f 100644 --- a/sass/elements/button.sass +++ b/sass/elements/button.sass @@ -1,5 +1,5 @@ =button-small - border-radius: 2px + border-radius: $radius-small font-size: 11px height: 24px line-height: 16px diff --git a/sass/utilities/controls.sass b/sass/utilities/controls.sass index 8cf701600..887e34c7c 100644 --- a/sass/utilities/controls.sass +++ b/sass/utilities/controls.sass @@ -32,7 +32,7 @@ color: rgba($control, 0.3) =control-small - border-radius: 2px + border-radius: $radius-small font-size: 11px height: 24px line-height: 16px diff --git a/sass/utilities/variables.sass b/sass/utilities/variables.sass index 70ccf8d2d..7513e8b38 100644 --- a/sass/utilities/variables.sass +++ b/sass/utilities/variables.sass @@ -52,7 +52,9 @@ $nav-height: 50px !default // Miscellaneous $easing: ease-out !default +$radius-small: 2px !default $radius: 3px !default +$radius-large: 5px !default $speed: 86ms !default // 2. Primary colors