From efeeed2a0a1798a8d5ad4bfd014f6f3f4d9f3d8c Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 1 Oct 2015 14:06:29 +0200 Subject: content block height fix --- app/assets/stylesheets/generic/sidebar.scss | 46 +++++++++++++++++++++++++++-- app/views/layouts/_page.html.haml | 2 +- 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 -- cgit v1.2.1 From a4383aea4ce5d610509d0019b85dabe90695deec Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 1 Oct 2015 14:18:12 +0200 Subject: css aligning --- app/assets/stylesheets/generic/sidebar.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss index 39532f28990..e3a5b7ad65e 100644 --- a/app/assets/stylesheets/generic/sidebar.scss +++ b/app/assets/stylesheets/generic/sidebar.scss @@ -29,7 +29,6 @@ .container-fluid { background: #FFF; padding: $gl-padding; - /*min-height: 90vh;*/ height: 100%; min-height: 100%; -- cgit v1.2.1 From fd86b66914c1fff35d38ed0715d64f7e9dfa2757 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 2 Oct 2015 11:24:12 +0200 Subject: CSS markup fixed Everything is fixed according DZ comments. Added a bit sexy transition for our project buttons >< --- app/assets/stylesheets/base/layout.scss | 6 +++++ app/assets/stylesheets/generic/buttons.scss | 4 +++ app/assets/stylesheets/generic/sidebar.scss | 40 +++-------------------------- app/assets/stylesheets/pages/projects.scss | 16 ++++++++++++ app/views/layouts/_page.html.haml | 2 +- 5 files changed, 30 insertions(+), 38 deletions(-) diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss index b91c15d8910..ced3769af0a 100644 --- a/app/assets/stylesheets/base/layout.scss +++ b/app/assets/stylesheets/base/layout.scss @@ -1,15 +1,21 @@ 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; } 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 e3a5b7ad65e..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; @@ -40,43 +43,6 @@ } } - -.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/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index a5940543a9d..c1505b9a62f 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -505,3 +505,19 @@ pre.light-well { display: inline-block; } +.content { + height: 100%; + width: 100%; + +} + +.max-height { + height: 100%; + display: table; + width: 100%; +} + +section { + height: 100%; + display: table-row; +} \ No newline at end of file diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 95a6267e2eb..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.max_height + .clearfix.max-height = yield -- cgit v1.2.1 From 5ebcf21b81eaf3b67d1f7c675ec54be19041a379 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 2 Oct 2015 12:01:46 +0200 Subject: section and .content now in layout.cssc --- app/assets/stylesheets/base/layout.scss | 10 ++++++++++ app/assets/stylesheets/pages/projects.scss | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss index ced3769af0a..c6301ab6d32 100644 --- a/app/assets/stylesheets/base/layout.scss +++ b/app/assets/stylesheets/base/layout.scss @@ -19,6 +19,16 @@ html { z-index: 5; } +.content { + height: 100%; + width: 100%; +} + +.content section { + height: 100%; + display: table-row; +} + .container .content { margin: 0 0; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index c1505b9a62f..ddcf65d38f1 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -505,19 +505,8 @@ pre.light-well { display: inline-block; } -.content { - height: 100%; - width: 100%; - -} - .max-height { height: 100%; display: table; width: 100%; -} - -section { - height: 100%; - display: table-row; } \ No newline at end of file -- cgit v1.2.1 From acdb5f34cffc124ac9f727ff434f375b0bbe9971 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 2 Oct 2015 16:38:37 +0200 Subject: max height to layout.scss --- app/assets/stylesheets/base/layout.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss index c6301ab6d32..f0569a5e673 100644 --- a/app/assets/stylesheets/base/layout.scss +++ b/app/assets/stylesheets/base/layout.scss @@ -40,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 -- cgit v1.2.1 From 75c03530f8c85924d0b7dfc020ebe65ec0488dba Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 2 Oct 2015 17:08:12 +0200 Subject: removed max-heght from project.scss --- app/assets/stylesheets/pages/projects.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index ddcf65d38f1..acf07440122 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -503,10 +503,4 @@ pre.light-well { .inline-form { display: inline-block; -} - -.max-height { - height: 100%; - display: table; - width: 100%; } \ No newline at end of file -- cgit v1.2.1