summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-01-16 14:20:11 +0100
committerTim Zallmann <tzallmann@gitlab.com>2018-01-16 14:20:11 +0100
commit3ae49ea591afcc29df61149b96a8bf072ebed93a (patch)
treec1fd08617ae9148c68729710c9ce0274dc9b0ba1
parent1a3f405e003e7655f3af4d7cf6039da6b5143adf (diff)
downloadgitlab-ce-3ae49ea591afcc29df61149b96a8bf072ebed93a.tar.gz
Fixes the max height for Firefox
-rw-r--r--app/assets/stylesheets/pages/repo.scss18
1 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index bb23e7215d7..13fc78b3f7e 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -260,6 +260,11 @@ table.table tr td.multi-file-table-name {
.projects-sidebar {
display: flex;
flex-direction: column;
+
+ .context-header {
+ width: auto;
+ margin-right: 0;
+ }
}
.multi-file-commit-panel-inner {
@@ -515,8 +520,8 @@ table.table tr td.multi-file-table-name {
margin-top: $header-height;
}
- .multi-file-commit-panel-inner {
- height: calc(100vh - #{$header-height + $performance-bar-height});
+ .multi-file-commit-panel .multi-file-commit-panel-inner-scroll {
+ max-height: calc(100vh - #{$header-height + $performance-bar-height});
}
}
@@ -529,11 +534,14 @@ table.table tr td.multi-file-table-name {
margin-top: #{$header-height + $performance-bar-height};
}
- .ide-view,
- .multi-file-commit-panel-inner {
+ .ide-view {
height: calc(100vh - #{$header-height + $performance-bar-height});
}
+ .multi-file-commit-panel .multi-file-commit-panel-inner-scroll {
+ max-height: calc(100vh - #{$header-height + $performance-bar-height + 60});
+ }
+
&.flash-shown {
.content {
margin-top: 0;
@@ -541,7 +549,7 @@ table.table tr td.multi-file-table-name {
.ide-view,
.multi-file-commit-panel-inner {
- height: calc(100vh - #{$header-height + $performance-bar-height + 52});
+ height: calc(100vh - #{$header-height + $performance-bar-height + 112});
}
}
}