Skip to content

Commit f1a1200

Browse files
authored
Merge pull request rancher-sandbox#3483 from torchiaf/fix/3477
Help buttons, fix colors
2 parents 8f72821 + 9a1f392 commit f1a1200

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

pkg/rancher-desktop/assets/styles/themes/_dark.scss

+3
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,7 @@
199199

200200
--product-icon : #{$lighter};
201201
--product-icon-active : #{$lightest};
202+
203+
--button-icon : #{$medium};
204+
--button-icon-bg : #{$lightest};
202205
}

pkg/rancher-desktop/assets/styles/themes/_light.scss

+3
Original file line numberDiff line numberDiff line change
@@ -525,4 +525,7 @@ BODY, .theme-light {
525525

526526
--product-icon : #{$darker};
527527
--product-icon-active : #{$darkest};
528+
529+
--button-icon : #{$dark};
530+
--button-icon-bg : #{$secondary};
528531
}

pkg/rancher-desktop/components/Help.vue

+22-24
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default Vue.extend({
4141
content: tooltipContent,
4242
placement: 'right'
4343
}"
44-
class="btn role-fab ripple"
44+
class="btn role-fab"
4545
:class="{
4646
disabled: !helpUrl
4747
}"
@@ -63,11 +63,23 @@ export default Vue.extend({
6363
6464
.icon {
6565
display: inline-block;
66-
color: var(--primary);
67-
font-size: 1.5rem;
68-
width: 1.5rem;
69-
height: 1.5rem;
66+
background-color: var(--primary);
67+
color: var(--body-bg);
68+
font-size: 1.3rem;
69+
width: 1.4rem;
70+
height: 1.4rem;
71+
border-radius: 50%;
7072
cursor: pointer;
73+
74+
&:before{
75+
padding-top: 5%;
76+
padding-left: 2%;
77+
display: block;
78+
}
79+
80+
&:hover {
81+
background: var(--primary-hover-bg);
82+
}
7183
}
7284
7385
.disabled {
@@ -82,29 +94,15 @@ export default Vue.extend({
8294
// Material Design
8395
.role-fab {
8496
all: revert;
85-
line-height: 0;
97+
8698
border: 0;
87-
padding: 0.1rem;
88-
background: none;
89-
color: var(--body-text);
99+
padding: 0;
100+
background: transparent;
90101
transition: background 200ms;
91102
border-radius: 50%;
92-
}
93-
94-
.ripple {
95-
background-position: center;
96-
transition: background 0.4s;
97-
98-
&:hover {
99-
background: var(--tooltip-bg) radial-gradient(circle, transparent 1%, var(--tooltip-bg) 1%) center/15000%;
103+
&.disabled {
104+
border: 0;
100105
}
101-
102-
&:active {
103-
background-color: var(--default);
104-
background-size: 100%;
105-
transition: background 0s;
106-
}
107-
108106
}
109107
}
110108
</style>

0 commit comments

Comments
 (0)