Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

This commit is contained in:
Sebastiaan Janssen
2017-07-17 22:15:24 +02:00
13 changed files with 87 additions and 42 deletions

View File

@@ -7,7 +7,7 @@ ul.sections {
background: @purple;
height: 100%;
width: 80px;
border-right: 1px solid @purple;
border-right: 1px solid @purple-d1;
}
ul.sections li {
@@ -22,13 +22,16 @@ ul.sections li [class^="icon-"],
ul.sections li [class*=" icon-"],
ul.sections li img.icon-section {
font-size: 30px;
line-height: 20px; /* set line-height to ensure all icons use same line-height */
display: inline-block;
margin: 1px 0 0 0;
color: @purple-l2;
-webkit-transition: all .3s linear;
-moz-transition: all .3s linear;
transition: all .3s linear;
&, &:before {
line-height: 20px !important; /* set line-height to ensure all icons use same line-height */
}
}
ul.sections:hover li [class^="icon-"],
@@ -168,7 +171,7 @@ ul.sections-tray {
width: 80px;
& > li:first-child > a {
border-top: 1px solid @purple;
border-top: 1px solid @purple-d1;
}
& > li {

View File

@@ -20,7 +20,7 @@
</div>
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" >
<button type="button" class="btn btn-info" ng-click="nav.hideDialog()">
<button type="button" class="btn btn-info" ng-click="nav.hideDialog(true)">
<localize key="buttons_somethingElse">Do something else</localize>
</button>
</div>

View File

@@ -4,7 +4,7 @@
ng-model="renderModel">
<li ng-repeat="node in renderModel">
<i class="icon icon-delete red hover-show pull-right" ng-click="remove($index)"></i>
<i class="icon icon-delete red hover-show pull-right" style="cursor:pointer;" ng-click="remove($index); $event.stopPropagation();"></i>
<i class="icon {{node.icon}} hover-hide"></i>
<a href prevent-default ng-click="openContentPicker()" >{{node.name}}</a>