Skip to content

Commit ac43111

Browse files
committed
Merge branch 'main' into fix-color-contrast
# Conflicts: # app/components/DependencyPathPopup.vue
2 parents 6294ef2 + adc8d07 commit ac43111

67 files changed

Lines changed: 715 additions & 674 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/assets/main.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,6 @@ dd {
236236
margin: 0;
237237
}
238238

239-
/* Reset button styles */
240-
button {
241-
cursor: pointer;
242-
}
243-
244239
/* Selection */
245240
::selection {
246241
background-color: var(--fg-muted);

app/components/ColumnPicker.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,7 @@ function handleReset() {
102102
v-for="column in toggleableColumns"
103103
:key="column.id"
104104
class="flex gap-2 items-center px-3 py-2 transition-colors duration-200"
105-
:class="
106-
column.disabled
107-
? 'opacity-50 cursor-not-allowed'
108-
: 'hover:bg-bg-muted cursor-pointer'
109-
"
105+
:class="column.disabled ? 'opacity-50 cursor-not-allowed' : 'hover:bg-bg-muted'"
110106
>
111107
<input
112108
type="checkbox"

app/components/DependencyPathPopup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function parsePackageString(pkg: string): { name: string; version: string } {
6868
<!-- Path badge button -->
6969
<button
7070
type="button"
71-
class="path-badge font-mono text-3xs px-1.5 py-0.5 rounded bg-amber-500/10 border border-amber-500/30 text-amber-800 dark:text-amber-400 cursor-pointer transition-all duration-200 ease-out whitespace-nowrap flex items-center gap-1 hover:bg-amber-500/20 hover:border-amber-500/50"
71+
class="path-badge font-mono text-3xs px-1.5 py-0.5 rounded bg-amber-500/10 border border-amber-500/30 text-amber-800 dark:text-amber-400 transition-all duration-200 ease-out whitespace-nowrap flex items-center gap-1 hover:bg-amber-500/20 hover:border-amber-500/50"
7272
:aria-expanded="isOpen"
7373
@click.stop="togglePopup"
7474
>

app/components/Header/AuthModal.client.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ watch(handleInput, newHandleInput => {
105105

106106
<details class="text-sm">
107107
<summary
108-
class="text-fg-subtle cursor-pointer hover:text-fg-muted transition-colors duration-200 focus-visible:(outline-2 outline-accent/70)"
108+
class="text-fg-subtle hover:text-fg-muted transition-colors duration-200 focus-visible:(outline-2 outline-accent/70)"
109109
>
110110
{{ $t('auth.modal.what_is_atmosphere') }}
111111
</summary>

app/components/Header/ConnectorModal.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@ function handleDisconnect() {
173173
</div>
174174

175175
<details class="text-sm">
176-
<summary
177-
class="text-fg-subtle cursor-pointer hover:text-fg-muted transition-colors duration-200"
178-
>
176+
<summary class="text-fg-subtle hover:text-fg-muted transition-colors duration-200">
179177
{{ $t('connector.modal.advanced') }}
180178
</summary>
181179
<div class="mt-3">

app/components/Org/OperationsQueue.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ watch(isExecuting, executing => {
292292
<!-- Completed operations log (collapsed by default) -->
293293
<details v-if="hasCompletedOperations" class="mt-4 border-t border-border pt-4">
294294
<summary
295-
class="flex items-center gap-2 font-mono text-xs text-fg-muted cursor-pointer hover:text-fg transition-colors duration-200 select-none"
295+
class="flex items-center gap-2 font-mono text-xs text-fg-muted hover:text-fg transition-colors duration-200 select-none"
296296
>
297297
<span
298298
class="i-carbon:chevron-right rtl-flip w-3 h-3 transition-transform duration-200 [[open]>&]:rotate-90"

app/components/Package/ClaimPackageModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ const previewPackageJson = computed(() => {
344344
<!-- Expandable package.json preview -->
345345
<details class="border border-border rounded-md overflow-hidden">
346346
<summary
347-
class="px-3 py-2 text-sm text-fg-muted bg-bg-subtle cursor-pointer hover:text-fg transition-colors select-none"
347+
class="px-3 py-2 text-sm text-fg-muted bg-bg-subtle hover:text-fg transition-colors select-none"
348348
>
349349
{{ $t('claim.modal.preview_json') }}
350350
</summary>

app/components/Package/DownloadAnalytics.vue

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -895,10 +895,10 @@ function buildExportFilename(extension: string): string {
895895
}
896896
897897
const granularityLabels = computed(() => ({
898-
daily: $t('package.downloads.granularity_daily'),
899-
weekly: $t('package.downloads.granularity_weekly'),
900-
monthly: $t('package.downloads.granularity_monthly'),
901-
yearly: $t('package.downloads.granularity_yearly'),
898+
daily: $t('package.trends.granularity_daily'),
899+
weekly: $t('package.trends.granularity_weekly'),
900+
monthly: $t('package.trends.granularity_monthly'),
901+
yearly: $t('package.trends.granularity_yearly'),
902902
}))
903903
904904
function getGranularityLabel(granularity: ChartTimeGranularity) {
@@ -1321,18 +1321,18 @@ const chartConfig = computed(() => {
13211321
userOptions: {
13221322
buttons: { pdf: false, labels: false, fullscreen: false, table: false, tooltip: false },
13231323
buttonTitles: {
1324-
csv: $t('package.downloads.download_file', { fileType: 'CSV' }),
1325-
img: $t('package.downloads.download_file', { fileType: 'PNG' }),
1326-
svg: $t('package.downloads.download_file', { fileType: 'SVG' }),
1327-
annotator: $t('package.downloads.toggle_annotator'),
1324+
csv: $t('package.trends.download_file', { fileType: 'CSV' }),
1325+
img: $t('package.trends.download_file', { fileType: 'PNG' }),
1326+
svg: $t('package.trends.download_file', { fileType: 'SVG' }),
1327+
annotator: $t('package.trends.toggle_annotator'),
13281328
},
13291329
callbacks: {
13301330
img: ({ imageUri }: { imageUri: string }) => {
13311331
loadFile(imageUri, buildExportFilename('png'))
13321332
},
13331333
csv: (csvStr: string) => {
13341334
const PLACEHOLDER_CHAR = '\0'
1335-
const multilineDateTemplate = $t('package.downloads.date_range_multiline', {
1335+
const multilineDateTemplate = $t('package.trends.date_range_multiline', {
13361336
start: PLACEHOLDER_CHAR,
13371337
end: PLACEHOLDER_CHAR,
13381338
})
@@ -1360,8 +1360,9 @@ const chartConfig = computed(() => {
13601360
fontSize: isMobile.value ? 24 : 16,
13611361
color: pending.value ? colors.value.border : colors.value.fgSubtle,
13621362
axis: {
1363-
yLabel: $t('package.downloads.y_axis_label', {
1363+
yLabel: $t('package.trends.y_axis_label', {
13641364
granularity: getGranularityLabel(selectedGranularity.value),
1365+
facet: $t('package.trends.items.downloads'),
13651366
}),
13661367
xLabel: isMultiPackageMode.value ? '' : xAxisLabel.value, // for multiple series, names are displayed in the chart's legend
13671368
yLabelOffsetX: 12,
@@ -1478,7 +1479,7 @@ const chartConfig = computed(() => {
14781479
for="granularity"
14791480
class="text-3xs font-mono text-fg-subtle tracking-wide uppercase"
14801481
>
1481-
{{ $t('package.downloads.granularity') }}
1482+
{{ $t('package.trends.granularity') }}
14821483
</label>
14831484

14841485
<div
@@ -1490,10 +1491,18 @@ const chartConfig = computed(() => {
14901491
:disabled="pending"
14911492
class="w-full px-2.5 py-1.75 bg-bg-subtle font-mono text-sm text-fg outline-none appearance-none focus-visible:outline-accent/70"
14921493
>
1493-
<option value="daily">{{ $t('package.downloads.granularity_daily') }}</option>
1494-
<option value="weekly">{{ $t('package.downloads.granularity_weekly') }}</option>
1495-
<option value="monthly">{{ $t('package.downloads.granularity_monthly') }}</option>
1496-
<option value="yearly">{{ $t('package.downloads.granularity_yearly') }}</option>
1494+
<option value="daily">
1495+
{{ $t('package.trends.granularity_daily') }}
1496+
</option>
1497+
<option value="weekly">
1498+
{{ $t('package.trends.granularity_weekly') }}
1499+
</option>
1500+
<option value="monthly">
1501+
{{ $t('package.trends.granularity_monthly') }}
1502+
</option>
1503+
<option value="yearly">
1504+
{{ $t('package.trends.granularity_yearly') }}
1505+
</option>
14971506
</select>
14981507
</div>
14991508
</div>
@@ -1504,7 +1513,7 @@ const chartConfig = computed(() => {
15041513
for="startDate"
15051514
class="text-3xs font-mono text-fg-subtle tracking-wide uppercase"
15061515
>
1507-
{{ $t('package.downloads.start_date') }}
1516+
{{ $t('package.trends.start_date') }}
15081517
</label>
15091518
<div
15101519
class="flex items-center gap-2 px-2.5 py-1.75 bg-bg-subtle border border-border rounded-md focus-within:(border-border-hover ring-2 ring-accent/70)"
@@ -1522,7 +1531,7 @@ const chartConfig = computed(() => {
15221531

15231532
<div class="flex flex-col gap-1">
15241533
<label for="endDate" class="text-3xs font-mono text-fg-subtle tracking-wide uppercase">
1525-
{{ $t('package.downloads.end_date') }}
1534+
{{ $t('package.trends.end_date') }}
15261535
</label>
15271536
<div
15281537
class="flex items-center gap-2 px-2.5 py-1.75 bg-bg-subtle border border-border rounded-md focus-within:(border-border-hover ring-2 ring-accent/70)"
@@ -1656,9 +1665,7 @@ const chartConfig = computed(() => {
16561665
stroke-linecap="round"
16571666
/>
16581667
</svg>
1659-
<span class="text-fg-subtle">{{
1660-
$t('package.downloads.legend_estimation')
1661-
}}</span>
1668+
<span class="text-fg-subtle">{{ $t('package.trends.legend_estimation') }}</span>
16621669
</div>
16631670
</div>
16641671
</template>
@@ -1747,7 +1754,11 @@ const chartConfig = computed(() => {
17471754
v-if="!chartData.dataset && !pending"
17481755
class="min-h-[260px] flex items-center justify-center text-fg-subtle font-mono text-sm"
17491756
>
1750-
{{ $t('package.downloads.no_data') }}
1757+
{{
1758+
$t('package.trends.no_data', {
1759+
facet: $t('package.trends.items.downloads'),
1760+
})
1761+
}}
17511762
</div>
17521763

17531764
<div
@@ -1756,7 +1767,7 @@ const chartConfig = computed(() => {
17561767
aria-live="polite"
17571768
class="absolute top-1/2 inset-is-1/2 -translate-x-1/2 -translate-y-1/2 text-xs text-fg-subtle font-mono bg-bg/70 backdrop-blur px-3 py-2 rounded-md border border-border"
17581769
>
1759-
{{ $t('package.downloads.loading') }}
1770+
{{ $t('package.trends.loading') }}
17601771
</div>
17611772
</div>
17621773
</template>

app/components/Package/ListControls.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const showFilteredCount = computed(() => {
7878
<select
7979
id="package-sort"
8080
v-model="sortValue"
81-
class="appearance-none bg-bg-subtle border border-border rounded-lg ps-3 pe-8 py-2 font-mono text-sm text-fg cursor-pointer transition-colors duration-200 focus:(border-border-hover outline-none) hover:border-border-hover"
81+
class="appearance-none bg-bg-subtle border border-border rounded-lg ps-3 pe-8 py-2 font-mono text-sm text-fg transition-colors duration-200 focus:(border-border-hover outline-none) hover:border-border-hover"
8282
>
8383
<option v-for="option in sortOptions" :key="option.value" :value="option.value">
8484
{{ option.label }}

app/components/Package/ListToolbar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ function getSortKeyLabelKey(key: SortKey): string {
162162
<select
163163
id="sort-select"
164164
:value="currentSort.key"
165-
class="appearance-none bg-bg-subtle border border-border rounded-md ps-3 pe-8 py-1.5 font-mono text-sm text-fg cursor-pointer transition-colors duration-200 hover:border-border-hover"
165+
class="appearance-none bg-bg-subtle border border-border rounded-md ps-3 pe-8 py-1.5 font-mono text-sm text-fg transition-colors duration-200 hover:border-border-hover"
166166
@change="handleSortKeyChange"
167167
>
168168
<option

0 commit comments

Comments
 (0)