Skip to content

Commit a579667

Browse files
Merge pull request #2307 from rhamilto/issue-2288
Automatic merge from submit-queue. Remove hero-icon and make empty-state-message more consistent Fixes #2288 dialog from within project BEFORE ![screen shot 2017-10-19 at 9 03 30 am](https://user-images.githubusercontent.com/895728/31773606-4234cab0-b4b1-11e7-815b-62889d0e0515.PNG) now with the icon gone, the text should not be muted so as to be consistent with empty-state-message elsewhere. and i think the horizontal rule being present before a selection is made helps clarify. yea/nay? dialog from catalog ![screen shot 2017-10-19 at 9 26 22 am](https://user-images.githubusercontent.com/895728/31773504-fa6daf44-b4b0-11e7-9409-2a7d0d5917db.PNG) dialog from within project ![screen shot 2017-10-19 at 9 26 35 am](https://user-images.githubusercontent.com/895728/31773514-fe2a4188-b4b0-11e7-8511-bcf4f2af7c47.PNG) ![screen shot 2017-10-19 at 9 43 13 am](https://user-images.githubusercontent.com/895728/31773821-f9a570dc-b4b1-11e7-89e9-c113ab3f4856.PNG) create page ![screen shot 2017-10-19 at 9 26 41 am](https://user-images.githubusercontent.com/895728/31773513-fe1cca3a-b4b0-11e7-92da-253704611131.PNG)
2 parents b2a602f + d11b3ca commit a579667

File tree

5 files changed

+15
-46
lines changed

5 files changed

+15
-46
lines changed

app/styles/_core.less

-14
Original file line numberDiff line numberDiff line change
@@ -154,20 +154,6 @@
154154
// Avoid clipped descenders with class truncate or overflow: hidden
155155
line-height: 1.4;
156156
}
157-
.hero-icon {
158-
// Hidden at height < 600px.
159-
display: none;
160-
@media (min-height: 600px) {
161-
display: inline-block;
162-
font-size: 90px;
163-
}
164-
@media (min-height: 800px) {
165-
font-size: 100px;
166-
}
167-
@media (min-height: 1024px) {
168-
font-size: 120px;
169-
}
170-
}
171157
}
172158

173159
// Mark is used for highlighting terms like search terms. See http://getbootstrap.com/css/#type-inline-text

app/styles/_overlay-forms.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
}
88

99
.deploy-image .empty-state-message {
10-
margin: 30px auto 0;
10+
margin: 60px auto 0;
1111
}
1212
}

app/views/directives/deploy-image.html

+6-8
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,14 @@
6363
</fieldset>
6464
</fieldset>
6565
</ng-form>
66-
67-
<div ng-if="loading || !import" class="empty-state-message text-muted text-center">
68-
<span class="fa fa-cube icon-lg hero-icon" aria-hidden="true"></span>
69-
<div ng-if="!loading" class="h2">Select an image stream tag or enter an image name.</div>
70-
<div ng-if="loading" class="h2">Loading image metadata for <span class="word-break">{{imageName | stripSHA}}</span>...</div>
66+
<div class="mar-top-lg mar-bottom-lg">
67+
<div class="separator"></div>
68+
</div>
69+
<div ng-if="loading || !import" class="empty-state-message text-center">
70+
<h2 ng-if="!loading" class="h2">Select an image stream tag or enter an image name.</h2>
71+
<h2 ng-if="loading" class="h2">Loading image metadata for <span class="word-break">{{imageName | stripSHA}}</span>...</h2>
7172
</div>
7273
<div class="row mar-bottom-md" ng-if-start="!loading && import.image">
73-
<div class="col-sm-12 mar-top-lg mar-bottom-lg">
74-
<div class="separator"></div>
75-
</div>
7674
<div class="col-sm-2 hidden-xs text-right h2">
7775
<span class="fa fa-cube text-muted" style="font-size: 100px;" aria-hidden="true"></span>
7876
</div>

dist/scripts/templates.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -6340,15 +6340,14 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
63406340
"</fieldset>\n" +
63416341
"</fieldset>\n" +
63426342
"</ng-form>\n" +
6343-
"<div ng-if=\"loading || !import\" class=\"empty-state-message text-muted text-center\">\n" +
6344-
"<span class=\"fa fa-cube icon-lg hero-icon\" aria-hidden=\"true\"></span>\n" +
6345-
"<div ng-if=\"!loading\" class=\"h2\">Select an image stream tag or enter an image name.</div>\n" +
6346-
"<div ng-if=\"loading\" class=\"h2\">Loading image metadata for <span class=\"word-break\">{{imageName | stripSHA}}</span>...</div>\n" +
6347-
"</div>\n" +
6348-
"<div class=\"row mar-bottom-md\" ng-if-start=\"!loading && import.image\">\n" +
6349-
"<div class=\"col-sm-12 mar-top-lg mar-bottom-lg\">\n" +
6343+
"<div class=\"mar-top-lg mar-bottom-lg\">\n" +
63506344
"<div class=\"separator\"></div>\n" +
63516345
"</div>\n" +
6346+
"<div ng-if=\"loading || !import\" class=\"empty-state-message text-center\">\n" +
6347+
"<h2 ng-if=\"!loading\" class=\"h2\">Select an image stream tag or enter an image name.</h2>\n" +
6348+
"<h2 ng-if=\"loading\" class=\"h2\">Loading image metadata for <span class=\"word-break\">{{imageName | stripSHA}}</span>...</h2>\n" +
6349+
"</div>\n" +
6350+
"<div class=\"row mar-bottom-md\" ng-if-start=\"!loading && import.image\">\n" +
63526351
"<div class=\"col-sm-2 hidden-xs text-right h2\">\n" +
63536352
"<span class=\"fa fa-cube text-muted\" style=\"font-size: 100px\" aria-hidden=\"true\"></span>\n" +
63546353
"</div>\n" +

dist/styles/main.css

+2-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)