From 64c9360b3825cffb7bb7fa70108ca73d1b87aa77 Mon Sep 17 00:00:00 2001 From: Juan de la Cruz Date: Thu, 17 Dec 2015 12:34:40 +0100 Subject: [PATCH] fix project bar styles bugs --- frontend/uxbox/ui/workspace/base.cljs | 2 +- resources/public/styles/framework.scss | 10 ++++++++++ resources/public/styles/partials/project-bar.scss | 6 ++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/frontend/uxbox/ui/workspace/base.cljs b/frontend/uxbox/ui/workspace/base.cljs index bb2725050d..587e14512d 100644 --- a/frontend/uxbox/ui/workspace/base.cljs +++ b/frontend/uxbox/ui/workspace/base.cljs @@ -255,7 +255,7 @@ {:disabled (str/empty? (str/trim (get-in @parent [:form :name] ""))) :on-click on-save} "Save"] - [:button.btn-primary.btn-small + [:button.btn-delete.btn-small {:on-click on-cancel} "Cancel"]])))) diff --git a/resources/public/styles/framework.scss b/resources/public/styles/framework.scss index 670d988337..ba48f909c0 100644 --- a/resources/public/styles/framework.scss +++ b/resources/public/styles/framework.scss @@ -49,6 +49,16 @@ } } +.btn-delete { + @extend %btn; + background: $color-danger; + color: $color-white; + &:hover { + background: $color-danger-dark; + color: $color-white; + } +} + .btn-gray { @extend %btn; background: $color-gray; diff --git a/resources/public/styles/partials/project-bar.scss b/resources/public/styles/partials/project-bar.scss index aa82ee6e41..0fcfb45754 100644 --- a/resources/public/styles/partials/project-bar.scss +++ b/resources/public/styles/partials/project-bar.scss @@ -3,7 +3,7 @@ border-right: 1px solid $color-gray-lighter; bottom: 0; height: 100%; - left:55px; + left: 50px; position: fixed; width: 200px; z-index: 9; @@ -28,8 +28,10 @@ width: 100%; } - .btn-primary { + .btn-primary, + .btn-delete { font-size: $fs13; + margin-bottom: .5rem; padding: 8px $small; width: 90%; }