yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shannon
2016-03-07 15:13:41 +01:00
parent a707d23692 0929b7d42c
commit f13bc07ddc
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/less/forms.less
View File

@@ -16,12 +16,12 @@ label small, .guiDialogTiny {
font-size: 11px
}
label.control-label {
label.control-label, .control-label {
padding: 0 10px 0 0 !important;
font-weight: bold;
}
.umb-status-label{
color: @gray !important;
}

2
src/Umbraco.Web.UI.Client/src/less/main.less
View File

@@ -139,7 +139,7 @@ h5.-black {
}
/* LABELS*/
.umb-control-group label.control-label {
.umb-control-group label.control-label, .umb-control-group .control-label {
text-align: left;
}
.umb-control-group label.control-label > div > label {

42
src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-results.html
View File

@@ -1,19 +1,23 @@
<div>
<ul class="umb-tree">
<li class="root">
<ul class="umb-search-group">
<li ng-repeat="result in results">
<div style="padding-left: 20px">
<a class="umb-search-group-item-link" ng-class="{first:$first}" ng-click="selectResultCallback($event, result)">
<div class="umb-search-group-item-name">
<i class="icon umb-tree-icon sprTree {{result.icon}}"></i>
{{result.name}}
</div>
<small class="search-subtitle" ng-if="result.subTitle">{{result.subTitle}}</small>
</a>
</div>
</li>
</ul>
</li>
</ul>
</div>
<ul class="umb-tree">
<li class="root">
<ul class="umb-search-group">
<li ng-repeat="result in results">
<div style="padding-left: 20px" ng-class="{'umb-tree-node-checked' : result.selected}">
<a class="umb-search-group-item-link" ng-class="{first:$first}" ng-click="selectResultCallback($event, result)">
<div class="umb-search-group-item-name">
<i class="icon umb-tree-icon sprTree {{result.icon}}"></i>
{{result.name}}
</div>
<small class="search-subtitle" ng-if="result.subTitle">{{result.subTitle}}</small>
</a>
</div>
</li>
</ul>
</li>
</ul>