Permalink
Browse files

MINOR Merge errors

  • Loading branch information...
1 parent 18e5dec commit f6748f5b56993c8db0cab7f0328b71321cd8ff05 @chillu chillu committed Feb 13, 2012
Showing with 13 additions and 5 deletions.
  1. +11 −5 admin/css/screen.css
  2. +2 −0 admin/scss/_style.scss
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -503,6 +503,8 @@ body.cms {
overflow-x: hidden;
z-index: 70;
@include box-shadow($color-shadow-dark 0 0 ($grid-horizontal / 2));
+ float: left;
+ position: relative;
.cms-panel-header {
padding: 0;

0 comments on commit f6748f5

Please sign in to comment.