Skip to content

Commit 037476d

Browse files
authored
Merge pull request #47276 from nextcloud/backport/47248/stable30
2 parents a54375b + 941cd72 commit 037476d

11 files changed

+73
-64
lines changed

apps/settings/css/settings.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/css/settings.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/css/settings.scss

+15-12
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,28 @@ select {
133133

134134
.link-button {
135135
display: inline-block;
136-
margin: 16px;
137-
padding: 14px 20px;
136+
margin: calc(2 * var(--default-grid-baseline));
137+
padding: calc(2 * var(--default-grid-baseline)) calc(4 * var(--default-grid-baseline));
138138
background-color: var(--color-primary-element);
139139
color: var(--color-primary-element-text);
140-
border-radius: var(--border-radius-pill);
140+
border-radius: var(--border-radius-element);
141141
border: 1px solid var(--color-primary-element);
142142
box-shadow: 0 2px 9px var(--color-box-shadow);
143143

144-
&:active,
145144
&:hover,
146-
&:focus,
145+
&:focus {
146+
background-color: var(--color-primary-element-hover);
147+
}
148+
149+
&:active,
147150
&:focus-visible {
148151
box-shadow: 0 0 0 4px var(--color-main-background) !important;
149152
outline: 2px solid var(--color-main-text) !important;
150153
}
151154

152155
&.icon-file {
153-
padding-left: 48px;
154-
background-position: 24px;
156+
padding-left: calc(var(--default-grid-baseline) + var(--default-clickable-area));
157+
background-position: calc(2 * var(--default-grid-baseline));
155158
}
156159
}
157160

@@ -236,17 +239,17 @@ select {
236239
.federation-menu {
237240
position: relative;
238241
cursor: pointer;
239-
width: 44px;
240-
height: 44px;
241-
padding: 10px;
242+
width: var(--default-clickable-area);
243+
height: var(--default-clickable-area);
244+
padding: calc(2 * var(--default-grid-baseline));
242245
margin: 0;
243246
background: none;
244247
border: none;
245248

246249
&:hover,
247250
&:focus {
248251
background-color: var(--color-background-hover);
249-
border-radius: var(--border-radius-pill);
252+
border-radius: var(--border-radius-element);
250253

251254
.icon-federation-menu {
252255
opacity: 0.8;
@@ -268,7 +271,7 @@ select {
268271
}
269272

270273
.federationScopeMenu {
271-
top: 44px;
274+
top: var(--default-clickable-area);
272275

273276
&.popovermenu {
274277
.menuitem {

core/css/apps.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/apps.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)