Skip to content

Commit 6069c5c

Browse files
amberjasmijnamberjasmijn
committed
Merge branch 'feature/castlecss-forms' of https://github.com/CastleCSS/castlecss-docs into feature/castlecss-forms
# Conflicts: # views/forms.html
2 parents 28953db + 425707b commit 6069c5c

File tree

2 files changed

+48
-46
lines changed

2 files changed

+48
-46
lines changed

‎dist/forms.html

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ <h3>Input with button</h3>
134134
<li class="b0_12 ">
135135
<div class="form-field">
136136
<label for="search">Search</label>
137-
<div class="combined-item">
138-
<input type="search" name="search" class="form-input" id="search">
137+
<div class="input-combined">
138+
<input type="search" name="search" class="form-input" id="search"/>
139139
<button type="submit" class="btn btn-submit">Submit</button>
140140
</div>
141141
</div>
@@ -200,19 +200,19 @@ <h3>Standard checkbox</h3>
200200
<li class="b0_12">
201201
<label class="input-control input-checkbox">Orange
202202
<input type="checkbox" />
203-
<div class="input-indicator"></div>
203+
<span class="input-indicator"></span>
204204
</label>
205205
<label class="input-control input-checkbox">Banana
206206
<input type="checkbox" />
207-
<div class="input-indicator"></div>
207+
<span class="input-indicator"></span>
208208
</label>
209209
<label class="input-control input-checkbox">Apple
210210
<input type="checkbox" />
211-
<div class="input-indicator"></div>
211+
<span class="input-indicator"></span>
212212
</label>
213213
<label class="input-control input-checkbox">Pear
214214
<input type="checkbox" />
215-
<div class="input-indicator"></div>
215+
<span class="input-indicator"></span>
216216
</label>
217217
</li>
218218
</ul>
@@ -223,19 +223,19 @@ <h3>Standard checkbox</h3>
223223
<li class="b0_12">
224224
<label class="input-control input-checkbox">Orange
225225
<input type="checkbox" />
226-
<div class="input-indicator"></div>
226+
<span class="input-indicator"></span>
227227
</label>
228228
<label class="input-control input-checkbox">Banana
229229
<input type="checkbox" />
230-
<div class="input-indicator"></div>
230+
<span class="input-indicator"></span>
231231
</label>
232232
<label class="input-control input-checkbox">Apple
233233
<input type="checkbox" />
234-
<div class="input-indicator"></div>
234+
<span class="input-indicator"></span>
235235
</label>
236236
<label class="input-control input-checkbox">Pear
237237
<input type="checkbox" />
238-
<div class="input-indicator"></div>
238+
<span class="input-indicator"></span>
239239
</label>
240240
</li>
241241
</ul>
@@ -253,35 +253,36 @@ <h5>Vertical radios</h5>
253253
<label for="gender"><b>Gender</b></label>
254254
<label class="input-control input-radio">First radio
255255
<input type="radio" name="radio"/>
256-
<div class="input-indicator"></div>
256+
<span class="input-indicator"></span>
257257
</label>
258258
<label class="input-control input-radio">Second radio
259259
<input type="radio" name="radio"/>
260-
<div class="input-indicator"></div>
260+
<span class="input-indicator"></span>
261261
</label>
262262
</li>
263263
</ul>
264264
</div>
265265
<div class="b0_12 b3_12">
266266
<h5>Horizontal radios</h5>
267267
<p>Sed ligula eros, sollicitudin nec luctus ac, consectetur quis massa. Praesent nec dictum leo.</p>
268-
<code>.form-inline</code>
268+
<code>.form-horizontal</code>
269269
<ul class="g fields">
270270
<li class="b0_12">
271-
<div class="form-field form-inline">
271+
<div class="form-field form-horizontal">
272272
<label for="gender" class="label"><b>Gender</b></label>
273273
<label class="input-control input-radio">Male
274274
<input type="radio" name="radio2" checked="checked"/>
275-
<div class="input-indicator"></div>
275+
<span class="input-indicator"></span>
276276
</label>
277277
<label class="input-control input-radio">Female
278278
<input type="radio" name="radio2"/>
279-
<div class="input-indicator"></div>
279+
<span class="input-indicator"></span>
280280
</label>
281281
</div>
282282
</li>
283283
</ul>
284284
</div>
285+
</div>
285286
</section>
286287
<section class="select">
287288
<h2>Select</h2>
@@ -304,53 +305,53 @@ <h5>Input with add-on and button</h5>
304305
<li class="b0_12 ">
305306
<div class="form-field input-icon">
306307
<label for="search">Product sku</label>
307-
<div class="combined-item fa fa-star">
308-
<input type="search" name="search" class="form-input" id="search">
308+
<div class="input-combined fa fa-star">
309+
<input type="search" name="search" class="form-input" id="search"/>
309310
<button type="submit" class="btn btn-submit">Search</button>
310311
</div>
311312
</div>
312313
</li>
313314
</ul>
314315

315316
<h5>Horizontal checkboxes</h5>
316-
<ul class="g fields form-inline">
317+
<ul class="g fields form-horizontal">
317318
<li class="b0_12">
318319
<label class="input-control input-checkbox">Orange
319320
<input type="checkbox">
320-
<div class="input-indicator"></div>
321+
<span class="input-indicator"></span>
321322
</label>
322323
<label class="input-control input-checkbox">Banana
323324
<input type="checkbox">
324-
<div class="input-indicator"></div>
325+
<span class="input-indicator"></span>
325326
</label>
326327
<label class="input-control input-checkbox">Apple
327328
<input type="checkbox">
328-
<div class="input-indicator"></div>
329+
<span class="input-indicator"></span>
329330
</label>
330331
<label class="input-control input-checkbox">Pear
331332
<input type="checkbox">
332-
<div class="input-indicator"></div>
333+
<span class="input-indicator"></span>
333334
</label>
334335
</li>
335336
</ul>
336337

