Merge pull request #502 from Inkdpixels/master

Style consistency for the stylesheet and a more future proof retina MQ

select2.css

@@ -20,14 +20,34 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 
     More Info : http://www.quirksmode.org/css/box.html
   */
-  -moz-box-sizing: border-box;    /* firefox */
-  -ms-box-sizing: border-box;     /* ie */
   -webkit-box-sizing: border-box; /* webkit */
    -khtml-box-sizing: border-box; /* konqueror */
+     -moz-box-sizing: border-box; /* firefox */
+      -ms-box-sizing: border-box; /* ie */
           box-sizing: border-box; /* css3 */
 }
 
 .select2-container .select2-choice {
+    display: block;
+    height: 26px;
+    padding: 0 0 0 8px;
+    overflow: hidden;
+    position: relative;
+
+    border: 1px solid #aaa;
+    white-space: nowrap;
+    line-height: 26px;
+    color: #444;
+    text-decoration: none;
+
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+
+    -webkit-background-clip: padding-box;
+       -moz-background-clip: padding;
+            background-clip: padding-box;
+
     background-color: #fff;
     background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
     background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
@@ -36,30 +56,15 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     background-image: -ms-linear-gradient(top, #eeeeee 0%, #ffffff 50%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#ffffff', GradientType = 0);
     background-image: linear-gradient(top, #eeeeee 0%, #ffffff 50%);
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    -moz-background-clip: padding;
-    -webkit-background-clip: padding-box;
-    background-clip: padding-box;
-    border: 1px solid #aaa;
-    display: block;
-    overflow: hidden;
-    white-space: nowrap;
-    position: relative;
-    height: 26px;
-    line-height: 26px;
-    padding: 0 0 0 8px;
-    color: #444;
-    text-decoration: none;
 }
 
-.select2-container.select2-drop-above .select2-choice
+.select2-container.select2-drop-above .select2-choice {
-{
     border-bottom-color: #aaa;
-    -webkit-border-radius:0px 0px 4px 4px;
+
-    -moz-border-radius:0px 0px 4px 4px;
+    -webkit-border-radius:0 0 4px 4px;
-    border-radius:0px 0px 4px 4px;
+       -moz-border-radius:0 0 4px 4px;
+            border-radius:0 0 4px 4px;
+
     background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.9, white));
     background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 90%);
     background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 90%);
@@ -73,24 +78,28 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     margin-right: 26px;
     display: block;
     overflow: hidden;
+
     white-space: nowrap;
-    -o-text-overflow: ellipsis;
+
     -ms-text-overflow: ellipsis;
+     -o-text-overflow: ellipsis;
         text-overflow: ellipsis;
 }
 
 .select2-container .select2-choice abbr {
     display: block;
+    width: 12px;
+    height: 12px;
     position: absolute;
     right: 26px;
     top: 8px;
-  width: 12px;
+
-  height: 12px;
     font-size: 1px;
+    text-decoration: none;
+
+    border: 0;
     background: url('select2.png') right top no-repeat;
     cursor: pointer;
-  text-decoration: none;
-  border:0;
     outline: 0;
 }
 .select2-container .select2-choice abbr:hover {
@@ -99,33 +108,36 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 }
 
 .select2-drop {
+    width: 100%;
+    margin-top:-1px;
+    position: absolute;
+    z-index: 9999;
+    top: 100%;
+
     background: #fff;
     color: #000;
     border: 1px solid #aaa;
     border-top: 0;
-    position: absolute;
-    top: 100%;
-    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-    -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-    -o-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-    box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-    z-index: 9999;
-    width:100%;
-    margin-top:-1px;
 
     -webkit-border-radius: 0 0 4px 4px;
        -moz-border-radius: 0 0 4px 4px;
             border-radius: 0 0 4px 4px;
+
+    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+       -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+         -o-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+            box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
 }
 
 .select2-drop.select2-drop-above {
-    -webkit-border-radius: 4px 4px 0px 0px;
-    -moz-border-radius: 4px 4px 0px 0px;
-    border-radius: 4px 4px 0px 0px;
     margin-top: 1px;
     border-top: 1px solid #aaa;
     border-bottom: 0;
 
+    -webkit-border-radius: 4px 4px 0 0;
+       -moz-border-radius: 4px 4px 0 0;
+            border-radius: 4px 4px 0 0;
+
     -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
        -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
          -o-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
@@ -133,12 +145,22 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 }
 
 .select2-container .select2-choice div {
+    display: block;
+    width: 18px;
+    height: 100%;
+    position: absolute;
+    right: 0;
+    top: 0;
+
+    border-left: 1px solid #aaa;
     -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;
+       -moz-background-clip: padding;
             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%);
