From 3c78f92f2c4a8cf8e11a6b7b1e229fcd1689b472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Mon, 4 Feb 2019 13:31:18 +0100 Subject: Fix guest name input field and submit button in public share auth page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "guest.css" overrides the default style of inputs set in "input.scss", which causes all inputs in the public share auth page to look like the main password input. Due to this, the rules from "input.scss" need to be restored for inputs in the Talk sidebar to get the proper appearance. Signed-off-by: Daniel Calviño Sánchez --- css/publicshareauth.scss | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'css/publicshareauth.scss') diff --git a/css/publicshareauth.scss b/css/publicshareauth.scss index 42997a90e..55f36da48 100644 --- a/css/publicshareauth.scss +++ b/css/publicshareauth.scss @@ -231,12 +231,41 @@ input#request-password-button:disabled ~ .icon { display: unset; } +/* Restore rules from input.scss overriden by guest.css for the sidebar */ +#talk-sidebar input:not([type='range']) { + margin: 3px 3px 3px 0; + padding: 7px 6px; + font-size: 13px; + border: 1px solid var(--color-border-dark); + box-sizing: border-box; + + &:not(:disabled):not(.primary) { + &:hover, + &:focus { + border-color: var(--color-primary-element); + } + } +} + +#talk-sidebar input[type="text"], +#talk-sidebar input[type="password"] { + width: 130px; + + padding-right: 34px; +} + /* Unset conflicting rules from publicshareauth.css (core) for the sidebar */ #talk-sidebar input[type="submit"], #talk-sidebar input.icon-confirm[type="submit"] { top: unset; } +#talk-sidebar .guest-name input.icon-confirm[type="submit"] { + top: -5px; + right: 0px; + border: none; +} + /* Unset conflicting rules from guest.css for the sidebar */ #talk-sidebar input[type="submit"].hidden, #talk-sidebar input.icon-confirm[type="submit"].hidden { -- cgit v1.2.3