Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
19a94d08
Commit
19a94d08
authored
Dec 19, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove support for multiple buttons in input groups because fuck that shit.
parent
4c82dd36
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
76 deletions
+10
-76
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+4
-4
docs/css.html
docs/css.html
+2
-34
docs/templates/pages/css.mustache
docs/templates/pages/css.mustache
+0
-34
less/forms.less
less/forms.less
+4
-4
No files found.
docs/assets/css/bootstrap.css
View file @
19a94d08
...
@@ -1424,22 +1424,22 @@ select:focus:invalid:focus {
...
@@ -1424,22 +1424,22 @@ select:focus:invalid:focus {
display
:
table-cell
;
display
:
table-cell
;
}
}
.input-group-btn
:first-child
>
.btn
:last-child
,
.input-group-btn
:first-child
>
.btn
,
.input-group-btn.btn-group
:first-child
>
.btn
{
.input-group-btn.btn-group
:first-child
>
.btn
{
border-right
:
0
;
border-right
:
0
;
}
}
.input-group-btn
:first-child
>
.btn
:first-child
,
.input-group-btn
:first-child
>
.btn
,
.input-group-btn.btn-group
:first-child
>
.btn
{
.input-group-btn.btn-group
:first-child
>
.btn
{
border-radius
:
4px
0
0
4px
;
border-radius
:
4px
0
0
4px
;
}
}
.input-group-btn
:last-child
>
.btn
:first-child
,
.input-group-btn
:last-child
>
.btn
,
.input-group-btn.btn-group
:last-child
>
.btn
:first-child
{
.input-group-btn.btn-group
:last-child
>
.btn
:first-child
{
border-left
:
0
;
border-left
:
0
;
}
}
.input-group-btn
:last-child
>
.btn
:last-child
,
.input-group-btn
:last-child
>
.btn
,
.input-group-btn.btn-group
:last-child
>
.btn
{
.input-group-btn.btn-group
:last-child
>
.btn
{
border-radius
:
0
4px
4px
0
;
border-radius
:
0
4px
4px
0
;
}
}
...
...
docs/css.html
View file @
19a94d08
...
@@ -1357,40 +1357,6 @@ For example, <code><section></code> should be wrapped as inlin
...
@@ -1357,40 +1357,6 @@ For example, <code><section></code> should be wrapped as inlin
<
button class="btn" type="button"
>
Go!
<
/button
>
<
button class="btn" type="button"
>
Go!
<
/button
>
<
/span
>
<
/span
>
<
/div
>
<
/div
>
</pre>
<form
class=
"bs-docs-example"
>
<div
class=
"input-group span7"
>
<input
type=
"text"
>
<span
class=
"input-group-btn"
>
<button
class=
"btn"
type=
"button"
>
Search
</button>
<button
class=
"btn"
type=
"button"
>
Options
</button>
</span>
</div>
<br>
<div
class=
"input-group span7"
>
<span
class=
"input-group-btn"
>
<button
class=
"btn"
type=
"button"
>
Search
</button>
<button
class=
"btn"
type=
"button"
>
Options
</button>
</span>
<input
type=
"text"
>
</div>
</form>
<pre
class=
"prettyprint linenums"
>
<
div class="input-group span7"
>
<
input type="text"
>
<
span class="input-group-btn"
>
<
button class="btn" type="button"
>
Search
<
/button
>
<
button class="btn" type="button"
>
Options
<
/button
>
<
/span
>
<
/div
>
<
div class="input-group span7"
>
<
span class="input-group-btn"
>
<
button class="btn" type="button"
>
Search
<
/button
>
<
button class="btn" type="button"
>
Options
<
/button
>
<
/span
>
<
input type="text"
>
<
/div
>
</pre>
</pre>
<h4>
Button dropdowns
</h4>
<h4>
Button dropdowns
</h4>
...
@@ -1471,6 +1437,8 @@ For example, <code><section></code> should be wrapped as inlin
...
@@ -1471,6 +1437,8 @@ For example, <code><section></code> should be wrapped as inlin
<input
type=
"text"
class=
"span3"
>
<input
type=
"text"
class=
"span3"
>
</div>
</div>
<br>
<div
class=
"input-group span7"
>
<div
class=
"input-group span7"
>
<input
type=
"text"
>
<input
type=
"text"
>
<div
class=
"input-group-btn btn-group"
>
<div
class=
"input-group-btn btn-group"
>
...
...
docs/templates/pages/css.mustache
View file @
19a94d08
...
@@ -1297,40 +1297,6 @@ For example, <code><section></code> should be wrapped as inlin
...
@@ -1297,40 +1297,6 @@ For example, <code><section></code> should be wrapped as inlin
<
button class="btn" type="button"
>
Go!
<
/button
>
<
button class="btn" type="button"
>
Go!
<
/button
>
<
/span
>
<
/span
>
<
/div
>
<
/div
>
</pre>
<form
class=
"bs-docs-example"
>
<div
class=
"input-group span7"
>
<input
type=
"text"
>
<span
class=
"input-group-btn"
>
<button
class=
"btn"
type=
"button"
>
Search
</button>
<button
class=
"btn"
type=
"button"
>
Options
</button>
</span>
</div>
<br>
<div
class=
"input-group span7"
>
<span
class=
"input-group-btn"
>
<button
class=
"btn"
type=
"button"
>
Search
</button>
<button
class=
"btn"
type=
"button"
>
Options
</button>
</span>
<input
type=
"text"
>
</div>
</form>
<pre
class=
"prettyprint linenums"
>
<
div class="input-group span7"
>
<
input type="text"
>
<
span class="input-group-btn"
>
<
button class="btn" type="button"
>
Search
<
/button
>
<
button class="btn" type="button"
>
Options
<
/button
>
<
/span
>
<
/div
>
<
div class="input-group span7"
>
<
span class="input-group-btn"
>
<
button class="btn" type="button"
>
Search
<
/button
>
<
button class="btn" type="button"
>
Options
<
/button
>
<
/span
>
<
input type="text"
>
<
/div
>
</pre>
</pre>
<h4>
Button dropdowns
</h4>
<h4>
Button dropdowns
</h4>
...
...
less/forms.less
View file @
19a94d08
...
@@ -510,22 +510,22 @@ select:focus:invalid {
...
@@ -510,22 +510,22 @@ select:focus:invalid {
}
}
// Prepend
// Prepend
.input-group-btn {
.input-group-btn {
&:first-child > .btn
:last-child
,
&:first-child > .btn,
&.btn-group:first-child > .btn {
&.btn-group:first-child > .btn {
border-right: 0;
border-right: 0;
}
}
&:first-child > .btn
:first-child
,
&:first-child > .btn,
&.btn-group:first-child > .btn {
&.btn-group:first-child > .btn {
border-radius: @border-radius-base 0 0 @border-radius-base;
border-radius: @border-radius-base 0 0 @border-radius-base;
}
}
}
}
// Append
// Append
.input-group-btn {
.input-group-btn {
&:last-child > .btn
:first-child
,
&:last-child > .btn,
&.btn-group:last-child > .btn:first-child {
&.btn-group:last-child > .btn:first-child {
border-left: 0;
border-left: 0;
}
}
&:last-child > .btn
:last-child
,
&:last-child > .btn,
&.btn-group:last-child > .btn {
&.btn-group:last-child > .btn {
border-radius: 0 @border-radius-base @border-radius-base 0;
border-radius: 0 @border-radius-base @border-radius-base 0;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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