X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fbootstrap.scss;h=cb266cc68a3f80ad00ffd3a70967f12863b43c5c;hb=610d0be13b3d01f653ef269271dd667a57c85ef2;hp=50f1dafedd7497f2a21df2685a1b97fc458ba54e;hpb=0d3a2982a9b29bd66a05e4b36e606518d4c09959;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 50f1dafed..cb266cc68 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss @@ -27,7 +27,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; } /* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */ -.dropdown:not(.btn-group):not(.dropdown-root):not(.action-dropdown) { +.dropdown:not(.btn-group):not(.dropdown-root):not(.action-dropdown):not(.input-group-prepend) { z-index: z(dropdown) !important; &.list-overflow-menu, @@ -270,10 +270,9 @@ ngb-tooltip-window { & > .form-control { flex: initial; } - - .input-group-prepend, - .input-group-append { - height: 30px; + input.form-control { + width: unset !important; + flex-grow: 1; } .input-group-prepend + input { @@ -281,3 +280,35 @@ ngb-tooltip-window { border-bottom-left-radius: 0 !important; } } + +.has-feedback.has-clear { + position: relative; + + input { + padding-right: 1.5rem !important; + } + + .form-control-clear { + color: rgba(0, 0, 0, 0.4); + /* + * Enable pointer events as they have been disabled since Bootstrap 3.3 + * See https://github.com/twbs/bootstrap/pull/14104 + */ + pointer-events: all; + display: flex; + justify-content: center; + align-items: center; + position: absolute; + right: .5rem; + height: 95%; + + &:hover { + color: rgba(0, 0, 0, 0.7); + cursor: pointer; + } + } + + input:placeholder-shown + .form-control-clear { + display: none; + } +}