]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'patch-11' of https://github.com/bassjobsen/bootstrap into bassjobsen...
authorMark Otto <markdotto@gmail.com>
Tue, 8 Dec 2015 07:28:31 +0000 (23:28 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 8 Dec 2015 07:28:31 +0000 (23:28 -0800)
1  2 
scss/_type.scss

diff --cc scss/_type.scss
index 6759677aa9bd22393c2a7dad7abb602112e101c8,99f773e2a56e41ca28cfba42ed42bc16ef2f5d79..ea682812ea82d158bb53c7f23f9e95bfe26f0824
@@@ -92,13 -100,13 +92,13 @@@ mark
  // Inline turns list items into inline-block
  .list-inline {
    @include list-unstyled;
 -  margin-left: -5px;
 +  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: 5px;
 -  padding-left: 5px;
++  padding-right: $list-inline-padding;
++  padding-left: $list-inline-padding;
  }
  
  // Horizontal description lists w/ grid classes