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

Merge branch 'dev-v7' into 7.3.0

Browse Source
This commit is contained in:
Shannon
2015-01-19 13:26:30 +11:00
parent a999fca349 db3b8a1acd
commit 0a0d845173
16 changed files with 235 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
View File

@@ -19,12 +19,12 @@
ng-class="{last:$last, selected:section==currentSection}"
ng-repeat="section in currentLayout.sections"
ng-click="configureSection(section, currentLayout)"
style="width:{{ percentage(section.grid) }}%">
ng-style="{width: percentage(section.grid) +'%'}">
</a>
<a class="td uSky-templates-column add" ng-if="availableLayoutSpace > 0"
ng-click="configureSection(undefined, currentLayout)"
style="width:{{ percentage(availableLayoutSpace) }}%">
ng-style="{width: percentage(availableLayoutSpace) + '%'}">
<i class="icon icon-add"></i>
</a>
@@ -113,4 +113,4 @@
</div>
</div>
</div>
</div>
</div>

6
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
View File

@@ -20,12 +20,12 @@ ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
ng-class="{last:$last, selected:cell==currentCell}"
ng-repeat="cell in currentRow.areas"
ng-click="configureCell(cell, currentRow)"
style="width:{{ percentage(cell.grid) }}%">
ng-style="{width: percentage(cell.grid) + '%'}">
</a>
<a class="td uSky-templates-column add"
ng-click="configureCell(undefined, currentRow)"
style="width:{{ percentage(availableRowSpace) }}%">
ng-style="{width: percentage(availableRowSpace) + '%'}">
<i class="icon icon-add"></i>
</a>
</div>
@@ -35,7 +35,7 @@ ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
<div ng-if="currentCell" style="padding-bottom: 50px;">
<umb-control-group label="@general_width">
<div class="grid-size-scaler" >
<div class="grid-size-scaler" >
<div class="grid-size-scaler">
<a href ng-click="scaleDown(currentCell)">
<i class="icon icon-remove"></i>