Permalink
Browse files

Merge commit '721e133eaa1dfe66c30777945d42954fe9e02a08' into Modules

  • Loading branch information...
2 parents 6d5dfe4 + 721e133 commit 9082a49bd50ba09b4f00731f1c38e893d663192e @kanduvisla kanduvisla committed Mar 28, 2012
@@ -160,11 +160,11 @@ button:focus,
input[type=submit].selected,
button.selected,
.button.selected {
- box-shadow: inset 2px 2px 3px rgba(0, 0, 0, 0.15), inset -1px -1px 2px rgba(255, 255, 255, 0.7);
+ box-shadow: inset 2px 2px 7px rgba(0, 0, 0, 0.1), inset 1px 1px 2px rgba(0, 0, 0, 0.15), inset -2px -2px 2px rgba(255, 255, 255, 0.85);
cursor: pointer;
- border-color: rgba(0, 0, 0, 0.25);
- color: rgba(0, 0, 0, 1);
- text-shadow: 1px 1px 1px rgba(255, 255, 255, 1);
+ color: rgba(0, 0, 0, 0.65);
+ border-color: rgba(0, 0, 0, 0.3);
+ text-shadow: -1px -1px 1px #fff;
}
input[type=submit][disabled=disabled]:hover,
@@ -36,7 +36,8 @@
--------------------------------------------------------------------------*/
span.frame,
-fieldset.frame {
+fieldset.frame,
+.frame.inline {
display: block;
margin-bottom: 15px;
border: 1px solid rgba(0, 0, 0, 0.2);
@@ -109,6 +109,10 @@ table + fieldset {
margin-top: 50px !important;
}
+td img {
+ vertical-align: middle;
+}
+
/*-----------------------------------------------------------------------------
Selectable rows
-----------------------------------------------------------------------------*/
@@ -4,12 +4,11 @@
* @since Symphony 2.3
*/
-
ul.tabs {
clear: both;
list-style-type: none;
- margin: 40px 0 0 -11px;
padding: 0;
+ margin: 0;
height: 23px;
position: relative;
top: 1px;
@@ -110,12 +109,22 @@ ul.tabs li.selected a.destructor:hover {
ul.tabs li.invalid {
background: #dd4422;
border-color: #bb2211;
- color: #fb9;
+ color: rgba(255, 255, 255, 0.7);
text-shadow: 1px 1px 1px rgba(187, 34, 17, 1);
box-shadow: none;
}
+ul.tabs li.invalid:hover {
+ color: rgba(255, 255, 255, 0.9);
+}
+
ul.tabs li.invalid a.destructor {
color: #fb9;
text-shadow: none;
}
+
+/* Tabs in context area */
+
+#context ul.tabs {
+ margin: 20px 0 0 -11px;
+}
@@ -63,7 +63,6 @@
complete: function() {
contents.css('margin-left', settings.verticalWidth + 1); // +1px right border
drawer.trigger('expandstop.drawer');
- button.addClass('selected');
}
});
}
@@ -83,7 +82,6 @@
complete: function() {
contents.css('margin-right', settings.verticalWidth + 1); // +1px right border
drawer.trigger('expandstop.drawer');
- button.addClass('selected');
}
});
}
@@ -98,10 +96,11 @@
complete: function() {
verticals.trigger('update.drawer');
drawer.trigger('expandstop.drawer');
- button.addClass('selected');
}
});
}
+
+ button.addClass('selected');
// store state
if(Symphony.Support.localStorage === true) {

0 comments on commit 9082a49

Please sign in to comment.