upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Some more fixes

Browse source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2022-08-31 12:05:13 +02:00
parent d6bd98d3c5
commit b6a6802857
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
29 changed files with 194 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/dashboard/src/DashboardApp.vue
View file

@ -365,18 +365,18 @@ export default {
if (isBackgroundBright) {
document.querySelector('#header').style.setProperty('--primary-invert-if-bright', 'invert(100%)')
document.querySelector('#header').style.setProperty('--color-primary-text', '#000000')
//document.body.removeAttribute('data-theme-dark')
//document.body.setAttribute('data-theme-light', 'true')
// document.body.removeAttribute('data-theme-dark')
// document.body.setAttribute('data-theme-light', 'true')
} else {
document.querySelector('#header').style.setProperty('--primary-invert-if-bright', 'no')
document.querySelector('#header').style.setProperty('--color-primary-text', '#ffffff')
//document.body.removeAttribute('data-theme-light')
//document.body.setAttribute('data-theme-dark', 'true')
// document.body.removeAttribute('data-theme-light')
// document.body.setAttribute('data-theme-dark', 'true')
}
document.documentElement.style.setProperty('--image-main-background', this.backgroundStyle.backgroundImage);
document.querySelector('#header').style.setProperty('--image-main-background', this.backgroundStyle.backgroundImage);
document.querySelector('body').style.setProperty('--image-main-background', this.backgroundStyle.backgroundImage);
document.documentElement.style.setProperty('--image-main-background', this.backgroundStyle.backgroundImage)
document.querySelector('#header').style.setProperty('--image-main-background', this.backgroundStyle.backgroundImage)
document.querySelector('body').style.setProperty('--image-main-background', this.backgroundStyle.backgroundImage)
},
updateSkipLink() {
// Make sure "Skip to main content" link points to the app content

3
apps/files/css/files.css
View file

@ -1270,7 +1270,8 @@ table.dragshadow td.size {
padding: 22px;
opacity: 0.5;
position: fixed;
right: 16px;
right: calc(var(--default-grid-baseline) * 4);
top: calc(var(--header-height) + var(--default-grid-baseline));
z-index: 100;
}
#view-toggle:hover, #view-toggle:focus, #showgridview:focus + #view-toggle {

2
apps/files/css/files.css.map
View file

File diff suppressed because one or more lines are too long

3
apps/files/css/files.scss
View file

@ -1236,7 +1236,8 @@ table.dragshadow td.size {
padding: 22px;
opacity: .5;
position: fixed;
right: 16px;
right: calc(var(--default-grid-baseline) * 4);
top: calc(var(--header-height) + var(--default-grid-baseline));
z-index: 100;
&:hover,

3
apps/files/css/merged.css
View file

@ -1270,7 +1270,8 @@ table.dragshadow td.size {
padding: 22px;
opacity: 0.5;
position: fixed;
right: 16px;
right: calc(var(--default-grid-baseline) * 4);
top: calc(var(--header-height) + var(--default-grid-baseline));
z-index: 100;
}
#view-toggle:hover, #view-toggle:focus, #showgridview:focus + #view-toggle {

2
apps/files/css/merged.css.map
View file

File diff suppressed because one or more lines are too long

2
apps/files/src/sidebar.js
View file

@ -52,8 +52,6 @@ window.addEventListener('DOMContentLoaded', function() {
}
}
document.getElementById('app-sidebar').tabIndex = 0
// Init vue app
const View = Vue.extend(SidebarView)
const AppSidebar = new View({

1
apps/files/src/views/Sidebar.vue
View file

@ -25,6 +25,7 @@
ref="sidebar"
v-bind="appSidebar"
:force-menu="true"
tabindex="0"
@close="close"
@update:active="setActiveTab"
@update:starred="toggleStarred"

5
apps/settings/css/settings.css
View file

@ -951,7 +951,8 @@ span.version {
padding-left: 60px;
width: 100%;
background-color: var(--color-main-background);
position: fixed;
position: sticky;
top: 0;
z-index: 1;
display: flex;
align-items: center;
@ -1383,7 +1384,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
background-color: var(--color-main-background);
z-index: 100;
/* above multiselect */
top: 50px;
top: 0;
}
#body-settings #app-content.user-list-grid .row#grid-header.sticky {
box-shadow: 0 -2px 10px 1px var(--color-box-shadow);

2
apps/settings/css/settings.css.map
View file

File diff suppressed because one or more lines are too long

5
apps/settings/css/settings.scss
View file

@ -1070,7 +1070,8 @@ span.version {
padding-left: $toolbar-height;
width: 100%;
background-color: var(--color-main-background);
position: fixed;
position: sticky;
top: 0;
z-index: 1;
display: flex;
align-items: center;
@ -1580,7 +1581,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
align-self: normal;
background-color: var(--color-main-background);
z-index: 100; /* above multiselect */
top: variables.$header-height;
top: 0;
&.sticky {
box-shadow: 0 -2px 10px 1px var(--color-box-shadow);

3
apps/theming/lib/Themes/DefaultTheme.php
View file

@ -87,6 +87,7 @@ class DefaultTheme implements ITheme {
public function getCSSVariables(): array {
$colorMainText = '#222222';
$colorMainTextRgb = join(',', $this->util->hexToRGB($colorMainText));
$colorMainBackground = '#ffffff';
$colorMainBackgroundRGB = join(',', $this->util->hexToRGB($colorMainBackground));
$colorBoxShadow = $this->util->darken($colorMainBackground, 70);
@ -142,6 +143,8 @@ class DefaultTheme implements ITheme {
'--color-text-light' => $colorMainText,
'--color-text-lighter' => $this->util->lighten($colorMainText, 33),
'--color-scrollbar' => 'rgba(' . $colorMainTextRgb . ', .15)',
// info/warning/success feedback colours
'--color-error' => '#e9322d',
'--color-error-rgb' => join(',', $this->util->hexToRGB('#e9322d')),

36
core/css/apps.css
View file

@ -92,14 +92,14 @@ html {
background-color: var(--color-primary);
background-image: var(--image-main-background);
background-size: cover;
background-position: top center;
background-position: center;
}
body {
background-color: var(--color-primary);
background-image: var(--image-main-background);
background-size: cover;
background-position: top center;
background-position: center;
position: fixed;
width: 100%;
height: calc(100vh - env(safe-area-inset-bottom));
@ -175,7 +175,6 @@ kbd {
-webkit-user-select: none;
position: sticky;
height: 100%;
padding: calc(var(--default-grid-baseline) * 2);
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
@ -208,7 +207,7 @@ kbd {
}
#app-navigation:not(.vue) .app-navigation-new {
display: block;
padding: 10px;
padding: calc(var(--default-grid-baseline) * 2);
}
#app-navigation:not(.vue) .app-navigation-new button {
display: inline-block;
@ -231,8 +230,13 @@ kbd {
box-sizing: border-box;
display: flex;
flex-direction: column;
padding: calc(var(--default-grid-baseline) * 2);
padding-bottom: 0;
/* Menu and submenu */
}
#app-navigation:not(.vue) > ul:last-child {
padding-bottom: calc(var(--default-grid-baseline) * 2);
}
#app-navigation:not(.vue) > ul > li {
display: inline-flex;
flex-wrap: wrap;
@ -379,7 +383,6 @@ kbd {
text-overflow: ellipsis;
border-radius: var(--border-radius-pill);
color: var(--color-main-text);
opacity: 0.8;
flex: 1 1 0px;
z-index: 100;
/* above the bullet to allow click*/
@ -775,7 +778,9 @@ kbd {
#app-settings-content {
display: none;
padding: 10px;
padding: calc(var(--default-grid-baseline) * 2);
padding-top: 0;
padding-left: calc(var(--default-grid-baseline) * 4);
/* restrict height of settings and make scrollable */
max-height: 300px;
overflow-y: auto;
@ -799,7 +804,9 @@ kbd {
box-sizing: border-box;
background-color: transparent;
overflow: hidden;
border-radius: var(--border-radius-pill);
border-radius: calc(var(--default-clickable-area) / 2);
padding: calc(var(--default-grid-baseline) * 2);
padding-top: 0;
}
#app-settings-header .settings-button {
@ -809,10 +816,10 @@ kbd {
width: 100%;
padding: 0;
margin: 0;
background-color: transparent;
background-color: var(--color-main-background);
box-shadow: none;
border: 0;
border-radius: var(--border-radius-pill);
border-radius: calc(var(--default-clickable-area) / 2);
text-align: left;
font-weight: normal;
font-size: 100%;
@ -1052,13 +1059,12 @@ kbd {
cursor: pointer;
line-height: 44px;
border: 0;
border-radius: var(--border-radius-large);
border-radius: 0;
background-color: transparent;
display: flex;
align-items: flex-start;
height: auto;
margin: 0;
margin-bottom: 2px;
font-weight: normal;
box-shadow: none;
width: 100%;
@ -1500,14 +1506,14 @@ kbd {
/* CONTENT LIST ------------------------------------------------------------ */
.app-content-list {
position: -webkit-sticky;
position: sticky;
top: 50px;
position: relative;
top: 0;
border-right: 1px solid var(--color-border);
display: flex;
flex-direction: column;
transition: transform 250ms ease-in-out;
min-height: calc(100vh - 50px);
max-height: calc(100vh - 50px);
min-height: 100%;
max-height: 100%;
overflow-y: auto;
overflow-x: hidden;
flex: 1 1 200px;

2
core/css/apps.css.map
View file

File diff suppressed because one or more lines are too long

38
core/css/apps.scss
View file

@ -42,14 +42,14 @@ html {
background-color: var(--color-primary);
background-image: var(--image-main-background);
background-size: cover;
background-position: top center;
background-position: center;
}
body {
background-color: var(--color-primary);
background-image: var(--image-main-background);
background-size: cover;
background-position: top center;
background-position: center;
position: fixed;
width: 100%;
height: calc(100vh - env(safe-area-inset-bottom));
@ -129,7 +129,6 @@ kbd {
-webkit-backdrop-filter: var(--filter-background-blur); -webkit-user-select: none;
position: sticky;
height: 100%;
padding: calc(var(--default-grid-baseline) * 2);
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
@ -141,7 +140,7 @@ kbd {
/* 'New' button */
.app-navigation-new {
display: block;
padding: 10px;
padding: calc(var(--default-grid-baseline) * 2);
button {
display: inline-block;
width: 100%;
@ -165,6 +164,13 @@ kbd {
box-sizing: border-box;
display: flex;
flex-direction: column;
padding: calc(var(--default-grid-baseline) * 2);
padding-bottom: 0;
&:last-child {
padding-bottom: calc(var(--default-grid-baseline) * 2);
}
> li {
display: inline-flex;
flex-wrap: wrap;
@ -325,7 +331,6 @@ kbd {
text-overflow: ellipsis;
border-radius: var(--border-radius-pill);
color: var(--color-main-text);
opacity: .8;
flex: 1 1 0px;
z-index: 100; /* above the bullet to allow click*/
/* TODO: forbid using img as icon in menu? */
@ -770,7 +775,9 @@ $min-content-width: variables.$breakpoint-mobile - variables.$navigation-width -
#app-settings-content {
display: none;
padding: 10px;
padding: calc(var(--default-grid-baseline) * 2);
padding-top: 0;
padding-left: calc(var(--default-grid-baseline) * 4);
/* restrict height of settings and make scrollable */
max-height: 300px;
overflow-y: auto;
@ -804,7 +811,9 @@ $min-content-width: variables.$breakpoint-mobile - variables.$navigation-width -
box-sizing: border-box;
background-color: transparent;
overflow: hidden;
border-radius: var(--border-radius-pill);
border-radius: calc(var(--default-clickable-area) / 2);
padding: calc(var(--default-grid-baseline) * 2);
padding-top: 0;
}
@ -815,10 +824,10 @@ $min-content-width: variables.$breakpoint-mobile - variables.$navigation-width -
width: 100%;
padding: 0;
margin: 0;
background-color: transparent;
background-color: var(--color-main-background);
box-shadow: none;
border: 0;
border-radius: var(--border-radius-pill);
border-radius: calc(var(--default-clickable-area) / 2);
text-align: left;
font-weight: normal;
font-size: 100%;
@ -1053,13 +1062,12 @@ $outter-margin: math.div($popoveritem-height - $popovericon-size, 2);
cursor: pointer;
line-height: $popoveritem-height;
border: 0;
border-radius: var(--border-radius-large); // otherwise Safari will cut the border-radius area
border-radius: 0; // otherwise Safari will cut the border-radius area
background-color: transparent;
display: flex;
align-items: flex-start;
height: auto;
margin: 0;
margin-bottom: 2px;
font-weight: normal;
box-shadow: none;
width: 100%;
@ -1227,14 +1235,14 @@ $outter-margin: math.div($popoveritem-height - $popovericon-size, 2);
/* CONTENT LIST ------------------------------------------------------------ */
.app-content-list {
position: -webkit-sticky;
position: sticky;
top: variables.$header-height;
position: relative;
top: 0;
border-right: 1px solid var(--color-border);
display: flex;
flex-direction: column;
transition: transform 250ms ease-in-out;
min-height: calc(100vh - #{variables.$header-height});
max-height: calc(100vh - #{variables.$header-height});
min-height: 100%;
max-height: 100%;
overflow-y: auto;
overflow-x: hidden;
flex: 1 1 variables.$list-min-width;

9
core/css/header.css
View file

@ -310,12 +310,13 @@
width: 0;
position: absolute;
pointer-events: none;
border: 0 solid transparent;
border-bottom-color: var(--color-main-background);
border-width: 10px;
bottom: 0;
bottom: 2px;
z-index: 100;
display: block;
width: 10px;
height: 5px;
border-radius: 3px;
background-color: var(--color-primary-text);
}
#settings #expanddiv:after {
right: 22px;

2
core/css/header.css.map
View file

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["variables.scss","header.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAgBA;AACA;AAAA;EAEC;EACA;EACA;;AACA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;EACA;EACA,QDqEe;ECpEf;EACA;;;AAGD;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;;;AASF;AACC;AA8HA;;AA3HA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EAfD;EACA;EAgBC;EACA,KD0Bc;ECzBd;AAMA;AAoBA;;AAxBA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EAEC;EACA;EAzCF;EACA;;AA+CG;EACC;EACA;EACA,QA7CuB;EA8CvB;EACA;EACA;EACA;EACA;EACA;;AACA;EAEC;;AAED;EAEC;;AAED;EACC;EACA;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAED;EACC;EACA;;AAED;AAAA;EAEC;EACA;EACA;EACA;EACA;;AAML;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;;AAGD;EACC;EACA;;AAKA;AAAA;EAEC;EACA;;AACA;AAAA;EACC;EACA;EACA;EACA,ODjGY;ECkGZ;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOL;AAEA;EACC;;;AAGD;AACA;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;AACA;EACC;EACA;EACA;EACA;AAEA;;AACA;EACC;AAAY;EACZ;AAqBA;AA2BA;;AA9CA;EAGC;;AAEA;AAAA;AAAA;AAAA;EAEC;EACA;EACA;;AAED;EACC;;AAED;EACC;;AAKF;EACC;EACA;EACA;AAMA;;AAJA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;EACA;AAEA;;AACA;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIF;EACC;;;AAIF;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC,KD7Oc;;;ACkPhB;AAGC;AAAA;EACC;EACA;;AAED;AAAA;AAAA;AAAA;EAEC;EACA;EACA","file":"header.css"}
{"version":3,"sourceRoot":"","sources":["variables.scss","header.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ACAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAgBA;AACA;AAAA;EAEC;EACA;EACA;;AACA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;EACA;EACA,QDqEe;ECpEf;EACA;;;AAGD;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;;;AASF;AACC;AA8HA;;AA3HA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EAfD;EACA;EAgBC;EACA,KD0Bc;ECzBd;AAMA;AAoBA;;AAxBA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EAEC;EACA;EAzCF;EACA;;AA+CG;EACC;EACA;EACA,QA7CuB;EA8CvB;EACA;EACA;EACA;EACA;EACA;;AACA;EAEC;;AAED;EAEC;;AAED;EACC;EACA;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAED;EACC;EACA;;AAED;AAAA;EAEC;EACA;EACA;EACA;EACA;;AAML;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;;AAGD;EACC;EACA;;AAKA;AAAA;EAEC;EACA;;AACA;AAAA;EACC;EACA;EACA;EACA,ODjGY;ECkGZ;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOL;AAEA;EACC;;;AAGD;AACA;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;AACA;EACC;EACA;EACA;EACA;AAEA;;AACA;EACC;AAAY;EACZ;AAqBA;AA2BA;;AA9CA;EAGC;;AAEA;AAAA;AAAA;AAAA;EAEC;EACA;EACA;;AAED;EACC;;AAED;EACC;;AAKF;EACC;EACA;EACA;AAMA;;AAJA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;EACA;AAEA;;AACA;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIF;EACC;;;AAIF;AACA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC,KD9Oc;;;ACmPhB;AAGC;AAAA;EACC;EACA;;AAED;AAAA;AAAA;AAAA;EAEC;EACA;EACA","file":"header.css"}

9
core/css/header.scss
View file

@ -317,12 +317,13 @@
width: 0;
position: absolute;
pointer-events: none;
border: 0 solid transparent;
border-bottom-color: var(--color-main-background);
border-width: 10px;
bottom: 0;
bottom: 2px;
z-index: 100;
display: block;
width: 10px;
height: 5px;
border-radius: 3px;
background-color: var(--color-primary-text);
}
}

47
core/css/server.css
View file

@ -191,7 +191,7 @@ body {
}
::-webkit-scrollbar-thumb {
background: var(--color-border-dark);
background: var(--color-scrollbar);
border-radius: var(--border-radius-large);
border: 2px solid transparent;
background-clip: content-box;
@ -2529,12 +2529,13 @@ label.infield {
width: 0;
position: absolute;
pointer-events: none;
border: 0 solid transparent;
border-bottom-color: var(--color-main-background);
border-width: 10px;
bottom: 0;
bottom: 2px;
z-index: 100;
display: block;
width: 10px;
height: 5px;
border-radius: 3px;
background-color: var(--color-primary-text);
}
#settings #expanddiv:after {
right: 22px;
@ -2864,14 +2865,14 @@ html {
background-color: var(--color-primary);
background-image: var(--image-main-background);
background-size: cover;
background-position: top center;
background-position: center;
}
body {
background-color: var(--color-primary);
background-image: var(--image-main-background);
background-size: cover;
background-position: top center;
background-position: center;
position: fixed;
width: 100%;
height: calc(100vh - env(safe-area-inset-bottom));
@ -2947,7 +2948,6 @@ kbd {
-webkit-user-select: none;
position: sticky;
height: 100%;
padding: calc(var(--default-grid-baseline) * 2);
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
@ -2980,7 +2980,7 @@ kbd {
}
#app-navigation:not(.vue) .app-navigation-new {
display: block;
padding: 10px;
padding: calc(var(--default-grid-baseline) * 2);
}
#app-navigation:not(.vue) .app-navigation-new button {
display: inline-block;
@ -3003,8 +3003,13 @@ kbd {
box-sizing: border-box;
display: flex;
flex-direction: column;
padding: calc(var(--default-grid-baseline) * 2);
padding-bottom: 0;
/* Menu and submenu */
}
#app-navigation:not(.vue) > ul:last-child {
padding-bottom: calc(var(--default-grid-baseline) * 2);
}
#app-navigation:not(.vue) > ul > li {
display: inline-flex;
flex-wrap: wrap;
@ -3151,7 +3156,6 @@ kbd {
text-overflow: ellipsis;
border-radius: var(--border-radius-pill);
color: var(--color-main-text);
opacity: 0.8;
flex: 1 1 0px;
z-index: 100;
/* above the bullet to allow click*/
@ -3547,7 +3551,9 @@ kbd {
#app-settings-content {
display: none;
padding: 10px;
padding: calc(var(--default-grid-baseline) * 2);
padding-top: 0;
padding-left: calc(var(--default-grid-baseline) * 4);
/* restrict height of settings and make scrollable */
max-height: 300px;
overflow-y: auto;
@ -3571,7 +3577,9 @@ kbd {
box-sizing: border-box;
background-color: transparent;
overflow: hidden;
border-radius: var(--border-radius-pill);
border-radius: calc(var(--default-clickable-area) / 2);
padding: calc(var(--default-grid-baseline) * 2);
padding-top: 0;
}
#app-settings-header .settings-button {
@ -3581,10 +3589,10 @@ kbd {
width: 100%;
padding: 0;
margin: 0;
background-color: transparent;
background-color: var(--color-main-background);
box-shadow: none;
border: 0;
border-radius: var(--border-radius-pill);
border-radius: calc(var(--default-clickable-area) / 2);
text-align: left;
font-weight: normal;
font-size: 100%;
@ -3824,13 +3832,12 @@ kbd {
cursor: pointer;
line-height: 44px;
border: 0;
border-radius: var(--border-radius-large);
border-radius: 0;
background-color: transparent;
display: flex;
align-items: flex-start;
height: auto;
margin: 0;
margin-bottom: 2px;
font-weight: normal;
box-shadow: none;
width: 100%;
@ -4272,14 +4279,14 @@ kbd {
/* CONTENT LIST ------------------------------------------------------------ */
.app-content-list {
position: -webkit-sticky;
position: sticky;
top: 50px;
position: relative;
top: 0;
border-right: 1px solid var(--color-border);
display: flex;
flex-direction: column;
transition: transform 250ms ease-in-out;
min-height: calc(100vh - 50px);
max-height: calc(100vh - 50px);
min-height: 100%;
max-height: 100%;
overflow-y: auto;
overflow-x: hidden;
flex: 1 1 200px;

2
core/css/server.css.map
View file

File diff suppressed because one or more lines are too long

2
core/css/styles.css
View file

@ -190,7 +190,7 @@ body {
}
::-webkit-scrollbar-thumb {
background: var(--color-border-dark);
background: var(--color-scrollbar);
border-radius: var(--border-radius-large);
border: 2px solid transparent;
background-clip: content-box;

2
core/css/styles.scss
View file

@ -172,7 +172,7 @@ body {
}
::-webkit-scrollbar-thumb {
background: var(--color-border-dark);
background: var(--color-scrollbar);
border-radius: var(--border-radius-large);
border: 2px solid transparent;
background-clip: content-box;

146
core/src/views/Profile.vue
View file

@ -47,96 +47,96 @@
<div class="profile__wrapper">
<div class="profile__content">
<div class="profile__sidebar">
<NcAvatar class="avatar"
:class="{ interactive: isCurrentUser }"
:user="userId"
:size="180"
:show-user-status="true"
:show-user-status-compact="false"
:disable-menu="true"
:disable-tooltip="true"
:is-no-user="!isUserAvatarVisible"
@click.native.prevent.stop="openStatusModal" />
<div class="profile__sidebar">
<NcAvatar class="avatar"
:class="{ interactive: isCurrentUser }"
:user="userId"
:size="180"
:show-user-status="true"
:show-user-status-compact="false"
:disable-menu="true"
:disable-tooltip="true"
:is-no-user="!isUserAvatarVisible"
@click.native.prevent.stop="openStatusModal" />
<div class="user-actions">
<!-- When a tel: URL is opened with target="_blank", a blank new tab is opened which is inconsistent with the handling of other URLs so we set target="_self" for the phone action -->
<PrimaryActionButton v-if="primaryAction"
class="user-actions__primary"
:href="primaryAction.target"
:icon="primaryAction.icon"
:target="primaryAction.id === 'phone' ? '_self' :'_blank'">
{{ primaryAction.title }}
</PrimaryActionButton>
<div class="user-actions__other">
<!-- FIXME Remove inline styles after https://github.com/nextcloud/nextcloud-vue/issues/2315 is fixed -->
<NcActions v-for="action in middleActions"
:key="action.id"
:default-icon="action.icon"
style="
<div class="user-actions">
<!-- When a tel: URL is opened with target="_blank", a blank new tab is opened which is inconsistent with the handling of other URLs so we set target="_self" for the phone action -->
<PrimaryActionButton v-if="primaryAction"
class="user-actions__primary"
:href="primaryAction.target"
:icon="primaryAction.icon"
:target="primaryAction.id === 'phone' ? '_self' :'_blank'">
{{ primaryAction.title }}
</PrimaryActionButton>
<div class="user-actions__other">
<!-- FIXME Remove inline styles after https://github.com/nextcloud/nextcloud-vue/issues/2315 is fixed -->
<NcActions v-for="action in middleActions"
:key="action.id"
:default-icon="action.icon"
style="
background-position: 14px center;
background-size: 16px;
background-repeat: no-repeat;"
:style="{
backgroundImage: `url(${action.icon})`,
...(colorMainBackground === '#181818' && { filter: 'invert(1)' })
}">
<NcActionLink :close-after-click="true"
:icon="action.icon"
:href="action.target"
:target="action.id === 'phone' ? '_self' :'_blank'">
{{ action.title }}
</NcActionLink>
</NcActions>
<template v-if="otherActions">
<NcActions :force-menu="true">
<NcActionLink v-for="action in otherActions"
:key="action.id"
:class="{ 'icon-invert': colorMainBackground === '#181818' }"
:close-after-click="true"
:style="{
backgroundImage: `url(${action.icon})`,
...(colorMainBackground === '#181818' && { filter: 'invert(1)' })
}">
<NcActionLink :close-after-click="true"
:icon="action.icon"
:href="action.target"
:target="action.id === 'phone' ? '_self' :'_blank'">
{{ action.title }}
</NcActionLink>
</NcActions>
</template>
<template v-if="otherActions">
<NcActions :force-menu="true">
<NcActionLink v-for="action in otherActions"
:key="action.id"
:class="{ 'icon-invert': colorMainBackground === '#181818' }"
:close-after-click="true"
:icon="action.icon"
:href="action.target"
:target="action.id === 'phone' ? '_self' :'_blank'">
{{ action.title }}
</NcActionLink>
</NcActions>
</template>
</div>
</div>
</div>
</div>
<div class="profile__blocks">
<div v-if="organisation || role || address" class="profile__blocks-details">
<div v-if="organisation || role" class="detail">
<p>{{ organisation }} <span v-if="organisation && role">•</span> {{ role }}</p>
</div>
<div v-if="address" class="detail">
<p>
<MapMarkerIcon class="map-icon"
:size="16" />
{{ address }}
</p>
<div class="profile__blocks">
<div v-if="organisation || role || address" class="profile__blocks-details">
<div v-if="organisation || role" class="detail">
<p>{{ organisation }} <span v-if="organisation && role">•</span> {{ role }}</p>
</div>
<div v-if="address" class="detail">
<p>
<MapMarkerIcon class="map-icon"
:size="16" />
{{ address }}
</p>
</div>
</div>
<template v-if="headline || biography">
<div v-if="headline" class="profile__blocks-headline">
<h3>{{ headline }}</h3>
</div>
<div v-if="biography" class="profile__blocks-biography">
<p>{{ biography }}</p>
</div>
</template>
<template v-else>
<div class="profile__blocks-empty-info">
<AccountIcon :size="60"
fill-color="var(--color-text-maxcontrast)" />
<h3>{{ emptyProfileMessage }}</h3>
<p>{{ t('core', 'The headline and about sections will show up here') }}</p>
</div>
</template>
</div>
<template v-if="headline || biography">
<div v-if="headline" class="profile__blocks-headline">
<h3>{{ headline }}</h3>
</div>
<div v-if="biography" class="profile__blocks-biography">
<p>{{ biography }}</p>
</div>
</template>
<template v-else>
<div class="profile__blocks-empty-info">
<AccountIcon :size="60"
fill-color="var(--color-text-maxcontrast)" />
<h3>{{ emptyProfileMessage }}</h3>
<p>{{ t('core', 'The headline and about sections will show up here') }}</p>
</div>
</template>
</div>
</div>
</div>
</div>
</template>

4
dist/core-profile.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/core-profile.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/dashboard-main.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/dashboard-main.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files-sidebar.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files-sidebar.js.map vendored
View file

File diff suppressed because one or more lines are too long