From 831858a3361fcda879c5732c3b488c25db9e14e7 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Fri, 21 Sep 2018 16:12:23 +0200 Subject: [PATCH] CSS: Make buttons use bootstraps' variable for roundness --- src/styles/_config.sass | 3 +++ src/styles/_error.sass | 4 ++-- src/styles/_pages.sass | 2 +- src/styles/_project-dashboard.sass | 2 +- src/styles/_project.sass | 28 ++++++++++++++-------------- src/styles/_user.sass | 4 ++-- src/styles/components/_forms.sass | 2 +- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/styles/_config.sass b/src/styles/_config.sass index d43944e2..7ed8b57e 100644 --- a/src/styles/_config.sass +++ b/src/styles/_config.sass @@ -163,3 +163,6 @@ $navbar-padding-y: 0 $btn-padding-y-sm: 0.1rem $grid-breakpoints: (xs: 0,sm: 576px,md: 768px,lg: 1060px,xl: 1500px, xxl: 1800px) + +$border-radius: .33rem +$btn-border-radius: .33rem diff --git a/src/styles/_error.sass b/src/styles/_error.sass index 5ad02dc4..d0f06953 100644 --- a/src/styles/_error.sass +++ b/src/styles/_error.sass @@ -54,9 +54,9 @@ padding: 5px text-decoration: none &.sign-up - +button($color-primary, 3px, true) + +button($color-primary, $btn-border-radius, true) &.sign-in - +button($color-text-dark-primary, 3px) + +button($color-text-dark-primary, $btn-border-radius) #node-overlay #error-container diff --git a/src/styles/_pages.sass b/src/styles/_pages.sass index b08417b8..d02c6ce4 100644 --- a/src/styles/_pages.sass +++ b/src/styles/_pages.sass @@ -369,7 +369,7 @@ a.page-card-cta margin-right: 0 &.download - +button($color-success, 3px, true) + +button($color-success, $btn-border-radius, true) opacity: 1 padding-left: 20px padding-right: 20px diff --git a/src/styles/_project-dashboard.sass b/src/styles/_project-dashboard.sass index c11b6d9c..761a89e7 100644 --- a/src/styles/_project-dashboard.sass +++ b/src/styles/_project-dashboard.sass @@ -178,7 +178,7 @@ display: block margin: 15px auto 0 auto width: 200px - +button($color-success, 3px) + +button($color-success, $btn-border-radius) padding: 5px 10px .blender_sync-main-last text-align: right diff --git a/src/styles/_project.sass b/src/styles/_project.sass index 023fb4b7..5023bde2 100644 --- a/src/styles/_project.sass +++ b/src/styles/_project.sass @@ -801,7 +801,7 @@ a.learn-more font-size: .9em margin-left: 20px padding: 5px 10px - +button($color-info, 3px) + +button($color-info, $btn-border-radius) .node-extra display: flex @@ -1683,7 +1683,7 @@ a.learn-more width: 100% #files-action-add - +button($color-success, 3px, true) + +button($color-success, $btn-border-radius, true) width: 200px padding: 5px 10px margin-bottom: 10px @@ -1816,10 +1816,10 @@ a.learn-more button.cancel - +button($color-text-dark-primary, 3px) + +button($color-text-dark-primary, $btn-border-radius) button.move - +button($color-success, 3px, true) + +button($color-success, $btn-border-radius, true) &.disabled pointer-events: none @@ -1841,27 +1841,27 @@ a.learn-more .fileupload-buttonbar padding: 10px 0 .fileinput-button - +button($color-success, 3px) + +button($color-success, $btn-border-radius) .start - +button($color-info, 3px) + +button($color-info, $btn-border-radius) .cancel - +button($color-warning, 3px) + +button($color-warning, $btn-border-radius) .delete - +button($danger, 3px) + +button($danger, $btn-border-radius) .toggle margin: 0 20px .files .btn &.start - +button($color-info, 3px) + +button($color-info, $btn-border-radius) &.cancel - +button($color-warning, 3px) + +button($color-warning, $btn-border-radius) &.delete - +button($danger, 3px) + +button($danger, $btn-border-radius) &.create - +button($color-success, 3px) + +button($color-success, $btn-border-radius) .template-upload, .template-download @@ -1928,11 +1928,11 @@ a.learn-more a.cta padding: 5px 35px - +button($color-primary, 3px, true) + +button($color-primary, $btn-border-radius, true) a.cta-learn-more padding: 5px 20px - +button(white, 3px) + +button(white, $btn-border-radius) display: inline-block margin: 25px 0 25px 15px padding: 5px 35px diff --git a/src/styles/_user.sass b/src/styles/_user.sass index d22469cd..4c66667a 100644 --- a/src/styles/_user.sass +++ b/src/styles/_user.sass @@ -87,10 +87,10 @@ padding: 10px 0 #submit_edit_user - +button($color-success, 3px, true) + +button($color-success, $btn-border-radius, true) #button-cancel - +button(#aaa, 3px) + +button(#aaa, $btn-border-radius) margin: 0 10px #user-edit-notification diff --git a/src/styles/components/_forms.sass b/src/styles/components/_forms.sass index 60b4b059..3cb14239 100644 --- a/src/styles/components/_forms.sass +++ b/src/styles/components/_forms.sass @@ -34,7 +34,7 @@ margin-right: 10px .fieldlist-action-button - +button($color-success, 3px) + +button($color-success, $btn-border-radius) margin: 0 0 0 10px padding: 5px 10px text-transform: initial