337338
<h5>Horizontal radios</h5>
338339
<ul class="g fields">
339340
<li class="b0_12">
340-
<div class="form-field form-inline">
341+
<div class="form-field form-horizontal">
341342
<label class="input-control input-radio">Male
342343
<input type="radio" name="radio2" checked="checked"/>
343-
<div class="input-indicator"></div>
344+
<span class="input-indicator"></span>
344345
</label>
345346
<label class="input-control input-radio">Female
346347
<input type="radio" name="radio2"/>
347-
<div class="input-indicator"></div>
348+
<span class="input-indicator"></span>
348349
</label>
349350
</div>
350351
</li>
351352
</ul>
352353
</section>
353-
</div>
354+
</section>
354355
</div>
355356
</div>
356357
<!-- End main -->

‎views/forms.html

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ <h3>Standard checkbox</h3>
9393
<li class="form-field">
9494
<label class="input-control input-checkbox">Orange
9595
<input type="checkbox" />
96-
<div class="input-indicator"></div>
96+
<span class="input-indicator"></span>
9797
</label>
9898
<label class="input-control input-checkbox">Banana
9999
<input type="checkbox" />
100-
<div class="input-indicator"></div>
100+
<span class="input-indicator"></span>
101101
</label>
102102
<label class="input-control input-checkbox">Apple
103103
<input type="checkbox" />
104-
<div class="input-indicator"></div>
104+
<span class="input-indicator"></span>
105105
</label>
106106
<label class="input-control input-checkbox">Pear
107107
<input type="checkbox" />
108-
<div class="input-indicator"></div>
108+
<span class="input-indicator"></span>
109109
</label>
110110
</li>
111111
</ul>
@@ -116,19 +116,19 @@ <h3>Standard checkbox</h3>
116116
<li class="form-field">
117117
<label class="input-control input-checkbox">Orange
118118
<input type="checkbox" />
119-
<div class="input-indicator"></div>
119+
<span class="input-indicator"></span>
120120
</label>
121121
<label class="input-control input-checkbox">Banana
122122
<input type="checkbox" />
123-
<div class="input-indicator"></div>
123+
<span class="input-indicator"></span>
124124
</label>
125125
<label class="input-control input-checkbox">Apple
126126
<input type="checkbox" />
127-
<div class="input-indicator"></div>
127+
<span class="input-indicator"></span>
128128
</label>
129129
<label class="input-control input-checkbox">Pear
130130
<input type="checkbox" />
131-
<div class="input-indicator"></div>
131+
<span class="input-indicator"></span>
132132
</label>
133133
</li>
134134
</ul>
@@ -146,11 +146,11 @@ <h5>Vertical radios</h5>
146146
<label for="gender"><b>Gender</b></label>
147147
<label class="input-control input-radio">First radio
148148
<input type="radio" name="radio"/>
149-
<div class="input-indicator"></div>
149+
<span class="input-indicator"></span>
150150
</label>
151151
<label class="input-control input-radio">Second radio
152152
<input type="radio" name="radio"/>
153-
<div class="input-indicator"></div>
153+
<span class="input-indicator"></span>
154154
</label>
155155
</li>
156156
</ul>
@@ -165,16 +165,17 @@ <h5>Horizontal radios</h5>
165165
<label for="gender" class="label"><b>Gender</b></label>
166166
<label class="input-control input-radio">Male
167167
<input type="radio" name="radio2" checked="checked"/>
168-
<div class="input-indicator"></div>
168+
<span class="input-indicator"></span>
169169
</label>
170170
<label class="input-control input-radio">Female
171171
<input type="radio" name="radio2"/>
172-
<div class="input-indicator"></div>
172+
<span class="input-indicator"></span>
173173
</label>
174174
</div>
175175
</div>
176176
</form>
177177
</div>
178+
</div>
178179
</section>
179180
<section class="select">
180181
<h2>Select</h2>
@@ -211,19 +212,19 @@ <h5>Horizontal checkboxes</h5>
211212
<div class="form-field">
212213
<label class="input-control input-checkbox">Orange
213214
<input type="checkbox">
214-
<div class="input-indicator"></div>
215+
<span class="input-indicator"></div>
215216
</label>
216217
<label class="input-control input-checkbox">Banana
217218
<input type="checkbox">
218-
<div class="input-indicator"></div>
219+
<span class="input-indicator"></div>
219220
</label>
220221
<label class="input-control input-checkbox">Apple
221222
<input type="checkbox">
222-
<div class="input-indicator"></div>
223+
<span class="input-indicator"></div>
223224
</label>
224225
<label class="input-control input-checkbox">Pear
225226
<input type="checkbox">
226-
<div class="input-indicator"></div>
227+
<span class="input-indicator"></div>
227228
</label>
228229
<div>
229230
</div>
@@ -235,17 +236,17 @@ <h5>Horizontal radios</h5>
235236
<div class="form-field">
236237
<label class="input-control input-radio">Male
237238
<input type="radio" name="radio2" checked="checked"/>
238-
<div class="input-indicator"></div>
239+
<span class="input-indicator"></span>
239240
</label>
240241
<label class="input-control input-radio">Female
241242
<input type="radio" name="radio2"/>
242-
<div class="input-indicator"></div>
243+
<span class="input-indicator"></span>
243244
</label>
244245
<div>
245246
</div>
246247
</form>
247248
</section>
248-
</div>
249+
</section>
249250
</div>
250251
</div>
251252
<!-- End main -->

0 commit comments

Comments
 (0)