Merge pull request #2365 from rhamilto/issue-2356

openshift-merge-robot · web-flow · commit ddf87bf8fafc · 2017-10-24T13:22:53.000-07:00
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)
diff --git a/app/styles/_core.less b/app/styles/_core.less
@@ -459,11 +459,6 @@ label.checkbox {
       margin-top: 0;
     }
   }
-  @media (min-height:800px) {
-    .empty-state-message {
-      margin-top: 100px;
-    }
-  }
 }
 
 .icon-xl {
diff --git a/app/styles/_overlay-forms.less b/app/styles/_overlay-forms.less
@@ -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;
+      }
+    }
   }
 }
diff --git a/dist/styles/main.css b/dist/styles/main.css

Original file line number	Diff line number	Diff line change
`@@ -459,11 +459,6 @@ label.checkbox {`
`459`	`459`	`margin-top: 0;`
`460`	`460`	`}`
`461`	`461`	`}`
`462`		`- @media (min-height:800px) {`
`463`		`- .empty-state-message {`
`464`		`- margin-top: 100px;`
`465`		`- }`
`466`		`- }`
`467`	`462`	`}`
`468`	`463`
`469`	`464`	`.icon-xl {`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,18 @@`
`2`	`2`	`.ace_editor.editor {`
`3`	`3`	`height: 265px;`
`4`	`4`	`.landing-page & {`
`5`		`- height: 200px;`
	`5`	`+ height: 175px;`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`.deploy-image .empty-state-message {`
`10`		`- margin: 60px auto 0;`
	`10`	`+ margin-bottom: 0;`
	`11`	`+ margin-top: 35px;`
	`12`	`+ @media(min-width: @screen-sm-min) {`
	`13`	`+ margin-top: 90px;`
	`14`	`+ .landing-page & {`
	`15`	`+ margin-top: 50px;`
	`16`	`+ }`
	`17`	`+ }`
`11`	`18`	`}`
`12`	`19`	`}`