From ad0ec30e62421c7dbbf283b7fea3b47a43eca9f7 Mon Sep 17 00:00:00 2001 From: perploug Date: Mon, 23 Sep 2013 21:26:23 +0200 Subject: [PATCH] styling cleanup --- src/Umbraco.Web.UI.Client/src/less/belle.less | 4 ++-- src/Umbraco.Web.UI.Client/src/less/colors.less | 1 - src/Umbraco.Web.UI.Client/src/less/listview.less | 1 + src/Umbraco.Web.UI.Client/src/less/modals.less | 3 --- .../src/less/property-editors.less | 12 ++++++++++++ .../propertyeditors/mediapicker/mediapicker.html | 4 ++-- 6 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/less/colors.less diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 7a5145dea1..7379a23fa6 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -23,7 +23,7 @@ @import "../../lib/bootstrap/less/type.less"; @import "../../lib/bootstrap/less/code.less"; @import "tables.less"; -@import "colors.less"; + // Components: common //@import "../../lib/bootstrap/less/sprites.less"; @@ -82,4 +82,4 @@ //used for property editors @import "property-editors.less"; -@import "hacks.less"; // Remove and rewrite before release +@import "hacks.less"; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/colors.less b/src/Umbraco.Web.UI.Client/src/less/colors.less deleted file mode 100644 index 0b2d107c8f..0000000000 --- a/src/Umbraco.Web.UI.Client/src/less/colors.less +++ /dev/null @@ -1 +0,0 @@ -i.red{color: #b94a48;} \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less index 22ece1ac8f..fc932805ce 100644 --- a/src/Umbraco.Web.UI.Client/src/less/listview.less +++ b/src/Umbraco.Web.UI.Client/src/less/listview.less @@ -1,6 +1,7 @@ // Listview // ------------------------- +.umb-listview{width: auto !important;} .umb-listview .dropdown-menu { border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less index 0e7ef77c62..2e642457ca 100644 --- a/src/Umbraco.Web.UI.Client/src/less/modals.less +++ b/src/Umbraco.Web.UI.Client/src/less/modals.less @@ -57,7 +57,6 @@ .umb-dialog { outline: none; } - .umb-dialog .umb-btn-toolbar { text-align: right; padding: 15px 20px 10px 20px; @@ -65,13 +64,11 @@ clear: both; border-top: #efefef 1px solid } - .umb-dialog-body{ overflow:auto; } /* modal and umb-modal are used for right.hand dialogs */ - .modal.fade.in{border: none !important; border-radius: none !important;} .umb-modal.fade { outline: none; diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less index 572660bbe6..c996a2bdae 100644 --- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less +++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less @@ -20,3 +20,15 @@ ul.color-picker li a { width:30px; border:none; } + +// +// Media picker +// -------------------------------------------------- +.umb-mediapicker .add-link{ + display: inline-block; + height: 100px; + width: 100px; + text-align: center; + border: 1px @grayLight dashed; + line-height: 100px +} diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html index 7d7a4c35d7..fc2e061b49 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html @@ -7,8 +7,8 @@ -
  • - +
  • +