Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2015-12-08 10:28:31 +0300
committerMark Otto <markdotto@gmail.com>2015-12-08 10:28:31 +0300
commitd3c87d32fad1ce71b78c1f7ec3ac5369c52f7072 (patch)
tree94023062602a7112735c707fe375f1d4484d113f /scss/_type.scss
parent7eadfbc9b224fc43e25dacd6b22031953e03c4f7 (diff)
parent2c7bac8f4f696537f4f22d2472f5a33ff4547d08 (diff)
Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-11
Diffstat (limited to 'scss/_type.scss')
-rw-r--r--scss/_type.scss10
1 files changed, 5 insertions, 5 deletions
diff --git a/scss/_type.scss b/scss/_type.scss
index 6759677aa9..ea682812ea 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -93,12 +93,12 @@ mark,
.list-inline {
@include list-unstyled;
margin-left: -$list-inline-padding;
+}
- > li {
- display: inline-block;
- padding-right: $list-inline-padding;
- padding-left: $list-inline-padding;
- }
+.list-inline-item {
+ display: inline-block;
+ padding-right: $list-inline-padding;
+ padding-left: $list-inline-padding;
}
// Horizontal description lists w/ grid classes