vendor/assets/stylesheets/conte.css.scss in conte_rails_template-0.0.11 vs vendor/assets/stylesheets/conte.css.scss in conte_rails_template-0.0.12

- old
+ new

@@ -25,16 +25,19 @@ color: #444; text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.75); #page { width: 100%; height: inherit; - display: table; + margin: 0px; padding: 0px; + > .row-fluid { + height: inherit; + } + #sidebar { background: #3B3D43; width: 16%; height: inherit; - display: table-cell; #logo-bg { background: #3B3D43; height: 50px; width: 100%; @include box-shadow(rgba(0, 0, 0, 0.3) 0px 2px 3px); @@ -116,12 +119,12 @@ } } #main { width: 84%; - display: table-cell; - vertical-align: top; + margin: 0px; + background: #E3E4E5; #header { position: relative; z-index: 1000; @include box-shadow(rgba(0, 0, 0, 0.3) 0px 2px 3px); height: 50px; @@ -160,9 +163,10 @@ #page-toolbar { background: #CE97AE; position: relative; z-index: 1; padding: 10px; + height: 30px; a { margin: 0px 5px; } \ No newline at end of file