From 42c7fbaa92e2b1f76a99a2704f777f18c9095c33 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 1 Jul 2015 20:37:27 +0500 Subject: [PATCH 1/4] Fixing css issues in IE, adding doctype to html files --- web/templates/channel.html | 1 + web/templates/find_team.html | 1 + web/templates/home.html | 1 + web/templates/login.html | 1 + web/templates/password_reset.html | 1 + web/templates/signup_team.html | 1 + web/templates/signup_team_complete.html | 1 + web/templates/signup_team_confirm.html | 1 + web/templates/signup_user_complete.html | 1 + web/templates/verify.html | 1 + web/templates/welcome.html | 1 + 11 files changed, 11 insertions(+) diff --git a/web/templates/channel.html b/web/templates/channel.html index d10ae23044..f8a4008f5e 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -1,4 +1,5 @@ {{define "channel"}} + {{template "head" . }} diff --git a/web/templates/find_team.html b/web/templates/find_team.html index c731f7a8f8..9acf3ac64b 100644 --- a/web/templates/find_team.html +++ b/web/templates/find_team.html @@ -1,4 +1,5 @@ {{define "find_team"}} + {{template "head" . }} diff --git a/web/templates/home.html b/web/templates/home.html index 74f7a015bf..abf8062f26 100644 --- a/web/templates/home.html +++ b/web/templates/home.html @@ -1,4 +1,5 @@ {{define "home"}} + {{template "head" . }} diff --git a/web/templates/login.html b/web/templates/login.html index 1bc5394abf..c107e1ad5c 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -1,4 +1,5 @@ {{define "login"}} + {{template "head" . }} diff --git a/web/templates/password_reset.html b/web/templates/password_reset.html index 1c5485e335..8b63556b1f 100644 --- a/web/templates/password_reset.html +++ b/web/templates/password_reset.html @@ -1,4 +1,5 @@ {{define "password_reset"}} + {{template "head" . }} diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html index f7e2773402..fad332beee 100644 --- a/web/templates/signup_team.html +++ b/web/templates/signup_team.html @@ -1,4 +1,5 @@ {{define "signup_team"}} + {{template "head" . }} diff --git a/web/templates/signup_team_complete.html b/web/templates/signup_team_complete.html index aad521cb30..59f49cdbda 100644 --- a/web/templates/signup_team_complete.html +++ b/web/templates/signup_team_complete.html @@ -1,4 +1,5 @@ {{define "signup_team_complete"}} + {{template "head" . }} diff --git a/web/templates/signup_team_confirm.html b/web/templates/signup_team_confirm.html index a34c39ab6c..9e21126da8 100644 --- a/web/templates/signup_team_confirm.html +++ b/web/templates/signup_team_confirm.html @@ -1,4 +1,5 @@ {{define "signup_team_confirm"}} + {{template "head" . }} diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html index a6827bc3a4..5fe907ba70 100644 --- a/web/templates/signup_user_complete.html +++ b/web/templates/signup_user_complete.html @@ -1,4 +1,5 @@ {{define "signup_user_complete"}} + {{template "head" . }} diff --git a/web/templates/verify.html b/web/templates/verify.html index 60a7990f0a..a61964bb30 100644 --- a/web/templates/verify.html +++ b/web/templates/verify.html @@ -1,4 +1,5 @@ {{define "verify"}} + {{template "head" . }} diff --git a/web/templates/welcome.html b/web/templates/welcome.html index 27bf4bcaf1..bab7a135db 100644 --- a/web/templates/welcome.html +++ b/web/templates/welcome.html @@ -1,4 +1,5 @@ {{define "welcome"}} + {{template "head" . }} From 494781d3cc67a0784ee36c4448194df66392b1e0 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 1 Jul 2015 23:30:41 +0500 Subject: [PATCH 2/4] Fixing height for content --- web/sass-files/sass/partials/_base.scss | 7 ++++--- web/templates/channel.html | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 5808aeb445..444f8db294 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -10,9 +10,6 @@ body { height: 100%; &.white { background: #fff; - .inner__wrap { - height: 100%; - } .row.content { min-height: 100%; height: auto !important; @@ -20,8 +17,12 @@ body { margin-bottom: -89px; } } + .inner__wrap, .row.main { + height: 100%; + } > .container-fluid { @include clearfix; + height: 100%; position: relative; } } diff --git a/web/templates/channel.html b/web/templates/channel.html index f8a4008f5e..d96aee3d45 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -1,3 +1,4 @@ + {{define "channel"}} From 64c88565654b9cfcd973961245a796d104c4e266 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 1 Jul 2015 23:36:51 +0500 Subject: [PATCH 3/4] Just arranging the css more properly --- web/sass-files/sass/partials/_base.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 444f8db294..4f069b23b9 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -17,8 +17,11 @@ body { margin-bottom: -89px; } } - .inner__wrap, .row.main { + .inner__wrap { height: 100%; + > .row.main { + height: 100%; + } } > .container-fluid { @include clearfix; From c15bc9ad94b80f3342c5daf3702231ce86561073 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 1 Jul 2015 23:37:50 +0500 Subject: [PATCH 4/4] Improving targeting for row content --- web/sass-files/sass/partials/_base.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 4f069b23b9..4fb918bd1d 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -10,11 +10,11 @@ body { height: 100%; &.white { background: #fff; - .row.content { - min-height: 100%; - height: auto !important; - height: 100%; - margin-bottom: -89px; + .inner__wrap { + > .row.content { + min-height: 100%; + margin-bottom: -89px; + } } } .inner__wrap {