Skip to content

Commit

Permalink
Merge pull request #2365 from rhamilto/issue-2356
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Adjust display of empty state message and Ace editor

in deploy image and import yaml/json modals

Fixes #2356 

![screen shot 2017-10-24 at 12 50 31 pm](https://user-images.githubusercontent.com/895728/31956709-48348d8a-b8ba-11e7-840c-5a9396f27627.PNG)
![screen shot 2017-10-24 at 12 50 42 pm](https://user-images.githubusercontent.com/895728/31956710-483ff3c8-b8ba-11e7-8987-5ff61be8e683.PNG)
![screen shot 2017-10-24 at 12 51 00 pm](https://user-images.githubusercontent.com/895728/31956711-48503ed6-b8ba-11e7-84ca-818aaa29cff9.PNG)
![screen shot 2017-10-24 at 12 51 22 pm](https://user-images.githubusercontent.com/895728/31956712-485abe42-b8ba-11e7-99cd-737809466ba2.PNG)
  • Loading branch information
openshift-merge-robot authored Oct 24, 2017
2 parents 77f200e + 8394277 commit ddf87bf
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
5 changes: 0 additions & 5 deletions app/styles/_core.less
Original file line number Diff line number Diff line change
Expand Up @@ -459,11 +459,6 @@ label.checkbox {
margin-top: 0;
}
}
@media (min-height:800px) {
.empty-state-message {
margin-top: 100px;
}
}
}

.icon-xl {
Expand Down
11 changes: 9 additions & 2 deletions app/styles/_overlay-forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@
.ace_editor.editor {
height: 265px;
.landing-page & {
height: 200px;
height: 175px;
}
}

.deploy-image .empty-state-message {
margin: 60px auto 0;
margin-bottom: 0;
margin-top: 35px;
@media(min-width: @screen-sm-min) {
margin-top: 90px;
.landing-page & {
margin-top: 50px;
}
}
}
}
11 changes: 6 additions & 5 deletions dist/styles/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ddf87bf

Please sign in to comment.