summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-03 08:44:06 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-03 08:44:06 +0000
commit2b493695a39cd4e30e92cf7830e33f2f126cb30a (patch)
tree8726974c6afc36d3836e61eaee9b0f7fced29779
parentb5c12f742ab7431257cc685477d3be16c8cc5f0e (diff)
parent75c03530f8c85924d0b7dfc020ebe65ec0488dba (diff)
downloadgitlab-ce-2b493695a39cd4e30e92cf7830e33f2f126cb30a.tar.gz
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
-rw-r--r--app/assets/stylesheets/base/layout.scss22
-rw-r--r--app/assets/stylesheets/generic/buttons.scss4
-rw-r--r--app/assets/stylesheets/generic/sidebar.scss11
-rw-r--r--app/assets/stylesheets/pages/projects.scss1
-rw-r--r--app/views/layouts/_page.html.haml2
5 files changed, 36 insertions, 4 deletions
diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss
index b91c15d8910..f0569a5e673 100644
--- a/app/assets/stylesheets/base/layout.scss
+++ b/app/assets/stylesheets/base/layout.scss
@@ -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%;
+} \ No newline at end of file
diff --git a/app/assets/stylesheets/generic/buttons.scss b/app/assets/stylesheets/generic/buttons.scss
index cf76f538e01..a5fe5890447 100644
--- a/app/assets/stylesheets/generic/buttons.scss
+++ b/app/assets/stylesheets/generic/buttons.scss
@@ -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;
}
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index c5ea3aca7ca..d30fc6e189d 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -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;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 818aa10aefe..b7d046e891a 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -510,4 +510,3 @@ pre.light-well {
.inline-form {
display: inline-block;
}
-
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 2468687b56d..1f4ade81ed2 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