Commit 2b493695 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'projects' into 'master'

Improve project page height

old thing. Grey block not aligned to the bottom. It was a scroll even with short project description.

![Screen_Shot_2015-10-01_at_16.03.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b412eeaa40c79861191d1a432d95951d/Screen_Shot_2015-10-01_at_16.03.24.png)

New awesome stuff, no scroll, grey block aligned to the bottom. 

![Screen_Shot_2015-10-01_at_16.04.08](https://gitlab.com/gitlab-org/gitlab-ce/uploads/823cdb6bfb8caec892ed001448f731e5/Screen_Shot_2015-10-01_at_16.04.08.png)

See merge request !1487
parents b5c12f74 75c03530
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;
} }
...@@ -24,3 +40,9 @@ html { ...@@ -24,3 +40,9 @@ 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,6 +94,7 @@ body { ...@@ -94,6 +94,7 @@ 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;
...@@ -116,6 +117,7 @@ body { ...@@ -116,6 +117,7 @@ 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;
} }
...@@ -123,6 +125,7 @@ body { ...@@ -123,6 +125,7 @@ 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;
...@@ -145,6 +148,7 @@ body { ...@@ -145,6 +148,7 @@ 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;
...@@ -18,15 +21,19 @@ ...@@ -18,15 +21,19 @@
} }
.content-wrapper { .content-wrapper {
min-height: 100vh; min-height: 900px;
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;
min-height: 90vh; height: 100%;
min-height: 100%;
&.container-blank { &.container-blank {
background: none; background: none;
......
...@@ -510,4 +510,3 @@ pre.light-well { ...@@ -510,4 +510,3 @@ 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 .clearfix.max-height
= 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