summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-05 13:59:01 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-05 13:59:01 +0200
commit813c0ead2e969aa2c68e657f8b6a64ff0f0076d5 (patch)
tree5055f4da1e07b874ff76408a4b9e1550b24a9d21
parent0de7c83a78711601b40b5a739070da2e3af29b11 (diff)
downloadgitlab-ce-813c0ead2e969aa2c68e657f8b6a64ff0f0076d5.tar.gz
Revert "Merge branch 'projects' into 'master' "revert-layout-changes
This reverts commit 2b493695a39cd4e30e92cf7830e33f2f126cb30a, reversing changes made to b5c12f742ab7431257cc685477d3be16c8cc5f0e.
-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, 4 insertions, 36 deletions
diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss
index f0569a5e673..b91c15d8910 100644
--- a/app/assets/stylesheets/base/layout.scss
+++ b/app/assets/stylesheets/base/layout.scss
@@ -1,34 +1,18 @@
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;
}
@@ -40,9 +24,3 @@ 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 a5fe5890447..cf76f538e01 100644
--- a/app/assets/stylesheets/generic/buttons.scss
+++ b/app/assets/stylesheets/generic/buttons.scss
@@ -94,7 +94,6 @@ body {
@mixin btn-info {
@include border-radius(2px);
- @include transition (all 0.2s ease 0s);
border-width: 1px;
border-style: solid;
@@ -117,7 +116,6 @@ body {
&:active {
@include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
-
border-width: 1px;
border-style: solid;
}
@@ -125,7 +123,6 @@ body {
@mixin btn-middle {
@include border-radius(2px);
- @include transition (all 0.2s ease 0s);
border-width: 1px;
border-style: solid;
@@ -148,7 +145,6 @@ 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 d30fc6e189d..c5ea3aca7ca 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -1,7 +1,4 @@
.page-with-sidebar {
- min-height: 100%;
- height: 100%;
-
.sidebar-wrapper {
position: fixed;
top: 0;
@@ -21,19 +18,15 @@
}
.content-wrapper {
- min-height: 900px;
- display: table;
+ min-height: 100vh;
width: 100%;
padding: 20px;
background: #EAEBEC;
- height: 100%;
- width: 100%;
.container-fluid {
background: #FFF;
padding: $gl-padding;
- height: 100%;
- min-height: 100%;
+ min-height: 90vh;
&.container-blank {
background: none;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index b7d046e891a..818aa10aefe 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -510,3 +510,4 @@ 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 1f4ade81ed2..2468687b56d 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.max-height
+ .clearfix
= yield