Skip to content

Commit 08f73d0

Browse files
Merge pull request #28 from CastleCSS/develop
1.0.9
2 parents 4da3c37 + cd4e0f7 commit 08f73d0

File tree

6 files changed

+163
-131
lines changed

6 files changed

+163
-131
lines changed

js/Select.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
var $ = require('jquery');
1313

1414
function wrapSelects(selector) {
15-
$(selector).each(function() {
15+
$(selector).each(function () {
1616
var $this = $(this);
17-
18-
if ( $this.parent('.select').length == 0 ) {
17+
if ($this.parent('.select').length == 0) {
1918
$this.wrap('<div class="select">');
20-
$('.select').append('<div class="select-arrow">')
19+
$this.parent('.select').append('<div class="select-arrow">');
2120
}
2221
});
2322
}

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"description": "Easy to use forms for CastleCSS",
55
"main": "index.js",
66
"scripts": {
7-
"test": "echo \"Error: no test specified\" && exit 1"
7+
"test": "echo \"Error: no test specified\" && exit 1",
8+
"create_js": "webpack"
89
},
910
"repository": {
1011
"type": "git",

sass/component/default.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ input[type=file] {
6767
border: $input-border;
6868
}
6969

70-
/* TODO: When enabling this it breaks normal buttons in Chrome and Firefox
70+
/* TODO: When enabling this it breaks normal buttons in Chrome and Firefox
7171
Need a safe fix
7272
*/
7373
/*&::-ms-browse {
7474
@extend .btn;
7575
}*/
76-
76+
7777
}
7878

7979
// -webkit fix for the label placeholder in input[type=date]
@@ -86,6 +86,7 @@ input[type=date]::-webkit-datetime-edit {
8686
}
8787

8888
textarea {
89+
padding: 12px;
8990
min-height: 14rem;
9091
line-height: 1.4;
9192
}
@@ -98,7 +99,7 @@ textarea {
9899

99100
> *:last-child:not(:only-child) {
100101

101-
> * {
102+
> *:last-child {
102103
margin-bottom: 0;
103104

104105
> * {

sass/component/input.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
/* Radio or checkbox, general styling */
6262
.input-indicator {
6363
position: absolute;
64-
top: -2px;
64+
top: 2px;
6565
left: 0;
6666
width: 20px;
6767
height: 20px;

0 commit comments

Comments
 (0)