From b116a960585a0b314d96111b3aab5b72158a5fe2 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 14 Jan 2016 09:52:55 +0100 Subject: [PATCH] Fixes: U4-7581 Why so curvy? --- src/Umbraco.Web.UI.Client/src/less/belle.less | 2 +- .../less/components/umb-child-selector.less | 4 +--- .../less/components/umb-grid-selector.less | 1 - ...-view.less => umb-list-view-settings.less} | 21 ++++++++----------- .../src/less/listview.less | 3 --- src/Umbraco.Web.UI.Client/src/less/panel.less | 1 - .../components/umb-list-view-settings.html | 20 +++++++++--------- 7 files changed, 21 insertions(+), 31 deletions(-) rename src/Umbraco.Web.UI.Client/src/less/components/{umb-list-view.less => umb-list-view-settings.less} (60%) diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index dc6743c57d..1400547383 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -88,7 +88,7 @@ @import "components/umb-grid-selector.less"; @import "components/umb-child-selector.less"; @import "components/umb-group-builder.less"; -@import "components/umb-list-view.less"; +@import "components/umb-list-view-settings.less"; @import "components/umb-table.less"; @import "components/umb-confirm-action.less"; @import "components/umb-keyboard-shortcuts-overview.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less index f52c7eb47f..67b5a0495e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less @@ -4,7 +4,6 @@ margin-bottom: 5px; min-width: 300px; display: flex; - border-radius: 5px; animation: fadeIn 0.5s; } @@ -17,7 +16,6 @@ .umb-child-selector__child.-placeholder { border: 1px dashed @grayLight; background: none; - border-radius: 5px; cursor: pointer; text-align: center; justify-content: center; @@ -58,4 +56,4 @@ .umb-child-selector__child-remove { cursor: pointer; -} \ No newline at end of file +} diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less index 068894884e..d05bc9fc43 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less @@ -15,7 +15,6 @@ display: flex; align-items: center; justify-content: center; - border-radius: 5px; animation: fadeIn 0.5s; position: relative; } diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less similarity index 60% rename from src/Umbraco.Web.UI.Client/src/less/components/umb-list-view.less rename to src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less index aadcd9dc89..8c0f310cf3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less @@ -1,52 +1,49 @@ -.umb-list-view__box { +.umb-list-view-settings__box { background: #f8f8f8; border: 1px solid #CCCCCC; display: flex; - border-radius: 5px; animation: fadeIn 0.5s; padding: 15px; position: relative; } -.umb-list-view__trigger { +.umb-list-view-settings__trigger { margin-bottom: 20px; } -.umb-list-view__box.-open { +.umb-list-view-settings__box.-open { border-bottom: transparent; - border-radius: 5px 5px 0 0; } -.umb-list-view__content { +.umb-list-view-settings__content { display: flex; } -.umb-list-view__list-view-icon { +.umb-list-view-settings__list-view-icon { font-size: 20px; color: #d9d9d9; margin-right: 10px; } -.umb-list-view__name { +.umb-list-view-settings__name { margin-right: 5px; font-size: 14px; font-weight: bold; float: left; } -.umb-list-view__create-new { +.umb-list-view-settings__create-new { font-size: 12px; color: @blue; } -.umb-list-view__remove-new { +.umb-list-view-settings__remove-new { font-size: 12px; color: @red; } -.umb-list-view__settings { +.umb-list-view-settings__settings { border: 1px dashed #d9d9d9; border-top: none; - border-radius: 0 0 5px 5px; padding: 20px; } diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less index 017599afdb..b6efa9567f 100644 --- a/src/Umbraco.Web.UI.Client/src/less/listview.less +++ b/src/Umbraco.Web.UI.Client/src/less/listview.less @@ -258,7 +258,6 @@ align-items: center; padding: 10px 15px; background: @grayLighter; - border-radius: 5px; margin-bottom: 1px; } @@ -297,7 +296,6 @@ margin-right: 10px; vertical-align: middle; border: 1px solid @grayLight; - border-radius: 5px; background: #ffffff; padding: 6px 8px; display: block; @@ -318,7 +316,6 @@ margin-top: 10px; color: @blue; border: 1px dashed #d9d9d9; - border-radius: 5px; display: flex; align-items: center; justify-content: center; diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index 36c2812cc7..a1776bf12d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -386,7 +386,6 @@ align-items: center; background: #ffffff; border: 1px solid #ECECEC; - border-radius: 5px; animation: fadeIn 0.5s; flex: 0 0 55px; } diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html index f9e5eef63a..39b604aa1d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html @@ -1,6 +1,6 @@ -
+
-
+
@@ -8,24 +8,24 @@
-
+
-
- +
+
-
{{ dataType.name }} (default)
- +
{{ dataType.name }} (default)
+
- Create custom list view - Remove custom list view + Create custom list view + Remove custom list view
-
+