Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2018-07-13 04:11:47 +0300
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2018-07-13 04:11:47 +0300
commit26db9540d41cbbaa9a4161b5d07325dea5ff5dd6 (patch)
tree871a33234997f6ddf7fa4410fd62688c43220f62 /core
parent8c004fdc64f5234b0f4f5baa7c9db90c522ede9e (diff)
Remove SCSS rules for "#body-login" elements
"#body-login" is only used in the layout for guest pages. Therefore, before SCSS was enabled for guest pages, all "#body-login" rules in SCSS files were ignored. Now that SCSS is enabled for guest pages those rules break the guest pages, but given that they were ignored until now they can be safely removed. Note, however, that all of the above refers to regular SCSS rules; those defined in the Theming app are different, as they were converted to CSS and used in the guest pages even when SCSS was disabled, so they do not need to be adjusted due to SCSS being enabled now. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'core')
-rw-r--r--core/css/mobile.scss11
-rw-r--r--core/css/styles.scss352
2 files changed, 0 insertions, 363 deletions
diff --git a/core/css/mobile.scss b/core/css/mobile.scss
index f3b89ddb48c..116d174989c 100644
--- a/core/css/mobile.scss
+++ b/core/css/mobile.scss
@@ -1,16 +1,5 @@
@media only screen and (max-width: 768px) {
-#body-login #header {
- padding-top: 10px;
-}
-
-#body-login .wrapper {
- display: flex;
- flex-direction: row;
- align-self: center;
- align-items: center;
-}
-
/* do not show update notification on mobile */
#update-notification {
display: none !important;
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 1938eb79afd..6ff8d30a590 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -92,15 +92,6 @@ body {
height: auto;
}
-#body-login {
- text-align: center;
- background-color: var(--color-primary);
- background-image: url('../img/background.png?v=2');
- background-position: 50% 50%;
- background-repeat: no-repeat;
- background-size: cover;
-}
-
.two-factor-header {
text-align: center;
}
@@ -125,11 +116,6 @@ body {
display: none;
}
-#body-login .float-spinner {
- margin-top: -32px;
- padding-top: 32px;
-}
-
#nojavascript {
position: fixed;
top: 0;
@@ -332,135 +318,10 @@ body {
/* LOG IN & INSTALLATION ------------------------------------------------------------ */
-/* Some whitespace to the top */
-
-#body-login {
- #header {
- padding-top: 100px;
- }
- background-attachment: fixed;
- /* fix background gradient */
- height: 100%;
- /* fix sticky footer */
- p.info, form fieldset legend, #datadirContent label {
- text-align: center;
- color: var(--color-primary-text);
- }
- form {
- fieldset .warning-info, input[type='checkbox'] + label {
- text-align: center;
- color: var(--color-primary-text);
- }
- .warning input[type='checkbox'] {
- &:hover + label, &:focus + label, + label {
- color: var(--color-primary-text) !important;
- }
- }
- }
- .update {
- h2 {
- margin: 0 0 20px;
- }
- a {
- color: var(--color-primary-text);
- border-bottom: 1px solid var(--color-background-darker);
- }
- }
- .infogroup {
- margin-bottom: 15px;
- }
- p#message img {
- vertical-align: middle;
- padding: 5px;
- }
- div.buttons {
- text-align: center;
- }
- p.info {
- margin: 0 auto;
- padding-top: 20px;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- a {
- font-weight: 600;
- padding: 13px;
- margin: -13px;
- }
- }
- form {
- position: relative;
- width: 280px;
- margin: 16px auto;
- padding: 0;
- fieldset {
- margin-bottom: 20px;
- text-align: left;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- }
- #sqliteInformation {
- margin-top: -20px;
- margin-bottom: 20px;
- }
- #adminaccount {
- margin-bottom: 15px;
- }
- fieldset legend {
- width: 100%;
- }
- }
-}
-
-/* Dark subtle label text */
-
-/* overrides another !important statement that sets this to unreadable black */
-
#datadirContent label {
width: 100%;
}
-#body-login {
- #datadirContent label {
- display: block;
- margin: 0;
- }
- form #datadirField legend {
- margin-bottom: 15px;
- }
- #showAdvanced {
- padding: 13px;
- /* increase clickable area of Advanced dropdown */
- img {
- vertical-align: bottom;
- /* adjust position of Advanced dropdown arrow */
- margin-left: -4px;
- }
- }
- .icon-info-white {
- padding: 10px;
- }
- .strengthify-wrapper {
- display: inline-block;
- position: relative;
- left: 5px;
- top: -20px;
- width: 269px;
- border-radius: 0 0 2px 2px;
- overflow: hidden;
- height: 3px;
- }
- input {
- &[type='text'], &[type='password'], &[type='email'] {
- border: none;
- font-weight: 300;
- }
- }
-}
-
/* strengthify wrapper */
/* General new input field look */
@@ -475,88 +336,12 @@ body {
user-select: none;
}
-#body-login .grouptop input, .grouptop input {
- margin-bottom: 0 !important;
- border-bottom: 0 !important;
- border-bottom-left-radius: 0 !important;
- border-bottom-right-radius: 0 !important;
-}
-
-#body-login .groupmiddle input, .groupmiddle input {
- margin-top: 0 !important;
- margin-bottom: 0 !important;
- border-top: 0 !important;
- border-bottom: 0 !important;
- border-radius: 0 !important;
-}
-
-#body-login .groupbottom input, .groupbottom input {
- margin-top: 0 !important;
- border-top: 0 !important;
- border-top-right-radius: 0 !important;
- border-top-left-radius: 0 !important;
-}
-
-#body-login .groupbottom input[type=submit] {
- box-shadow: none !important;
-}
-
/* keep the labels for screen readers but hide them since we use placeholders */
label.infield {
display: none;
}
-#body-login {
- form {
- 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;
- }
- .errors {
- border: 1px solid var(--color-error);
- list-style-indent: inside;
- margin: 0 0 2em;
- padding: 1em;
- }
- }
- .success {
- border: 1px solid var(--color-success);
- width: 35%;
- margin: 30px auto;
- padding: 1em;
- text-align: center;
- }
- #showAdvanced > img {
- padding: 4px;
- box-sizing: border-box;
- }
- p.info a, #showAdvanced {
- color: var(--color-primary-text);
- }
- #remember_login {
- &:hover + label, &:focus + label {
- opacity: .6;
- }
- }
- #forgot-password {
- &:hover, &:focus {
- opacity: .6;
- }
- }
- p.info a {
- &:hover, &:focus {
- opacity: .6;
- }
- }
-}
-
/* Show password toggle */
#show, #dbpassword {
@@ -611,60 +396,6 @@ label.infield {
padding: 6px 4px;
}
-/* Database selector */
-#body-login {
- form #selectDbType {
- text-align: center;
- white-space: nowrap;
- margin: 0;
- .info {
- white-space: normal;
- }
- label {
- position: static;
- margin: 0 -3px 5px;
- font-size: 12px;
- background: var(--color-background-dark);
- color: var(--color-text-lighter);
- cursor: pointer;
- border: 1px solid var(--color-border-dark);
- span {
- cursor: pointer;
- padding: 10px 20px;
- }
- &.ui-state-hover, &.ui-state-active {
- color: var(--color-main-text);
- background-color: var(--color-border);
- }
- }
- }
- .warning, .update, .error {
- display: block;
- padding: 10px;
- background-color: var(--color-background-darker);
- color: var(--color-primary-text);
- text-align: left;
- border-radius: var(--border-radius);
- cursor: default;
- }
- .update {
- width: inherit;
- text-align: center;
- .appList {
- list-style: disc;
- text-align: left;
- margin-left: 25px;
- margin-right: 25px;
- }
- }
- .v-align {
- width: inherit;
- }
- .update img.float-spinner {
- float: left;
- }
-}
-
/* Warnings and errors are the same */
#body-user .warning, #body-settings .warning {
@@ -708,27 +439,6 @@ label.infield {
border-color: var(--color-error) !important;
}
-/* Fixes for log in page, TODO should be removed some time */
-
-#body-login {
- ul.error-wide {
- margin-top: 35px;
- }
- .warning {
- margin: 0 7px 5px 4px;
- legend {
- opacity: 1;
- }
- }
- a.warning {
- cursor: pointer;
- }
- .updateProgress .error {
- margin-top: 10px;
- margin-bottom: 10px;
- }
-}
-
/* fixes for update page TODO should be fixed some time in a proper way */
/* this is just for an error while updating the ownCloud instance */
@@ -747,72 +457,10 @@ label.infield {
/* Log in and install button */
-#body-login #submit-wrapper {
- position: relative; /* Make the wrapper the containing block of its
- absolutely positioned descendant icons */
-
- .icon-confirm-white {
- position: absolute;
- top: 23px;
- right: 23px;
- }
- .icon-loading-small {
- position: absolute;
- top: 22px;
- right: 24px;
- }
-
- #submit-icon {
- pointer-events: none; /* The submit icon is positioned on the submit
- button. From the user point of view the icon is
- part of the button, so the clicks on the icon
- have to be applied to the button instead. */
- }
-}
-
-#body-login input {
- font-size: 20px;
- margin: 5px;
- padding: 10px 10px 8px;
- &[type='text'], &[type='password'] {
- width: calc(100% - 10px); /* 5px margin */
- }
- &.login {
- width: 269px;
- background-position: right 16px center;
- }
- &[type='submit'] {
- padding: 10px 20px;
- /* larger log in and installation buttons */
- }
-}
-
#remember_login {
margin: 18px 5px 0 16px !important;
}
-#body-login {
- .remember-login-container {
- display: inline-block;
- margin: 10px 0;
- text-align: center;
- width: 100%;
- }
- #forgot-password {
- padding: 11px;
- float: right;
- color: var(--color-primary-text);
- }
- .wrapper {
- min-height: 100%;
- margin: 0 auto -70px;
- width: 300px;
- }
- footer, .push {
- height: 70px;
- }
-}
-
/* Sticky footer */
/* round profile photos */