@@ -147,32 +169,27 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     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;
-    position: absolute;
-    right: 0;
-    top: 0;
-    display: block;
-    height: 100%;
-    width: 18px;
 }
 
 .select2-container .select2-choice div b {
-    background: url('select2.png') no-repeat 0 1px;
     display: block;
     width: 100%;
     height: 100%;
+    background: url('select2.png') no-repeat 0 1px;
 }
 
 .select2-search {
     display: inline-block;
-  white-space: nowrap;
-  z-index: 10000;
-  position: relative;
-  min-height: 26px;
     width: 100%;
+    min-height: 26px;
     margin: 0;
     padding-left: 4px;
     padding-right: 4px;
+
+    position: relative;
+    z-index: 10000;
+
+    white-space: nowrap;
 }
 
 .select2-search-hidden {
@@ -182,6 +199,25 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 }
 
 .select2-search input {
+    width: 100%;
+    height: auto !important;
+    min-height: 26px;
+    padding: 4px 20px 4px 5px;
+    margin: 0;
+
+    outline: 0;
+    font-family: sans-serif;
+    font-size: 1em;
+
+    border: 1px solid #aaa;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+
     background: #fff url('select2.png') no-repeat 100% -22px;
     background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
     background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
@@ -189,25 +225,9 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     background: url('select2.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
     background: url('select2.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
     background: url('select2.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
-    padding: 4px 20px 4px 5px;
-    outline: 0;
-    border: 1px solid #aaa;
-    font-family: sans-serif;
-    font-size: 1em;
-    width:100%;
-    margin:0;
-    height:auto !important;
-    min-height: 26px;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-    border-radius: 0;
-    -moz-border-radius: 0;
-    -webkit-border-radius: 0;
 }
 
-.select2-drop.select2-drop-above .select2-search input
+.select2-drop.select2-drop-above .select2-search input {
-{
     margin-top: 4px;
 }
 
@@ -221,15 +241,15 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     background: url('spinner.gif') no-repeat 100%, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
 }
 
-
 .select2-container-active .select2-choice,
 .select2-container-active .select2-choices {
+    border: 1px solid #5897fb;
+    outline: none;
+
     -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
        -moz-box-shadow: 0 0 5px rgba(0,0,0,.3);
          -o-box-shadow: 0 0 5px rgba(0,0,0,.3);
             box-shadow: 0 0 5px rgba(0,0,0,.3);
-    border: 1px solid #5897fb;
-    outline: none;
 }
 
 .select2-dropdown-open .select2-choice {
@@ -239,6 +259,15 @@ Version: @@ver@@ Timestamp: @@timestamp@@
        -moz-box-shadow: 0 1px 0 #fff inset;
          -o-box-shadow: 0 1px 0 #fff inset;
             box-shadow: 0 1px 0 #fff inset;
+
+    -webkit-border-bottom-left-radius: 0;
+        -moz-border-radius-bottomleft: 0;
+            border-bottom-left-radius: 0;
+
+    -webkit-border-bottom-right-radius: 0;
+        -moz-border-radius-bottomright: 0;
+            border-bottom-right-radius: 0;
+
     background-color: #eee;
     background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
     background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
@@ -247,12 +276,6 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
     background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
-  -webkit-border-bottom-left-radius : 0;
-  -webkit-border-bottom-right-radius: 0;
-  -moz-border-radius-bottomleft : 0;
-  -moz-border-radius-bottomright: 0;
-  border-bottom-left-radius : 0;
-  border-bottom-right-radius: 0;
 }
 
 .select2-dropdown-open .select2-choice div {
@@ -265,16 +288,16 @@ Version: @@ver@@ Timestamp: @@timestamp@@
 
 /* results */
 .select2-results {
-  margin: 4px 4px 4px 0;
+    max-height: 200px;
     padding: 0 0 0 4px;
+    margin: 4px 4px 4px 0;
     position: relative;
     overflow-x: hidden;
     overflow-y: auto;
-  max-height: 200px;
 }
 
 .select2-results ul.select2-result-sub {
-  margin: 0 0 0 0;
+    margin: 0;
 }
 
 .select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px }
@@ -368,6 +391,16 @@ disabled look for already selected choices in the results dropdown
 /* multiselect */
 
 .select2-container-multi .select2-choices {
+    height: auto !important;
+    height: 1%;
+    margin: 0;
+    padding: 0;
+    position: relative;
+
+    border: 1px solid #aaa;
+    cursor: text;
+    overflow: hidden;
+
     background-color: #fff;
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
     background-image: -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
@@ -375,14 +408,6 @@ disabled look for already selected choices in the results dropdown
     background-image: -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
     background-image: -ms-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
     background-image: linear-gradient(top, #eeeeee 1%, #ffffff 15%);
-      border: 1px solid #aaa;
-      margin: 0;
-      padding: 0;
-      cursor: text;
-      overflow: hidden;
-      height: auto !important;
-      height: 1%;
-      position: relative;
 }
 
 .select2-container-multi .select2-choices {
@@ -390,37 +415,39 @@ disabled look for already selected choices in the results dropdown
 }
 
 .select2-container-multi.select2-container-active .select2-choices {
+    border: 1px solid #5897fb;
+    outline: none;
+
     -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
        -moz-box-shadow: 0 0 5px rgba(0,0,0,.3);
          -o-box-shadow: 0 0 5px rgba(0,0,0,.3);
             box-shadow: 0 0 5px rgba(0,0,0,.3);
-    border: 1px solid #5897fb;
-    outline: none;
 }
 .select2-container-multi .select2-choices li {
     float: left;
     list-style: none;
 }
 .select2-container-multi .select2-choices .select2-search-field {
-  white-space: nowrap;
     margin: 0;
     padding: 0;
+    white-space: nowrap;
 }
 
 .select2-container-multi .select2-choices .select2-search-field input {
-  color: #666;
-  background: transparent !important;
-  font-family: sans-serif;
-  font-size: 100%;
     height: 15px;
     padding: 5px;
     margin: 1px 0;
+
+    font-family: sans-serif;
+    font-size: 100%;
+    color: #666;
     outline: 0;
     border: 0;
     -webkit-box-shadow: none;
        -moz-box-shadow: none;
          -o-box-shadow: none;
             box-shadow: none;
+    background: transparent !important;
 }
 
 .select2-container-multi .select2-choices .select2-search-field input.select2-active {
@@ -432,12 +459,27 @@ disabled look for already selected choices in the results dropdown
 }
 
 .select2-container-multi .select2-choices .select2-search-choice {
+    padding: 3px 5px 3px 18px;
+    margin: 3px 0 3px 5px;
+    position: relative;
+
+    line-height: 13px;
+    color: #333;
+    cursor: default;
+    border: 1px solid #aaaaaa;
+
     -webkit-border-radius: 3px;
        -moz-border-radius: 3px;
             border-radius: 3px;
-  -moz-background-clip   : padding;
+
+    -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+       -moz-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+            box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+
     -webkit-background-clip: padding-box;
+       -moz-background-clip: padding;
             background-clip: padding-box;
+
     background-color: #e4e4e4;
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#eeeeee', GradientType=0 );
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
@@ -446,16 +488,6 @@ disabled look for already selected choices in the results dropdown
     background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
     background-image: -ms-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
     background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
-  -moz-box-shadow   : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
-  box-shadow        : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
-  color: #333;
-  border: 1px solid #aaaaaa;
-  line-height: 13px;
-  padding: 3px 5px 3px 18px;
-  margin: 3px 0 3px 5px;
-  position: relative;
-  cursor: default;
 }
 .select2-container-multi .select2-choices .select2-search-choice span {
     cursor: default;
@@ -466,21 +498,21 @@ disabled look for already selected choices in the results dropdown
 
 .select2-search-choice-close {
     display: block;
+    width: 12px;
+    height: 13px;
     position: absolute;
     right: 3px;
     top: 4px;
-  width: 12px;
+
-  height: 13px;
     font-size: 1px;
-  background: url('select2.png') right top no-repeat;
     outline: none;
+    background: url('select2.png') right top no-repeat;
 }
 
 .select2-container-multi .select2-search-choice-close {
     left: 3px;
 }
 
-
 .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
   background-position: right -11px;
 }
@@ -489,7 +521,6 @@ disabled look for already selected choices in the results dropdown
 }
 
 /* disabled styles */
-
 .select2-container-multi.select2-container-disabled .select2-choices{
     background-color: #f4f4f4;
     background-image: none;
@@ -498,10 +529,10 @@ disabled look for already selected choices in the results dropdown
 }
 
 .select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice {
+    padding: 3px 5px 3px 5px;
+    border: 1px solid #ddd;
     background-image: none;
     background-color: #f4f4f4;
-    border: 1px solid #ddd;
-    padding: 3px 5px 3px 5px;
 }
 
 .select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close {
@@ -509,15 +540,23 @@ disabled look for already selected choices in the results dropdown
 }
 /* end multiselect */
 
-.select2-result-selectable .select2-match,
-.select2-result-unselectable .select2-result-selectable .select2-match { text-decoration: underline; }
-.select2-result-unselectable .select2-match { text-decoration: none; }
 
-.select2-offscreen { position: absolute; left: -10000px; }
+.select2-result-selectable .select2-match,
+.select2-result-unselectable .select2-result-selectable .select2-match {
+    text-decoration: underline;
+}
+.select2-result-unselectable .select2-match {
+    text-decoration: none;
+}
+
+.select2-offscreen {
+    position: absolute;
+    left: -10000px;
+}
 
 /* Retina-ize icons */
 
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi)  {
   .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b {
       background-image: url('select2x2.png') !important;
       background-repeat: no-repeat !important;