summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-10-31 21:19:54 -0500
committerMike Greiling <mike@pixelcog.com>2017-10-31 21:23:25 -0500
commit91c0eeb65a177ec419d2f79f3d676851483e9347 (patch)
tree5e7cf1c51a497d154c3722ae761ae058ebb68938 /app/assets/stylesheets/pages
parent84e67a475b821fbbf32828f05c9dc4848f256565 (diff)
downloadgitlab-ce-91c0eeb65a177ec419d2f79f3d676851483e9347.tar.gz
remove PhantomJS specific hacks
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r--app/assets/stylesheets/pages/boards.scss3
-rw-r--r--app/assets/stylesheets/pages/notes.scss3
2 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index 91296b354a7..1409503d8e7 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -82,10 +82,7 @@
white-space: nowrap;
@media (min-width: $screen-sm-min) {
- height: 475px; // Needed for PhantomJS
- // scss-lint:disable DuplicateProperty
height: calc(100vh - 222px);
- // scss-lint:enable DuplicateProperty
min-height: 475px;
}
}
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 312917bd13a..f2d3e3d5cb6 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -469,8 +469,6 @@ ul.notes {
flex-shrink: 0;
display: inline-flex;
align-items: center;
- // For PhantomJS that does not support flex
- float: right;
margin-left: 10px;
color: $gray-darkest;
@@ -481,7 +479,6 @@ ul.notes {
}
.more-actions {
- float: right; // phantomjs fallback
display: flex;
align-items: flex-end;