Skip to content

Commit c523f69

Browse files
authored
Merge pull request #89 from amuguna1mandeum/btnIssue
color, font-size 수정
2 parents a024015 + 4316bd9 commit c523f69

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

ssulocker/locker/static/main.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -614,11 +614,12 @@ li.selected {
614614
#cancelPopupDiv #btnsWrap button {
615615
font-family: Pretendard, Roboto, "Noto Sans KR", "Segoe UI", "Malgun Gothic", sans-serif;
616616
text-align: center;
617-
font-size: 1.2em;
617+
font-size: 1.0em;
618618
list-style: none;
619619
border: 3px solid #d1e4ff;
620620
border-radius: 5px;
621621
background-color: #fff;
622+
color: black;
622623
}
623624
#registerPopupDiv #btnsWrap button:hover,
624625
#cancelPopupDiv #btnsWrap button:hover {
@@ -658,6 +659,7 @@ li.selected {
658659
border-radius: 5px;
659660
background-color: #fff;
660661
margin: 1%;
662+
color: black;
661663
}
662664
@media (max-width: 1200px) {
663665
#popup button {
@@ -769,7 +771,7 @@ li.selected {
769771
align-items: center;
770772
min-width: 100%;
771773
}
772-
#registerPopupDiv button,
774+
/* #registerPopupDiv button,
773775
#cancelPopupDiv button {
774776
font-family: Pretendard, Roboto, "Noto Sans KR", "Segoe UI", "Malgun Gothic", sans-serif;
775777
text-align: center;
@@ -784,7 +786,7 @@ li.selected {
784786
#registerPopupDiv button:hover,
785787
#cancelPopupDiv button:hover {
786788
background-color: #d1e4ff;
787-
}
789+
} */
788790
@media (max-width: 1200px) {
789791
#registerPopupDiv,
790792
#cancelPopupDiv {

ssulocker/templates/locker/cancel_popup.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
{% endif %}
2727
<div id="btnsWrap">
2828
<button type="submit" name="back" value="back" onclick="location.href='{%url 'locker:lockerlist' %}'"
29-
style="cursor: pointer;">뒤로가기</button>
29+
style="cursor: pointer; color:black;">뒤로가기</button>
3030
<button type="submit" name="cancelation" value="cancel" class="cancelBtn"
31-
style="cursor: pointer;">취소하기</button>
31+
style="cursor: pointer; color:black;">취소하기</button>
3232
</div>
3333

3434
</div>

ssulocker/templates/locker/regist_popup.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
{% endif %}
2929
<div id="btnsWrap">
3030
<button type="submit" name="back" value="back" onclick="location.href='{%url 'locker:lockerlist' %}'"
31-
style="cursor: pointer;">뒤로가기</button>
31+
style="cursor: pointer; color:black;">뒤로가기</button>
3232
<button type="submit" name="reservation" value="reserve" class="reserveBtn"
33-
style="cursor: pointer;">예약하기</button>
33+
style="cursor: pointer; color:black;">예약하기</button>
3434
</div>
3535
</div>
3636
</div>

0 commit comments

Comments
 (0)