Skip to content
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.

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

Style-sheet-vars #490

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 15 commits
Commits
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
159 changes: 71 additions & 88 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@tinymce/tinymce-vue": "^5.0.0",
"@types/lodash": "^4.14.170",
"@types/marked": "^4.0.3",
"@types/node": "^18.8.0",
"@typescript-eslint/eslint-plugin": "^5.28.0",
"@typescript-eslint/parser": "^5.28.0",
"@typescript/analyze-trace": "^0.9.0",
Expand Down
2 changes: 1 addition & 1 deletion src/module/helpers/handlebars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export class IronswornHandlebarsHelpers {
viewbox="0 0 17.32050807568877 20"
class="rank-pip ${
isFilled ? 'filled' : ''
} clickable svg ironsworn__progress__rank"
}s svg ironsworn__progress__rank"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a typo.

data-rank="${testRank}"
data-item="${id}"
>
Expand Down
4 changes: 2 additions & 2 deletions src/module/vue/bondset-sheet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<input type="text" v-model="bond.name" @blur="save" />
<textarea v-model="bond.notes" @blur="save" />
</div>
<BtnFaicon class="block nogrow" icon="trash" @click="deleteBond(i)" />
<BtnFaicon class="btn-block nogrow" icon="trash" @click="deleteBond(i)" />
</article>
</CollapseTransition>
<BtnFaicon class="block nogrow" icon="plus" @click="addBond" />
<BtnFaicon class="btn-block nogrow" icon="plus" @click="addBond" />
</div>
</template>
<script setup lang="ts">
Expand Down
2 changes: 1 addition & 1 deletion src/module/vue/challenge-resolution-dialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<div class="boxrow flexrow">
<button
type="button"
class="clickable block save"
class="btn-block save"
:class="{ disabled: saveDisabled }"
@click="save"
>
Expand Down
5 changes: 3 additions & 2 deletions src/module/vue/character-sheet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Main body row -->
<!-- Momentum on left -->
<div class="flexcol margin-left">
<div class="flexcol left-margin">
<MomentumMeterSlider labelPosition="right" data-tooltip-direction="UP" />
</div>

Expand All @@ -38,8 +38,9 @@
</div>

<!-- Stats on right -->

<PcConditionMeters
class="flexcol margin-right"
class="flexcol right-margin"
data-tooltip-direction="UP"
labelPosition="left"
/>
Expand Down
15 changes: 6 additions & 9 deletions src/module/vue/components/active-completed-progresses.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<progress-controls :foeCompendium="foeCompendium" />
</div>

<div class="item-row nogrow progress-completed" style="margin-top: 1rem">
<div class="item-row nogrow progress-completed">
<!-- TODO: refactor this as a component in PR for collapsible/progressive disclosure element -->
<h3>
<btn-faicon
:disabled="completedItems.length === 0"
class="text collapse-control"
class="click-text collapse-control"
:class="completedClass"
:icon="completedCaret"
@click="data.expandCompleted = !data.expandCompleted"
Expand Down Expand Up @@ -71,6 +71,7 @@

<style lang="less">
.progress-completed {
margin-top: 1rem;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is getting clobbered by .item-row

CleanShot 2022-10-16 at 06 46 08

.collapse-control {
text-transform: uppercase;
height: inherit;
Expand All @@ -79,25 +80,21 @@
}
h3 {
display: flex;
}
.highlighted {
background-color: lightyellow;
border-bottom: none;
}
}
</style>

<style lang="less" scoped>
.progress-completed {
}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need this or no? We've also got a scoped style sheet and a global one here. Do we need both, or should we standardize on one of them?

h3 {
margin: 5px 0;
transition: background-color 0.2s ease;
i {
width: 15px;
text-align: center;
}

&.highlighted {
background-color: lightyellow;
}
}
</style>

Expand Down
7 changes: 4 additions & 3 deletions src/module/vue/components/asset/asset-browser-card.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
@dragstart="dragStart"
>
<header class="asset-header nogrow flexrow">
<i class="fa-solid fa-grip nogrow block draggable item"></i>

<i class="fa-solid fa-grip nogrow btn-block draggable item"></i>
<button
type="button"
@click="state.expanded = !state.expanded"
:aria-controls="bodyId"
class="clickable text asset-expand-toggle"
class="click-text asset-expand-toggle"
>
<h4 class="asset-title">
{{ foundryItem().name }}
Expand Down Expand Up @@ -84,6 +83,8 @@
:max="data.data.track.max"
:currentValue="data.data.track.current"
:read-only="true"
:fillColorHover="data.data.color"
:fillColorSelected="data.data.color"
>
<template #label>
<label>{{ data.data.track.name }}</label>
Expand Down
2 changes: 1 addition & 1 deletion src/module/vue/components/asset/asset-exclusiveoption.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<!-- TODO: as radio set -->
<div
class="clickable block stack-row"
class="btn-block stack-row"
:class="selectedClass"
@click="$emit('click')"
>
Expand Down
Loading