rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #542 from lvuch/bugfixes 

add clip to resolve 3995
This commit is contained in:
Vincent Fiduccia 2016-03-17 21:16:55 -07:00
parent 9deb36a58b bb7d1ccfc4
commit 390a6be888
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/applications-tab/compose-services/index/template.hbs
View File

@ -17,7 +17,7 @@
{{#each arranged as |service|}}
{{swarm/service-row model=service}}
{{else}}
<tr><td colspan="5" class="text-center text-muted">You do not have any Services yet.</td></tr>
<tr><td colspan="7" class="text-center text-muted">You do not have any Services yet.</td></tr>
{{/each}}
</tbody>
</table>

12
app/catalog-tab/index/template.hbs
View File

@ -57,14 +57,16 @@
<div class="catalog-icon">
<img src="{{catalogItem.links.icon}}"/>
</div>
<h5>
{{catalogItem.name}}
<div class="itemwrap">
<h5>
{{catalogItem.name}}
</h5>
{{#if showCatalogDropdown}}
<span class="small">in <span class="text-capitalize">{{catalogItem.catalogId}}</span></span>
{{/if}}
</h5>
<div class="r-mt10 description">{{catalogItem.description}}</div>
<hr class="r-m10" />
<div class="r-mt10 description">{{catalogItem.description}}</div>
</div>
{{#link-to launchRoute catalogItem.id class="btn btn-sm btn-primary"}}View Details{{/link-to}}
</div>
{{else}}

4
app/components/scheduling-rule-row/template.hbs
View File

@ -115,7 +115,5 @@
{{/if}}
</td>
<td class="text-right">
<div class="form-control-static input-sm">
<button class="btn btn-primary btn-sm" {{action "remove"}}><i class="icon icon-minus"/></button>
</div>
<button class="btn btn-primary btn-sm" {{action "remove"}}><i class="icon icon-minus"/></button>
</td>

2
app/k8s-tab/namespace/pods/index/template.hbs
View File

@ -20,7 +20,7 @@
{{#each arranged as |pod|}}
{{k8s/pod-row model=pod}}
{{else}}
<tr><td colspan="5" class="text-center text-muted">You do not have any Pods yet.</td></tr>
<tr><td colspan="7" class="text-center text-muted">You do not have any Pods yet.</td></tr>
{{/each}}
</tbody>
</table>

10
app/styles/pages/_catalog.scss
View File

@ -17,11 +17,14 @@ $lines-to-show: 4;
&:hover {
border: solid $blueTwo;
}
.itemwrap {
max-height: 119px;
overflow: hidden;
}
h5 {
border-bottom: solid thin rgba($darkestGrayTwo, .5);
text-align: center;
padding: 15px 0;
padding-top: 15px;
margin: 0 15px;
font-weight: bold;
}
@ -41,10 +44,9 @@ $lines-to-show: 4;
}
.description {
display: block; /* Fallback for non-webkit */
display: block;
display: -webkit-box;
max-width: 200px;
/*height: $font-size*$line-height*$lines-to-show;*/ /* Fallback for non-webkit */
margin: auto;
font-size: $font-size;
line-height: $line-height;