aboutsummaryrefslogtreecommitdiffstats
path: root/apps/settings/css/settings.scss
diff options
context:
space:
mode:
Diffstat (limited to 'apps/settings/css/settings.scss')
-rw-r--r--apps/settings/css/settings.scss153
1 files changed, 92 insertions, 61 deletions
diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
index 04111cda4f7..782733a76a8 100644
--- a/apps/settings/css/settings.scss
+++ b/apps/settings/css/settings.scss
@@ -1,9 +1,11 @@
-/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net
- This file is licensed under the Affero General Public License version 3 or later.
- See the COPYING-README file. */
+/*!
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2011 Jan-Christoph Borchardt, http://jancborchardt.net
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
@use 'variables';
@use 'sass:math';
-@import 'functions';
+@use 'functions';
input {
&#openid, &#webdav {
@@ -18,23 +20,23 @@ input {
/* icons for sidebar */
.nav-icon-personal-settings {
- @include icon-color('personal', 'settings', variables.$color-black);
+ @include functions.icon-color('personal', 'settings', variables.$color-black);
}
.nav-icon-security {
- @include icon-color('toggle-filelist', 'settings', variables.$color-black);
+ @include functions.icon-color('toggle-filelist', 'settings', variables.$color-black);
}
.nav-icon-clientsbox {
- @include icon-color('change', 'settings', variables.$color-black);
+ @include functions.icon-color('change', 'settings', variables.$color-black);
}
.nav-icon-federated-cloud {
- @include icon-color('share', 'settings', variables.$color-black);
+ @include functions.icon-color('share', 'settings', variables.$color-black);
}
.nav-icon-second-factor-backup-codes, .nav-icon-ssl-root-certificate {
- @include icon-color('password', 'settings', variables.$color-black);
+ @include functions.icon-color('password', 'settings', variables.$color-black);
}
#personal-settings-avatar-container {
@@ -108,14 +110,14 @@ select {
}
.personal-info {
- margin-right: 10%;
+ margin-inline-end: 10%;
margin-bottom: 12px;
margin-top: 12px;
}
.personal-info[class^='icon-'], .personal-info[class*=' icon-'] {
background-position: 0px 2px;
- padding-left: 30px;
+ padding-inline-start: 30px;
opacity: 0.7;
}
}
@@ -130,26 +132,32 @@ select {
}
.link-button {
- display: inline-block;
- margin: 16px;
- padding: 14px 20px;
+ display: inline-flex;
+ margin: calc(2 * var(--default-grid-baseline));
+ padding: calc(2 * var(--default-grid-baseline)) calc(4 * var(--default-grid-baseline));
background-color: var(--color-primary-element);
color: var(--color-primary-element-text);
- border-radius: var(--border-radius-pill);
+ border-radius: var(--border-radius-element);
border: 1px solid var(--color-primary-element);
box-shadow: 0 2px 9px var(--color-box-shadow);
+ align-items: center;
+ gap: calc(var(--default-grid-baseline) * 2);
- &:active,
&:hover,
- &:focus,
+ &:focus {
+ background-color: var(--color-primary-element-hover);
+ }
+
+ &:active,
&:focus-visible {
box-shadow: 0 0 0 4px var(--color-main-background) !important;
outline: 2px solid var(--color-main-text) !important;
}
- &.icon-file {
- padding-left: 48px;
- background-position: 24px;
+ .icon-file-text {
+ filter: var(--primary-invert-if-dark);
+ width: 20px;
+ height: 20px;
}
}
@@ -181,7 +189,7 @@ select {
> form span {
&[class^='icon-checkmark'], &[class^='icon-error'] {
position: relative;
- right: 8px;
+ inset-inline-end: 8px;
top: -28px;
pointer-events: none;
float: right;
@@ -191,7 +199,7 @@ select {
.verify {
position: relative;
- left: 100%;
+ inset-inline-start: 100%;
top: 0;
height: 0;
@@ -216,7 +224,7 @@ select {
/* only show pointer cursor when popup will be there */
.verification-dialog {
display: none;
- right: -9px;
+ inset-inline-end: -9px;
top: 40px;
width: 275px;
@@ -234,9 +242,9 @@ select {
.federation-menu {
position: relative;
cursor: pointer;
- width: 44px;
- height: 44px;
- padding: 10px;
+ width: var(--default-clickable-area);
+ height: var(--default-clickable-area);
+ padding: calc(2 * var(--default-grid-baseline));
margin: 0;
background: none;
border: none;
@@ -244,7 +252,7 @@ select {
&:hover,
&:focus {
background-color: var(--color-background-hover);
- border-radius: var(--border-radius-pill);
+ border-radius: var(--border-radius-element);
.icon-federation-menu {
opacity: 0.8;
@@ -252,7 +260,7 @@ select {
}
.icon-federation-menu {
- padding-left: 16px;
+ padding-inline-start: 16px;
background-size: 16px;
background-position: left center;
opacity: .3;
@@ -266,7 +274,7 @@ select {
}
.federationScopeMenu {
- top: 44px;
+ top: var(--default-clickable-area);
&.popovermenu {
.menuitem {
@@ -344,7 +352,7 @@ input#identity {
table.nostyle {
label {
- margin-right: 2em;
+ margin-inline-end: 2em;
}
td {
@@ -381,9 +389,9 @@ table.nostyle {
}
.personal-show-label {
top: 34px !important;
- margin-right: 0;
+ margin-inline-end: 0;
margin-top: 0 !important;
- right: 3px;
+ inset-inline-end: 3px;
}
}
@@ -397,7 +405,7 @@ table.nostyle {
.strengthify-wrapper {
position: absolute;
- left: 0;
+ inset-inline-start: 0;
width: 100%;
border-radius: 0 0 2px 2px;
margin-top: 5px;
@@ -415,13 +423,12 @@ table.nostyle {
}
li > div {
- margin-left: 20px;
+ margin-inline-start: 20px;
}
.two-factor-provider-settings-icon {
width: 16px;
height: 16px;
- vertical-align: sub;
filter: var(--background-invert-if-dark);
}
}
@@ -458,7 +465,7 @@ li.active {
#usersearchform {
position: absolute;
top: 2px;
- right: 0;
+ inset-inline-end: 0;
input {
width: 150px;
@@ -475,23 +482,25 @@ table.grid {
th {
height: 2em;
- padding: 0 1em 0 0;
+ padding: 0;
+ padding-inline-end: 1em;
border-bottom: 1px solid var(--color-border);
- text-align: left;
+ text-align: start;
font-weight: normal;
}
td {
border-bottom: 1px solid var(--color-border);
- padding: 0 1em 0 0;
- text-align: left;
+ padding: 0;
+ padding-inline-end: 1em;
+ text-align: start;
font-weight: normal;
}
}
td, th {
&.name {
- padding-left: .8em;
+ padding-inline-start: .8em;
min-width: 5em;
max-width: 12em;
text-overflow: ellipsis;
@@ -499,7 +508,7 @@ td, th {
}
&.password {
- padding-left: .8em;
+ padding-inline-start: .8em;
> img {
visibility: hidden;
@@ -529,7 +538,7 @@ td, th {
}
&.password > span {
- margin-right: 1.2em;
+ margin-inline-end: 1.2em;
color: #C7C7C7;
}
}
@@ -543,12 +552,12 @@ span.usersLastLoginTooltip {
/* Navigation icons */
img {
margin-bottom: -3px;
- margin-right: 6px;
+ margin-inline-end: 6px;
width: 16px;
}
li span.no-icon {
- padding-left: 32px;
+ padding-inline-start: 32px;
}
ul li.active > span.utils {
@@ -559,6 +568,7 @@ span.usersLastLoginTooltip {
}
/* SETTINGS SECTIONS */
+// to match with NcSettingsSection component
.section {
margin-bottom: 0;
/* section divider lines, none needed for last one */
@@ -568,13 +578,32 @@ span.usersLastLoginTooltip {
/* correctly display help icons next to headings */
h2 {
- margin-bottom: 22px;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 20px;
+ font-weight: bold;
+ max-width: 900px;
+ margin-top: 0;
- .icon-info {
- padding: 6px 20px;
- vertical-align: text-bottom;
- display: inline-block;
+ .icon-info {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: var(--default-clickable-area);
+ height: var(--default-clickable-area);
+ margin: calc((var(--default-clickable-area) - 16px) / 2 * -1);
+ margin-inline-start: 0;
+ color: var(--color-text-maxcontrast);
}
+
+ }
+
+ p {
+ margin-top: -0.2em;
+ margin-bottom: 1em;
+ color: var(--color-text-maxcontrast);
+ max-width: 900px;
}
}
@@ -639,15 +668,15 @@ table.grid td.date {
}
.indent {
- padding-left: 28px;
+ padding-inline-start: 28px;
}
.double-indent {
- padding-left: 56px;
+ padding-inline-start: 56px;
}
.nocheckbox {
- padding-left: 20px;
+ padding-inline-start: 20px;
}
#s2id_linksExcludedGroups {
@@ -656,7 +685,7 @@ table.grid td.date {
}
#shareApiDefaultPermissionsSection label {
- margin-right: 20px;
+ margin-inline-end: 20px;
}
#fileSharingSettings h3 {
@@ -668,7 +697,7 @@ table.grid td.date {
/* 20 px left margin, 3 px right margin */
max-width: 600px;
height: 150px;
- margin-left: 20px;
+ margin-inline-start: 20px;
box-sizing: border-box;
}
@@ -690,7 +719,7 @@ table.grid td.date {
label:first-child {
display: inline-block;
width: 300px;
- text-align: right;
+ text-align: end;
}
select:nth-child(2),
@@ -702,7 +731,7 @@ table.grid td.date {
@media (max-width: calc(variables.$breakpoint-mobile * 0.75)) {
.mail_settings p label:first-child {
width: unset;
- text-align: left;
+ text-align: start;
display: block;
margin-top: calc(var(--default-grid-baseline) * 2);
}
@@ -713,7 +742,7 @@ table.grid td.date {
}
.cronlog {
- margin-left: 10px;
+ margin-inline-start: 10px;
}
.status {
@@ -758,7 +787,7 @@ span {
/* OPERA hack for strengthify*/
doesnotexist:-o-prefocus, .strengthify-wrapper {
- left: 185px;
+ inset-inline-start: 185px;
width: 129px;
}
@@ -772,7 +801,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
#postsetupchecks {
ul {
- margin-left: 44px;
+ margin-inline-start: 44px;
list-style: disc;
li {
@@ -818,7 +847,9 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
margin-bottom: calc(var(--default-grid-baseline) * 8);
> h2 {
- margin-bottom: 0px;
+ margin: 0;
+ font-size: 20px;
+ font-weight: bold;
}
> a {