openstack/horizon
Code Issues Proposed changes

Merge "Containers list styling fix"

Browse Source
This commit is contained in:
Jenkins 2017-01-24 18:46:47 +00:00 committed by Gerrit Code Review
commit feec43457c
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/dashboards/project/static/dashboard/project/containers/_containers.scss
View File

@ -1,13 +1,11 @@
.hz-container-accordion { .hz-container-accordion {
cursor: pointer;
.accordion-toggle { .accordion-toggle {
display: inline-block; display: inline-block;
width: calc(100% - 1em); width: calc(100% - 1em);
padding: $panel-heading-padding; padding: $panel-heading-padding;
position: relative; position: relative;
&:hover { &:hover,&:focus {
text-decoration: none; text-decoration: none;
} }
} }
@ -29,7 +27,6 @@
padding: 0; padding: 0;
& > h4 > a { & > h4 > a {
padding: 0;
display: inline-block; display: inline-block;
width: 100%; width: 100%;
& > div { & > div {

16
openstack_dashboard/dashboards/project/static/dashboard/project/containers/containers.html
View File

@ -14,16 +14,20 @@
<uib-accordion class="hz-container-accordion"> <uib-accordion class="hz-container-accordion">
<div uib-accordion-group ng-repeat="container in cc.model.containers" <div uib-accordion-group ng-repeat="container in cc.model.containers"
ng-class="{'panel-primary': container.name === cc.model.container.name}" ng-class="{'panel-primary': container.name === cc.model.container.name}"
class="panel-default"
ng-click="cc.selectContainer(container)"> ng-click="cc.selectContainer(container)">
<uib-accordion-heading> <uib-accordion-heading>
<div ng-click="cc.selectContainer(container)"> <div ng-click="cc.selectContainer(container)">
<span class="hz-container-title truncate" <span class="hz-container-title truncate"
tooltip="{$ container.name $}" tooltip-placement="top" uib-tooltip="{$ container.name $}"
tooltip-popup-delay="500" tooltip-trigger="mouseenter"> uib-tooltip-placement="top"
uib-tooltip-popup-delay="1000"
uib-tooltip-trigger="mouseenter">
{$ container.name $} {$ container.name $}
</span> </span>
<span tooltip="{$ 'Delete Container' | translate $}" tooltip-placement="top" <span uib-tooltip="{$ 'Delete Container' | translate $}"
tooltip-trigger="mouseenter" uib-tooltip-placement="top"
uib-tooltip-trigger="mouseenter"
class="fa fa-trash hz-container-delete-icon" class="fa fa-trash hz-container-delete-icon"
ng-if="container.name === cc.model.container.name" ng-if="container.name === cc.model.container.name"
ng-click="cc.deleteContainer(container)"></span> ng-click="cc.deleteContainer(container)"></span>
@ -57,8 +61,8 @@
</div> </div>
<span class="hz-object-val col-lg-5 col-md-12"> <span class="hz-object-val col-lg-5 col-md-12">
<a href="{$ container.public_url $}" target="_blank" <a href="{$ container.public_url $}" target="_blank"
ng-show="container.public_url" translate>link</a> ng-show="container.public_url" translate>Link</a>
<span ng-hide="container.public_url" translate>disabled</span> <span ng-hide="container.public_url" translate>Disabled</span>
</span> </span>
</li> </li>
</ul> </ul>