Skip to content

Replacing generic cubes icon with custom-icon directive #890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2016
Merged

Replacing generic cubes icon with custom-icon directive #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions app/styles/_core.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,15 +468,11 @@ label.checkbox {
}

.osc-form {
.template-name {
text-align: right;
span.fa {
font-size: 40px;
}
@media (min-width: @screen-sm-min) {
span.fa {
font-size: 100px;
}
.icon {
text-align: center;
custom-icon {
font-size: 100px;
line-height: 1;
}
}
span.fa.visible-xs-inline {
Expand Down
2 changes: 1 addition & 1 deletion app/views/catalog/_image.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="card-pf-body card-pf-body-with-version">
<div class="card-pf-details">
<div class="card-pf-title-with-icon">
<custom-icon resource="imageStream" kind="image" tag="is.tag.tag" title="{{imageStream.metadata.name}}:{{is.tag.tag}}" class="image-icon"></custom-icon>
<custom-icon resource="imageStream" kind="image" tag="is.tag.tag" class="image-icon"></custom-icon>
<h2 class="card-pf-title">
{{imageStream | displayName}}
</h2>
Expand Down
14 changes: 7 additions & 7 deletions app/views/create/fromimage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@
<div class="middle-container">
<div class="middle-content">
<div class="container surface-shaded">
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
<div class="row">
<div class="col-md-12">
<div class="osc-form">
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
<div ng-hide="imageStream">
{{ emptyMessage }}
</div>
<div class="osc-form" ng-show="imageStream">
<div class="row">
<div class="col-md-2 template-name gutter-top hidden-sm hidden-xs">
<span class="fa fa-cubes"></span>
<div class="col-md-2 icon hidden-sm hidden-xs">
<custom-icon resource="imageStream" kind="image" tag="imageTag"></custom-icon>
</div>
<div class="col-md-8">
<fieldset ng-disabled="disableInputs">
Expand Down Expand Up @@ -405,9 +408,6 @@ <h3>Environment Variables <span class="appended-icon">(Runtime only) <span class
<a class="btn btn-default btn-lg" href="{{projectName | projectOverviewURL}}">Cancel</a>
</div>
</form>
<div ng-hide="imageStream">
{{ emptyMessage }}
</div>
</fieldset>
</div>
</div><!-- /row -->
Expand Down
12 changes: 6 additions & 6 deletions app/views/newfromtemplate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@
<div class="row">
<div class="col-md-12">
<breadcrumbs breadcrumbs="breadcrumbs"></breadcrumbs>
<div class="osc-form">
<div ng-hide="template">
{{ emptyMessage }}
</div>
<div class="osc-form" ng-show="template">
<div class="row">
<div class="col-md-2 template-name gutter-top hidden-sm hidden-xs">
<span class="fa fa-cubes"></span>
<div class="col-md-2 icon hidden-sm hidden-xs">
<custom-icon resource="template" kind="template"></custom-icon>
</div>
<div class="col-md-8">
<fieldset ng-disabled="disableInputs">
Expand Down Expand Up @@ -56,9 +59,6 @@ <h2>Images</h2>
</fieldset>
</div>
</div>
<div ng-hide="template">
{{ emptyMessage }}
</div>
</div><!-- /osc-form -->
</div><!-- /col-* -->
</div>
Expand Down
28 changes: 14 additions & 14 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3777,7 +3777,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"card-pf-body card-pf-body-with-version\">\n" +
"<div class=\"card-pf-details\">\n" +
"<div class=\"card-pf-title-with-icon\">\n" +
"<custom-icon resource=\"imageStream\" kind=\"image\" tag=\"is.tag.tag\" title=\"{{imageStream.metadata.name}}:{{is.tag.tag}}\" class=\"image-icon\"></custom-icon>\n" +
"<custom-icon resource=\"imageStream\" kind=\"image\" tag=\"is.tag.tag\" class=\"image-icon\"></custom-icon>\n" +
"<h2 class=\"card-pf-title\">\n" +
"{{imageStream | displayName}}\n" +
"</h2>\n" +
Expand Down Expand Up @@ -4368,13 +4368,16 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"middle-container\">\n" +
"<div class=\"middle-content\">\n" +
"<div class=\"container surface-shaded\">\n" +
"<breadcrumbs breadcrumbs=\"breadcrumbs\"></breadcrumbs>\n" +
"<div class=\"row\">\n" +
"<div class=\"col-md-12\">\n" +
"<div class=\"osc-form\">\n" +
"<breadcrumbs breadcrumbs=\"breadcrumbs\"></breadcrumbs>\n" +
"<div ng-hide=\"imageStream\">\n" +
"{{ emptyMessage }}\n" +
"</div>\n" +
"<div class=\"osc-form\" ng-show=\"imageStream\">\n" +
"<div class=\"row\">\n" +
"<div class=\"col-md-2 template-name gutter-top hidden-sm hidden-xs\">\n" +
"<span class=\"fa fa-cubes\"></span>\n" +
"<div class=\"col-md-2 icon hidden-sm hidden-xs\">\n" +
"<custom-icon resource=\"imageStream\" kind=\"image\" tag=\"imageTag\"></custom-icon>\n" +
"</div>\n" +
"<div class=\"col-md-8\">\n" +
"<fieldset ng-disabled=\"disableInputs\">\n" +
Expand Down Expand Up @@ -4604,9 +4607,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<a class=\"btn btn-default btn-lg\" href=\"{{projectName | projectOverviewURL}}\">Cancel</a>\n" +
"</div>\n" +
"</form>\n" +
"<div ng-hide=\"imageStream\">\n" +
"{{ emptyMessage }}\n" +
"</div>\n" +
"</fieldset>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -9530,10 +9530,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"row\">\n" +
"<div class=\"col-md-12\">\n" +
"<breadcrumbs breadcrumbs=\"breadcrumbs\"></breadcrumbs>\n" +
"<div class=\"osc-form\">\n" +
"<div ng-hide=\"template\">\n" +
"{{ emptyMessage }}\n" +
"</div>\n" +
"<div class=\"osc-form\" ng-show=\"template\">\n" +
"<div class=\"row\">\n" +
"<div class=\"col-md-2 template-name gutter-top hidden-sm hidden-xs\">\n" +
"<span class=\"fa fa-cubes\"></span>\n" +
"<div class=\"col-md-2 icon hidden-sm hidden-xs\">\n" +
"<custom-icon resource=\"template\" kind=\"template\"></custom-icon>\n" +
"</div>\n" +
"<div class=\"col-md-8\">\n" +
"<fieldset ng-disabled=\"disableInputs\">\n" +
Expand Down Expand Up @@ -9569,9 +9572,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</fieldset>\n" +
"</div>\n" +
"</div>\n" +
"<div ng-hide=\"template\">\n" +
"{{ emptyMessage }}\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down
13 changes: 5 additions & 8 deletions dist/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3682,6 +3682,7 @@ code.probe-command{display:inline-block;line-height:1.3;margin-right:2px}
.builds-block{margin-left:5px}
.builds-block .builds{margin:0;overflow:hidden}
.builds-block .builds .build{border:1px solid transparent;border-radius:5px;padding:5px;position:relative;margin:10px 0 0;text-align:left}
.empty-project .fa,.osc-form .icon,.service-table,.service-table thead tr th,.show-drag-and-drop-zone{text-align:center}
@media (min-width:768px){.builds-block .builds .build.osc-object.osc-object-hover{cursor:pointer;border-color:rgba(0,168,225,.5)}
.builds-block .builds .build.osc-object.osc-object-active{border-color:#00a8e1}
}
Expand Down Expand Up @@ -3750,7 +3751,7 @@ body{padding-right:0px!important}
.nav-tabs>li>a:before{left:0!important}
.nav-tabs,.tab-content{margin-bottom:20px;margin-top:20px}
.empty-project{margin:10px auto;max-width:500px;padding:30px}
.empty-project .fa{width:16px;text-align:center}
.empty-project .fa{width:16px}
.empty-project dd{margin-left:20px;margin-bottom:10px}
.empty-state-message{margin:60px auto;max-width:600px;padding:0 20px}
.empty-state-message .h2,.empty-state-message h2{line-height:1.4}
Expand All @@ -3763,8 +3764,7 @@ body{padding-right:0px!important}
@media (min-height:1024px){.empty-state-message{margin-top:200px}
.empty-state-message .hero-icon{font-size:120px}
}
.service-table{text-align:center;max-width:650px}
.service-table thead tr th{text-align:center}
.service-table{max-width:650px}
@media (max-width:991px){.service-table{min-width:100%}
}
.build-config-summary .latest-build-status{margin-right:5px}
Expand Down Expand Up @@ -3816,7 +3816,7 @@ body{padding-right:0px!important}
label.checkbox{font-weight:400}
.form-group .checkbox{margin-bottom:inherit}
.drag-and-drop-zone{display:none}
.show-drag-and-drop-zone{border-style:dashed;display:block;border-color:#888;border-width:3px;background-color:rgba(255,255,255,.6);margin:-3px;text-align:center;vertical-align:middle}
.show-drag-and-drop-zone{border-style:dashed;display:block;border-color:#888;border-width:3px;background-color:rgba(255,255,255,.6);margin:-3px;vertical-align:middle}
.show-drag-and-drop-zone p{position:absolute;top:50%;left:50%;transform:translateX(-50%) translateY(-50%);font-size:24px;font-weight:400;margin:0}
.highlight-drag-and-drop-zone{border-color:#0099d3}
.highlight-drag-and-drop-zone p{color:#0099d3}
Expand All @@ -3833,10 +3833,7 @@ label.checkbox{font-weight:400}
.lifecycle-hook{padding-bottom:20px}
.lifecycle-hook:first-of-type{padding-top:20px}
.lifecycle-hook .read-only-tag-image{padding-bottom:10px}
.osc-form .template-name{text-align:right}
.osc-form .template-name span.fa{font-size:40px}
@media (min-width:768px){.osc-form .template-name span.fa{font-size:100px}
}
.osc-form .icon custom-icon{font-size:100px;line-height:1}
.osc-form span.fa.visible-xs-inline{margin-right:10px}
.osc-form .flow{border-top:1px solid rgba(0,0,0,.15);display:table;margin-top:40px;width:100%}
.osc-form .flow>.flow-block{display:inline-block}
Expand Down