From 1fd921be587bd2687df4179369aa593ce98bbc7e Mon Sep 17 00:00:00 2001 From: Josef Citrine Date: Mon, 11 Jul 2016 02:30:01 +0100 Subject: [PATCH] Buttons! --- .../templates/partials/playlist-dialog.html | 4 +-- .../assets/styles/components/components.less | 34 ++++++++++++++++++- resources/assets/styles/layout.less | 24 +++++++++++++ 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/public/templates/partials/playlist-dialog.html b/public/templates/partials/playlist-dialog.html index 7448e811..6802647d 100644 --- a/public/templates/partials/playlist-dialog.html +++ b/public/templates/partials/playlist-dialog.html @@ -31,13 +31,13 @@ diff --git a/resources/assets/styles/components/components.less b/resources/assets/styles/components/components.less index 72e34a57..cae87153 100644 --- a/resources/assets/styles/components/components.less +++ b/resources/assets/styles/components/components.less @@ -51,6 +51,12 @@ margin: 0px; } + > .btn { + text-transform: initial; + box-shadow: 0 0 0 transparent !important; + transition: background-color 0.3s @swift-ease-in-out; + } + &.has-filter { > .btn { background: @pfm-purple; @@ -216,13 +222,39 @@ ui-view { html body { .btn { - .border-radius(0px); + .material-shadow(1); + .border-radius(3px); + border:0; + transition: all 0.3s @swift-ease-in-out; + text-transform: uppercase; + letter-spacing: .5px; + outline: 0; + + &:hover { + .material-shadow(2); + } + + &.btn-flat { + box-shadow: 0 0 0 transparent !important; + } } .btn.btn-primary, .add-btn, .btn-success { background: @pfm-purple; border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25); color: #fff; + &:hover { + background-color: darken(@pfm-purple, 15%); + } + + &.btn-flat { + background-color: transparent; + color: @pfm-purple; + &:hover { + background-color: lighten(@pfm-purple, 30%); + color: darken(@pfm-purple, 15%); + } + } } .btn-success.disabled { diff --git a/resources/assets/styles/layout.less b/resources/assets/styles/layout.less index 0744b385..70cfb0d2 100644 --- a/resources/assets/styles/layout.less +++ b/resources/assets/styles/layout.less @@ -309,3 +309,27 @@ header { .playlist-form .modal-footer { margin-top: 20px; } + +.modal-content { + .material-shadow(3); + border: 0; + border-radius: 2px; +} + +.modal-header { + border-bottom: 0; + padding: 15px 20px; + h4 { + margin-bottom: 0; + font-weight: 700; + } +} + +.modal-body { + padding: 20px; +} + +.modal-footer { + padding: 20px; + border-top: 0; +}