Use inline flex for buttons, Fix progress bars, Remove display helpers

This commit is contained in:
Jeremy Thomas 2016-03-26 17:12:13 +00:00
parent fdb9800652
commit 9228455b09
5 changed files with 16 additions and 25 deletions

View File

@ -11,6 +11,11 @@
### Updated ### Updated
* `.button` uses `display: inline-flex` now
* `.button` needs an `.icon` now * `.button` needs an `.icon` now
* `.control.is-grouped` renamed to `.control.has-addons` * `.control.is-grouped` renamed to `.control.has-addons`
* `.control.is-inline` renamed to `.control.is-grouped` * `.control.is-inline` renamed to `.control.is-grouped`
### Removed
* **helpers** `.is-inline` and `.is-block`

View File

@ -1,11 +1,5 @@
// Display // Display
.is-block
display: block
.is-inline
display: inline
.is-flex .is-flex
display: flex display: flex

View File

@ -26,8 +26,11 @@
font-size: $size-small font-size: $size-small
line-height: 1 line-height: 1
margin-top: 5px margin-top: 5px
.icon.is-small .icon
margin: 4px 0 &:first-child
margin-right: 4px
&:last-child
margin-left: 4px
&:hover &:hover
color: $control-hover color: $control-hover
&:active &:active
@ -77,14 +80,10 @@
color: $text-strong color: $text-strong
&.is-small &.is-small
+button-small +button-small
.icon.is-small
margin: 0
&.is-medium &.is-medium
+button-medium +button-medium
&.is-large &.is-large
+button-large +button-large
.icon.is-medium
margin: -4px 0px -4px -4px
&.is-fullwidth &.is-fullwidth
display: block display: block
width: 100% width: 100%
@ -101,12 +100,3 @@
&[disabled] &[disabled]
opacity: 0.5 opacity: 0.5
pointer-events: none pointer-events: none
+tablet
small
color: $text
left: 0
margin-top: 10px
position: absolute
top: 100%
width: 100%

View File

@ -1,11 +1,12 @@
=control =control
-moz-appearance: none -moz-appearance: none
-webkit-appearance: none -webkit-appearance: none
align-items: center
background: $control-background background: $control-background
border: 1px solid $control-border border: 1px solid $control-border
border-radius: $radius border-radius: $radius
color: $control color: $control
display: inline-block display: inline-flex
font-size: $size-normal font-size: $size-normal
height: 32px height: 32px
line-height: 24px line-height: 24px

View File

@ -11,7 +11,8 @@
width: 100% width: 100%
&::-webkit-progress-bar &::-webkit-progress-bar
background: $border background: $border
&::-webkit-progress-value, &::-webkit-progress-value
background: $text
&::-moz-progress-bar &::-moz-progress-bar
background: $text background: $text
&.is-small &.is-small
@ -23,7 +24,7 @@
@each $name, $pair in $colors @each $name, $pair in $colors
$color: nth($pair, 1) $color: nth($pair, 1)
&.is-#{$name} &.is-#{$name}
&::-webkit-progress-value, &::-webkit-progress-value
background: $color
&::-moz-progress-bar &::-moz-progress-bar
background: $color background: $color