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
dda263d9
Commit
dda263d9
authored
9 years ago
by
Chris Rebert
Browse files
Options
Download
Plain Diff
Merge pull request #18820 from twbs/media-obj-vars
Add variables for media object margins and padding
parents
db5babb2
4a667f5b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_media.scss
+4
-4
scss/_media.scss
scss/_variables.scss
+7
-0
scss/_variables.scss
with
11 additions
and
4 deletions
+11
-4
scss/_media.scss
+
4
-
4
View file @
dda263d9
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
}
}
}
@else
{
}
@else
{
.media
{
.media
{
margin-top
:
15px
;
margin-top
:
$media-margin-top
;
&
:first-child
{
&
:first-child
{
margin-top
:
0
;
margin-top
:
0
;
...
@@ -61,11 +61,11 @@
...
@@ -61,11 +61,11 @@
//
//
.media-right
{
.media-right
{
padding-left
:
10p
x
;
padding-left
:
$media-alignment-padding-
x
;
}
}
.media-left
{
.media-left
{
padding-right
:
10p
x
;
padding-right
:
$media-alignment-padding-
x
;
}
}
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
.media-heading
{
.media-heading
{
margin-top
:
0
;
margin-top
:
0
;
margin-bottom
:
5px
;
margin-bottom
:
$media-heading-margin-bottom
;
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
7
-
0
View file @
dda263d9
...
@@ -628,6 +628,13 @@ $breadcrumb-active-color: $gray-light !default;
...
@@ -628,6 +628,13 @@ $breadcrumb-active-color: $gray-light !default;
$breadcrumb-divider
:
"/"
!
default
;
$breadcrumb-divider
:
"/"
!
default
;
// Media objects
$media-margin-top
:
15px
!
default
;
$media-heading-margin-bottom
:
5px
!
default
;
$media-alignment-padding-x
:
10px
!
default
;
// Carousel
// Carousel
$carousel-text-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,.
6
)
!
default
;
$carousel-text-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,.
6
)
!
default
;
...
...
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