Skip to content

Commit 84b7489

Browse files
committed
Added sass build task, made sass-generated CSS canonical.
1 parent 2fc117c commit 84b7489

File tree

4 files changed

+12
-27
lines changed

4 files changed

+12
-27
lines changed

Gruntfile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ module.exports = function(grunt) {
1515
},
1616
dist: {
1717
files: {
18-
'docs/select2-bootstrap.css': 'lib/build.scss'
18+
'docs/select2-bootstrap.css': 'lib/build.scss',
19+
'select2-bootstrap.css': 'lib/build.scss'
1920
}
2021
},
2122
test: {

select2-bootstrap.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Compatible with select2 3.3.2 and bootstrap 2.3.1
44
* MIT License
55
*/
6-
76
.select2-container {
87
vertical-align: middle;
98
}
@@ -17,7 +16,7 @@
1716
-moz-border-radius: 4px;
1817
border-radius: 4px;
1918
background: none;
20-
background-color: #ffffff;
19+
background-color: white;
2120
filter: none;
2221
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
2322
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);

test/support/less.patch

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Index: select2-bootstrap.css
22
===================================================================
33
--- select2-bootstrap.css
44
+++ select2-bootstrap.css
5-
@@ -1,14 +1,39 @@
5+
@@ -1,13 +1,39 @@
66
+.clearfix {
77
+ *zoom: 1;
88
+}
@@ -35,7 +35,6 @@ Index: select2-bootstrap.css
3535
* Compatible with select2 3.3.2 and bootstrap 2.3.1
3636
* MIT License
3737
*/
38-
-
3938
.select2-container {
4039
vertical-align: middle;
4140
}
@@ -44,7 +43,14 @@ Index: select2-bootstrap.css
4443
.select2-container-multi .select2-choices {
4544
height: 28px;
4645
line-height: 29px;
47-
@@ -22,66 +47,54 @@
46+
@@ -15,72 +41,60 @@
47+
-webkit-border-radius: 4px;
48+
-moz-border-radius: 4px;
49+
border-radius: 4px;
50+
background: none;
51+
+ background-color: #ffffff;
52+
- background-color: white;
53+
filter: none;
4854
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
4955
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
5056
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);

test/support/scss.patch

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,3 @@ Index: select2-bootstrap.css
22
===================================================================
33
--- select2-bootstrap.css
44
+++ select2-bootstrap.css
5-
@@ -2,9 +2,8 @@
6-
* Select2 Bootstrap CSS 1.0
7-
* Compatible with select2 3.3.2 and bootstrap 2.3.1
8-
* MIT License
9-
*/
10-
-
11-
.select2-container {
12-
vertical-align: middle;
13-
}
14-
15-
@@ -16,9 +15,9 @@
16-
-webkit-border-radius: 4px;
17-
-moz-border-radius: 4px;
18-
border-radius: 4px;
19-
background: none;
20-
+ background-color: white;
21-
- background-color: #ffffff;
22-
filter: none;
23-
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
24-
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
25-
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);

0 commit comments

Comments
 (0)