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

Fixed U4-5906 7.2.0 RC - other values than 12 in Grid Columns config mess up styling

Browse Source
This commit is contained in:
per ploug
2014-12-03 08:17:02 +01:00
parent 6b92e47631
commit bf90edb5be
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web.UI.Client/src/less/gridview.less
View File

@@ -5,7 +5,7 @@
overflow-y:hidden!important;
}
IFRAME {overflow:hidden;}
IFRAME {overflow:hidden;}
// Sortabel
@@ -500,7 +500,7 @@
.usky-grid .usky-templates-columns{
margin-top: 30px;
}
.usky-grid .usky-row-inner{
margin-right: 45px;
border: 1px dashed transparent;
@@ -598,7 +598,7 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
width: 125px;
margin: 35px 40px 15px 0;
margin: 35px 40px 15px 0;
border: 2px solid @grayLight; /* @grayLight */
transition: border 200ms linear;
@@ -618,7 +618,7 @@
border-color: @blue;
cursor: pointer;
}
.preview-row {
display: inline-block;
width: 100%;
@@ -627,7 +627,6 @@
}
.preview-rows.layout {
height: 180px;
padding: 2px;
.preview-row {
@@ -635,7 +634,7 @@
}
.preview-col {
height: 100%;
height: 180px;
border: dashed 1px @grayLight;
}
@@ -806,7 +805,7 @@
}
.usky-grid-configuration .uSky-templates-column.last{
margin-right: -1px;
margin-right: -1px;
}
.usky-grid-configuration .uSky-templates-column.add{

20
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
View File

@@ -12,17 +12,17 @@
<li ng-repeat="template in model.value.templates">
<div ng-click="configureTemplate(template)"
class="preview-rows layout" style="height: 60px; margin-top: 5px; margin-bottom: 20px; float:left">
class="preview-rows layout" style="margin-top: 5px; margin-bottom: 20px; float:left">
<div class="preview-row">
<div class="preview-col"
ng-class="{last:$last}"
ng-repeat="section in template.sections"
ng-style="{width: percentage(section.grid) + '%'}">
ng-style="{width: percentage(section.grid) + '%', height: '60px'}">
<div class="preview-cell"></div>
</div>
</div>
</div>
</div>
<div>
{{template.name}} <br/>
@@ -57,7 +57,7 @@
<li ng-repeat="layout in model.value.layouts">
<div ng-click="configureLayout(layout)"
<div ng-click="configureLayout(layout)"
class="preview-rows columns" style="margin-top: 5px; margin-bottom: 25px; float:left">
<div class="preview-row">
@@ -65,17 +65,17 @@
ng-class="{last:$last}"
ng-repeat="area in layout.areas"
ng-style="{width: percentage(area.grid) + '%'}">
<div class="preview-cell"></div>
</div>
</div>
</div>
</div>
<div>
{{layout.name}}<br />
<i class="icon-delete red"></i>
<a class="btn btn-small btn-link" href ng-click="deleteLayout($index)">
<localize key="general_delete" />
<localize key="general_delete" />
</a>
</div>
@@ -95,13 +95,13 @@
<div style="max-width: 600px">
<umb-control-group
label="@grid_columns"
<umb-control-group
label="@grid_columns"
description="@grid_columnsDetails">
<input type="text" class="" ng-model="model.value.columns" />
</umb-control-group>
<umb-control-group
<umb-control-group
label="@grid_settings"
description="@grid_settingsDetails">