app/assets/stylesheets/alchemy/buttons.scss in alchemy_cms-5.1.0.beta2 vs app/assets/stylesheets/alchemy/buttons.scss in alchemy_cms-5.1.0.rc1

- old
+ new

@@ -1,6 +1,9 @@ -button, input[type="submit"], a.button, input.button { +button, +input[type="submit"], +a.button, +input.button { @include button-defaults; position: relative; &.secondary { background-color: $secondary-button-bg-color; @@ -12,20 +15,21 @@ $border-color: $button-focus-border-color, $box-shadow: $button-focus-box-shadow ); } - &:active, &:active:focus { + &:active, + &:active:focus { border-color: $button-hover-border-color; box-shadow: none; } } &.small { padding: $small-button-padding; vertical-align: inherit; - line-height: 4*$default-padding; + line-height: 4 * $default-padding; font-size: inherit; } &.with_icon .icon { position: relative; @@ -81,17 +85,18 @@ &:hover { border: $default-border-width $default-border-style $icon-color; color: $icon-color; - .icon { color: inherit } + .icon { + color: inherit; + } } } &.disabled, &[disabled] { - span { opacity: 0.3; cursor: not-allowed; } @@ -116,11 +121,12 @@ button.icon_button { background: transparent; border: 0 none; box-shadow: none; - &:disabled, &.disabled { + &:disabled, + &.disabled { background: transparent; } } #new_element button.button { @@ -129,14 +135,19 @@ .button_with_label { position: relative; display: inline-block; text-align: center; - margin: 0 2*$default-margin; - &.active, &:active, &:hover { - .icon_button:not([disabled]) { + .toolbar_buttons & { + margin: 0 2 * $default-margin; + } + + &.active, + &:active, + &:hover { + .icon_button:not([disabled]) { background-color: $default-border-color; cursor: pointer; } } @@ -159,12 +170,12 @@ opacity: 0.5; cursor: default; } } -.button_with_label, .button_group { - +.button_with_label, +.button_group { .icon_button { width: 29px; height: 29px; line-height: 24px; } @@ -177,20 +188,20 @@ left: 50%; margin-left: -13px; z-index: 30; background-color: $tooltip-background-color; color: $white; - padding: $default-padding 2*$default-padding 1.5*$default-padding; + padding: $default-padding 2 * $default-padding 1.5 * $default-padding; line-height: 1; box-shadow: 0 0 4px $default-border-color; white-space: nowrap; pointer-events: none; opacity: 0; - transition: .3s; + transition: 0.3s; &:before { - content: ''; + content: ""; position: absolute; bottom: -10px; left: 8px; border: 5px transparent solid; border-top-color: $tooltip-background-color; @@ -236,8 +247,8 @@ &:hover label { visibility: visible; opacity: 1; top: -25px; - transition-delay: .2s; + transition-delay: 0.2s; } }