RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-30 00:26:03 +03:00
Code Issues Projects Releases Wiki Activity

Revert "applied fix for #1172 - Clear button overlaps text"

Browse Source 
This reverts commit fd07c11484.
This commit is contained in:
Igor Vaynberg 2013-04-12 07:58:13 -07:00
parent 06c82f2d0b
commit 25549c787b
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
select2.css
View File

@ -81,10 +81,6 @@ Version: @@ver@@ Timestamp: @@timestamp@@
background-image: linear-gradient(top, #eeeeee 0%,#ffffff 90%); background-image: linear-gradient(top, #eeeeee 0%,#ffffff 90%);
} }
.select2-container.select2-allowclear .select2-choice span {
margin-right: 42px;
}
.select2-container .select2-choice span { .select2-container .select2-choice span {
margin-right: 26px; margin-right: 26px;
display: block; display: block;
@ -98,11 +94,11 @@ Version: @@ver@@ Timestamp: @@timestamp@@
} }
.select2-container .select2-choice abbr { .select2-container .select2-choice abbr {
display: inline-block; display: block;
width: 12px; width: 12px;
height: 12px; height: 12px;
position: absolute; position: absolute;
right: 24px; right: 26px;
top: 8px; top: 8px;
font-size: 1px; font-size: 1px;
@ -175,7 +171,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
} }
.select2-container .select2-choice div { .select2-container .select2-choice div {
display: inline-block; display: block;
width: 18px; width: 18px;
height: 100%; height: 100%;
position: absolute; position: absolute;

2
select2.js
View File

@ -1944,7 +1944,6 @@ the specific language governing permissions and limitations under the Apache Lic
this.selection.addClass("select2-default"); this.selection.addClass("select2-default");
this.container.removeClass("select2-allowclear");
this.selection.find("abbr").hide(); this.selection.find("abbr").hide();
} }
}, },
@ -2023,7 +2022,6 @@ the specific language governing permissions and limitations under the Apache Lic
this.selection.removeClass("select2-default"); this.selection.removeClass("select2-default");
if (this.opts.allowClear && this.getPlaceholder() !== undefined) { if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
this.container.addClass("select2-allowclear");
this.selection.find("abbr").show(); this.selection.find("abbr").show();
} }
}, },