From 94da555fea5b385ff03c7d28cc2fbc1d0c77ad8b Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 12 Nov 2014 11:37:35 +0100 Subject: [PATCH] Some styles unification for the grid's prevalues --- .../src/less/gridview.less | 128 +++---- .../src/views/propertyeditors/grid/grid.html | 2 +- .../propertyeditors/grid/grid.prevalues.html | 362 +++++++++--------- 3 files changed, 233 insertions(+), 259 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less index 16d49939d4..eeb763ba8a 100644 --- a/src/Umbraco.Web.UI.Client/src/less/gridview.less +++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less @@ -162,6 +162,7 @@ bottom: 0px; left: 0; right: 0; + margin: 0 20px 1px 0; } .usky-grid .usky-control:hover .cell-tools-add{ @@ -478,7 +479,7 @@ /**************************************************************************************************/ .usky-grid .usky-cell{ - padding-bottom: 20px; + padding-bottom: 15px; } .usky-grid .usky-control{ @@ -499,7 +500,7 @@ .usky-grid .usky-control-inner{ padding: 5px; margin-right: 45px; - margin-bottom: 10px; + margin-bottom: 15px; border: 1px dashed transparent; } @@ -559,57 +560,6 @@ /* template column */ /**************************************************************************************************/ - .usky-grid .usky-templates-columns .td{ - border: none !important; - vertical-align: middle; - } - -.usky-grid .usky-templates-columns .td i{ - color: @gray; - opacity: 0.8 -} - -.usky-grid .mainTbpt:hover { - border-color:@blue; -} - -.usky-grid .mainTbpt { - cursor:pointer; - border-collapse: separate; - min-height: 35px; - border: 2px solid @grayLight; - margin:0px; - padding: 1px; -} - -.usky-grid .mainTdpt { - padding: 1px; -} - -.usky-grid .mainTbpt { - height: auto; -} - -.usky-grid .mainTdpt { - height: 11px; - margin: 0; - overflow: hidden; - border: 1px dashed #d9d9d9; - display: block; - float: left; -} - -.mainTdpt span{ - width: 100%; - display: block; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - margin: 0 1px; - height: 10px; - background: @grayLight -} - /* New template preview */ .usky-grid { @@ -632,6 +582,7 @@ } .preview-rows { + display: inline-block; position: relative; -webkit-box-sizing: border-box; @@ -642,6 +593,18 @@ border: 2px solid @grayLight; /* @grayLight */ transition: border 200ms linear; + &.prevalues-rows { + margin: 0px 20px 20px 0px; + width: 80px; + float:left; + } + + &.prevalues-templates { + margin: 0px 20px 20px 0px; + float:left; + + } + &:hover { border-color: @blue; cursor: pointer; @@ -679,28 +642,43 @@ min-height: 18px; line-height: 11px; padding: 1px; + + &.prevalues-rows { + min-height: 30px; + } } - .preview-col { - display: block; - float: left; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - width: 33.3%; /* temp value */ - height: 10px; - margin: 0; - border: 1px solid @white; /* @white */ + .preview-rows { + + .preview-col { + + display: block; + float: left; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + width: 33.3%; /* temp value */ + height: 10px; + margin: 0; + border: 1px solid @white; /* @white */ + + .preview-cell { + display: block; + width: 100%; + height: 100%; + background-color: @grayLight; /* @grayLight */ + margin: 0 1px 1px 0; + } + } + + &.prevalues-templates { + .preview-col { + height: 80px; + } + } + + } - .preview-cell { - display: block; - width: 100%; - height: 100%; - background-color: @grayLight; /* @grayLight */ - margin: 0 1px 1px 0; - } - } - .preview-overlay { display: block; width: 100%; @@ -793,12 +771,6 @@ text-align: left; } -.usky-grid-configuration .uSky-templates .uSky-templates-template{ - margin: 0px 20px 20px 0px; - width: 80px; -} - - .usky-grid-configuration .uSky-templates .uSky-templates-template .tb{ max-height: 50px; border-width: 2px !important; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html index 7ecf2d4cbb..5740608fb3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html @@ -171,7 +171,7 @@
+ class="usky-cell-{{control.editor.view}}">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html index ca5266fc1f..1d5b3c1543 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html @@ -1,172 +1,167 @@
-
- + +
- - + -
+
- -
-
Layout
- - - +
- -
-
-
- - + +
- - - -
+
Layout
+ + + + + +
+
+
+
-
- -
- - - - {{currentSection.grid}} - - - -
-
+
+ +
+ + + + {{currentSection.grid}} + + + +
+
+ + +
    +
  • + +
  • +
+ +
+
+ +
+
    + +
  • - -
      -
    • - -
    • -
    - -
    -
    - -
    -
      - -
    • - - - -
      - -
      -
      - -
      +
      -
      - {{layout.name}}
      - {{layout.areas.length}} configurable sections
      -
      +
      + {{layout.name}}
      + {{layout.areas.length}} configurable sections
      +
      -
      -
    • -
    -
    +
    +
  • +
- +
+
- + - Delete section -
+ Delete section +
-
- - - - - - -
+ + + + +
- +
+
- +
+ prevent-default + ng-click="configureLayout()"> + Add new row configuration +
+