From 071f30ded77dccd4d320b0567ac3c617a7374ec6 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 14 Jun 2013 23:46:52 +0200 Subject: [PATCH] Consistent dropdown styles between chosen.js and treedropdown Removed trigger background. Incidentally this also makes it less obvious that the trigger has too much padding on the right (which I can't figure out ...) --- admin/css/screen.css | 1 - admin/scss/_style.scss | 5 ----- css/TreeDropdownField.css | 2 +- scss/TreeDropdownField.scss | 13 ------------- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index c73deee4f..c8286ee58 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -717,7 +717,6 @@ form.import-form label.left { width: 250px; } .cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .optionset li { white-space: nowrap; } .cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .optionset li label { padding-left: 2px; } .cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .fieldgroup .fieldgroup-field { width: 216px; padding-left: 0; } -.cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .TreeDropdownField .treedropdownfield-toggle-panel-link { border-left: none; background: none; background-image: none; } /** -------------------------------------------- Buttons for FileUpload -------------------------------------------- */ .ss-uploadfield-item-edit-all .ui-button-text { padding-right: 0; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 02b9d42d7..2a9dd316d 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -1709,11 +1709,6 @@ form.import-form { width:$grid-x*27; padding-left:0; } - .TreeDropdownField .treedropdownfield-toggle-panel-link { - border-left:none; - background:none; - background-image:none; - } } } diff --git a/css/TreeDropdownField.css b/css/TreeDropdownField.css index bda6fbbd9..dfd84351e 100644 --- a/css/TreeDropdownField.css +++ b/css/TreeDropdownField.css @@ -5,7 +5,7 @@ div.TreeDropdownField .treedropdownfield-panel { clear: left; position: absolute div.TreeDropdownField .treedropdownfield-panel.loading { min-height: 30px; background: white url("../images/network-save.gif") 7px 7px no-repeat; } div.TreeDropdownField .treedropdownfield-panel ul.tree { margin: 0; } div.TreeDropdownField .treedropdownfield-panel ul.tree a { font-size: 12px; } -div.TreeDropdownField .treedropdownfield-toggle-panel-link { border: none; margin: 0; z-index: 0; padding: 7px 3px; overflow: hidden; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; -moz-background-clip: padding; -webkit-background-clip: padding-box; background-clip: padding-box; background: #ccc; background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #cccccc), color-stop(0.6, #eeeeee)); background-image: -webkit-linear-gradient(center bottom, #cccccc 0%, #eeeeee 60%); background-image: -moz-linear-gradient(center bottom, #cccccc 0%, #eeeeee 60%); background-image: -o-linear-gradient(bottom, #cccccc 0%, #eeeeee 60%); background-image: -ms-linear-gradient(top, #cccccc 0%, #eeeeee 60%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 ); background-image: linear-gradient(top, #cccccc 0%, #eeeeee 60%); border-left: 1px solid #aaa; } +div.TreeDropdownField .treedropdownfield-toggle-panel-link { border: none; margin: 0; z-index: 0; padding: 7px 3px; overflow: hidden; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } div.TreeDropdownField .treedropdownfield-toggle-panel-link.treedropdownfield-open-tree { background: transparent; border: none; } div.TreeDropdownField .treedropdownfield-toggle-panel-link a { text-decoration: none; display: block; border: 0; margin: 0; opacity: 0.5; } div.TreeDropdownField a.jstree-loading .jstree-pageicon { background: white url("../images/network-save.gif") center center no-repeat; } diff --git a/scss/TreeDropdownField.scss b/scss/TreeDropdownField.scss index 05605f61f..576854a06 100755 --- a/scss/TreeDropdownField.scss +++ b/scss/TreeDropdownField.scss @@ -62,20 +62,7 @@ div.TreeDropdownField { -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; - -moz-background-clip : padding; - -webkit-background-clip: padding-box; - background-clip: padding-box; - background: #ccc; - background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee)); - background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%); - background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%); - background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%); - background-image: -ms-linear-gradient(top, #cccccc 0%,#eeeeee 60%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cccccc', endColorstr='#eeeeee',GradientType=0 ); - background-image: linear-gradient(top, #cccccc 0%,#eeeeee 60%); - border-left: 1px solid #aaa; - &.treedropdownfield-open-tree { background: transparent; border: none;