Commit 94dc0224 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'revert-layout-changes' into 'master'

Revert "Merge branch 'projects' into 'master'"

This reverts commit 2b493695, reversing
changes made to b5c12f74.

This reverts !1487 MR because it cause bugs on mobile devices 


cc @skyruler 

See merge request !1509
parents 144eef38 813c0ead
html { html {
overflow-y: scroll; overflow-y: scroll;
height: 100%;
margin: 0;
&.touch .tooltip { display: none !important; } &.touch .tooltip { display: none !important; }
body { body {
padding-top: $header-height; padding-top: $header-height;
height: 100%;
margin: 0;
} }
} }
.container { .container {
padding-top: 0; padding-top: 0;
height: 100%;
width: 100%;
z-index: 5; z-index: 5;
} }
.content {
height: 100%;
width: 100%;
}
.content section {
height: 100%;
display: table-row;
}
.container .content { .container .content {
margin: 0 0; margin: 0 0;
} }
...@@ -40,9 +24,3 @@ html { ...@@ -40,9 +24,3 @@ html {
.container-limited { .container-limited {
max-width: $fixed-layout-width; max-width: $fixed-layout-width;
} }
.max-height {
height: 100%;
display: table;
width: 100%;
}
\ No newline at end of file
...@@ -94,7 +94,6 @@ body { ...@@ -94,7 +94,6 @@ body {
@mixin btn-info { @mixin btn-info {
@include border-radius(2px); @include border-radius(2px);
@include transition (all 0.2s ease 0s);
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
...@@ -117,7 +116,6 @@ body { ...@@ -117,7 +116,6 @@ body {
&:active { &:active {
@include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12)); @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
} }
...@@ -125,7 +123,6 @@ body { ...@@ -125,7 +123,6 @@ body {
@mixin btn-middle { @mixin btn-middle {
@include border-radius(2px); @include border-radius(2px);
@include transition (all 0.2s ease 0s);
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
...@@ -148,7 +145,6 @@ body { ...@@ -148,7 +145,6 @@ body {
&:active { &:active {
@include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12)); @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
} }
......
.page-with-sidebar { .page-with-sidebar {
min-height: 100%;
height: 100%;
.sidebar-wrapper { .sidebar-wrapper {
position: fixed; position: fixed;
top: 0; top: 0;
...@@ -21,19 +18,15 @@ ...@@ -21,19 +18,15 @@
} }
.content-wrapper { .content-wrapper {
min-height: 900px; min-height: 100vh;
display: table;
width: 100%; width: 100%;
padding: 20px; padding: 20px;
background: #EAEBEC; background: #EAEBEC;
height: 100%;
width: 100%;
.container-fluid { .container-fluid {
background: #FFF; background: #FFF;
padding: $gl-padding; padding: $gl-padding;
height: 100%; min-height: 90vh;
min-height: 100%;
&.container-blank { &.container-blank {
background: none; background: none;
......
...@@ -510,3 +510,4 @@ pre.light-well { ...@@ -510,3 +510,4 @@ pre.light-well {
.inline-form { .inline-form {
display: inline-block; display: inline-block;
} }
...@@ -25,5 +25,5 @@ ...@@ -25,5 +25,5 @@
= render "layouts/flash" = render "layouts/flash"
%div{ class: container_class } %div{ class: container_class }
.content .content
.clearfix.max-height .clearfix
= yield = yield
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment