Skip to content

[no-merge] style changes with current font #1811

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

Closed
wants to merge 105 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
696adea
Side navigation
qwinndev May 28, 2025
3809f81
New font
qwinndev May 29, 2025
6219538
Header update start
qwinndev May 30, 2025
4100d0a
AppHeader trade update
qwinndev Jun 3, 2025
ef22e51
Footer update
qwinndev Jun 3, 2025
e35a623
Chart section update
qwinndev Jun 4, 2025
9c25625
Tabs update and layout fix
qwinndev Jun 5, 2025
19bfae5
Tradebox update
qwinndev Jun 5, 2025
36179b8
Continue tradebox update
qwinndev Jun 6, 2025
5e53735
Continue tradebox update
qwinndev Jun 6, 2025
9c3a644
Merge branch 'release-74' of github.com:gmx-io/gmx-interface into sty…
qwinndev Jun 16, 2025
e0a56f3
Merge branch 'master' of github.com:gmx-io/gmx-interface into style-c…
qwinndev Jul 14, 2025
fa80437
Merge branch 'master' of github.com:gmx-io/gmx-interface into style-c…
qwinndev Jul 14, 2025
0369387
Colors update
qwinndev Jul 15, 2025
3fad3ba
Update trade tables section
qwinndev Jul 16, 2025
5e7f586
Merge branch 'style-changes' of github.com:gmx-io/gmx-interface into …
qwinndev Jul 16, 2025
e47ba18
Leverage slider update
qwinndev Jul 16, 2025
3eaeacb
Merge branch 'master' of github.com:gmx-io/gmx-interface into style-c…
qwinndev Jul 16, 2025
5fdfb7f
Colors update
qwinndev Jul 16, 2025
214ed2f
OrderList update
qwinndev Jul 17, 2025
c668d72
Update trade and claims history
qwinndev Jul 18, 2025
7b5fba2
Update empty lists contents
qwinndev Jul 21, 2025
afe0dc7
ChartTokenSelector update
qwinndev Jul 21, 2025
db45b45
PositionItem small update
qwinndev Jul 21, 2025
33b0b57
OrderItem tablet update
qwinndev Jul 22, 2025
2bd1193
Use tooltip with portals in tables
qwinndev Jul 23, 2025
b894688
Mobile side navigation
qwinndev Jul 23, 2025
ef2d8d7
Tablet header update
qwinndev Jul 23, 2025
ea9ae95
Update tradebox in curtain
qwinndev Jul 23, 2025
72a578a
Update filters popup
qwinndev Jul 23, 2025
ff65363
Claims and bottom tabs mobile update
qwinndev Jul 24, 2025
e555ebd
ChartHeader mobile update
qwinndev Jul 24, 2025
ee9ee0d
Fix header hover effects
qwinndev Jul 24, 2025
7957127
Update address dropdown buttons and effects
qwinndev Jul 24, 2025
47f7c67
Sorter icons update
qwinndev Jul 24, 2025
3d633b4
Pagination update
qwinndev Jul 25, 2025
49224fd
Update tradebox modals
qwinndev Jul 25, 2025
839c5ea
Update modals
qwinndev Jul 25, 2025
d378c1a
Fix leverage marks test
qwinndev Jul 25, 2025
814cf0d
Fix build
qwinndev Jul 25, 2025
5d13d83
Toasts update
qwinndev Jul 25, 2025
965e110
Fix icon name
qwinndev Jul 25, 2025
46ffcc3
Fix icon name
qwinndev Jul 25, 2025
c514bf8
Rename Ic_new_link.svg to ic_new_link.svg
qwinndev Jul 25, 2025
831f207
Disable source maps
qwinndev Jul 25, 2025
7d567c5
Disable source maps
qwinndev Jul 25, 2025
b946a0c
SideNav width fix
qwinndev Jul 25, 2025
77bafca
Date select update
qwinndev Jul 25, 2025
7f452c2
Fix date select padding
qwinndev Jul 25, 2025
4bdb4f6
Merge branch 'master' of github.com:gmx-io/gmx-interface into style-c…
qwinndev Jul 28, 2025
516765d
Tooltips update
qwinndev Jul 28, 2025
1f56a13
Update app pages to use common layout
qwinndev Jul 29, 2025
108fe93
Start update pools page
qwinndev Jul 29, 2025
5cdb16b
Trade page comments fixes
qwinndev Jul 29, 2025
f21d670
Pools page update
qwinndev Jul 29, 2025
919df5b
Remove old clear search input button
qwinndev Jul 30, 2025
db59ecb
Fix network dropdown hover color
qwinndev Jul 30, 2025
4da3c02
Update mobile pools page
qwinndev Jul 30, 2025
89b2b43
Pools page fixes
qwinndev Jul 30, 2025
d393b25
Localels update
qwinndev Jul 30, 2025
c605a1a
Locales update
qwinndev Jul 30, 2025
9175e0e
Locales update
qwinndev Jul 30, 2025
455d002
Locales update
qwinndev Jul 30, 2025
192aa3e
Update pools details desktop page
qwinndev Jul 30, 2025
78a757d
Update pools details mobile
qwinndev Jul 30, 2025
0e8e997
Fix style changes issues
qwinndev Jul 31, 2025
3a7e0a6
Add numbers classname for numbers everywhere
qwinndev Jul 31, 2025
240e1c2
Update locales
qwinndev Jul 31, 2025
c3a0a71
Update tooltips and Edit icon
qwinndev Jul 31, 2025
e9d0b98
Fix trade page tables
qwinndev Jul 31, 2025
b962c91
Fix toasts for interview and survey
qwinndev Jul 31, 2025
e29a57d
Fixed trade page jumping
qwinndev Aug 1, 2025
b21a9f8
Fix style changes issues
qwinndev Aug 1, 2025
a05b410
Settings update
qwinndev Aug 1, 2025
81a6bdd
Pools pages fixes
qwinndev Aug 1, 2025
deae69c
Fix nested items tab hover
qwinndev Aug 1, 2025
9c4ed56
Update Ecosystem and Refferals
qwinndev Aug 1, 2025
cece63f
Accound PnL desktop page update
qwinndev Aug 3, 2025
8176a8b
PnL mobile page update
qwinndev Aug 4, 2025
3b3da79
Trade page grow fix
qwinndev Aug 4, 2025
b818d15
Stats page update
qwinndev Aug 4, 2025
5febb09
Fixed hidden filters in empty tables
qwinndev Aug 5, 2025
676d8ad
Update page titles
qwinndev Aug 5, 2025
e92c48d
Add side nav collapsed tooltips
qwinndev Aug 5, 2025
41f1214
Updated colorful banner
qwinndev Aug 5, 2025
b7c12e7
Pools pages fixes
qwinndev Aug 5, 2025
9c86c56
Fix card heights
qwinndev Aug 5, 2025
e80e0e5
Removed font-medium from table numbers
qwinndev Aug 5, 2025
de6d82b
Updated prizes and table header on leaderboard
qwinndev Aug 6, 2025
2852a5a
Fix colorful banner styles
qwinndev Aug 6, 2025
1e0d98f
Breadcrumbs for concluded and pools details
qwinndev Aug 6, 2025
0501103
Leaderboard page improvements
qwinndev Aug 6, 2025
327ee96
Leaderboard mobile
qwinndev Aug 6, 2025
c9e50ed
Locale update
qwinndev Aug 6, 2025
c279d27
Fix competition mobile tabs
qwinndev Aug 6, 2025
a154f23
Issues fixes
qwinndev Aug 6, 2025
4d1631f
Move language item to side nav
qwinndev Aug 6, 2025
3b4beaa
Issues fixes
qwinndev Aug 6, 2025
36a94be
One more dot
qwinndev Aug 6, 2025
fdd2123
Fix border size across app
qwinndev Aug 7, 2025
76b492e
Updated border tailwind rule
qwinndev Aug 7, 2025
e57de3e
Updated border tailwind rule
qwinndev Aug 8, 2025
266c762
In progress alert cards update
qwinndev Aug 8, 2025
214928a
Use current font
qwinndev Aug 8, 2025
3b79898
Use current font settings
qwinndev Aug 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
"es-x/no-promise-all-settled": "off",
"es-x/no-promise-withresolvers": "off",
"es-x/no-array-prototype-findlast-findlastindex": "off",
"es-x/no-array-prototype-toreversed": "off",

"no-restricted-imports": [
"error",
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ package-lock.json
!.yarn/sdks
!.yarn/versions
/.idea/

CLAUDE.md
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"start": "VITE_APP_VERSION=$(git rev-parse HEAD) vite --port 3010 --host",
"start-home": "yarn lingui:prepare && VITE_APP_VERSION=$(git rev-parse HEAD) env-cmd -e development-home vite --port 3010",
"start-app": "yarn lingui:prepare && VITE_APP_VERSION=$(git rev-parse HEAD) env-cmd -e development-app vite --port 3011",
"build": "VITE_APP_VERSION=$(git rev-parse HEAD) vite build",
"build:analyze": "VITE_APP_VERSION=$(git rev-parse HEAD) vite build --mode analyze",
"build-home": "VITE_APP_VERSION=$(git rev-parse HEAD) env-cmd -e production-home vite build",
"build-app": "VITE_APP_VERSION=$(git rev-parse HEAD) env-cmd -e production-app vite build",
"build": "NODE_OPTIONS='--max-old-space-size=8192' VITE_APP_VERSION=$(git rev-parse HEAD) vite build",
"build:analyze": "NODE_OPTIONS='--max-old-space-size=8192' VITE_APP_VERSION=$(git rev-parse HEAD) vite build --mode analyze",
"build-home": "NODE_OPTIONS='--max-old-space-size=8192' VITE_APP_VERSION=$(git rev-parse HEAD) env-cmd -e production-home vite build",
"build-app": "NODE_OPTIONS='--max-old-space-size=8192' VITE_APP_VERSION=$(git rev-parse HEAD) env-cmd -e production-app vite build",
"test": "vitest",
"test:ci": "vitest run",
"lint": "node node_modules/.bin/eslint src",
Expand Down Expand Up @@ -82,7 +82,7 @@
"react-dom": "18.2.0",
"react-helmet": "6.1.0",
"react-hot-toast": "2.2.0",
"react-icons": "4.3.1",
"react-icons": "5.5.0",
"react-jazzicon": "1.0.4",
"react-loading-skeleton": "3.3.1",
"react-remove-scroll": "2.5.5",
Expand Down
17 changes: 5 additions & 12 deletions public/tradingview-chart.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.theme-dark:root {
--dark-blue-bg: #16182e;
--dark-blue-bg: #121421;
--color-blue-600: #2d42fc;
--tv-color-pane-background: var(--dark-blue-bg);
--tv-color-platform-background: var(--dark-blue-bg);
--tv-color-pane-background-secondary: var(--dark-blue-bg);
--tv-color-toolbar-button-text-hover: #b2b5be;
--tv-color-toolbar-button-background-hover: #272942;
--tv-color-toolbar-button-text-active: #ffffff;
--tv-color-toolbar-toggle-button-background-active: #3a3e5e;
--tv-color-toolbar-toggle-button-background-active-hover: #3a3e5e;
--tv-color-toolbar-button-background-expanded: var(--dark-blue-bg);
--tv-color-toolbar-toggle-button-background-active: var(--color-blue-600);
--tv-color-toolbar-toggle-button-background-active-hover: var(--color-blue-600);
--tv-color-toolbar-button-background-expanded: var(--color-blue-600);

--tv-color-popup-background: #20243f;
--themed-color-bg-primary: #20243f;
Expand Down Expand Up @@ -41,6 +41,7 @@ html.theme-dark [data-role="menuitem"] {

html.theme-dark .chart-page {
font-family: "Relative", sans-serif;
font-variant-numeric: tabular-nums lining-nums;
}

html.theme-dark .chart-controls-bar {
Expand Down Expand Up @@ -71,14 +72,6 @@ html.theme-dark .chart-controls-bar {
--tv-color-pane-background: var(--tv-color-toolbar-toggle-button-background-active);
--themed-color-arrow-stroke: var(--dark-blue-bg);
}

[data-name="toolbar-drawing-toggle-button"][data-value="collapsed"]:hover,
[data-name="toolbar-drawing-toggle-button"][data-value="visible"]:hover {
--tv-color-toolbar-toggle-button-background-active-hover: #464a6e;
--tv-color-platform-background: #464a6e;
--tv-color-pane-background: #464a6e;
}

/* Hide tooltip tail */
html.theme-dark .common-tooltip__ear-holder-EJBD96zX:after {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/prebuilt/hashedKinkModelMarketRatesKeys.json
Original file line number Diff line number Diff line change
Expand Up @@ -1031,4 +1031,4 @@
"aboveOptimalUsageBorrowingFactorShort": "0x1ecf10a4f1f28b4e3c1f1fae6af7ea5a7e93d90844720b89b38509945c507896"
}
}
}
}
2 changes: 1 addition & 1 deletion sdk/src/prebuilt/hashedMarketConfigKeys.json
Original file line number Diff line number Diff line change
Expand Up @@ -6535,4 +6535,4 @@
"virtualShortTokenId": "0xb315f0a55a09b93c77ef9d370a2278b19027c88ccc7afd8b899b98bb033ffed6"
}
}
}
}
2 changes: 1 addition & 1 deletion sdk/src/prebuilt/hashedMarketValuesKeys.json
Original file line number Diff line number Diff line change
Expand Up @@ -1927,4 +1927,4 @@
"shortInterestInTokensUsingShortToken": "0x459afc07ae83faa216fe9bcbbb75a032a0557d866842476547540f230077ab76"
}
}
}
}
83 changes: 40 additions & 43 deletions src/App/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ $app-card-padding: 1.5rem;
position: relative;
min-height: 100%;
font-size: var(--font-size-body-medium);
height: 100%;
font-variant-numeric: tabular-nums lining-nums;
}

.App-content {
height: 100%;
}

.App-content header {
Expand Down Expand Up @@ -99,8 +105,8 @@ $app-card-padding: 1.5rem;
.App-box-highlight,
.App-box-solid {
position: relative;
border-radius: 0.4rem;
background: var(--color-slate-800);
border-radius: 8px;
background: var(--color-slate-900);
font-size: var(--font-size-body-medium);
}

Expand Down Expand Up @@ -129,9 +135,9 @@ $app-card-padding: 1.5rem;
}

.App-card-divider-vertical {
width: 1px;
width: 0.5px;
height: 8.8rem;
background: var(--color-slate-100);
background: var(--color-slate-600);
}

.App-card-title-block {
Expand Down Expand Up @@ -183,7 +189,7 @@ $app-card-padding: 1.5rem;
background: var(--dark-blue);
height: 5.1rem;
width: 26.35rem;
border: 1px solid var(--color-stroke-primary);
border: 0.5px solid var(--color-slate-600);
border-radius: 0.3rem;
position: relative;
color: var(--color-white);
Expand Down Expand Up @@ -248,7 +254,7 @@ button.App-connect-wallet:hover {
}

.App-header-user-address {
border: 1px solid var(--color-stroke-primary);
border: 0.5px solid var(--color-slate-600);
height: 3.6rem;
border-radius: 0.4rem;
display: inline-flex;
Expand All @@ -259,12 +265,12 @@ button.App-connect-wallet:hover {

.mobile-menu-divider {
height: 1px;
background: var(--color-slate-500);
background: var(--color-slate-100);
}

.App-card-divider {
height: 1px;
background: var(--color-slate-700);
height: 0.5px;
background: var(--color-slate-600);
margin: 1.05rem -1.5rem;

&:last-child {
Expand Down Expand Up @@ -422,8 +428,8 @@ button.App-connect-wallet:hover {

.App-card-title {
font-size: var(--font-size-body-large);
font-weight: normal;
letter-spacing: 0px;
font-weight: 500;
letter-spacing: -0.012em;
color: var(--color-white);
margin-bottom: $app-card-padding;
display: flex;
Expand All @@ -435,15 +441,6 @@ button.App-connect-wallet:hover {
justify-content: start;
}

.Position-card-title::after {
content: "";
position: absolute;
left: -$app-card-padding;
top: -$app-card-padding;
bottom: -$app-card-padding;
right: -$app-card-padding;
}

.App-card-title-small {
font-size: var(--font-size-body-medium);
display: inline-flex;
Expand Down Expand Up @@ -827,39 +824,45 @@ button.App-button {
max-width: 46.5rem;
}

.Toastify__toast {
border-radius: 8px;
box-shadow: 0px 8px 40px -8px #090a1466;
}

.Toastify__toast--error {
background: #333957;
color: var(--color-white);
border-radius: 0.6rem;
background: var(--color-red-900);
color: var(--color-red-100);
border-bottom: 2px solid var(--color-red-500);

.link-underline {
color: var(--color-white) !important;
}

& .Toastify__close-button {
color: var(--color-red-500);
}
}

.Toastify__toast--success {
background: transparent linear-gradient(90deg, #19836c 0%, #177c66 100%) 0% 0% no-repeat padding-box;
color: var(--color-white);
box-shadow: 0px 0.3rem 0.6rem #0000005c;
border-radius: 0.4rem;
background: var(--color-green-900);
color: var(--color-green-100);
border-bottom: 2px solid var(--color-green-500);

.link-underline {
color: var(--color-white) !important;
& .Toastify__close-button {
color: var(--color-green-500);
}
}

.Toastify__toast--default {
background: linear-gradient(90deg, #0b0b0f 0%, rgba(10, 13, 28, 1) 100%);
color: var(--color-white);
border-radius: 0.6rem;
}
background: var(--color-cold-blue-900);
color: var(--color-blue-100);

.Toastify__toast--default .Toastify__close-button {
color: var(--color-white);
& .Toastify__close-button {
color: var(--color-blue-300);
}
}

.Toastify__toast--default .Toastify__close-button:hover {
color: var(--color-white);
.Toastify__toast .Toastify__close-button:hover {
background: transparent;
}

Expand Down Expand Up @@ -1166,12 +1169,6 @@ button.App-button {
}
}

@media (max-width: 600px) {
.page-layout {
padding-top: 2.5rem;
}
}

@media (max-width: 600px) {
.App-header-link-main img.big {
display: none;
Expand Down
23 changes: 13 additions & 10 deletions src/App/AppRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,19 @@ export function AppRoutes() {

return (
<>
<div className="App">
<div className="App-content">
<Header
disconnectAccountAndCloseSettings={disconnectAccountAndCloseSettings}
openSettings={openSettings}
showRedirectModal={showRedirectModal}
/>
{isHome && <HomeRoutes showRedirectModal={showRedirectModal} />}
{!isHome && <MainRoutes openSettings={openSettings} />}
</div>
<div className="App w-full font-relative">
{isHome ? (
<div className="App-content">
<Header
disconnectAccountAndCloseSettings={disconnectAccountAndCloseSettings}
openSettings={openSettings}
showRedirectModal={showRedirectModal}
/>
<HomeRoutes showRedirectModal={showRedirectModal} />
</div>
) : (
<MainRoutes openSettings={openSettings} />
)}
</div>
<ToastContainer
limit={1}
Expand Down
11 changes: 6 additions & 5 deletions src/components/AddressDropdown/AddressDropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
min-width: 17rem;
width: 100%;
transform-origin: top right;
border-radius: 0.4rem;
border-radius: 8px;
overflow: hidden;
background: var(--color-slate-800);
border: 1px solid var(--color-stroke-primary);
background: var(--color-slate-900);
border: 0.5px solid var(--color-slate-600);
list-style: none;
cursor: pointer;
outline: none;
Expand All @@ -45,15 +45,16 @@
align-items: center;
color: var(--color-slate-100);
padding-bottom: 1.5rem;
font-size: var(--font-size-body-medium);
font-size: 13px;
padding: 0.85rem 0.8rem;
border-radius: 0.4rem;
font-weight: 500;

&:hover {
background: #808aff14 !important;
border-radius: 0.4rem;
opacity: 1;
color: var(--color-gray-50);
color: var(--color-white);
}

> p {
Expand Down
Loading