Skip to content

Commit 99bd69d

Browse files
rhamiltof0x11
authored andcommitted
Remove hero-icon and make empty-state-message more consistent
Fixes openshift#2288
1 parent e71fd4c commit 99bd69d

File tree

5 files changed

+24
-27
lines changed

5 files changed

+24
-27
lines changed

app/styles/_core.less

-14
Original file line numberDiff line numberDiff line change
@@ -167,20 +167,6 @@
167167
// Avoid clipped descenders with class truncate or overflow: hidden
168168
line-height: 1.4;
169169
}
170-
.hero-icon {
171-
// Hidden at height < 600px.
172-
display: none;
173-
@media (min-height: 600px) {
174-
display: inline-block;
175-
font-size: 90px;
176-
}
177-
@media (min-height: 800px) {
178-
font-size: 100px;
179-
}
180-
@media (min-height: 1024px) {
181-
font-size: 120px;
182-
}
183-
}
184170
}
185171

186172
// 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

+8-11
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,16 @@
9494
</fieldset>
9595
</fieldset>
9696
</ng-form>
97-
98-
<div ng-if="loading || !import" class="empty-state-message text-muted text-center">
99-
<span class="fa fa-cube icon-lg hero-icon" aria-hidden="true"></span>
100-
<div ng-if="!loading" class="h2">Select an image stream tag or enter an image name.</div>
101-
<div ng-if="loading" class="h2">Loading image metadata for <span class="word-break">{{imageName | stripSHA}}</span>...</div>
97+
<div class="mar-top-lg mar-bottom-lg">
98+
<div class="separator"></div>
99+
</div>
100+
<div ng-if="loading || !import" class="empty-state-message text-center">
101+
<h2 ng-if="!loading" class="h2">Select an image stream tag or enter an image name.</h2>
102+
<h2 ng-if="loading" class="h2">Loading image metadata for <span class="word-break">{{imageName | stripSHA}}</span>...</h2>
102103
</div>
103104
<div class="row mar-bottom-md" ng-if-start="!loading && import.image">
104-
<div class="col-sm-12 mar-top-lg mar-bottom-lg">
105-
<div class="separator"></div>
106-
</div>
107-
<div ng-if="loading || !import" class="empty-state-message text-center">
108-
<h2 ng-if="!loading" class="h2" translate>Select an image stream tag or enter an image name.</h2>
109-
<h2 ng-if="loading" class="h2" translate>Loading image metadata for <span class="word-break">{{imageName | stripSHA}}</span>...</h2>
105+
<div class="col-sm-2 hidden-xs text-right h2">
106+
<span class="fa fa-cube text-muted" style="font-size: 100px;" aria-hidden="true"></span>
110107
</div>
111108
<div class="row mar-bottom-md" ng-if-start="!loading && import.image">
112109
<div class="col-sm-2 hidden-xs text-right h2">

dist/scripts/templates.js

+5
Original file line numberDiff line numberDiff line change
@@ -7748,8 +7748,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
77487748
"<div class=\"separator\"></div>\n" +
77497749
"</div>\n" +
77507750
"<div ng-if=\"loading || !import\" class=\"empty-state-message text-center\">\n" +
7751+
<<<<<<< e55ce2d3708c2c2f2729b609a0a1feba8417c7e8
77517752
"<h2 ng-if=\"!loading\" class=\"h2\" translate>Select an image stream tag or enter an image name.</h2>\n" +
77527753
"<h2 ng-if=\"loading\" class=\"h2\" translate>Loading image metadata for <span class=\"word-break\">{{imageName | stripSHA}}</span>...</h2>\n" +
7754+
=======
7755+
"<h2 ng-if=\"!loading\" class=\"h2\">Select an image stream tag or enter an image name.</h2>\n" +
7756+
"<h2 ng-if=\"loading\" class=\"h2\">Loading image metadata for <span class=\"word-break\">{{imageName | stripSHA}}</span>...</h2>\n" +
7757+
>>>>>>> Remove hero-icon and make empty-state-message more consistent
77537758
"</div>\n" +
77547759
"<div class=\"row mar-bottom-md\" ng-if-start=\"!loading && import.image\">\n" +
77557760
"<div class=\"col-sm-2 hidden-xs text-right h2\">\n" +

dist/styles/main.css

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

0 commit comments

Comments
 (0)