Remove deprecated +button-rounded-filled mixin
We now use just 'button', as roundness and filled are configurable
This commit is contained in:
parent
9ac2f38042
commit
80601f75ed
@ -520,7 +520,7 @@ $comments-width-max: 710px
|
|||||||
min-height: 30px
|
min-height: 30px
|
||||||
transition: all 200ms ease-in-out
|
transition: all 200ms ease-in-out
|
||||||
|
|
||||||
@include button-rounded($color-success, 6px)
|
+button($color-success, 6px)
|
||||||
position: relative
|
position: relative
|
||||||
|
|
||||||
span.hint
|
span.hint
|
||||||
@ -550,7 +550,7 @@ $comments-width-max: 710px
|
|||||||
|
|
||||||
|
|
||||||
&.button-field-error
|
&.button-field-error
|
||||||
@include button-rounded($color-danger, 6px)
|
+button($color-danger, 6px)
|
||||||
background: transparent
|
background: transparent
|
||||||
|
|
||||||
pointer-events: none
|
pointer-events: none
|
||||||
@ -567,7 +567,7 @@ $comments-width-max: 710px
|
|||||||
left: 15px
|
left: 15px
|
||||||
right: 15px
|
right: 15px
|
||||||
|
|
||||||
@include button-rounded($color-text-dark-secondary, 6px)
|
+button($color-text-dark-secondary, 6px)
|
||||||
border-color: transparent
|
border-color: transparent
|
||||||
|
|
||||||
i
|
i
|
||||||
|
@ -92,9 +92,9 @@ body.error
|
|||||||
font-size: 1.2em
|
font-size: 1.2em
|
||||||
margin: 0 15px
|
margin: 0 15px
|
||||||
&.sign-up
|
&.sign-up
|
||||||
@include button-rounded-filled($color-primary, 999em)
|
+button($color-primary, 999em, true)
|
||||||
&.sign-in
|
&.sign-in
|
||||||
@include button-rounded($color-background, 999em)
|
+button($color-background, 999em)
|
||||||
border-color: transparent
|
border-color: transparent
|
||||||
|
|
||||||
|
|
||||||
|
@ -603,7 +603,7 @@ $node-type-post: #647bce
|
|||||||
flex-wrap: wrap
|
flex-wrap: wrap
|
||||||
|
|
||||||
a
|
a
|
||||||
@include button-rounded($color-text-light, 3px)
|
+button($color-text-light, 3px)
|
||||||
padding: 5px 0
|
padding: 5px 0
|
||||||
margin:
|
margin:
|
||||||
bottom: 5px
|
bottom: 5px
|
||||||
@ -621,14 +621,14 @@ $node-type-post: #647bce
|
|||||||
margin-right: 15px
|
margin-right: 15px
|
||||||
|
|
||||||
&.blue
|
&.blue
|
||||||
@include button-rounded(hsl(hue($color-info), 60%, 45%), 3px)
|
+button(hsl(hue($color-info), 60%, 45%), 3px)
|
||||||
|
|
||||||
&.orange
|
&.orange
|
||||||
@include button-rounded(hsl(hue($color-secondary), 50%, 50%), 3px)
|
+button(hsl(hue($color-secondary), 50%, 50%), 3px)
|
||||||
padding: 5px 15px
|
padding: 5px 15px
|
||||||
|
|
||||||
&.green
|
&.green
|
||||||
@include button-rounded-filled(hsl(hue($color-success), 60%, 40%), 3px)
|
+button(hsl(hue($color-success), 60%, 40%), 3px, true)
|
||||||
|
|
||||||
section#random-asset
|
section#random-asset
|
||||||
|
|
||||||
@ -810,10 +810,10 @@ section.pricing
|
|||||||
transform: scale(1)
|
transform: scale(1)
|
||||||
|
|
||||||
a.sign-up-now
|
a.sign-up-now
|
||||||
+button-rounded-filled($color-primary, 999em)
|
+button($color-primary, 999em, true)
|
||||||
|
|
||||||
&:hover
|
&:hover
|
||||||
+button-rounded-filled($color-success, 999em)
|
+button($color-success, 999em, true)
|
||||||
|
|
||||||
&.education
|
&.education
|
||||||
.pricing-caption
|
.pricing-caption
|
||||||
@ -878,14 +878,14 @@ section.pricing
|
|||||||
transform: translateX(-50%)
|
transform: translateX(-50%)
|
||||||
font-size: 1.2em
|
font-size: 1.2em
|
||||||
|
|
||||||
+button-rounded($color-primary, 999em)
|
+button($color-primary, 999em)
|
||||||
padding: 5px 25px
|
padding: 5px 25px
|
||||||
white-space: nowrap
|
white-space: nowrap
|
||||||
text-align: center
|
text-align: center
|
||||||
|
|
||||||
&:hover
|
&:hover
|
||||||
.sign-up-now
|
.sign-up-now
|
||||||
+button-rounded-filled($color-success, 999em)
|
+button($color-success, 999em, true)
|
||||||
|
|
||||||
|
|
||||||
section.supported-by
|
section.supported-by
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
margin: 30px auto
|
margin: 30px auto
|
||||||
|
|
||||||
a.page-header-cta
|
a.page-header-cta
|
||||||
+button-rounded-filled($color-info, 3px)
|
+button($color-info, 3px, true)
|
||||||
font:
|
font:
|
||||||
size: 1.3em
|
size: 1.3em
|
||||||
weight: 500
|
weight: 500
|
||||||
@ -352,7 +352,7 @@ $page-card-icon-size: 75px
|
|||||||
margin-right: initial
|
margin-right: initial
|
||||||
|
|
||||||
a.page-card-cta
|
a.page-card-cta
|
||||||
+button-rounded-filled($color-primary, 3px)
|
+button($color-primary, 3px, true)
|
||||||
padding: 5px 30px
|
padding: 5px 30px
|
||||||
margin-right: 25px
|
margin-right: 25px
|
||||||
font-size: 1em
|
font-size: 1em
|
||||||
@ -367,7 +367,7 @@ a.page-card-cta
|
|||||||
margin-right: 0
|
margin-right: 0
|
||||||
|
|
||||||
&.download
|
&.download
|
||||||
+button-rounded-filled($color-success, 3px)
|
+button($color-success, 3px, true)
|
||||||
opacity: 1
|
opacity: 1
|
||||||
|
|
||||||
i
|
i
|
||||||
|
@ -194,7 +194,7 @@
|
|||||||
display: block
|
display: block
|
||||||
margin: 15px auto 0 auto
|
margin: 15px auto 0 auto
|
||||||
width: 200px
|
width: 200px
|
||||||
@include button-rounded($color-success, 3px)
|
+button($color-success, 3px)
|
||||||
padding: 5px 10px
|
padding: 5px 10px
|
||||||
.blender_sync-main-last
|
.blender_sync-main-last
|
||||||
text-align: right
|
text-align: right
|
||||||
|
@ -1161,7 +1161,7 @@ section.node-preview.group
|
|||||||
display: inline-block
|
display: inline-block
|
||||||
|
|
||||||
.btn-browsetoggle
|
.btn-browsetoggle
|
||||||
+button-rounded(lighten($color-background-nav, 20%), 3px)
|
+button(lighten($color-background-nav, 20%), 3px)
|
||||||
width: 48px
|
width: 48px
|
||||||
text-align: center
|
text-align: center
|
||||||
padding: 2px 4px
|
padding: 2px 4px
|
||||||
@ -1350,7 +1350,7 @@ section.node-preview.group
|
|||||||
|
|
||||||
/* Actual button */
|
/* Actual button */
|
||||||
button
|
button
|
||||||
@include button-rounded($color-primary, 3px)
|
+button($color-primary, 3px)
|
||||||
position: relative
|
position: relative
|
||||||
|
|
||||||
padding:
|
padding:
|
||||||
@ -1375,7 +1375,7 @@ section.node-preview.group
|
|||||||
|
|
||||||
&.file.download
|
&.file.download
|
||||||
button
|
button
|
||||||
@include button-rounded-filled($color-primary, 3px)
|
+button($color-primary, 3px, true)
|
||||||
padding:
|
padding:
|
||||||
left: 15px
|
left: 15px
|
||||||
right: 15px
|
right: 15px
|
||||||
@ -2359,7 +2359,7 @@ section.node-children
|
|||||||
width: 100%
|
width: 100%
|
||||||
|
|
||||||
#files-action-add
|
#files-action-add
|
||||||
+button-rounded-filled($color-success, 3px)
|
+button($color-success, 3px, true)
|
||||||
width: 200px
|
width: 200px
|
||||||
padding: 5px 10px
|
padding: 5px 10px
|
||||||
margin-bottom: 10px
|
margin-bottom: 10px
|
||||||
@ -2486,10 +2486,10 @@ section.node-children
|
|||||||
|
|
||||||
|
|
||||||
button.cancel
|
button.cancel
|
||||||
+button-rounded($color-text-dark-primary, 3px)
|
+button($color-text-dark-primary, 3px)
|
||||||
|
|
||||||
button.move
|
button.move
|
||||||
+button-rounded-filled($color-success, 3px)
|
+button($color-success, 3px, true)
|
||||||
|
|
||||||
&.disabled
|
&.disabled
|
||||||
pointer-events: none
|
pointer-events: none
|
||||||
@ -2511,27 +2511,27 @@ section.node-children
|
|||||||
.fileupload-buttonbar
|
.fileupload-buttonbar
|
||||||
padding: 10px 0
|
padding: 10px 0
|
||||||
.fileinput-button
|
.fileinput-button
|
||||||
@include button-rounded($color-success, 3px)
|
+button($color-success, 3px)
|
||||||
.start
|
.start
|
||||||
@include button-rounded($color-info, 3px)
|
+button($color-info, 3px)
|
||||||
.cancel
|
.cancel
|
||||||
@include button-rounded($color-warning, 3px)
|
+button($color-warning, 3px)
|
||||||
.delete
|
.delete
|
||||||
@include button-rounded($color-danger, 3px)
|
+button($color-danger, 3px)
|
||||||
.toggle
|
.toggle
|
||||||
margin: 0 20px
|
margin: 0 20px
|
||||||
|
|
||||||
.files
|
.files
|
||||||
.btn
|
.btn
|
||||||
&.start
|
&.start
|
||||||
@include button-rounded($color-info, 3px)
|
+button($color-info, 3px)
|
||||||
&.cancel
|
&.cancel
|
||||||
@include button-rounded($color-warning, 3px)
|
+button($color-warning, 3px)
|
||||||
&.delete
|
&.delete
|
||||||
@include button-rounded($color-danger, 3px)
|
+button($color-danger, 3px)
|
||||||
|
|
||||||
&.create
|
&.create
|
||||||
@include button-rounded($color-success, 3px)
|
+button($color-success, 3px)
|
||||||
|
|
||||||
.template-upload,
|
.template-upload,
|
||||||
.template-download
|
.template-download
|
||||||
|
@ -48,11 +48,11 @@
|
|||||||
.button-login,
|
.button-login,
|
||||||
.button-submit
|
.button-submit
|
||||||
min-width: 200px
|
min-width: 200px
|
||||||
@include button-rounded-filled($color-primary, 999em)
|
+button($color-primary, 999em, true)
|
||||||
|
|
||||||
.button-register
|
.button-register
|
||||||
min-width: 150px
|
min-width: 150px
|
||||||
@include button-rounded($color-primary, 999em)
|
+button($color-primary, 999em)
|
||||||
|
|
||||||
#settings
|
#settings
|
||||||
display: flex
|
display: flex
|
||||||
@ -133,7 +133,7 @@
|
|||||||
clear: both
|
clear: both
|
||||||
min-width: 200px
|
min-width: 200px
|
||||||
margin: 0 auto
|
margin: 0 auto
|
||||||
@include button-rounded-filled($color-primary, 999em)
|
+button($color-primary, 999em, true)
|
||||||
|
|
||||||
|
|
||||||
#settings-container
|
#settings-container
|
||||||
@ -182,10 +182,10 @@
|
|||||||
padding: 10px 0
|
padding: 10px 0
|
||||||
|
|
||||||
#submit_edit_user
|
#submit_edit_user
|
||||||
+button-rounded-filled($color-success, 999em)
|
+button($color-success, 999em, true)
|
||||||
|
|
||||||
#button-cancel
|
#button-cancel
|
||||||
+button-rounded(#aaa, 999em)
|
+button(#aaa, 999em)
|
||||||
margin: 0 10px
|
margin: 0 10px
|
||||||
|
|
||||||
#user-edit-notification
|
#user-edit-notification
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
+clearfix
|
+clearfix
|
||||||
|
|
||||||
@mixin button-rounded($mixin-color, $roundness, $filled: false)
|
@mixin button($mixin-color, $roundness, $filled: false)
|
||||||
font-family: $font-body
|
font-family: $font-body
|
||||||
text-transform: uppercase
|
text-transform: uppercase
|
||||||
opacity: .9
|
opacity: .9
|
||||||
@ -68,41 +68,6 @@
|
|||||||
small
|
small
|
||||||
font-size: .6em
|
font-size: .6em
|
||||||
|
|
||||||
@mixin button-rounded-filled($mixin-color, $roundness)
|
|
||||||
font-family: $font-body
|
|
||||||
text-transform: uppercase
|
|
||||||
opacity: .9
|
|
||||||
padding:
|
|
||||||
left: 20px
|
|
||||||
right: 20px
|
|
||||||
color: white
|
|
||||||
border: thin solid darken($mixin-color, 5%)
|
|
||||||
border-radius: $roundness
|
|
||||||
background: linear-gradient(lighten($mixin-color, 2%), $mixin-color)
|
|
||||||
text-shadow: 1px 1px 0 rgba(black, .15)
|
|
||||||
|
|
||||||
transition: color 150ms ease-out, opacity 100ms ease-in-out, background 100ms ease-out
|
|
||||||
|
|
||||||
|
|
||||||
&:hover
|
|
||||||
opacity: 1
|
|
||||||
cursor: pointer
|
|
||||||
color: white
|
|
||||||
border-color: lighten($mixin-color, 5%)
|
|
||||||
background: linear-gradient(lighten($mixin-color, 5%), lighten($mixin-color, 5%))
|
|
||||||
text-decoration: none
|
|
||||||
|
|
||||||
&:active, &:focus
|
|
||||||
outline: none
|
|
||||||
box-shadow: none
|
|
||||||
border-color: lighten($mixin-color, 5%)
|
|
||||||
background: $mixin-color
|
|
||||||
color: white
|
|
||||||
|
|
||||||
i
|
|
||||||
margin-right: 10px
|
|
||||||
small
|
|
||||||
font-size: .6em
|
|
||||||
|
|
||||||
@mixin overlay($from-color, $from-percentage, $to-color, $to-percentage)
|
@mixin overlay($from-color, $from-percentage, $to-color, $to-percentage)
|
||||||
position: absolute
|
position: absolute
|
||||||
|
@ -796,7 +796,7 @@ label, label.control-label
|
|||||||
margin-right: 10px
|
margin-right: 10px
|
||||||
|
|
||||||
.fieldlist-action-button
|
.fieldlist-action-button
|
||||||
@include button-rounded($color-success, 3px)
|
+button($color-success, 3px)
|
||||||
margin: 0 0 0 10px
|
margin: 0 0 0 10px
|
||||||
padding: 5px 10px
|
padding: 5px 10px
|
||||||
text-transform: initial
|
text-transform: initial
|
||||||
|
@ -292,7 +292,7 @@
|
|||||||
z-index: 2
|
z-index: 2
|
||||||
top: 20px
|
top: 20px
|
||||||
right: 20px
|
right: 20px
|
||||||
+button-rounded-filled($color-success, 6px)
|
+button($color-success, 6px, true)
|
||||||
|
|
||||||
.button-edit
|
.button-edit
|
||||||
right: 170px
|
right: 170px
|
||||||
@ -383,13 +383,13 @@
|
|||||||
.button-create
|
.button-create
|
||||||
display: block
|
display: block
|
||||||
width: 100%
|
width: 100%
|
||||||
+button-rounded($color-success, 6px)
|
+button($color-success, 6px)
|
||||||
margin: 0
|
margin: 0
|
||||||
|
|
||||||
.button-back
|
.button-back
|
||||||
display: block
|
display: block
|
||||||
width: 100%
|
width: 100%
|
||||||
+button-rounded($color-info, 6px)
|
+button($color-info, 6px)
|
||||||
margin: 15px 0 0 0
|
margin: 15px 0 0 0
|
||||||
|
|
||||||
#blog_post-edit-form
|
#blog_post-edit-form
|
||||||
@ -489,19 +489,19 @@
|
|||||||
|
|
||||||
#blog_post-container
|
#blog_post-container
|
||||||
.button-create
|
.button-create
|
||||||
+button-rounded($color-success, 6px)
|
+button($color-success, 6px)
|
||||||
.button-back
|
.button-back
|
||||||
position: absolute
|
position: absolute
|
||||||
top: 15px
|
top: 15px
|
||||||
right: 15px
|
right: 15px
|
||||||
z-index: 2
|
z-index: 2
|
||||||
+button-rounded-filled($color-info, 6px)
|
+button($color-info, 6px, true)
|
||||||
.button-create, .button-edit
|
.button-create, .button-edit
|
||||||
position: absolute
|
position: absolute
|
||||||
z-index: 2
|
z-index: 2
|
||||||
top: 15px
|
top: 15px
|
||||||
right: 15px
|
right: 15px
|
||||||
+button-rounded-filled($color-success, 6px)
|
+button($color-success, 6px, true)
|
||||||
|
|
||||||
.button-edit
|
.button-edit
|
||||||
right: 170px
|
right: 170px
|
||||||
|
Loading…
x
Reference in New Issue
Block a user