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

Adapt layout to new base css variables

Browse source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2022-08-24 17:18:55 +02:00
parent ff219a7cd8
commit e4113b1779
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,7 +173,9 @@ class DefaultTheme implements ITheme {
// pill-style button, value is large so big buttons also have correct roundness
'--border-radius-pill' => '100px',
'--default-clickable-area' => '44px',
'--default-line-height' => '24px',
'--default-grid-baseline' => '4px',
// various structure data
'--header-height' => '50px',

13
core/css/apps.scss
View file

@ -21,8 +21,9 @@
:root {
--body-container-margin: 8px;
--body-container-radius: var(--border-radius-large);
--body-container-margin: calc(var(--default-grid-baseline) * 2);
/* - 2px is required for making it look nice */
--body-container-radius: calc(var(--default-clickable-area) / 2 + var(--default-grid-baseline) * 2 - 2px);
--body-height: calc(100% - env(safe-area-inset-bottom) - 50px - var(--body-container-margin));
}
@ -125,7 +126,7 @@ kbd {
-webkit-backdrop-filter: var(--filter-background-blur); -webkit-user-select: none;
position: sticky;
height: 100%;
padding: 6px;
padding: calc(var(--default-grid-baseline) * 2);
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
@ -166,11 +167,9 @@ kbd {
flex-wrap: wrap;
order: 1;
flex-shrink: 0;
margin-left: 8px;
margin-right: 8px;
margin-top: 3px;
margin: 0;
margin-bottom: 3px;
width: calc(100% - 16px);
width: 100%;
overflow: hidden;
border-radius: var(--border-radius-pill);