djb-eapim/eapim-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'z-eactive/jenkins_with_weblogic' into jenkins_with_weblogic

Browse Source 
# Conflicts:
#	src/main/resources/static/css/main.css
#	src/main/resources/static/css/main.css.map
#	src/main/resources/static/sass/abstracts/_variables.scss
This commit is contained in:
Rinjae
2025-12-12 13:21:02 +09:00
parent cbc975f3ec af2d1afa06
commit 4e1bf9c973
29 changed files with 235 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/sass/abstracts/_variables.scss
+1 -1
View File
@@ -35,7 +35,7 @@ $shadow-lg: 0 8px 24px rgba(75, 155, 255, 0.15);
$shadow-xl: 0 16px 40px rgba(75, 155, 255, 0.2);
// Typography
$font-family-primary: 'Spoqa Han Sans Neo', 'SpoqaHanSans', 'Pretendard', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Noto Sans KR', sans-serif;
$font-family-primary: 'Spoqa Han Sans Neo', 'SpoqaHanSans', 'Noto Sans KR', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
$font-family-mono: 'Fira Code', 'Courier New', monospace;
// Font sizes