diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 5808aeb445..4fb918bd1d 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -11,17 +11,21 @@ body { &.white { background: #fff; .inner__wrap { - height: 100%; + > .row.content { + min-height: 100%; + margin-bottom: -89px; + } } - .row.content { - min-height: 100%; - height: auto !important; + } + .inner__wrap { + height: 100%; + > .row.main { height: 100%; - margin-bottom: -89px; } } > .container-fluid { @include clearfix; + height: 100%; position: relative; } } diff --git a/web/templates/channel.html b/web/templates/channel.html index d10ae23044..d96aee3d45 100644 --- a/web/templates/channel.html +++ b/web/templates/channel.html @@ -1,4 +1,6 @@ + {{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" . }}