diff options
| -rw-r--r-- | core/Controller/LoginController.php | 2 | ||||
| -rw-r--r-- | core/Controller/SetupController.php | 1 | ||||
| -rw-r--r-- | core/css/guest.css | 196 | ||||
| -rw-r--r-- | lib/base.php | 4 | ||||
| -rw-r--r-- | lib/private/TemplateLayout.php | 6 |
5 files changed, 89 insertions, 120 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 52bd2213954..28cc39b9137 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -169,8 +169,6 @@ class LoginController extends Controller { $parameters['user_autofocus'] = true; } - \OC_Util::addStyle('guest'); - return new TemplateResponse( $this->appName, 'login', $parameters, 'guest' ); diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index 87508423cd3..bb7c8c4969d 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -92,7 +92,6 @@ class SetupController { \OC_Util::addVendorScript('strengthify/jquery.strengthify'); \OC_Util::addVendorStyle('strengthify/strengthify'); - \OC_Util::addStyle('guest'); \OC_Util::addScript('setup'); \OC_Template::printGuestPage('', 'installation', $parameters); } diff --git a/core/css/guest.css b/core/css/guest.css index 3223e764ac0..f0383ea75cd 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -37,11 +37,8 @@ p.info a, color: #fff; } #remember_login:hover+label, -#remember_login:focus+label, #forgot-password:hover, -#forgot-password:focus, -p.info a:hover, -p.info a:focus { +p.info a:hover { opacity: .6; } em { @@ -68,7 +65,7 @@ h3 { padding-top: 100px; } #header .logo { - background-image: url(../img/logo-icon.svg?v=1); + background-image: url('../img/logo-icon.svg?v=1'); background-repeat: no-repeat; background-size: 175px; background-position: center; @@ -180,113 +177,63 @@ button.primary { color: #fff; } -/* Radio and Checkbox */ -input[type="checkbox"].checkbox { - position: absolute; +/* Checkboxes */ +input[type='checkbox'].checkbox { + height:1px; left:-10000px; - top: auto; - width: 1px; - height: 1px; - overflow: hidden; -} -input[type="checkbox"].checkbox + label:before { - content: ""; - display: inline-block; - - height: 20px; - width: 20px; - vertical-align: middle; - - background: url('../img/actions/checkbox.svg') left top no-repeat; -} -input[type="checkbox"].checkbox:disabled +label:before { opacity: .6; } -input[type="checkbox"].checkbox.u-left +label:before { float: left; } -input[type="checkbox"].checkbox.u-hidden + label:before { display: none; } -input[type="checkbox"].checkbox:checked + label:before { - background-image: url('../img/actions/checkbox-checked.svg'); -} -input[type="checkbox"].checkbox:indeterminate + label:before { - background-image: url('../img/actions/checkbox-mixed.svg'); -} -input[type="checkbox"].checkbox:disabled + label:before { - background-image: url('../img/actions/checkbox-disabled.svg'); -} -input[type="checkbox"].checkbox:checked:disabled + label:before { - background-image: url('../img/actions/checkbox-checked-disabled.svg'); -} -input[type="checkbox"].checkbox:indeterminate:disabled + label:before { - background-image: url('../img/actions/checkbox-mixed-disabled.svg'); -} -input[type="checkbox"].checkbox--white + label:before { - background-image: url('../img/actions/checkbox-white.svg'); -} -input[type="checkbox"].checkbox--white:checked + label:before { - background-image: url('../img/actions/checkbox-checked-white.svg'); -} -input[type="checkbox"].checkbox--white:indeterminate + label:before { - background-image: url('../img/actions/checkbox-mixed-white.svg'); -} -input[type="checkbox"].checkbox--white:disabled + label:before { - background-image: url('../img/actions/checkbox-disabled-white.svg'); -} -input[type="checkbox"].checkbox--white:checked:disabled + label:before { - background-image: url('../img/actions/checkbox-checked-disabled.svg'); -} -input[type="checkbox"].checkbox--white:indeterminate:disabled + label:before { - background-image: url('../img/actions/checkbox-mixed-disabled.svg'); -} -input[type="checkbox"].checkbox:hover+label:before, input[type="checkbox"]:focus+label:before { - color:#111 !important; -} -input[type="checkbox"]+label { - position: relative; - margin: 0; - padding: 14px; - vertical-align: middle; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -input[type="radio"].radio { - position: absolute; - left:-10000px; - top: auto; - width: 1px; - height: 1px; - overflow: hidden; -} -input[type="radio"].radio + label:before { - content: ""; - display: inline-block; - - height: 20px; - width: 20px; - vertical-align: middle; - - background: url('../img/actions/radio.svg') left top no-repeat; -} -input[type="radio"].radio:checked + label:before { - background-image: url('../img/actions/radio-checked.svg'); -} -input[type="radio"].radio:disabled + label:before { - background-image: url('../img/actions/radio-disabled.svg'); -} -input[type="radio"].radio:checked:disabled + label:before { - background-image: url('../img/actions/radio-checked-disabled.svg'); -} -input[type="radio"].radio--white + label:before { - background-image: url('../img/actions/radio-white.svg'); -} -input[type="radio"].radio--white:checked + label:before { - background-image: url('../img/actions/radio-checked-white.svg'); -} -input[type="radio"].radio--white:disabled + label:before { - background-image: url('../img/actions/radio-disabled.svg'); -} -input[type="radio"].radio--white:checked:disabled + label:before { - background-image: url('../img/actions/radio-checked-disabled.svg'); + overflow:hidden; + position:absolute; + top:auto; + width:1px; +} +input[type='checkbox'].checkbox + label { + user-select:none; +} +input[type='checkbox'].checkbox:disabled + label, +input[type='checkbox'].checkbox:disabled + label:before { + cursor:default; +} +input[type='checkbox'].checkbox + label:before { + background-position:center; + border:1px solid #888; + border-radius:1px; + content:''; + display:inline-block; + height:10px; + margin:3px; + margin-top:1px; + vertical-align:middle; + width:10px; +} +input[type='checkbox'].checkbox--white:not(:disabled):not(:checked) + label:hover:before, +input[type='checkbox'].checkbox--white:focus + label:before { + border-color:#fff; +} +input[type='checkbox'].checkbox--white:checked + label:before, +input[type='checkbox'].checkbox--white.checkbox:indeterminate + label:before { + border-color:#fff; + background-color: #eee; +} +input[type='checkbox'].checkbox--white:disabled + label:before { + background-color:#666; + border-color:#999; +} +input[type='checkbox'].checkbox--white:checked:disabled + label:before { + border-color:#666; +} +input[type='checkbox'].checkbox--white:checked + label:before { + background-image:url('../img/actions/checkbox-mark-white.svg'); +} +input[type='checkbox'].checkbox--white:indeterminate + label:before { + background-image:url('../img/actions/checkbox-mixed-white.svg'); +} +input[type='checkbox'].checkbox--white:indeterminate:disabled + label:after { + background-color:#aaa; + border-color:#888; +} +input[type='checkbox'].checkbox--white + label:before, +input[type='checkbox'].checkbox--white:checked:disabled + label:after { + border-color:#aaa; } /* keep the labels for screen readers but hide them since we use placeholders */ @@ -372,6 +319,24 @@ form .warning input[type="checkbox"]+label { color: #fff !important; } +/* TOTP */ +.two-factor-header { + text-align: center; +} +.two-factor-provider { + text-align: center; + width: 258px !important; + display: inline-block; + margin-bottom: 0 !important; + background-color: rgba(0, 0, 0, 0.3) !important; + border: none !important; +} +.two-factor-link { + display: inline-block; + padding: 12px; + color: rgba(255, 255, 255, 0.75); +} + /* Additional login options */ #remember_login { margin: 18px 5px 0 16px !important; @@ -573,8 +538,15 @@ p.info { /* Icons */ .icon-info-white { - background-image: url(../img/actions/info-white.svg?v=1); + background-image: url('../img/actions/info-white.svg?v=2'); } +.icon-confirm { + background-image: url('../img/actions/confirm.svg?v=2'); +} +.icon-confirm-white { + background-image: url('../img/actions/confirm-white.svg?v=2'); +} + /* Loading */ .float-spinner { diff --git a/lib/base.php b/lib/base.php index 3ba0755eaab..9f480c0b0dc 100644 --- a/lib/base.php +++ b/lib/base.php @@ -281,7 +281,6 @@ class OC { // render error page $template = new OC_Template('', 'update.user', 'guest'); OC_Util::addScript('maintenance-check'); - OC_Util::addStyle('guest'); $template->printPage(); die(); } @@ -355,8 +354,6 @@ class OC { header('Status: 503 Service Temporarily Unavailable'); header('Retry-After: 120'); - OC_Util::addStyle('guest'); - // render error page $template = new OC_Template('', 'update.use-cli', 'guest'); $template->assign('productName', 'nextcloud'); // for now @@ -378,7 +375,6 @@ class OC { $systemConfig->setValue('theme', ''); OC_Util::addScript('config'); // needed for web root OC_Util::addScript('update'); - OC_Util::addStyle('guest'); /** @var \OC\App\AppManager $appManager */ $appManager = \OC::$server->getAppManager(); diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 7ded109f76b..19fc9462185 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -164,11 +164,15 @@ class TemplateLayout extends \OC_Template { // Do not load scss for update, errors, installation or login page if(\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade() - && strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('core.login.tryLogin')) !== 0) { + && !preg_match('/^\/login/', \OC::$server->getRequest()->getPathInfo())) { $cssFiles = self::findStylesheetFiles(\OC_Util::$styles); } else { + // If we ignore the scss compiler, + // we need to load the guest css fallback + \OC_Util::addStyle('guest'); $cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false); } + $this->assign('cssfiles', array()); $this->assign('printcssfiles', []); $this->assign('versionHash', self::$versionHash); |