Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
83cb1053
Commit
83cb1053
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
adding code snippets to form examples
parent
9b5b8460
2 merge requests
!1882
[2.0.1-wip] black/dark button
,
!1894
[2.0.1 wip] -- fixing Issue #1893 - removing hardcoded color border from <hr/>
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/base-css.html
+26
-3
docs/base-css.html
docs/templates/pages/base-css.mustache
+27
-3
docs/templates/pages/base-css.mustache
with
53 additions
and
6 deletions
+53
-6
docs/assets/bootstrap.zip
+
0
-
0
View file @
83cb1053
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
26
-
3
View file @
83cb1053
...
...
@@ -852,9 +852,9 @@ For example, <code>section</code> should be wrapped as inline.
<h2>
Example forms
<small>
using just form controls, no extra markup
</small></h2>
<h3>
Basic form
</h3>
<div
class=
"row"
>
<div
class=
"span3"
>
<h3>
Basic form
</h3>
<p>
With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.
</p>
</div>
<div
class=
"span9"
>
...
...
@@ -866,11 +866,21 @@ For example, <code>section</code> should be wrapped as inline.
</label>
<button
type=
"submit"
class=
"btn"
>
Submit
</button>
</form>
<pre
class=
"prettyprint linenums"
>
<
form class="well"
>
<
label
>
Label name
<
/label
>
<
input type="text" class="span3" placeholder="Type something…"
>
<
span class="help-inline"
>
Associated help text!
<
/span
>
<
label class="checkbox"
>
<
input type="checkbox"
>
Check me out
<
/label
>
<
button type="submit" class="btn"
>
Submit
<
/button
>
<
/form
>
</pre>
</div>
</div>
<!-- /row -->
<h3>
Search form
</h3>
<div
class=
"row"
>
<div
class=
"span3"
>
<h3>
Search form
</h3>
<p>
Reflecting default WebKit styles, just add
<code>
.form-search
</code>
for extra rounded search fields.
</p>
</div>
<div
class=
"span9"
>
...
...
@@ -878,11 +888,17 @@ For example, <code>section</code> should be wrapped as inline.
<input
type=
"text"
class=
"input-medium search-query"
>
<button
type=
"submit"
class=
"btn"
>
Search
</button>
</form>
<pre
class=
"prettyprint linenums"
>
<
form class="well form-search"
>
<
input type="text" class="input-medium search-query"
>
<
button type="submit" class="btn"
>
Search
<
/button
>
<
/form
>
</pre>
</div>
</div>
<!-- /row -->
<h3>
Inline form
</h3>
<div
class=
"row"
>
<div
class=
"span3"
>
<h3>
Inline form
</h3>
<p>
Inputs are block level to start. For
<code>
.form-inline
</code>
and
<code>
.form-horizontal
</code>
, we use inline-block.
</p>
</div>
<div
class=
"span9"
>
...
...
@@ -891,6 +907,13 @@ For example, <code>section</code> should be wrapped as inline.
<input
type=
"password"
class=
"input-small"
placeholder=
"Password"
>
<button
type=
"submit"
class=
"btn"
>
Go
</button>
</form>
<pre
class=
"prettyprint linenums"
>
<
form class="well form-inline"
>
<
input type="text" class="input-small" placeholder="Email"
>
<
input type="password" class="input-small" placeholder="Password"
>
<
button type="submit" class="btn"
>
Go
<
/button
>
<
/form
>
</pre>
</div>
</div>
<!-- /row -->
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
27
-
3
View file @
83cb1053
...
...
@@ -776,9 +776,9 @@
<h2>
{{
_i
}}
Example forms
<small>
using just form controls, no extra markup
</small>
{{/
i
}}
</h2>
<h3>
{{
_i
}}
Basic form
{{/
i
}}
</h3>
<div
class=
"row"
>
<div
class=
"span3"
>
<h3>
{{
_i
}}
Basic form
{{/
i
}}
</h3>
<p>
{{
_i
}}
With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.
{{/
i
}}
</p>
</div>
<div
class=
"span9"
>
...
...
@@ -790,11 +790,22 @@
</label>
<button
type=
"submit"
class=
"btn"
>
{{
_i
}}
Submit
{{/
i
}}
</button>
</form>
<pre
class=
"prettyprint linenums"
>
<
form class="well"
>
<
label
>
{{
_i
}}
Label name
{{/
i
}}
<
/label
>
<
input type="text" class="span3" placeholder="
{{
_i
}}
Type something…
{{/
i
}}
"
>
<
span class="help-inline"
>
Associated help text!
<
/span
>
<
label class="checkbox"
>
<
input type="checkbox"
>
{{
_i
}}
Check me out
{{/
i
}}
<
/label
>
<
button type="submit" class="btn"
>
{{
_i
}}
Submit
{{/
i
}}
<
/button
>
<
/form
>
</pre>
</div>
</div>
<!-- /row -->
<h3>
{{
_i
}}
Search form
{{/
i
}}
</h3>
<div
class=
"row"
>
<div
class=
"span3"
>
<h3>
{{
_i
}}
Search form
{{/
i
}}
</h3>
<p>
{{
_i
}}
Reflecting default WebKit styles, just add
<code>
.form-search
</code>
for extra rounded search fields.
{{/
i
}}
</p>
</div>
<div
class=
"span9"
>
...
...
@@ -802,11 +813,17 @@
<input
type=
"text"
class=
"input-medium search-query"
>
<button
type=
"submit"
class=
"btn"
>
{{
_i
}}
Search
{{/
i
}}
</button>
</form>
<pre
class=
"prettyprint linenums"
>
<
form class="well form-search"
>
<
input type="text" class="input-medium search-query"
>
<
button type="submit" class="btn"
>
{{
_i
}}
Search
{{/
i
}}
<
/button
>
<
/form
>
</pre>
</div>
</div>
<!-- /row -->
<h3>
{{
_i
}}
Inline form
{{/
i
}}
</h3>
<div
class=
"row"
>
<div
class=
"span3"
>
<h3>
{{
_i
}}
Inline form
{{/
i
}}
</h3>
<p>
{{
_i
}}
Inputs are block level to start. For
<code>
.form-inline
</code>
and
<code>
.form-horizontal
</code>
, we use inline-block.
{{/
i
}}
</p>
</div>
<div
class=
"span9"
>
...
...
@@ -815,6 +832,13 @@
<input
type=
"password"
class=
"input-small"
placeholder=
"
{{
_i
}}
Password
{{/
i
}}
"
>
<button
type=
"submit"
class=
"btn"
>
{{
_i
}}
Go
{{/
i
}}
</button>
</form>
<pre
class=
"prettyprint linenums"
>
<
form class="well form-inline"
>
<
input type="text" class="input-small" placeholder="
{{
_i
}}
Email
{{/
i
}}
"
>
<
input type="password" class="input-small" placeholder="
{{
_i
}}
Password
{{/
i
}}
"
>
<
button type="submit" class="btn"
>
{{
_i
}}
Go
{{/
i
}}
<
/button
>
<
/form
>
</pre>
</div>
</div>
<!-- /row -->
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets