summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/generic/sidebar.scss46
-rw-r--r--app/views/layouts/_page.html.haml2
2 files changed, 45 insertions, 3 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index c5ea3aca7ca..39532f28990 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -18,15 +18,20 @@
}
.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;
+ /*min-height: 90vh;*/
+ height: 100%;
+ min-height: 100%;
&.container-blank {
background: none;
@@ -36,6 +41,43 @@
}
}
+
+.content {
+ height: 100%;
+ width: 100%;
+
+}
+
+.max_height {
+ height: 100%;
+ display: table;
+ width: 100%;
+}
+
+.project-show-readme {
+ height: 100%;
+ display: table-row;
+}
+
+.wiki {
+ min-width: 1167px;
+}
+
+section {
+ height: 100%;
+ display: table-row;
+}
+
+html, body {
+ height: 100%;
+ margin: 0;
+}
+
+.page-with-sidebar{
+ min-height: 100%;
+ height: 100%;
+}
+
.nav-sidebar {
margin-top: 14 + $header-height;
margin-bottom: 100px;
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 2468687b56d..95a6267e2eb 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -25,5 +25,5 @@
= render "layouts/flash"
%div{ class: container_class }
.content
- .clearfix
+ .clearfix.max_height
= yield