mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-09 12:46:07 +10:00
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.  New awesome stuff, no scroll, grey block aligned to the bottom.  See merge request !1487
This commit is contained in:
@@ -1,18 +1,34 @@
|
||||
html {
|
||||
overflow-y: scroll;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
|
||||
&.touch .tooltip { display: none !important; }
|
||||
|
||||
body {
|
||||
padding-top: $header-height;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.container {
|
||||
padding-top: 0;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
z-index: 5;
|
||||
}
|
||||
|
||||
.content {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.content section {
|
||||
height: 100%;
|
||||
display: table-row;
|
||||
}
|
||||
|
||||
.container .content {
|
||||
margin: 0 0;
|
||||
}
|
||||
@@ -24,3 +40,9 @@ html {
|
||||
.container-limited {
|
||||
max-width: $fixed-layout-width;
|
||||
}
|
||||
|
||||
.max-height {
|
||||
height: 100%;
|
||||
display: table;
|
||||
width: 100%;
|
||||
}
|
||||
@@ -94,6 +94,7 @@ body {
|
||||
|
||||
@mixin btn-info {
|
||||
@include border-radius(2px);
|
||||
@include transition (all 0.2s ease 0s);
|
||||
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
@@ -116,6 +117,7 @@ body {
|
||||
|
||||
&:active {
|
||||
@include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
|
||||
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
}
|
||||
@@ -123,6 +125,7 @@ body {
|
||||
|
||||
@mixin btn-middle {
|
||||
@include border-radius(2px);
|
||||
@include transition (all 0.2s ease 0s);
|
||||
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
@@ -145,6 +148,7 @@ body {
|
||||
|
||||
&:active {
|
||||
@include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
|
||||
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
.page-with-sidebar {
|
||||
min-height: 100%;
|
||||
height: 100%;
|
||||
|
||||
.sidebar-wrapper {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
@@ -18,15 +21,19 @@
|
||||
}
|
||||
|
||||
.content-wrapper {
|
||||
min-height: 100vh;
|
||||
min-height: 900px;
|
||||
display: table;
|
||||
width: 100%;
|
||||
padding: 20px;
|
||||
background: #EAEBEC;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
.container-fluid {
|
||||
background: #FFF;
|
||||
padding: $gl-padding;
|
||||
min-height: 90vh;
|
||||
height: 100%;
|
||||
min-height: 100%;
|
||||
|
||||
&.container-blank {
|
||||
background: none;
|
||||
|
||||
@@ -510,4 +510,3 @@ pre.light-well {
|
||||
.inline-form {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,5 +25,5 @@
|
||||
= render "layouts/flash"
|
||||
%div{ class: container_class }
|
||||
.content
|
||||
.clearfix
|
||||
.clearfix.max-height
|
||||
= yield
|
||||
|
||||
Reference in New Issue
Block a user