Skip to content

Commit 4d1ca49

Browse files
committed
Resolved conflict with main in index.ts
2 parents 8d11a8c + ba2142d commit 4d1ca49

19 files changed

Lines changed: 800 additions & 652 deletions

File tree

backend/app/services/paper_service.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ async def _fetch_arxiv_pdf(arxiv_id: str) -> bytes:
136136
"""
137137
Fetch arXiv PDF and return its raw bytes.
138138
"""
139+
139140
url = f"https://arxiv.org/pdf/{arxiv_id}.pdf"
140141
async with httpx.AsyncClient(timeout=30, follow_redirects=True) as client:
141142
resp = await client.get(url)

frontend/package-lock.json

Lines changed: 57 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
]
2323
},
2424
"dependencies": {
25+
"@vueuse/core": "^14.1.0",
2526
"axios": "^1.13.1",
2627
"dompurify": "^3.3.1",
2728
"lucide-vue-next": "^0.554.0",

frontend/src/assets/base.css

Lines changed: 0 additions & 97 deletions
This file was deleted.

frontend/src/assets/colors.css

Lines changed: 0 additions & 23 deletions
This file was deleted.

frontend/src/assets/main.css

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
@import './base.css';
2-
@import './colors.css';
1+
/* 1. Import Tailwind */
2+
@import "tailwindcss";
3+
4+
/* 2. Global Resets */
5+
/* Prevent the browser window from scrolling. */
6+
html, body, #app {
7+
height: 100%;
8+
margin: 0;
9+
overflow: hidden !important;
10+
}

frontend/src/components/atoms/FormattedMarkdown.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ const rendered = computed(() => {
2929
.md {
3030
line-height: 1.5;
3131
font-size: 0.95rem;
32-
color: rgba(0, 0, 0, 0.87);
3332
}
3433
3534
/* Headings */

0 commit comments

Comments
 (0)