diff --git a/resources/assets/stylesheets/mixins/misc.scss b/resources/assets/stylesheets/mixins/misc.scss index 90d61c5ec99478ff0c10e226ed9d72f0dc20bf4d..1fe9d0883aacedaaf208c7579086ce5174e290ab 100644 --- a/resources/assets/stylesheets/mixins/misc.scss +++ b/resources/assets/stylesheets/mixins/misc.scss @@ -15,10 +15,6 @@ clear: both; } } -@mixin list-unstyled { - padding-left: 0; - list-style: none; -} @mixin size($height, $width) { diff --git a/resources/assets/stylesheets/mixins/studip.scss b/resources/assets/stylesheets/mixins/studip.scss index 344f8027114fb40a0ba22e06d6c81bae14651945..1bbd7d55eea813a53139a16263a6f3afc83d2347 100644 --- a/resources/assets/stylesheets/mixins/studip.scss +++ b/resources/assets/stylesheets/mixins/studip.scss @@ -259,19 +259,3 @@ /* Opera doesn't support this in the shorthand */ background-attachment: local, local, scroll, scroll; } - -@mixin list-unstyled { - padding-left: 0; - list-style: none; -} - -@mixin list-inline { - @include list-unstyled(); - margin-left: -5px; - - > li { - display: inline-block; - padding-left: 5px; - padding-right: 5px; - } -} diff --git a/resources/assets/stylesheets/scss/dashboard.scss b/resources/assets/stylesheets/scss/dashboard.scss index 6020d6e3c0ff652845d7384c9baae14403c4bf6b..e353f72a0e41bafa8492f5d201f5cb43c28f51a2 100644 --- a/resources/assets/stylesheets/scss/dashboard.scss +++ b/resources/assets/stylesheets/scss/dashboard.scss @@ -77,7 +77,7 @@ padding-bottom: 1em; ul { - @include list-inline(); + @extend .list-inline; img { margin-left: 0.25em; diff --git a/resources/assets/stylesheets/scss/lists.scss b/resources/assets/stylesheets/scss/lists.scss index a2609583d006a729a77be8473e4e469bf5773247..6de200415026d92b9c1793f9a2b84cb2aa1e58d7 100644 --- a/resources/assets/stylesheets/scss/lists.scss +++ b/resources/assets/stylesheets/scss/lists.scss @@ -10,9 +10,25 @@ ol { } } +.list-unstyled { + padding-left: 0; + list-style: none; +} + +.list-inline { + @extend .list-unstyled; + margin-left: -5px; + + > li { + display: inline-block; + padding-left: 5px; + padding-right: 5px; + } +} + //comma separated .list-csv { - @include list-inline(); + @extend .list-inline; margin-left: 0; > li { @@ -24,7 +40,6 @@ ol { &:last-child { padding-right: 0; - &::after { content: unset; } @@ -39,7 +54,7 @@ ol { } .list-pipe-separated { - @include list-inline(); + @extend .list-inline; display: flex; // Prevents the mystery gap between elements > li { diff --git a/resources/assets/stylesheets/scss/profile.scss b/resources/assets/stylesheets/scss/profile.scss index ef7e75adbf4dd488faf84ad0ddc4170cfdb7d3b5..c180e0398fe2fc390b6da679945289020eaa6b7f 100644 --- a/resources/assets/stylesheets/scss/profile.scss +++ b/resources/assets/stylesheets/scss/profile.scss @@ -13,7 +13,7 @@ padding: 0 1em; } .profile-view-actions { - @include list-unstyled(); + @extend .list-unstyled; img { vertical-align: text-top; }