X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fbootstrap.scss;h=bc37134dd12f6601148a6a8fc34f8ca8ddb9c02a;hb=26da644eab9ef62a3e559ac5626bb65a0b13a14d;hp=4f6e08c1bbe802865dfb43e26bb261ea98fa3e73;hpb=5f26f13b3c16ac5ae0a3b0a7142d84a9528cf565;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 4f6e08c1b..bc37134dd 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss @@ -58,37 +58,19 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; } } -/* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */ -.dropdown, -.dropup { - z-index: z(dropdown) !important; -} - -.list-overflow-menu, -.parent-entry { - z-index: z(menu) - 1 !important; -} - -.btn-group, -.dropdown-root, -.action-dropdown, -.input-group-prepend, -.column-toggle { - z-index: inherit !important; -} - .btn-group > .btn:not(:first-child) { border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important; } .dropdown-menu { - z-index: z(dropdown) + 1 !important; - border-radius: 3px; box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2); font-size: 15px; + color: pvar(--mainForegroundColor); + background-color: pvar(--mainBackgroundColor); + .dropdown-header { @include padding-left(1rem); } @@ -96,14 +78,19 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; .dropdown-item { padding: 3px 15px; + color: pvar(--mainForegroundColor); + background-color: pvar(--mainBackgroundColor); + &.active { color: pvar(--mainBackgroundColor) !important; background-color: pvar(--mainHoverColor); opacity: 0.9; } - &:active { + a:active, + &:hover { color: pvar(--mainForegroundColor) !important; + background-color: pvar(--mainBackgroundHoverColor); } &::after { @@ -117,7 +104,6 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; a { @include disable-default-a-behaviour; - color: #000 !important; } } @@ -183,7 +169,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; margin-bottom: 0; text-align: end; - > .peertube-button:not(:first-child) { + > *:not(:first-child) { @include margin-left(10px); } } @@ -287,6 +273,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; &.show { max-height: 1500px; + overflow: inherit !important; } } @@ -294,22 +281,6 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; margin: 0.3rem 0; } -ngb-modal-backdrop { - z-index: z(modal) - 1 !important; -} - -ngb-modal-window { - z-index: z(modal) !important; -} - -ngb-popover-window { - z-index: z(popover) !important; -} - -ngb-tooltip-window { - z-index: z(tooltip) !important; -} - .btn-outline-secondary { border-color: $input-border-color; @@ -333,6 +304,34 @@ ngb-tooltip-window { } } +.btn-group.select-button { + font-weight: $font-semibold; + + .active { + @include orange-button; + } + + :not(.active) { + @include grey-button; + } + + > * { + @include peertube-button-link; + + box-shadow: none !important; + + &:not(:first-child) { + border-top-left-radius: 0 !important; + border-bottom-left-radius: 0 !important; + } + + &:not(:last-child) { + border-top-right-radius: 0 !important; + border-bottom-right-radius: 0 !important; + } + } +} + // input box-shadow on focus .form-control { font-size: 15px;