Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Adjust legacy CSS styles for new Nextcloud 30 design #47248

Merged
merged 2 commits into from
Aug 16, 2024
Merged

fix: Adjust legacy CSS styles for new Nextcloud 30 design #47248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0a0be9
fix: Adjust legacy CSS styles for new Nextcloud 30 design
susnux Aug 14, 2024
d025c55
chore: Compile assets
susnux Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/settings/css/settings.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/css/settings.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 15 additions & 12 deletions apps/settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,25 +133,28 @@ select {

.link-button {
display: inline-block;
margin: 16px;
padding: 14px 20px;
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);

&: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;
padding-left: calc(var(--default-grid-baseline) + var(--default-clickable-area));
background-position: calc(2 * var(--default-grid-baseline));
}
}

Expand Down Expand Up @@ -236,17 +239,17 @@ 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;

&: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;
Expand All @@ -268,7 +271,7 @@ select {
}

.federationScopeMenu {
top: 44px;
top: var(--default-clickable-area);

&.popovermenu {
.menuitem {
Expand Down
2 changes: 1 addition & 1 deletion core/css/apps.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/css/apps.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading