Merge branch 'master' of github.com:wp-shortcake/shortcake into set-a…

…ctive-editor
wp-shortcake · Jul 13, 2017 · db25c16 · db25c16
2 parents 25577fe + a511299
commit db25c16
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/css/sass/_select2-fields.scss b/css/sass/_select2-fields.scss
@@ -1,5 +1,7 @@
 .edit-shortcode-form {
 	.select2-container {
+		z-index: 160000; // Make sure Select2 UI is visible above media modal
+		width: 300px;
 		min-width: 300px;
 	}
 
@@ -8,7 +10,8 @@
 		-webkit-transition: none;
 	}
 
-	.select2-drop {
+	.select2-dropdown {
+		transform: translateY(-2px); // Account for container border radius in select2--default theme
 		z-index: 160001;
 	}
 
@@ -40,11 +43,3 @@
 
 }
 
-.select2-container {
-	z-index: 160000; // Make sure Select2 UI is visible above media modal
-	max-width: 300px;
-}
-
-.select2-results li {
-	margin: 0;
-}
diff --git a/css/shortcode-ui.css b/css/shortcode-ui.css
diff --git a/css/shortcode-ui.css.map b/css/shortcode-ui.css.map
diff --git a/js/build/shortcode-ui.js b/js/build/shortcode-ui.js
@@ -1853,6 +1853,7 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( {
 		var $fieldSelect2 = $field[ shortcodeUIData.select2_handle ]({
 			placeholder: "Search",
 			multiple: this.model.get( 'multiple' ),
+			dropdownParent: this.$el,
 
 			ajax: {
 				url: ajaxurl,

diff --git a/js/src/views/select2-field.js b/js/src/views/select2-field.js
@@ -106,6 +106,7 @@ sui.views.editAttributeSelect2Field = sui.views.editAttributeField.extend( {
 		var $fieldSelect2 = $field[ shortcodeUIData.select2_handle ]({
 			placeholder: "Search",
 			multiple: this.model.get( 'multiple' ),
+			dropdownParent: this.$el,
 
 			ajax: {
 				url: ajaxurl,