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
dc614275
Commit
dc614275
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes
#6337
: scope '.media .pull-left' and '.media .pull-right' to immediate children only
parent
529ecc5a
6 merge requests
!6821
Typeahead updater
,
!6666
Patch 1
,
!6610
Add outline for input[type="image"]
,
!6546
3.0.0 wip - fixed the issue in which the test pid isn't killed if a test fails
,
!6503
control markup changes added
,
!6345
Input classes addition
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+2
-2
docs/assets/css/bootstrap.css
less/media.less
+2
-2
less/media.less
with
4 additions
and
4 deletions
+4
-4
docs/assets/css/bootstrap.css
+
2
-
2
View file @
dc614275
...
...
@@ -5519,11 +5519,11 @@ a.thumbnail:hover {
margin
:
0
0
5px
;
}
.media
.pull-left
{
.media
>
.pull-left
{
margin-right
:
10px
;
}
.media
.pull-right
{
.media
>
.pull-right
{
margin-left
:
10px
;
}
...
...
This diff is collapsed.
Click to expand it.
less/media.less
+
2
-
2
View file @
dc614275
...
...
@@ -37,10 +37,10 @@
// Media image alignment
// -------------------------
.media .pull-left {
.media
>
.pull-left {
margin-right: 10px;
}
.media .pull-right {
.media
>
.pull-right {
margin-left: 10px;
}
...
...
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