Skip to content

Commit 6ae5bf7

Browse files
pkp/pkp-lib#10850 Fix error in @apply directive
1 parent 9b113e0 commit 6ae5bf7

File tree

9 files changed

+15
-7
lines changed

9 files changed

+15
-7
lines changed

.storybook/preview.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import ModalManager from '@/components/Modal/ModalManager.vue';
2727

2828
import VueScrollTo from 'vue-scrollto';
2929

30-
import '../src/styles/_import.less';
30+
import '../tailwind.css';
3131
import '../src/styles/_global.less';
3232
import {allModes} from './modes';
3333
import {initialize, mswLoader} from 'msw-storybook-addon';

src/components/Composer/Composer.vue

+1
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,7 @@ export default {
10081008
10091009
<style lang="less">
10101010
@import '../../styles/_import';
1011+
@reference '../../../tailwind.css';
10111012
10121013
.composer__message {
10131014
position: relative;

src/components/Container/StatsPage.vue

+1
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ export default {
238238

239239
<style lang="less">
240240
@import '../../styles/_import';
241+
@reference '../../../tailwind.css';
241242
242243
.pkpStats > .pkpHeader {
243244
padding: 0.5rem 0;

src/components/DateRange/DateRange.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@blur="closeOnBlur"
1010
>
1111
<div
12-
class="flex h-8 w-8 items-center justify-center border-e border-e-light border-opacity-40 text-primary"
12+
class="border-e-light border-opacity-40 text-primary flex h-8 w-8 items-center justify-center border-e"
1313
>
1414
<Icon icon="Calendar" class="h-5 w-5" :inline="true" />
1515
</div>
@@ -65,7 +65,7 @@
6565
</label>
6666
</fieldset>
6767
<PkpButton @click="applyCustomRange">{{ applyLabel }}</PkpButton>
68-
<div v-if="errorMessage" class="pt-2 text-base-normal">
68+
<div v-if="errorMessage" class="text-base-normal pt-2">
6969
<Icon icon="Error" class="me-1 h-5 w-5" :inline="true" />
7070
<span class="align-middle" v-html="errorMessage" />
7171
</div>
@@ -421,6 +421,7 @@ export default {
421421

422422
<style lang="less">
423423
@import '../../styles/_import';
424+
@reference '../../../tailwind.css';
424425
425426
.pkpDateRange {
426427
position: relative;

src/components/Header/Header.vue

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export default {
3131

3232
<style lang="less">
3333
@import '../../styles/_import';
34+
@reference '../../../tailwind.css';
3435
3536
.pkpHeader {
3637
padding: 1rem 2rem;

src/components/Search/Search.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
<span class="pkpSearch__icons">
1414
<Icon
1515
icon="Search"
16-
class="absolute left-2/4 top-2/4 h-5 w-5 -translate-x-1/2 -translate-y-1/2 transform text-primary"
16+
class="text-primary absolute top-2/4 left-2/4 h-5 w-5 -translate-x-1/2 -translate-y-1/2 transform"
1717
/>
1818
</span>
1919
</label>
2020
<button
2121
v-if="searchPhrase"
22-
class="absolute top-0 h-full w-8 text-negative hover:bg-negative hover:text-on-dark focus:bg-negative focus:text-on-dark ltr:right-0 rtl:left-0 rtl:right-auto"
22+
class="text-negative hover:bg-negative hover:text-on-dark focus:bg-negative focus:text-on-dark absolute top-0 h-full w-8 ltr:right-0 rtl:right-auto rtl:left-0"
2323
:aria-controls="inputId"
2424
@click.prevent="clearSearchPhrase"
2525
>
@@ -90,6 +90,7 @@ export default {
9090

9191
<style lang="less">
9292
@import '../../styles/_import';
93+
@reference '../../../tailwind.css';
9394
9495
.pkpSearch {
9596
position: relative;

src/components/SideMenu/SideMenu.vue

+1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ function getButtonStyles(item, isFocused) {
186186
187187
<style lang="less" scoped>
188188
@import '../../styles/_import';
189+
@reference '../../../tailwind.css';
189190
190191
/* Override legacy styles for: a:hover, a:focus, where the color is being set to #008acb */
191192
a.text-on-dark:hover,

src/pages/dashboard/DashboardPage.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
2-
<div class="min-h-screentext-base-normal me-3 ms-5 text-base-normal">
2+
<div class="min-h-screentext-base-normal text-base-normal ms-5 me-3">
33
<div class="">
44
<span>
5-
<h1 class="flex-inline items-center gap-4 py-6 text-5xl-bold">
5+
<h1 class="flex-inline text-5xl-bold items-center gap-4 py-6">
66
{{
77
`${store.currentView.name} (${store.submissionsPagination.itemCount})`
88
}}
@@ -115,6 +115,7 @@ const store = useDashboardPageStore(props);
115115
</script>
116116

117117
<style>
118+
@reference '../../../tailwind.css';
118119
.pkp_page_dashboard .app__main {
119120
@apply bg-secondary p-0;
120121
}

src/styles/_global.less

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// disabled for now as its different normalisation than existing one
22

33
@tailwind base;
4+
@reference '../../tailwind.css';
45

56
/*
67
Apply some styles for backward-compatibility as tailwind by

0 commit comments

Comments
 (0)