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/components/_apikey-common.scss
-2
View File
@@ -474,8 +474,6 @@ $apikey-border-color: #dadada;
gap: $spacing-md;
padding: $spacing-md $spacing-lg;
background: $white;
border: 1px solid $border-gray;
border-radius: $border-radius-md;
transition: all 0.2s;
&:hover {
src/main/resources/static/sass/components/_header-auth.scss
+1 -1
View File
@@ -42,7 +42,7 @@
text-decoration: none;
border: 1px solid #212529;
border-radius: 6px;
font-family: 'Noto Sans CJK KR', $font-family-primary;
font-family: $font-family-primary;
font-weight: $font-weight-bold; // 700
font-size: $font-size-base; // 16px
background: transparent;
src/main/resources/static/sass/components/_page-title-banner.scss
+1 -1
View File
@@ -8,7 +8,7 @@
background: #E9F8FF;
position: relative;
width: 100%;
height: 220px;
height: 110px;
display: flex;
align-items: center;
justify-content: center;
src/main/resources/static/sass/components/_tables.scss
+2 -1
View File
@@ -430,7 +430,7 @@
align-items: center;
justify-content: center;
gap: 14px;
flex-wrap: wrap;
flex-wrap: nowrap;
@media (max-width: $breakpoint-md) {
width: 100%;
@@ -448,6 +448,7 @@
justify-content: center;
padding: $spacing-sm $spacing-md;
height: 40px;
white-space: nowrap;
border-radius: $border-radius-md;
font-size: $font-size-base;
font-weight: $font-weight-regular;