less.patch 13 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417
  1. Index: select2-bootstrap.css
  2. ===================================================================
  3. --- select2-bootstrap.css
  4. +++ select2-bootstrap.css
  5. @@ -9,16 +9,16 @@
  6. * courtesy of @juristr (@see https://github.com/fk/select2-bootstrap-css/pull/1)
  7. */
  8. .select2-container.form-control {
  9. background: transparent;
  10. + border: none;
  11. box-shadow: none;
  12. - border: none;
  13. display: block;
  14. /* 1 */
  15. +
  16. margin: 0;
  17. padding: 0;
  18. }
  19. -
  20. /**
  21. * Adjust Select2 inputs to fit Bootstrap 3 default .form-control appearance.
  22. */
  23. .select2-container .select2-choices .select2-search-field input,
  24. @@ -29,46 +29,41 @@
  25. border-color: #cccccc;
  26. border-radius: 4px;
  27. color: #555555;
  28. font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
  29. + background-color: #ffffff;
  30. - background-color: white;
  31. filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
  32. -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
  33. box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
  34. }
  35. -
  36. .select2-search input {
  37. border-color: #cccccc;
  38. border-radius: 4px;
  39. color: #555555;
  40. font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
  41. + background-color: #ffffff;
  42. - background-color: white;
  43. filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
  44. -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
  45. box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
  46. }
  47. -
  48. .select2-container .select2-choices .select2-search-field input {
  49. -webkit-box-shadow: none;
  50. box-shadow: none;
  51. }
  52. -
  53. /**
  54. * Adjust Select2 input heights to match the Bootstrap default.
  55. */
  56. .select2-container .select2-choice {
  57. height: 34px;
  58. + line-height: 1.428571429;
  59. - line-height: 1.42857;
  60. }
  61. -
  62. /**
  63. * Address Multi Select2's height which - depending on how many elements have been selected -
  64. * may grown higher than their initial size.
  65. */
  66. .select2-container.select2-container-multi.form-control {
  67. height: auto;
  68. }
  69. -
  70. /**
  71. * Address Bootstrap 3 control sizing classes
  72. * @see http://getbootstrap.com/css/#forms-control-sizes
  73. */
  74. @@ -77,79 +72,67 @@
  75. height: 30px;
  76. line-height: 1.5;
  77. border-radius: 3px;
  78. }
  79. -
  80. .select2-container.input-lg .select2-choice,
  81. .input-group-lg .select2-container .select2-choice {
  82. height: 46px;
  83. + line-height: 1.3333333;
  84. - line-height: 1.33333;
  85. border-radius: 6px;
  86. }
  87. -
  88. .select2-container-multi .select2-choices .select2-search-field input {
  89. height: 32px;
  90. }
  91. -
  92. .select2-container-multi.input-sm .select2-choices .select2-search-field input,
  93. .input-group-sm .select2-container-multi .select2-choices .select2-search-field input {
  94. height: 28px;
  95. }
  96. -
  97. .select2-container-multi.input-lg .select2-choices .select2-search-field input,
  98. .input-group-lg .select2-container-multi .select2-choices .select2-search-field input {
  99. height: 44px;
  100. }
  101. -
  102. /**
  103. * Adjust height and line-height for .select2-search-field amd multi-select Select2 widgets.
  104. *
  105. * 1. Class repetition to address missing .select2-chosen in Select2 < 3.3.2.
  106. */
  107. .select2-container-multi .select2-choices .select2-search-field input {
  108. margin: 0;
  109. }
  110. -
  111. .select2-chosen,
  112. .select2-choice > span:first-child,
  113. .select2-container .select2-choices .select2-search-field input {
  114. padding: 6px 12px;
  115. }
  116. -
  117. .input-sm .select2-chosen,
  118. .input-group-sm .select2-chosen,
  119. .input-sm .select2-choice > span:first-child,
  120. .input-group-sm .select2-choice > span:first-child,
  121. .input-sm .select2-choices .select2-search-field input,
  122. .input-group-sm .select2-choices .select2-search-field input {
  123. padding: 5px 10px;
  124. }
  125. -
  126. .input-lg .select2-chosen,
  127. .input-group-lg .select2-chosen,
  128. .input-lg .select2-choice > span:first-child,
  129. .input-group-lg .select2-choice > span:first-child,
  130. .input-lg .select2-choices .select2-search-field input,
  131. .input-group-lg .select2-choices .select2-search-field input {
  132. padding: 10px 16px;
  133. }
  134. -
  135. .select2-container-multi .select2-choices .select2-search-choice {
  136. margin-top: 5px;
  137. margin-bottom: 3px;
  138. }
  139. -
  140. .select2-container-multi.input-sm .select2-choices .select2-search-choice,
  141. .input-group-sm .select2-container-multi .select2-choices .select2-search-choice {
  142. margin-top: 3px;
  143. margin-bottom: 2px;
  144. }
  145. -
  146. .select2-container-multi.input-lg .select2-choices .select2-search-choice,
  147. .input-group-lg .select2-container-multi .select2-choices .select2-search-choice {
  148. line-height: 24px;
  149. }
  150. -
  151. /**
  152. * Adjust the single Select2's dropdown arrow button appearance.
  153. *
  154. * 1. For Select2 v.3.3.2.
  155. @@ -159,16 +142,14 @@
  156. border-left: none;
  157. background: none;
  158. filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
  159. }
  160. -
  161. .select2-dropdown-open .select2-choice .select2-arrow,
  162. .select2-dropdown-open .select2-choice div {
  163. border-left-color: transparent;
  164. background: none;
  165. filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
  166. }
  167. -
  168. /**
  169. * Adjust the dropdown arrow button icon position for the single-select Select2 elements
  170. * to make it line up vertically now that we increased the height of .select2-container.
  171. *
  172. @@ -177,42 +158,36 @@
  173. .select2-container .select2-choice .select2-arrow b,
  174. .select2-container .select2-choice div b {
  175. background-position: 0 3px;
  176. }
  177. -
  178. .select2-dropdown-open .select2-choice .select2-arrow b,
  179. .select2-dropdown-open .select2-choice div b {
  180. background-position: -18px 3px;
  181. }
  182. -
  183. .select2-container.input-sm .select2-choice .select2-arrow b,
  184. .input-group-sm .select2-container .select2-choice .select2-arrow b,
  185. .select2-container.input-sm .select2-choice div b,
  186. .input-group-sm .select2-container .select2-choice div b {
  187. background-position: 0 1px;
  188. }
  189. -
  190. .select2-dropdown-open.input-sm .select2-choice .select2-arrow b,
  191. .input-group-sm .select2-dropdown-open .select2-choice .select2-arrow b,
  192. .select2-dropdown-open.input-sm .select2-choice div b,
  193. .input-group-sm .select2-dropdown-open .select2-choice div b {
  194. background-position: -18px 1px;
  195. }
  196. -
  197. .select2-container.input-lg .select2-choice .select2-arrow b,
  198. .input-group-lg .select2-container .select2-choice .select2-arrow b,
  199. .select2-container.input-lg .select2-choice div b,
  200. .input-group-lg .select2-container .select2-choice div b {
  201. background-position: 0 9px;
  202. }
  203. -
  204. .select2-dropdown-open.input-lg .select2-choice .select2-arrow b,
  205. .input-group-lg .select2-dropdown-open .select2-choice .select2-arrow b,
  206. .select2-dropdown-open.input-lg .select2-choice div b,
  207. .input-group-lg .select2-dropdown-open .select2-choice div b {
  208. background-position: -18px 9px;
  209. }
  210. -
  211. /**
  212. * Address Bootstrap's validation states and change Select2's border colors and focus states.
  213. * Apply .has-warning, .has-danger or .has-succes to #select2-drop to match Bootstraps' colors.
  214. */
  215. @@ -231,9 +206,8 @@
  216. }
  217. .has-warning.select2-drop-active.select2-drop.select2-drop-above {
  218. border-top-color: #66512c;
  219. }
  220. -
  221. .has-error .select2-choice,
  222. .has-error .select2-choices {
  223. border-color: #a94442;
  224. }
  225. @@ -248,9 +222,8 @@
  226. }
  227. .has-error.select2-drop-active.select2-drop.select2-drop-above {
  228. border-top-color: #843534;
  229. }
  230. -
  231. .has-success .select2-choice,
  232. .has-success .select2-choices {
  233. border-color: #3c763d;
  234. }
  235. @@ -265,9 +238,8 @@
  236. }
  237. .has-success.select2-drop-active.select2-drop.select2-drop-above {
  238. border-top-color: #2b542c;
  239. }
  240. -
  241. /**
  242. * Make Select2's active-styles - applied to .select2-container when the widget receives focus -
  243. * fit Bootstrap 3's .form-element:focus appearance.
  244. */
  245. @@ -280,18 +252,15 @@
  246. -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
  247. -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
  248. transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
  249. }
  250. -
  251. .select2-drop-active {
  252. border-color: #66afe9;
  253. }
  254. -
  255. .select2-drop-auto-width,
  256. .select2-drop.select2-drop-above.select2-drop-active {
  257. border-top-color: #66afe9;
  258. }
  259. -
  260. /**
  261. * Select2 widgets in Bootstrap Input Groups
  262. *
  263. * When Select2 widgets are combined with other elements using Bootstrap 3's
  264. @@ -312,25 +281,22 @@
  265. .input-group.select2-bootstrap-prepend [class^="select2-choice"] {
  266. border-bottom-left-radius: 0 !important;
  267. border-top-left-radius: 0 !important;
  268. }
  269. -
  270. .input-group.select2-bootstrap-append [class^="select2-choice"] {
  271. border-bottom-right-radius: 0 !important;
  272. border-top-right-radius: 0 !important;
  273. }
  274. -
  275. .select2-dropdown-open [class^="select2-choice"] {
  276. border-bottom-right-radius: 0 !important;
  277. border-bottom-left-radius: 0 !important;
  278. }
  279. -
  280. .select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
  281. border-top-right-radius: 0 !important;
  282. border-top-left-radius: 0 !important;
  283. border-bottom-right-radius: 4px !important;
  284. border-bottom-left-radius: 4px !important;
  285. + background: #ffffff;
  286. - background: white;
  287. filter: none;
  288. }
  289. .input-group.select2-bootstrap-prepend .select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
  290. border-bottom-left-radius: 0 !important;
  291. @@ -351,68 +317,61 @@
  292. }
  293. .input-group.input-group-lg.select2-bootstrap-append .select2-dropdown-open.select2-drop-above [class^="select2-choice"] {
  294. border-bottom-left-radius: 6px !important;
  295. }
  296. -
  297. /**
  298. * Adjust Select2's choices hover and selected styles to match Bootstrap 3's default dropdown styles.
  299. */
  300. .select2-results .select2-highlighted {
  301. + color: #ffffff;
  302. - color: white;
  303. background-color: #337ab7;
  304. }
  305. -
  306. /**
  307. * Adjust alignment of Bootstrap 3 buttons in Bootstrap 3 Input Groups to address
  308. * Multi Select2's height which - depending on how many elements have been selected -
  309. * may grown higher than their initial size.
  310. */
  311. .select2-bootstrap-append .select2-container-multiple,
  312. +.select2-bootstrap-prepend .select2-container-multiple,
  313. .select2-bootstrap-append .input-group-btn,
  314. +.select2-bootstrap-prepend .input-group-btn,
  315. .select2-bootstrap-append .input-group-btn .btn,
  316. -.select2-bootstrap-prepend .select2-container-multiple,
  317. -.select2-bootstrap-prepend .input-group-btn,
  318. .select2-bootstrap-prepend .input-group-btn .btn {
  319. vertical-align: top;
  320. }
  321. -
  322. /**
  323. * Make Multi Select2's choices match Bootstrap 3's default button styles.
  324. */
  325. .select2-container-multi .select2-choices .select2-search-choice {
  326. color: #555555;
  327. + background: #ffffff;
  328. - background: white;
  329. border-color: #cccccc;
  330. filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
  331. -webkit-box-shadow: none;
  332. box-shadow: none;
  333. }
  334. -
  335. .select2-container-multi .select2-choices .select2-search-choice-focus {
  336. background: #ebebeb;
  337. border-color: #adadad;
  338. color: #333333;
  339. -webkit-box-shadow: none;
  340. box-shadow: none;
  341. }
  342. -
  343. /**
  344. * Address Multi Select2's choice close-button vertical alignment.
  345. */
  346. .select2-search-choice-close {
  347. margin-top: -7px;
  348. top: 50%;
  349. }
  350. -
  351. /**
  352. * Adjust the single Select2's clear button position (used to reset the select box
  353. * back to the placeholder value and visible once a selection is made
  354. * activated by Select2's "allowClear" option).
  355. */
  356. .select2-container .select2-choice abbr {
  357. top: 50%;
  358. }
  359. -
  360. /**
  361. * Adjust "no results" and "selection limit" messages to make use
  362. * of Bootstrap 3's default "Alert" style.
  363. *
  364. @@ -423,9 +382,8 @@
  365. .select2-results .select2-selection-limit {
  366. background-color: #fcf8e3;
  367. color: #8a6d3b;
  368. }
  369. -
  370. /**
  371. * Address disabled Select2 styles.
  372. *
  373. * 1. For Select2 v.3.3.2.
  374. @@ -438,16 +396,16 @@
  375. background-color: #eeeeee;
  376. border-color: #cccccc;
  377. }
  378. .select2-container.select2-container-disabled .select2-choice .select2-arrow,
  379. +.select2-container.select2-container-disabled .select2-choices .select2-arrow,
  380. .select2-container.select2-container-disabled .select2-choice div,
  381. -.select2-container.select2-container-disabled .select2-choices .select2-arrow,
  382. .select2-container.select2-container-disabled .select2-choices div {
  383. background-color: transparent;
  384. border-left: 1px solid transparent;
  385. /* 2 */
  386. +
  387. }
  388. -
  389. /**
  390. * Address Select2's loading indicator position - which should not stick
  391. * to the right edge of Select2's search input.
  392. *
  393. @@ -472,19 +430,20 @@
  394. .select2-container-multi .select2-choices .select2-search-field input.select2-active,
  395. .select2-more-results.select2-active {
  396. background-position: 99%;
  397. /* 4 */
  398. +
  399. background-position: right 4px center;
  400. /* 5 */
  401. +
  402. }
  403. -
  404. /**
  405. * To support Select2 pre v3.4.2 in combination with Bootstrap v3.2.0,
  406. * ensure that .select2-offscreen width, height and position can not be overwritten.
  407. *
  408. + * This adresses changes in Bootstrap somewhere after the initial v3.0.0 which –
  409. - * This adresses changes in Bootstrap somewhere after the initial v3.0.0 which -
  410. * in combination with Select2's pre-v3.4.2 CSS missing the "!important" after
  411. + * the following rules – allow Bootstrap to overwrite the latter, which results in
  412. - * the following rules - allow Bootstrap to overwrite the latter, which results in
  413. * the original <select> element Select2 is replacing not be properly being hidden
  414. * when used in a "Bootstrap Input Group with Addon".
  415. **/
  416. .select2-offscreen,