x
/
daisycloud-core
Code Issues Proposed changes

solve httpd service fail problem caused by angular 

Without this patch, we encountered the following problem while starting horizon:

Jul 06 15:32:22 host-172-16-1-76 python[4047]: CommandError: An error occurred during rendering /usr/share/openstack-dashboard/openstack_dashboard/templates/_stylesheets.html: Don't know how to merge conflicting combinators: <SimpleSelector: u'+ .btn:not(:first-child)'> and <SimpleSelector: u'> .btn'>

Change-Id: Ie558f0c00a1f915b49180f6ef090b8ba97c9b30a
Signed-off-by: luyao <lu.yao135@zte.com.cn>
This commit is contained in:
luyao 2016-07-07 10:37:14 +08:00
parent 6bdec39b98
commit f8b6c9bf45
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/horizon/horizon/static/angular/action-list/action-list.scss
View File

@ -16,33 +16,18 @@ action-list.btn-group {
notifications {
bottom: -0.5em;
font-size: 1.1em;
opacity: 1;
position: absolute;
right: -0.35em;
z-index: 3;
& + .btn:not(:first-child) {
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
&.btn-sm {
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
&.btn-lg {
border-top-left-radius: 6px;
border-bottom-left-radius: 6px;
}
}
}
.invalid {
color: $invalid-color;
color: $brand-warning;
}
& + .popover a {
cursor: pointer;
}
}
}