Skip to content
Snippets Groups Projects
Verified Commit 91c0eeb6 authored by Mike Greiling's avatar Mike Greiling
Browse files

remove PhantomJS specific hacks

parent 84e67a47
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -23,7 +23,6 @@ variables:
SIMPLECOV: "true"
GIT_DEPTH: "20"
GIT_SUBMODULE_STRATEGY: "none"
PHANTOMJS_VERSION: "2.1.1"
GET_SOURCES_ATTEMPTS: "3"
KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json
Loading
Loading
Loading
Loading
@@ -484,10 +484,7 @@
height: calc(100vh - #{$header-height});
 
@media (min-width: $screen-sm-min) {
height: 475px; // Needed for PhantomJS
// scss-lint:disable DuplicateProperty
height: calc(100vh - 180px);
// scss-lint:enable DuplicateProperty
}
}
 
Loading
Loading
Loading
Loading
@@ -268,12 +268,6 @@
.filtered-search-box-input-container {
flex: 1;
position: relative;
// Fix PhantomJS not supporting `flex: 1;` properly.
// This is important because it can change the expected `e.target` when clicking things in tests.
// See https://gitlab.com/gitlab-org/gitlab-ce/blob/b54acba8b732688c59fe2f38510c469dc86ee499/spec/features/issues/filtered_search/visual_tokens_spec.rb#L61
// - With `width: 100%`: `e.target` = `.tokens-container`, https://i.imgur.com/jGq7wbx.png
// - Without `width: 100%`: `e.target` = `.filtered-search`, https://i.imgur.com/cNI2CyT.png
width: 100%;
min-width: 0;
}
 
Loading
Loading
Loading
Loading
@@ -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;
}
}
Loading
Loading
Loading
Loading
@@ -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;
 
Loading
Loading
@@ -481,7 +479,6 @@ ul.notes {
}
 
.more-actions {
float: right; // phantomjs fallback
display: flex;
align-items: flex-end;
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment