Skip to content

Commit 3eb643b

Browse files
committed
fix: Tab buttons
1 parent 1bc7092 commit 3eb643b

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

djangocms_frontend/static/djangocms_frontend/css/base.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

private/sass/components/_button.scss

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
background-image: none;
1111
margin-bottom: 0; // For input.btn
1212
border-radius: $btn-border-radius-base;
13-
color: $color;
14-
background-color: $background;
13+
color: $body-fg;
14+
background-color: $body-bg;
1515
border: 1px solid $border;
1616
background-clip: padding-box;
1717
-webkit-appearance: none;
@@ -24,29 +24,28 @@
2424
}
2525
&:hover {
2626
color: $color;
27-
background-color: color-mix(in srgb, $background, $body-fg 10%);
28-
border-color: color-mix(in srgb, $border, $body-fg 10%);
27+
background-color: color-mix(in srgb, $background 40%, $body-bg);
2928
text-decoration: none;
3029
}
3130
&:active,
31+
&.active,
3232
&.cms-btn-active {
3333
color: $color;
34-
background-color: color-mix(in srgb, $background, $body-fg 15%);
35-
border-color: color-mix(in srgb, $border, $body-fg 15%);
34+
background-color: $background;
3635
box-shadow: $btn-active-shadow;
3736

38-
&:hover,
37+
&:hover {
38+
color: $color;
39+
background-color: color-mix(in srgb, $background, $body-fg 10%);
40+
border-color: color-mix(in srgb, $border, $body-fg 15%);
41+
}
3942
&:focus,
4043
&.focus {
4144
color: $color;
4245
background-color: color-mix(in srgb, $background, $body-fg 20%);
4346
border-color: color-mix(in srgb, $border, $body-fg 25%);
4447
}
4548
}
46-
&:active,
47-
&.cms-btn-active {
48-
background-image: none;
49-
}
5049
&.cms-btn-disabled,
5150
&[disabled] {
5251
&,

private/sass/components/_tabs.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ form ul.djangocms-frontend.nav.nav-pills {
2323
height: $nav-pills-height;
2424
line-height: $nav-pills-height;
2525
display: inline-block;
26-
@include button-variant($body-fg, $body-bg, $color-gray, $btn-border-radius-base);
27-
&.active {
28-
@include button-variant($nav-pills-color, $nav-pills-background, $color-gray, $btn-border-radius-base);
29-
}
26+
@include button-variant($nav-pills-color, $nav-pills-background, $color-gray, $btn-border-radius-base);
3027
}
3128
}
3229
.nav-link {

0 commit comments

Comments
 (0)