Skip to content

Commit

Permalink
Merge pull request #47276 from nextcloud/backport/47248/stable30
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Aug 16, 2024
2 parents a54375b + 941cd72 commit 037476d
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 64 deletions.
2 changes: 1 addition & 1 deletion apps/settings/css/settings.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/css/settings.css.map

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
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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/css/apps.css.map

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

Loading

0 comments on commit 037476d

Please sign in to comment.