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
d6680a50
Commit
d6680a50
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
start rearranging form docs and clear up messaging about required classes and default styles
parent
369ca13c
2 merge requests
!2929
Responsive video - from zurp's foundation
,
!2875
2.0.3 wip
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
+14
-25
docs/base-css.html
docs/templates/pages/base-css.mustache
+14
-25
docs/templates/pages/base-css.mustache
with
28 additions
and
50 deletions
+28
-50
docs/assets/bootstrap.zip
+
0
-
0
View file @
d6680a50
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
14
-
25
View file @
d6680a50
...
@@ -875,11 +875,9 @@ For example, <code>section</code> should be wrapped as inline.
...
@@ -875,11 +875,9 @@ For example, <code>section</code> should be wrapped as inline.
<h2>
Example forms
<small>
using just form controls, no extra markup
</small></h2>
<h2>
Example forms
<small>
using just form controls, no extra markup
</small></h2>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"span
3
"
>
<div
class=
"span
6
"
>
<h3>
Basic form
</h3>
<h3>
Basic form
</h3>
<p>
With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.
</p>
<p>
Smart and lightweight defaults without extra markup.
</p>
</div>
<div
class=
"span9"
>
<form
class=
"well"
>
<form
class=
"well"
>
<label>
Label name
</label>
<label>
Label name
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"Type something…"
>
<input
type=
"text"
class=
"span3"
placeholder=
"Type something…"
>
...
@@ -893,39 +891,30 @@ For example, <code>section</code> should be wrapped as inline.
...
@@ -893,39 +891,30 @@ For example, <code>section</code> should be wrapped as inline.
<
form class="well"
>
<
form class="well"
>
<
label
>
Label name
<
/label
>
<
label
>
Label name
<
/label
>
<
input type="text" class="span3" placeholder="Type something…"
>
<
input type="text" class="span3" placeholder="Type something…"
>
<
span class="help-
inline"
>
Associated
help text
!
<
/span
>
<
span class="help-
block"
>
Example block-level
help text
here.
<
/span
>
<
label class="checkbox"
>
<
label class="checkbox"
>
<
input type="checkbox"
>
Check me out
<
input type="checkbox"
>
Check me out
<
/label
>
<
/label
>
<
button type="submit" class="btn"
>
Submit
<
/button
>
<
button type="submit" class="btn"
>
Submit
<
/button
>
<
/form
>
<
/form
>
</pre>
</pre>
</div>
</div>
</div>
<!-- /row -->
<div
class=
"span6"
>
<div
class=
"row"
>
<h3>
Search form
</h3>
<div
class=
"span3"
>
<p>
Add
<code>
.form-search
</code>
to the form and
<code>
.search-query
</code>
to the
<code>
input
</code>
.
</p>
<h3>
Search form
</h3>
<form
class=
"well form-search"
>
<p>
Reflecting default WebKit styles, just add
<code>
.form-search
</code>
for extra rounded search fields.
</p>
<input
type=
"text"
class=
"input-medium search-query"
>
</div>
<button
type=
"submit"
class=
"btn"
>
Search
</button>
<div
class=
"span9"
>
</form>
<form
class=
"well form-search"
>
<input
type=
"text"
class=
"input-medium search-query"
>
<button
type=
"submit"
class=
"btn"
>
Search
</button>
</form>
<pre
class=
"prettyprint linenums"
>
<pre
class=
"prettyprint linenums"
>
<
form class="well form-search"
>
<
form class="well form-search"
>
<
input type="text" class="input-medium search-query"
>
<
input type="text" class="input-medium search-query"
>
<
button type="submit" class="btn"
>
Search
<
/button
>
<
button type="submit" class="btn"
>
Search
<
/button
>
<
/form
>
<
/form
>
</pre>
</pre>
</div>
</div>
<!-- /row -->
<div
class=
"row"
>
<div
class=
"span3"
>
<h3>
Inline form
</h3>
<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>
<p>
Add
<code>
.form-inline
</code>
to finesse the vertical alignment and spacing of form controls.
</p>
</div>
<div
class=
"span9"
>
<form
class=
"well form-inline"
>
<form
class=
"well form-inline"
>
<input
type=
"text"
class=
"input-small"
placeholder=
"Email"
>
<input
type=
"text"
class=
"input-small"
placeholder=
"Email"
>
<input
type=
"password"
class=
"input-small"
placeholder=
"Password"
>
<input
type=
"password"
class=
"input-small"
placeholder=
"Password"
>
...
@@ -944,7 +933,7 @@ For example, <code>section</code> should be wrapped as inline.
...
@@ -944,7 +933,7 @@ For example, <code>section</code> should be wrapped as inline.
<
button type="submit" class="btn"
>
Sign in
<
/button
>
<
button type="submit" class="btn"
>
Sign in
<
/button
>
<
/form
>
<
/form
>
</pre>
</pre>
</div>
</div>
<!-- /.span -->
</div>
<!-- /row -->
</div>
<!-- /row -->
<br>
<br>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
14
-
25
View file @
d6680a50
...
@@ -798,11 +798,9 @@
...
@@ -798,11 +798,9 @@
<h2>
{{
_i
}}
Example forms
<small>
using just form controls, no extra markup
</small>
{{/
i
}}
</h2>
<h2>
{{
_i
}}
Example forms
<small>
using just form controls, no extra markup
</small>
{{/
i
}}
</h2>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"span
3
"
>
<div
class=
"span
6
"
>
<h3>
{{
_i
}}
Basic form
{{/
i
}}
</h3>
<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>
<p>
{{
_i
}}
Smart and lightweight defaults without extra markup.
{{/
i
}}
</p>
</div>
<div
class=
"span9"
>
<form
class=
"well"
>
<form
class=
"well"
>
<label>
{{
_i
}}
Label name
{{/
i
}}
</label>
<label>
{{
_i
}}
Label name
{{/
i
}}
</label>
<input
type=
"text"
class=
"span3"
placeholder=
"
{{
_i
}}
Type something…
{{/
i
}}
"
>
<input
type=
"text"
class=
"span3"
placeholder=
"
{{
_i
}}
Type something…
{{/
i
}}
"
>
...
@@ -816,39 +814,30 @@
...
@@ -816,39 +814,30 @@
<
form class="well"
>
<
form class="well"
>
<
label
>
{{
_i
}}
Label name
{{/
i
}}
<
/label
>
<
label
>
{{
_i
}}
Label name
{{/
i
}}
<
/label
>
<
input type="text" class="span3" placeholder="
{{
_i
}}
Type something…
{{/
i
}}
"
>
<
input type="text" class="span3" placeholder="
{{
_i
}}
Type something…
{{/
i
}}
"
>
<
span class="help-
inline"
>
Associated
help text
!
<
/span
>
<
span class="help-
block"
>
Example block-level
help text
here.
<
/span
>
<
label class="checkbox"
>
<
label class="checkbox"
>
<
input type="checkbox"
>
{{
_i
}}
Check me out
{{/
i
}}
<
input type="checkbox"
>
{{
_i
}}
Check me out
{{/
i
}}
<
/label
>
<
/label
>
<
button type="submit" class="btn"
>
{{
_i
}}
Submit
{{/
i
}}
<
/button
>
<
button type="submit" class="btn"
>
{{
_i
}}
Submit
{{/
i
}}
<
/button
>
<
/form
>
<
/form
>
</pre>
</pre>
</div>
</div>
</div>
<!-- /row -->
<div
class=
"span6"
>
<div
class=
"row"
>
<h3>
{{
_i
}}
Search form
{{/
i
}}
</h3>
<div
class=
"span3"
>
<p>
{{
_i
}}
Add
<code>
.form-search
</code>
to the form and
<code>
.search-query
</code>
to the
<code>
input
</code>
.
{{/
i
}}
</p>
<h3>
{{
_i
}}
Search form
{{/
i
}}
</h3>
<form
class=
"well form-search"
>
<p>
{{
_i
}}
Reflecting default WebKit styles, just add
<code>
.form-search
</code>
for extra rounded search fields.
{{/
i
}}
</p>
<input
type=
"text"
class=
"input-medium search-query"
>
</div>
<button
type=
"submit"
class=
"btn"
>
{{
_i
}}
Search
{{/
i
}}
</button>
<div
class=
"span9"
>
</form>
<form
class=
"well form-search"
>
<input
type=
"text"
class=
"input-medium search-query"
>
<button
type=
"submit"
class=
"btn"
>
{{
_i
}}
Search
{{/
i
}}
</button>
</form>
<pre
class=
"prettyprint linenums"
>
<pre
class=
"prettyprint linenums"
>
<
form class="well form-search"
>
<
form class="well form-search"
>
<
input type="text" class="input-medium search-query"
>
<
input type="text" class="input-medium search-query"
>
<
button type="submit" class="btn"
>
{{
_i
}}
Search
{{/
i
}}
<
/button
>
<
button type="submit" class="btn"
>
{{
_i
}}
Search
{{/
i
}}
<
/button
>
<
/form
>
<
/form
>
</pre>
</pre>
</div>
</div>
<!-- /row -->
<div
class=
"row"
>
<div
class=
"span3"
>
<h3>
{{
_i
}}
Inline form
{{/
i
}}
</h3>
<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>
<p>
{{
_i
}}
Add
<code>
.form-inline
</code>
to finesse the vertical alignment and spacing of form controls.
{{/
i
}}
</p>
</div>
<div
class=
"span9"
>
<form
class=
"well form-inline"
>
<form
class=
"well form-inline"
>
<input
type=
"text"
class=
"input-small"
placeholder=
"
{{
_i
}}
Email
{{/
i
}}
"
>
<input
type=
"text"
class=
"input-small"
placeholder=
"
{{
_i
}}
Email
{{/
i
}}
"
>
<input
type=
"password"
class=
"input-small"
placeholder=
"
{{
_i
}}
Password
{{/
i
}}
"
>
<input
type=
"password"
class=
"input-small"
placeholder=
"
{{
_i
}}
Password
{{/
i
}}
"
>
...
@@ -867,7 +856,7 @@
...
@@ -867,7 +856,7 @@
<
button type="submit" class="btn"
>
{{
_i
}}
Sign in
{{/
i
}}
<
/button
>
<
button type="submit" class="btn"
>
{{
_i
}}
Sign in
{{/
i
}}
<
/button
>
<
/form
>
<
/form
>
</pre>
</pre>
</div>
</div>
<!-- /.span -->
</div>
<!-- /row -->
</div>
<!-- /row -->
<br>
<br>
...
...
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