app/assets/stylesheets/alchemy/toolbar.scss in alchemy_cms-3.0.0.rc5 vs app/assets/stylesheets/alchemy/toolbar.scss in alchemy_cms-3.0.0.rc6

- old
+ new

@@ -1,38 +1,32 @@ #toolbar { z-index: 10; - padding: 4px; - height: 44px; @extend %gradiated-toolbar; margin-right: 0px; border: $default-border; border-top-style: none; border-right-style: none; position: relative; - div.button_with_label { + .button_with_label { form { margin: 0; @include inline-block; line-height: 5px; select { margin: 0 } - - label { - margin-top: $default-margin; - } } } div p { float: right; margin: 3px $default-margin 0 0; padding: 0; } - a.button { + .button { width: 25px; height: 21px; text-decoration: none; float: right; border-width: 0; @@ -60,11 +54,11 @@ } } .search_form { position: absolute; - top: 4px; + top: 8px; right: 8px; text-align: center; } } @@ -72,34 +66,42 @@ margin-right: 8px; white-space: nowrap; &.right { position: absolute; - right: 8px; - top: 4px; + right: 0; + top: 8px; margin-left: 8px; + + label { + left: auto; + right: 50%; + margin-left: 0; + margin-right: -12px; + + &:before { + left: auto; + right: 8px; + } + } } } .toolbar_spacer { @include inline-block; - width: 1px; - height: 37px; - border-right-style: dotted; + width: 0px; + height: 29px; + border-right-style: solid; border-right-width: 1px; - margin-right: 2*$default-margin; + border-right-color: $default-border-color; + margin-right: $default-margin; margin-left: $default-margin; } #overlay_toolbar { @extend %gradiated-toolbar; - border: $default-border; - height: 44px; - border-top-style: none; - border-left-style: none; - border-right-style: none; - padding: $default-padding; + border-bottom: $default-border; a.button { width: 25px; height: 21px; text-decoration: none; @@ -115,23 +117,30 @@ text-decoration: none; background-position: 0 -21px; } } - .search_field { - width: 225px; - } - form { float: right; - width: 310px; - margin-top: 2px; - padding: 0 !important; - margin-right: 0; + margin-right: 8px; .button { position: absolute; - top: 2px; - right: 4px; + top: 4px; + right: 8px; } + } +} + +.button_group { + position: relative; + @include inline-block(top); + margin: 0 2*$default-margin; + + &:hover label { + display: block; + } + + .button_with_label { + margin: 0; } }