Skip to content

Commit

Permalink
fix: Removed CSS modules from FishTankTag
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Akpa committed Apr 17, 2019
1 parent 7c1f033 commit 1ba20ac
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions src/components/FishTankTag.vue
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<template>
<div
:class="[$style.wrap]"
:aria-label="removable ? `Remove ${label}`:null" >
class="wrap"
:aria-label="removable ? `Remove ${label}`:null">
<label
:for="id"
:class="$style.label">
class="label">
<input
:id="id"
:disabled="disabled"
:checked="isChecked"
:value="value"
:class="[$style.input]"
class="input"
type="checkbox"
@focus="isFocused = true"
@blur="isFocused = false"
v-on="listeners">
<div
:class="[$style.tag, {[$style.checked]:isChecked}, {[$style.disabled]:disabled}, {[$style.hasIcon]:hasIcon}, {'focused': isFocused}]">
:class="['tag', {'checked':isChecked}, {'disabled':disabled}, {'hasIcon':hasIcon}, {'focused': isFocused}]">
<div
:class="$style.labelContent">
<FishTankText
class="labelContent">
<f-text
:color="getStateColor"
inline
size="baseMd"
semi-bold>
{{ label }}
</FishTankText>
</f-text>
<span
v-if="iconPosition==='right'"
:class="[$style.icon, {[$style.iconRight]: (iconPosition==='right')}]">
<CloseSml24
:class="['icon', {'iconRight': (iconPosition==='right')}]">
<close-sml-24
v-if="removable"
:class="[$style.iconAlignment, {[$style.iconChecked]:isChecked}]"/>
:class="['iconAlignment', {'iconChecked':isChecked}]" />
<slot />
</span>
</div>
Expand All @@ -52,7 +52,7 @@ export default Vue.extend({
description: "Component description",
components: {
CloseSml24,
FishTankText
fText:FishTankText
},
mixins:[
a11y
Expand Down Expand Up @@ -185,9 +185,8 @@ export default Vue.extend({
})
</script>

<style module lang="scss">
@import '../../node_modules/@fishtank/colors/dist/index.custom-properties';
@import '../../node_modules/@fishtank/space/dist/index.custom-properties';
<style lang="scss" scoped>
@import '../styles/mixins';
.wrap{
position: relative;
display: inline-block;
Expand Down Expand Up @@ -264,5 +263,4 @@ export default Vue.extend({
body.user-is-tabbing .focused {
box-shadow: 0 0 0 2px var(--color-selected-darkest);
}
</style>

0 comments on commit 1ba20ac

Please sign in to comment.