Skip to content

Commit

Permalink
fix: styles issues (#136)
Browse files Browse the repository at this point in the history
  • Loading branch information
diegopf authored Jul 1, 2022
1 parent ce04e5f commit 8514427
Show file tree
Hide file tree
Showing 20 changed files with 193 additions and 82 deletions.
5 changes: 4 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"extends": ["plugin:@empathyco/x/all"]
"extends": ["plugin:@empathyco/x/all"],
"rules": {
"vuejs-accessibility/no-autofocus": "off"
}
}
50 changes: 25 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"dependencies": {
"@empathyco/x-adapter": "^8.0.0-alpha.2",
"@empathyco/x-components": "^3.0.0-alpha.118",
"@empathyco/x-components": "^3.0.0-alpha.121",
"@empathyco/x-adapter-platform": "^1.0.0-alpha.22",
"@empathyco/x-deep-merge": "^1.3.0-alpha.19",
"@empathyco/x-types": "^10.0.0-alpha.26",
Expand Down
12 changes: 9 additions & 3 deletions src/components/column-picker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,19 @@

<script lang="ts">
import { Component, Vue } from 'vue-property-decorator';
import { BaseColumnPickerList, Grid1ColIcon, Grid2ColIcon } from '@empathyco/x-components';
import {
BaseColumnPickerList,
Grid1ColIcon,
Grid2ColIcon,
Grid4ColIcon
} from '@empathyco/x-components';
@Component({
components: {
BaseColumnPickerList,
Grid1ColIcon,
Grid2ColIcon
Grid2ColIcon,
Grid4ColIcon
}
})
export default class ColumnPicker extends Vue {
Expand All @@ -28,7 +34,7 @@
if (this.$x.device === 'mobile') {
return column === 2 ? 'Grid2ColIcon' : 'Grid1ColIcon';
} else {
return column === 4 ? 'Grid2ColIcon' : 'Grid1ColIcon';
return column === 4 ? 'Grid4ColIcon' : 'Grid2ColIcon';
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/desktop/desktop-toolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
v-html="
$t('totalResults.message', { totalResults: $x.totalResults, query: $x.query.searchBox })
"
class="x-list__item--expand"
class="x-list__item--expand x-font-size--05"
/>

<ColumnPicker />
Expand Down
1 change: 1 addition & 0 deletions src/components/main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<div
v-if="$x.totalResults === 0 || $x.spellcheckedQuery"
class="x-padding--top-03 x-padding--bottom-07"
:class="{ 'x-margin--left-05 x-margin--right-05': $x.device === 'mobile' }"
>
<template>
<SpellcheckMessage />
Expand Down
2 changes: 1 addition & 1 deletion src/components/mobile/mobile-open-aside.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
v-if="$x.selectedFilters.length > 0"
class="
x-background--neutral-100
x-font-color--neutral-10
x-font-color--lead
x-border-radius--20
x-padding--01 x-padding--right-03 x-padding--left-03
"
Expand Down
4 changes: 2 additions & 2 deletions src/components/mobile/mobile-toolbar.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<div class="x-list x-list--horizontal x-list--align-center x-list__item--expand">
<span v-if="$x.totalResults" class="x-list__item--expand">
<span v-if="$x.totalResults" class="x-list__item--expand x-font-size--05">
{{ $t('totalResults.message', { totalResults: $x.totalResults }) }}
</span>

<ColumnPicker />
<ColumnPicker v-if="$x.totalResults" />

<EnvSelector />
</div>
Expand Down
6 changes: 4 additions & 2 deletions src/components/mobile/mobile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,14 @@
</template>

<template #floating>
<div class="x-row x-row--padding-03 x-row--justify-center x-list__item--expand">
<div class="x-row x-row--padding-03 x-list__item--expand x-margin--bottom-06">
<MobileOpenAside
v-if="$x.totalResults > 0"
class="x-row__item x-row__item--start-4 x-row__item--span-6"
/>
<ScrollToTop class="x-row__item x-row__item--start-11 x-row__item--span-2" />
<div class="x-row__item--start-11 x-row__item--span-2 x-row__item x-padding--00">
<ScrollToTop class="x-row__item" />
</div>
</div>
</template>

Expand Down
Loading

0 comments on commit 8514427

Please sign in to comment.