app/assets/stylesheets/alchemy/toolbar.scss in alchemy_cms-2.5.3.1 vs app/assets/stylesheets/alchemy/toolbar.scss in alchemy_cms-2.6.0.rc5
- old
+ new
@@ -1,28 +1,21 @@
#toolbar {
z-index: 10;
padding: 4px;
height: 44px;
- background: $medium-gray url('shading.png') repeat-x 0 -40px;
+ @extend %gradiated-toolbar;
margin-right: 0px;
border: $default-border;
border-top-style: none;
border-right-style: none;
- @include bottom-left-rounded-border;
+ @extend .bottom-left-rounded-border;
position: relative;
margin-left: 5px;
- form {
- margin: 0 8px;
- float: right;
- text-align: center;
- }
-
div.button_with_label {
form {
- float: none;
margin: 0;
@include inline-block;
line-height: 5px;
select { margin: 0 }
@@ -37,20 +30,79 @@
float: right;
margin: 3px $default-margin 0 0;
padding: 0;
}
- div.toolbar_spacer {
- float: left;
- width: 1px;
- height: 37px;
- border-right-style: dotted;
- border-right-width: 1px;
+ a.button {
+ width: 25px;
+ height: 21px;
+ text-decoration: none;
+ float: right;
+ border-width: 0;
+ border-style: none;
+ font-size: 0;
+ padding: 0;
+ background-repeat: no-repeat;
+ background-position: 0 0;
+
+ &:active {
+ text-decoration: none;
+ background-position: 0 -21px;
+ }
+ }
+
+ .js_filter_field {
+ @include border-radius(15px);
+ }
+
+ .js_filter_field_box {
margin-right: 2*$default-margin;
- margin-left: $default-margin;
+
+ label {
+ margin: 0;
+ }
}
+ .search_form {
+ position: absolute;
+ top: 4px;
+ right: 8px;
+ text-align: center;
+ }
+}
+
+.toolbar_buttons {
+ margin-right: 8px;
+ white-space: nowrap;
+
+ &.right {
+ position: absolute;
+ right: 8px;
+ top: 4px;
+ margin-left: 8px;
+ }
+}
+
+.toolbar_spacer {
+ @include inline-block;
+ width: 1px;
+ height: 37px;
+ border-right-style: dotted;
+ border-right-width: 1px;
+ margin-right: 2*$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;
+
a.button {
width: 25px;
height: 21px;
text-decoration: none;
float: right;
@@ -64,16 +116,24 @@
&:active {
text-decoration: none;
background-position: 0 -21px;
}
}
-}
-div#toolbar_buttons {
- float: left;
- margin-right: 6px;
-}
+ .search_field {
+ width: 225px;
+ }
-div#toolbar_buttons_right {
- float: right;
- margin-left: 8px;
+ form {
+ float: right;
+ width: 310px;
+ margin-top: 2px;
+ padding: 0 !important;
+ margin-right: 0;
+
+ .button {
+ position: absolute;
+ top: 2px;
+ right: 4px;
+ }
+ }
}