deblan-mirror/papercss
1
0
Fork 0
mirror of https://github.com/papercss/papercss synced 2024-06-15 20:25:10 +02:00
Code Issues Projects Releases Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
rhyneav 2017-11-23 11:09:08 -05:00
parent d34b0748cb 745be5a79c
commit fdcd20c0d0
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
index.html
View file

@ -281,26 +281,26 @@
<div id="forms" class="section">
<h2>Forms</h2>
<div class="form-group">
<label>Input</label>
<input type="text" placeholder="Nice input">
<label for="paperInputs1">Input</label>
<input type="text" placeholder="Nice input" id="paperInputs1">
</div>
<div class="row">
<div class="col sm-4">
<div class="form-group">
<label>Block Level</label>
<input class="input-block" type="text">
<label for="paperInputs2">Block Level</label>
<input class="input-block" type="text" id="paperInputs2">
</div>
</div>
<div class="col sm-8">
<div class="form-group">
<label>Block Level</label>
<input class="input-block" type="text">
<label for="paperInputs3">Block Level</label>
<input class="input-block" type="text" id="paperInputs3">
</div>
</div>
</div>
<div class="form-group">
<label>Disabled</label>
<input type="text" placeholder="Disabled" disabled>
<label for="paperInputs4">Disabled</label>
<input type="text" placeholder="Disabled" id="paperInputs4" disabled>
</div>
<div class="form-group">
<label>Large Input</label>
@ -311,8 +311,8 @@
<textarea class="no-resize" placeholder="No resize"></textarea>
</div>
<div class="form-group">
<label>Select</label>
<select>
<label for="paperSelects1">Select</label>
<select id="paperSelects1">
<option value="1">Option 1</option>
<option value="2">Option 2</option>
<option value="3">Option 3</option>
@ -339,26 +339,26 @@
<div class="docs">
<pre>
&lt;div class="form-group"&gt;
&lt;label&gt;Input&lt;/label&gt;
&lt;input type="text" placeholder="Nice input"&gt;
&lt;label for="paperInputs1"&gt;Input&lt;/label&gt;
&lt;input type="text" placeholder="Nice input" id="paperInputs1"&gt;
&lt;/div&gt;
&lt;div class="row"&gt;
&lt;div class="col sm-4"&gt;
&lt;div class="form-group"&gt;
&lt;label&gt;Block Level&lt;/label&gt;
&lt;input class="input-block" type="text"&gt;
&lt;label for="paperInputs2"&gt;Block Level&lt;/label&gt;
&lt;input class="input-block" type="text" id="paperInputs2"&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;div class="col sm-8"&gt;
&lt;div class="form-group"&gt;
&lt;label&gt;Block Level&lt;/label&gt;
&lt;input class="input-block" type="text"&gt;
&lt;label for="paperInputs3"&gt;Block Level&lt;/label&gt;
&lt;input class="input-block" type="text" id="paperInputs3"&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;div class="form-group"&gt;
&lt;label&gt;Disabled&lt;/label&gt;
&lt;input type="text" placeholder="Disabled" disabled&gt;
&lt;label for="paperInputs4"&gt;Disabled&lt;/label&gt;
&lt;input type="text" placeholder="Disabled" id="paperInputs4" disabled&gt;
&lt;/div&gt;
&lt;div class="form-group"&gt;
&lt;label&gt;Large Input&lt;/label&gt;
@ -369,8 +369,8 @@
&lt;textarea class="no-resize" placeholder="No resize"&gt; &lt;/textarea&gt;
&lt;/div&gt;
&lt;div class="form-group"&gt;
&lt;label&gt;Select&lt;/label&gt;
&lt;select&gt;
&lt;label for="paperSelects1"&gt;Select&lt;/label&gt;
&lt;select id="paperSelects1"&gt;
&lt;option value="1"&gt;Option 1&lt;/option&gt;
&lt;option value="2"&gt;Option 2&lt;/option&gt;
&lt;option value="3"&gt;Option 3&lt;/option&gt;