Merge pull request #49337 from nextcloud/fix/sass

pull/49354/head
John Molakvoæ 11 months ago committed by GitHub
commit 6ff7db6ad4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      apps/files_sharing/css/icons.scss
  2. 7
      apps/files_sharing/css/publicView.css
  3. 2
      apps/files_sharing/css/publicView.css.map
  4. 4
      apps/files_sharing/css/publicView.scss
  5. 12
      apps/settings/css/settings.scss
  6. 6
      core/css/apps.scss
  7. 2
      core/css/guest.scss
  8. 4
      core/css/icons.css
  9. 2
      core/css/icons.css.map
  10. 2
      core/css/icons.scss
  11. 4
      core/css/inputs.scss
  12. 29
      core/css/server.css
  13. 2
      core/css/server.css.map
  14. 22
      core/css/server.scss
  15. 4
      core/css/toast.scss
  16. 14
      core/css/variables.scss

@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@use 'variables';
@import 'functions';
@use 'functions';
// This is the icons used in the sharing ui (multiselect)
.icon-room {

@ -2,12 +2,13 @@
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*//*!
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2012-2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*//*!
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/#preview{text-align:center}#preview .notCreatable{display:none}#noPreview{display:none;padding-top:80px}#imgframe{height:75%;padding-bottom:32px;padding-top:32px;width:80%;margin:0 auto}#imgframe #viewer{height:100%;width:100%}#imgframe img{max-height:calc(100vh - var(--header-height) - 65px - 200px - 16px) !important;max-width:100% !important;width:unset !important}#imgframe :not(#viewer) img{min-width:100px}#imgframe video{max-height:calc(100vh - var(--header-height) - 65px - 200px - 16px)}#imgframe .plyr:fullscreen video{max-height:unset}#imgframe audio{display:block;margin-inline:auto}#imgframe #viewer[data-handler=audios]{margin-top:400px}#imgframe .plyr{top:0px !important}#imgframe .text-preview{display:inline-block;position:relative;text-align:start;white-space:pre-wrap;overflow-y:scroll;height:auto;min-height:200px;max-height:800px}#imgframe .ellipsis{font-size:1.2em}#imgframe .viewer__file{height:100%;width:100%}#imgframe .plyr{max-height:100%}.app-files_sharing #app-content footer{position:sticky !important}thead{inset-inline-start:0 !important}#data-upload-form{position:relative;inset-inline-end:0;height:32px;overflow:hidden;padding:0;float:right;display:inline;margin:0}.directDownload #downloadFile{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:90%;display:inline-block;margin-inline:auto;margin-top:16px}.download-size{opacity:.5}#details{display:inline-flex}#details button,#details input,#details .button{margin:0 5px;line-height:normal}#details button:hover,#details input:hover,#details .button:hover{border-color:rgba(0,0,0,.3) !important}#public-upload .avatardiv{margin:0 auto}.emptycontent.has-note{margin-top:5vh}#public-upload .emptycontent h2{margin:10px 0 5px 0}#public-upload .emptycontent h2+p{margin-bottom:30px}#public-upload .emptycontent .icon-folder{height:16px;width:16px;background-size:16px;display:inline-block;vertical-align:text-top;margin-bottom:0;margin-inline-end:5px;opacity:1}#public-upload .emptycontent #displayavatar .icon-folder{height:48px;width:48px;background-size:48px}#public-upload .emptycontent .button{display:inline-block;height:auto;width:auto;background-size:16px;background-position:16px;opacity:.7;font-size:20px;line-height:initial;margin:20px;padding:10px 20px;padding-inline-start:42px}#public-upload .emptycontent ul{width:230px;margin:5px auto 5vh;text-align:start}#public-upload .emptycontent li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:7px 0}#public-upload .emptycontent li img{margin-inline-end:5px;position:relative;top:2px}#drop-upload-progress-indicator span.icon-loading-small{padding-inline-start:18px;margin-inline-end:7px}#drop-uploaded-files li #drop-upload-name{float:left;max-width:180px;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}#drop-uploaded-files li #drop-upload-status{float:right}.disclaimer,.note{margin:0 auto 30px;max-width:400px;text-align:start}#note-content{padding:5px;display:inline-block;width:350px}#note-content .content{overflow:auto;max-height:200px}#show-terms-dialog{cursor:pointer;font-weight:bold}/*!
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*//*!
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2014 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["publicView.scss","../../../core/css/variables.scss","public.scss","mobile.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA,GCEA;AAAA;AAAA;AAAA,GCSA,SACC,kBAGD,uBACC,aAGD,WACC,aACA,iBAGD,UACC,WACA,oBACA,iBACA,UACA,cAGD,kBACC,YACA,WAGD,cACC,+EACA,0BACA,uBAGD,4BACI,gBAGJ,gBACC,oEAGD,iCACI,iBAGJ,gBACC,cACA,mBAGD,uCAEI,iBAGJ,gBACI,mBAGJ,wBACC,qBACA,kBACA,iBACA,qBACA,kBACA,YACA,iBACA,iBAGD,oBACC,gBAGD,wBACC,YACA,WAGD,gBACC,gBAID,uCACC,2BAID,MACC,gCAGD,kBACC,kBACA,mBACA,YACA,gBACA,UACA,YACA,eACA,SAID,8BACC,mBACA,gBACA,uBACA,cACA,qBACA,mBACA,gBAGD,eACC,WAID,SACC,oBAED,gDAGC,aACA,mBAED,kEAIC,uCAGD,0BACC,cAIA,uBACC,eAIF,gCACC,oBAGD,kCACC,mBAGD,0CACC,YACA,WACA,qBACA,qBACA,wBACA,gBACA,sBACA,UAGD,yDACC,YACA,WACA,qBAGD,qCACC,qBACA,YACA,WACA,qBACA,yBACA,WACA,eACA,oBACA,YACA,kBACA,0BAGD,gCACC,YACA,oBACA,iBAGD,gCACC,gBACA,uBACA,mBACA,cAGD,oCACC,sBACA,kBACA,QAGD,wDACC,0BACA,sBAGD,0CACC,WACA,gBACA,uBACA,mBACA,gBAGD,4CACC,YAGD,kBAEC,mBACA,gBACA,iBAGD,cACC,YACA,qBACA,YACA,uBACC,cACA,iBAIF,mBACC,eACA,iBDxPD;AAAA;AAAA;AAAA,GEFA;AAAA;AAAA;AAAA;AAAA,GAOA,2CAGA,mBACC,6BAID,2EAIC,aAID,4BACC,yBAID,UACC,WACA,UAGD,yBACC,gBAID,6BACC,gBACA,wBAGD,6CACC,aAID,UACC,UACA,mBACA,gBACA,uBAGD,oBACI,wBACA,2BAEJ,MACC,eAGD,cACC","file":"publicView.css"}
{"version":3,"sourceRoot":"","sources":["publicView.scss","../../../core/css/variables.scss","public.scss","mobile.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GCEA;AAAA;AAAA;AAAA,GCSA,SACC,kBAGD,uBACC,aAGD,WACC,aACA,iBAGD,UACC,WACA,oBACA,iBACA,UACA,cAGD,kBACC,YACA,WAGD,cACC,+EACA,0BACA,uBAGD,4BACI,gBAGJ,gBACC,oEAGD,iCACI,iBAGJ,gBACC,cACA,mBAGD,uCAEI,iBAGJ,gBACI,mBAGJ,wBACC,qBACA,kBACA,iBACA,qBACA,kBACA,YACA,iBACA,iBAGD,oBACC,gBAGD,wBACC,YACA,WAGD,gBACC,gBAID,uCACC,2BAID,MACC,gCAGD,kBACC,kBACA,mBACA,YACA,gBACA,UACA,YACA,eACA,SAID,8BACC,mBACA,gBACA,uBACA,cACA,qBACA,mBACA,gBAGD,eACC,WAID,SACC,oBAED,gDAGC,aACA,mBAED,kEAIC,uCAGD,0BACC,cAIA,uBACC,eAIF,gCACC,oBAGD,kCACC,mBAGD,0CACC,YACA,WACA,qBACA,qBACA,wBACA,gBACA,sBACA,UAGD,yDACC,YACA,WACA,qBAGD,qCACC,qBACA,YACA,WACA,qBACA,yBACA,WACA,eACA,oBACA,YACA,kBACA,0BAGD,gCACC,YACA,oBACA,iBAGD,gCACC,gBACA,uBACA,mBACA,cAGD,oCACC,sBACA,kBACA,QAGD,wDACC,0BACA,sBAGD,0CACC,WACA,gBACA,uBACA,mBACA,gBAGD,4CACC,YAGD,kBAEC,mBACA,gBACA,iBAGD,cACC,YACA,qBACA,YACA,uBACC,cACA,iBAIF,mBACC,eACA,iBC1PD;AAAA;AAAA;AAAA;AAAA,GAOA,2CAGA,mBACC,6BAID,2EAIC,aAID,4BACC,yBAID,UACC,WACA,UAGD,yBACC,gBAID,6BACC,gBACA,wBAGD,6CACC,aAID,UACC,UACA,mBACA,gBACA,uBAGD,oBACI,wBACA,2BAEJ,MACC,eAGD,cACC","file":"publicView.css"}

@ -2,5 +2,5 @@
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@import 'public.scss';
@import 'mobile.scss';
@use 'public.scss';
@use 'mobile.scss';

@ -5,7 +5,7 @@
*/
@use 'variables';
@use 'sass:math';
@import 'functions';
@use 'functions';
input {
&#openid, &#webdav {
@ -20,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 {

@ -5,7 +5,7 @@
*/
@use 'variables';
@use 'sass:math';
@import 'functions';
@use 'functions';
@media screen and (max-width: variables.$breakpoint-mobile) {
// Make the body full width on mobile
@ -449,7 +449,7 @@ kbd {
margin: 0;
padding: 0;
background: none;
@include icon-color('triangle-s', 'actions', variables.$color-black, 1, true);
@include functions.icon-color('triangle-s', 'actions', variables.$color-black, 1, true);
background-size: 16px;
background-repeat: no-repeat;
background-position: center;
@ -517,7 +517,7 @@ kbd {
.app-navigation-entry-utils-menu-button {
/* Prevent bg img override if an icon class is set */
button:not([class^='icon-']):not([class*=' icon-']) {
@include icon-color('more', 'actions', variables.$color-black, 1, true);
@include functions.icon-color('more', 'actions', variables.$color-black, 1, true);
}
&:hover button,
&:focus button {

@ -3,7 +3,7 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@import 'animations.scss';
@use 'animations.scss';
/* Default and reset */
html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }

@ -1,10 +1,10 @@
/*!
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*//*!
*/@import"../../dist/icons.css";/*!
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/@import"../../dist/icons.css";/*!
*//*!
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/[class^=icon-],[class*=" icon-"]{background-repeat:no-repeat;background-position:center;min-width:16px;min-height:16px}.icon-breadcrumb{background-image:url("../img/breadcrumb.svg?v=1")}.loading,.loading-small,.icon-loading,.icon-loading-dark,.icon-loading-small,.icon-loading-small-dark{position:relative}.loading:after,.loading-small:after,.icon-loading:after,.icon-loading-dark:after,.icon-loading-small:after,.icon-loading-small-dark:after{z-index:2;content:"";height:28px;width:28px;margin:-16px 0 0 -16px;position:absolute;top:50%;inset-inline-start:50%;border-radius:100%;-webkit-animation:rotate .8s infinite linear;animation:rotate .8s infinite linear;-webkit-transform-origin:center;-ms-transform-origin:center;transform-origin:center;border:2px solid var(--color-loading-light);border-top-color:var(--color-loading-dark);filter:var(--background-invert-if-dark)}.primary .loading:after,.primary+.loading:after,.primary .loading-small:after,.primary+.loading-small:after,.primary .icon-loading:after,.primary+.icon-loading:after,.primary .icon-loading-dark:after,.primary+.icon-loading-dark:after,.primary .icon-loading-small:after,.primary+.icon-loading-small:after,.primary .icon-loading-small-dark:after,.primary+.icon-loading-small-dark:after{filter:var(--primary-invert-if-bright)}.icon-loading-dark:after,.icon-loading-small-dark:after{border:2px solid var(--color-loading-dark);border-top-color:var(--color-loading-light)}.icon-loading-small:after,.icon-loading-small-dark:after{height:12px;width:12px;margin:-8px 0 0 -8px}audio.icon-loading,canvas.icon-loading,embed.icon-loading,iframe.icon-loading,img.icon-loading,input.icon-loading,object.icon-loading,video.icon-loading{background-image:url("../img/loading.gif")}audio.icon-loading-dark,canvas.icon-loading-dark,embed.icon-loading-dark,iframe.icon-loading-dark,img.icon-loading-dark,input.icon-loading-dark,object.icon-loading-dark,video.icon-loading-dark{background-image:url("../img/loading-dark.gif")}audio.icon-loading-small,canvas.icon-loading-small,embed.icon-loading-small,iframe.icon-loading-small,img.icon-loading-small,input.icon-loading-small,object.icon-loading-small,video.icon-loading-small{background-image:url("../img/loading-small.gif")}audio.icon-loading-small-dark,canvas.icon-loading-small-dark,embed.icon-loading-small-dark,iframe.icon-loading-small-dark,img.icon-loading-small-dark,input.icon-loading-small-dark,object.icon-loading-small-dark,video.icon-loading-small-dark{background-image:url("../img/loading-small-dark.gif")}@keyframes rotate{from{transform:rotate(0deg)}to{transform:rotate(360deg)}}.icon-32{background-size:32px !important}.icon-white.icon-shadow,.icon-audio-white,.icon-audio-off-white,.icon-fullscreen-white,.icon-screen-white,.icon-screen-off-white,.icon-video-white,.icon-video-off-white{filter:drop-shadow(1px 1px 4px var(--color-box-shadow))}/*# sourceMappingURL=icons.css.map */

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["icons.scss","variables.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAsHQ,8BCpHR;AAAA;AAAA;AAAA,GDMA,iCACC,4BACA,2BACA,eACA,gBAGD,iBACC,kDAID,sGAMC,kBACA,0IACC,UACA,WACA,YACA,WACA,uBACA,kBACA,QACA,uBACA,mBACA,6CACA,qCACA,gCACA,4BACA,wBACA,4CACA,2CAEA,wCAEA,gYAGC,uCAKH,wDAEC,2CACA,4CAGD,yDAEC,YACA,WACA,qBAKA,yJACC,2CAED,iMACC,gDAED,yMACC,iDAED,iPACC,sDAIF,kBACC,KACC,uBAED,GACC,0BAIF,SACC,gCAGD,yKAQC","file":"icons.css"}
{"version":3,"sourceRoot":"","sources":["icons.scss","variables.scss","functions.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;AAAA,GAsHQ,8BCpHR;AAAA;AAAA;AAAA,GCFA;AAAA;AAAA;AAAA,GFQA,iCACC,4BACA,2BACA,eACA,gBAGD,iBACC,kDAID,sGAMC,kBACA,0IACC,UACA,WACA,YACA,WACA,uBACA,kBACA,QACA,uBACA,mBACA,6CACA,qCACA,gCACA,4BACA,wBACA,4CACA,2CAEA,wCAEA,gYAGC,uCAKH,wDAEC,2CACA,4CAGD,yDAEC,YACA,WACA,qBAKA,yJACC,2CAED,iMACC,gDAED,yMACC,iDAED,iPACC,sDAIF,kBACC,KACC,uBAED,GACC,0BAIF,SACC,gCAGD,yKAQC","file":"icons.css"}

@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@use 'variables';
@import 'functions';
@use 'functions';
/* GLOBAL ------------------------------------------------------------------- */
[class^='icon-'], [class*=' icon-'] {

@ -5,7 +5,7 @@
*/
@use 'variables';
@use 'sass:color';
@import 'functions';
@use 'functions';
/* Specifically override browser styles */
input, textarea, select, button, div[contenteditable=true], div[contenteditable=false] {
@ -377,7 +377,7 @@ input {
margin-inline-end: 0;
&:disabled {
cursor: default;
@include icon-color('confirm-fade', 'actions', variables.$color-black, 2, true);
@include functions.icon-color('confirm-fade', 'actions', variables.$color-black, 2, true);
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -2,15 +2,15 @@
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@import 'styles.scss';
@import 'inputs.scss';
@import 'header.scss';
@import 'icons.scss';
@import 'apps.scss';
@import 'global.scss';
@import 'fixes.scss';
@import 'mobile.scss';
@import 'tooltip.scss';
@use 'styles.scss';
@use 'inputs.scss';
@use 'header.scss';
@use 'icons.scss';
@use 'apps.scss';
@use 'global.scss';
@use 'fixes.scss';
@use 'mobile.scss';
@use 'tooltip.scss';
// If you include .css, it will be imported as url
@import '../../node_modules/@nextcloud/dialogs/dist/style';
@import 'public.scss';
@use '../../node_modules/@nextcloud/dialogs/dist/style';
@use 'public.scss';

@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@use 'variables';
@import 'functions';
@use 'functions';
.toastify.toast {
min-width: 200px;
@ -25,7 +25,7 @@
width: 38px;
opacity: 0.4;
padding: 12px;
@include icon-color('close', 'actions', variables.$color-black, 2, true);
@include functions.icon-color('close', 'actions', variables.$color-black, 2, true);
background-position: center;
background-repeat: no-repeat;
text-indent: 200%;

@ -28,26 +28,26 @@ $color-placeholder-light: nc-darken($color-main-background, 10%) !default;
$color-placeholder-dark: nc-darken($color-main-background, 20%) !default;
$color-primary: #0082c9 !default;
$color-primary-hover: mix($color-primary, $color-main-background, 80%) !default;
$color-primary-hover: color.mix($color-primary, $color-main-background, 80%) !default;
$color-primary-light: mix($color-primary, $color-main-background, 10%) !default;
$color-primary-light: color.mix($color-primary, $color-main-background, 10%) !default;
$color-primary-light-text: $color-primary !default;
$color-primary-light-hover: mix($color-primary-light, $color-main-text, 95%) !default;
$color-primary-light-hover: color.mix($color-primary-light, $color-main-text, 95%) !default;
$color-primary-text: #ffffff !default;
// do not use nc-darken/lighten in case of overriding because
// primary-text is independent of color-main-text
$color-primary-element-text-dark: color.adjust($color-primary-text, $lightness: -7%, $space: hsl) !default;
$color-primary-element: $color-primary !default;
$color-primary-element-hover: mix($color-primary-element, $color-main-background, 80%) !default;
$color-primary-element-hover: color.mix($color-primary-element, $color-main-background, 80%) !default;
$color-primary-element-light: color.adjust($color-primary-element, $lightness: 15%, $space: hsl) !default;
$color-error: #e9322d;
$color-error-hover: mix($color-error, $color-main-background, 80%) !default;
$color-error-hover: color.mix($color-error, $color-main-background, 80%) !default;
$color-warning: #eca700;
$color-warning-hover: mix($color-warning, $color-main-background, 80%) !default;
$color-warning-hover: color.mix($color-warning, $color-main-background, 80%) !default;
$color-success: #46ba61;
$color-success-hover: mix($color-success, $color-main-background, 80%) !default;
$color-success-hover: color.mix($color-success, $color-main-background, 80%) !default;
// used for svg
$color-white: #fff;
$color-black: #000;

Loading…
Cancel
Save