From e6aaf65d032ecd02b4e2bbc710bce58a264696e8 Mon Sep 17 00:00:00 2001 From: Juan de la Cruz Date: Wed, 6 May 2020 08:45:15 +0200 Subject: [PATCH] changing btn styles --- .../resources/styles/common/framework.scss | 77 +++++++------------ .../styles/main/partials/project-bar.scss | 2 +- .../styles/main/partials/viewer-header.scss | 3 +- frontend/src/uxbox/main/ui/viewer/header.cljs | 2 +- 4 files changed, 30 insertions(+), 54 deletions(-) diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss index 02022aa2f..28ddbf920 100644 --- a/frontend/resources/styles/common/framework.scss +++ b/frontend/resources/styles/common/framework.scss @@ -2,60 +2,55 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. // -// Copyright (c) 2015-2016 Andrey Antukh -// Copyright (c) 2015-2016 Juan de la Cruz +// Copyright (c) 2020 Andrey Antukh +// Copyright (c) 2020 Juan de la Cruz // Buttons %btn { appearance: none; - align-items: stretch; + align-items: center; border: none; border-radius: 3px; cursor: pointer; display: flex; - font-size: $fs14; + font-size: $fs13; + height: 30px; justify-content: center; - padding: 1rem; + padding: 0 1rem; transition: all .4s; - &.btn-big { - padding: 2rem 1rem; - } - &.btn-noshr { - flex-shrink: 0; + &.btn-large { + font-size: $fs14; + height: 40px; } &.btn-small { - font-size: $fs13; - padding: .7rem 1rem; - line-height: 1.15; + height: 25px; } } .btn-primary { @extend %btn; - align-items: center; background: $color-primary; color: $color-black; - justify-content: center; - display: flex; - padding: 1rem; &:hover { background: $color-black; color: $color-primary; } } -.btn-success { +.btn-secondary { @extend %btn; - background: $color-success; - color: $color-white; + background: $color-white; + border: 1px solid $color-black; + color: $color-black; &:hover { - background: $color-success-dark; - color: $color-white; + background: $color-primary; + border-color: $color-primary; + color: $color-black; } } -.btn-delete { +.btn-warning { @extend %btn; background: $color-danger; color: $color-white; @@ -65,6 +60,15 @@ } } +.btn-text-basic { + @extend %btn; + background: transparent; + color: $color-primary-dark; + &:hover { + background: rgba(49,239,184,.12); + } +} + .btn-gray { @extend %btn; background: $color-gray-30; @@ -74,33 +78,6 @@ } } -.btn-complete { - @extend %btn; - background: $color-complete; - color: $color-white; - &:hover { - background: $color-complete-dark; - color: $color-white; - } -} - -.btn-transparent { - @extend %btn; - background: transparent; - border: 2px solid $color-white; - color: $color-white; - &:hover { - background: $color-white; - color: $color-info-dark; - } -} -.btn-large { - flex-grow: 3; - max-width: 400px; - flex-basis: 60%; - width: 100%; -} - .btn-option { display: flex; a { diff --git a/frontend/resources/styles/main/partials/project-bar.scss b/frontend/resources/styles/main/partials/project-bar.scss index aef5e3aa3..709d2b2ea 100644 --- a/frontend/resources/styles/main/partials/project-bar.scss +++ b/frontend/resources/styles/main/partials/project-bar.scss @@ -35,7 +35,7 @@ } .btn-primary, - .btn-delete { + .btn-warning { font-size: $fs13; margin-bottom: .5rem; padding: 8px $small; diff --git a/frontend/resources/styles/main/partials/viewer-header.scss b/frontend/resources/styles/main/partials/viewer-header.scss index 6402b4d27..5a493a1c7 100644 --- a/frontend/resources/styles/main/partials/viewer-header.scss +++ b/frontend/resources/styles/main/partials/viewer-header.scss @@ -197,10 +197,9 @@ justify-content: center; align-items: center; - .btn-delete, + .btn-warning, .btn-primary { width: 50%; - padding: $small; } } diff --git a/frontend/src/uxbox/main/ui/viewer/header.cljs b/frontend/src/uxbox/main/ui/viewer/header.cljs index 98b48b499..518d1d563 100644 --- a/frontend/src/uxbox/main/ui/viewer/header.cljs +++ b/frontend/src/uxbox/main/ui/viewer/header.cljs @@ -88,7 +88,7 @@ [:span.share-link-subtitle (t locale "viewer.header.share.subtitle")] [:div.share-link-buttons (if (string? token) - [:button.btn-delete {:on-click delete} + [:button.btn-warning {:on-click delete} (t locale "viewer.header.share.remove-link")] [:button.btn-primary {:on-click create} (t locale "viewer.header.share.create-link")])]]]]))