Browse Source

Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter into sudden

huiwonseo 4 years ago
parent
commit
1b37e4a057

+ 1 - 0
src/main/webapp/WEB-INF/jsp/mobile/health/health6.jsp

@@ -135,6 +135,7 @@ $( function(){
                     <br/>
                     <div class="diagnosis-agree">
                         <p><spring:message code="health.mental.agree.text2" /></p>
+                        <br/>
                         <div>
                             <input type="radio" id="agree-y" name="agree" value="1" required>
                             <label for="agree-y">

+ 1 - 1
src/main/webapp/WEB-INF/jsp/mobile/include/header.jsp

@@ -14,7 +14,7 @@
 <!-- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" > -->
 <!-- <link rel="stylesheet" type="text/css" href="/resources/css/mobile/bootstrap-datepicker.css" /> -->
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-<link rel="stylesheet" type="text/css" href="/resources/css/mobile/style.css?ver=1.5" />
+<link rel="stylesheet" type="text/css" href="/resources/css/mobile/style.css?ver=1.6" />
 <link rel="stylesheet" type="text/css" href="/resources/css/mobile/jquery.modal.css" />
 
 

+ 2 - 2
src/main/webapp/resources/css/mobile/style.css

@@ -587,12 +587,12 @@ button.not-accept{background-color:#CCCCCC !important;}
 .diagnosis-wrap .checkbox input + label {display: flex; align-items: center; justify-content: center; margin: 0 auto 7px; width: 56px; height: 56px; border-radius: 100%; background-color: #fff; font-size: 18px; font-weight: bold; color: #999; user-select: none; cursor: pointer;}
 .diagnosis-wrap .checkbox input[checked] + label, .diagnosis-wrap .checkbox input:checked + label {box-shadow: inset 0px 0px 0px 2px #3A71CB; background-color: #B0DBEC; color: #3A71CB;} 
 .diagnosis-wrap .checkbox span {display: inline-block; font-size: 11px; line-height: 1.28; letter-spacing: -1px; color: #333;padding: 0 8px;word-break: keep-all;}
-.diagnosis-wrap .ar-text-left, .diagnosis-wrap .ar-text-right {padding: 0 36px; height: 40px; background-repeat: no-repeat; background-size: auto 40px; line-height: 39px; user-select: none;}
+.diagnosis-wrap .ar-text-left, .diagnosis-wrap .ar-text-right {padding: 0 36px;background-repeat: no-repeat; background-size: auto 40px; line-height: 39px; user-select: none;}
 .diagnosis-wrap .ar-text-left {margin-bottom: 12px; background-image: url(../../images/mobile/arr-decrease.svg); background-position: left center}
 .diagnosis-wrap .ar-text-right {margin-top: 12px; background-image: url(../../images/mobile/arr-increase.svg); background-position: right center; text-align: right;}
 .diagnosis-desc1 {padding: 12px; line-height: 1.428; background-color: rgba(87,135,201,0.1); color: #325C96;}
 .diagnosis-desc2 {line-height: 1.57; color: #5787C9;}
-.diagnosis-agree {display: flex; align-items: center; justify-content: space-between; margin-top: 12px; color: #5787C9;}
+.diagnosis-agree {align-items: center;margin-top: 12px; color: #5787C9;}
 .diagnosis-agree label {margin-right: 14px; color: #000;}
 .diagnosis-agree label span {margin-right: 6px !important;}
 .diagnosis-agree label:last-child {margin-right: 0;}