Skip to content

Commit 3789f0b

Browse files
authored
Merge pull request Expensify#64567 from daledah/fix/64093
fix: Update Expensify Help version badges to look like badges
2 parents e7132ec + f250e34 commit 3789f0b

3 files changed

Lines changed: 23 additions & 15 deletions

File tree

docs/_sass/_main.scss

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,14 +1095,14 @@ button {
10951095
.title-platform-tabs {
10961096
display: flex;
10971097
justify-content: space-between;
1098-
padding-bottom: 12px;
1098+
padding-bottom: 20px;
10991099
h1 {
11001100
padding: 0;
11011101
}
11021102

11031103
@include maxBreakpoint($breakpoint-tablet) {
11041104
flex-direction: column;
1105-
gap: 20px;
1105+
gap: 8px;
11061106
}
11071107
}
11081108

@@ -1116,13 +1116,18 @@ button {
11161116
gap: 4px;
11171117
}
11181118

1119-
#platform-tabs > * {
1120-
cursor: pointer;
1121-
border-radius: 20px;
1122-
padding: 10px 20px;
1119+
.badge{
1120+
border-style: solid;
1121+
border-width: 1px;
1122+
border-color: var(--color-borders);
1123+
background-color: transparent;
1124+
border-radius: 4px;
1125+
text-align: center;
1126+
padding: 6px 12px;
1127+
color: var(--color-text);
1128+
font-size: 11px;
11231129
box-sizing: border-box;
1124-
height: 36px;
1125-
line-height: 16px;
1130+
height: 28px;
11261131
}
11271132

11281133
#platform-tabs > .active {

docs/assets/js/main.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,12 @@ mobileBreakpoint.addEventListener('change', handleBreakpointChange);
236236
handleBreakpointChange();
237237

238238
function selectNewExpensify(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent) {
239-
newExpensifyTab.classList.add('active');
239+
if (!expensifyClassicTab && !expensifyClassicContent) {
240+
newExpensifyTab.classList.add('badge');
241+
}
240242
newExpensifyContent.classList.remove('hidden');
241243

242244
if (expensifyClassicTab && expensifyClassicContent) {
243-
expensifyClassicTab.classList.remove('active');
244245
expensifyClassicContent.classList.add('hidden');
245246
}
246247
window.tocbot.refresh({
@@ -250,11 +251,12 @@ function selectNewExpensify(newExpensifyTab, newExpensifyContent, expensifyClass
250251
}
251252

252253
function selectExpensifyClassic(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent) {
253-
expensifyClassicTab.classList.add('active');
254+
if (!newExpensifyContent && !newExpensifyTab) {
255+
expensifyClassicTab.classList.add('badge');
256+
}
254257
expensifyClassicContent.classList.remove('hidden');
255258

256259
if (newExpensifyTab && newExpensifyContent) {
257-
newExpensifyTab.classList.remove('active');
258260
newExpensifyContent.classList.add('hidden');
259261
}
260262

docs/assets/js/platform-tabs.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ if (expensifyClassicContent || showExpensifyClassicBadge) {
1313
const tab = document.createElement('div');
1414
tab.innerHTML = 'Expensify Classic';
1515
tab.id = 'platform-tab-expensify-classic';
16-
tab.classList.add('active');
16+
if (!newExpensifyContent) {
17+
tab.classList.toggle('badge');
18+
}
1719
platformTabs.appendChild(tab);
1820
}
1921

@@ -26,9 +28,8 @@ if (newExpensifyContent || showNewExpensifyBadge) {
2628
const tab = document.createElement('div');
2729
tab.innerHTML = 'New Expensify';
2830
tab.id = 'platform-tab-new-expensify';
29-
3031
if (!expensifyClassicContent) {
31-
tab.classList.add('active');
32+
tab.classList.toggle('badge');
3233
}
3334
platformTabs.appendChild(tab);
3435
}

0 commit comments

Comments
 (0)