Skip to content

FOUR-25084: Fix sidebar SVG icons so they inherit nav text color #8650

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

Open
eiresendez wants to merge 1 commit into
base: develop
Choose a base branch
from
+44 −3
Open

FOUR-25084: Fix sidebar SVG icons so they inherit nav text color #8650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 26 additions & 3 deletions resources/js/components/Sidebaricon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
<a :href="item.url" class="nav-link" @click="toggle" :target="item.attributes.target" :aria-label="ariaLabel">
<i v-if="item.attributes.icon" class="fas nav-icon" :class="item.attributes.icon" ></i>
<i v-if="item.attributes.customicon" :class="item.attributes.customicon" ></i>
<img v-if="item.attributes.file" :src="item.attributes.file" class="nav-icon" id="custom_icon">
<span
v-if="item.attributes.file"
class="nav-icon custom-icon"
:style="maskStyle(item.attributes.file)"
id="custom_icon"
/>
<span class="nav-text" v-show="expanded()" v-cloak >
{{item.title}}
<i v-if="item.children && item.children.length" class="float-right fas" :class="{'fa-caret-right': !isOpen, 'fa-caret-down': isOpen}"></i>
Expand All @@ -19,7 +24,12 @@
</span>
</a>
<a :href="item.url" class="nav-link" v-show="item.attributes.file">
<img :src="item.attributes.file" class="nav-icon" id="custom_icon"><span class="nav-text" v-if="expanded()" v-cloak>{{item.title}}<span v-if="count !== null" class="nav-badge float-right">{{ count }}</span></span>
<span
:style="maskStyle(item.attributes.file)"
class="nav-icon custom-icon"
id="custom_icon"
/>
<span class="nav-text" v-if="expanded()" v-cloak>{{item.title}}<span v-if="count !== null" class="nav-badge float-right">{{ count }}</span></span>
<span class="nav-text" v-if="expanded()" v-cloak>{{item.title}}
<span v-if="count !== null" class="nav-badge float-right" :aria-label="ariaLabel">{{ count }}</span>
</span>
Expand Down Expand Up @@ -73,7 +83,20 @@
},
expanded() {
return this.$parent.expanded
}
},
maskStyle(file) {
return {
backgroundColor: 'currentColor',
WebkitMaskImage: `url(${file})`,
maskImage: `url(${file})`,
WebkitMaskRepeat: 'no-repeat',
maskRepeat: 'no-repeat',
WebkitMaskPosition: 'center',
maskPosition: 'center',
WebkitMaskSize: 'contain',
maskSize: 'contain',
};
}
}
}
</script>
Expand Down
18 changes: 18 additions & 0 deletions resources/sass/sidebar/sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,24 @@
font-size: 14px;
color: $light;
height: 43px;

.nav-icon {
color: inherit;

&.custom-icon {
display: inline-block;
width: 24px;
height: 24px;
background-color: currentColor;
}

svg {
width: 1em;
height: 1em;
fill: currentColor;
stroke: currentColor;
}
}
}

.logo {
Expand Down
Loading