From ef63381e09b975da1decb3aaafe12dc67f88f431 Mon Sep 17 00:00:00 2001 From: isol2011 Date: Thu, 19 May 2022 15:37:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=201=20-=20=EC=82=AC=EC=A7=84=20=EB=B0=91=EC=97=90=20'=EC=84=B1?= =?UTF-8?q?=EC=9E=A5=EC=9E=85=EB=A0=A5'=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EB=A1=9C=20=EC=97=B0=EA=B2=B0=ED=95=98=EB=8A=94=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/ftl/m/index/index.ftl | 104 +++++++++--------- src/main/webapp/m/css/style.css | 9 +- 2 files changed, 63 insertions(+), 50 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl index 36c86e9..68c7d8e 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl @@ -82,59 +82,65 @@ <#if (model['lm_child'])?has_content> <#list model['lm_child'] as item> -
  • -
    -

    ${item['name']!} (${item['gender_ko']!})

    -

    ${(item['past_day'])!}일 (${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일/${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)

    -

    +

  • +
    +
    +
    +

    ${item['name']!} (${item['gender_ko']!})

    +

    ${(item['past_day'])!}일 (${(item['past_day']?number/7)!}주 ${(item['past_day']?number%7)!}일/${item['past_month']!}개월 ${(item['past_day']?number%7)!}일)

    +
    +
    +

    + 프로필 사진 +

    +
    +
    + -
    -

    - 프로필 사진 + + + <#if item['day100'] gt 0> + <#if item['diff_d_day'] gt item['day100'] || item['diff_d_day'] lt 0> + 100일 D-${(item['day100'])!}일,${item['day100date']!} + <#elseif item['diff_d_day'] gt 0> + ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!} + + <#elseif item['day200'] gt 0> + <#if item['diff_d_day'] gt item['day200'] || item['diff_d_day'] lt 0> + 200일 D-${(item['day200'])!}일,${item['day200date']!} + <#elseif item['diff_d_day'] gt 0> + ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!} + + <#elseif item['day300'] gt 0> + <#if item['diff_d_day'] gt item['day300'] || item['diff_d_day'] lt 0> + 300일 D-${(item['day300'])!}일,${item['day300date']!} + <#elseif item['diff_d_day'] gt 0> + ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!} + + <#elseif item['day365'] gt 0> + <#if item['diff_d_day'] gt item['day365'] || item['diff_d_day'] lt 0> + 첫돌 D-${(item['day365'])!}일,${item['day365date']!} + <#elseif item['diff_d_day'] gt 0> + ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!} + + <#elseif item['day365'] lt 0> + <#if item['diff_d_day'] gt 0> + ${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!} + <#else> + 설정된 D-Day가 없습니다. + + +

    -
    -
  • - +

    성장기록 입력하기

    + + + diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css index 8b017e9..4245222 100644 --- a/src/main/webapp/m/css/style.css +++ b/src/main/webapp/m/css/style.css @@ -5670,6 +5670,8 @@ main { .main_pofile_txt { float: left; + display: flex; + flex-direction: column; } .main_pofile_txt h2 { @@ -5690,12 +5692,17 @@ main { border-radius: 15px; } +.main_pofile_txt .cont { + display: flex; + justify-content: space-between; + align-items: center; +} + .main_pofile_img { float: right; position: relative; width: 65px; height: 65px; - margin-right: 20px; } .main_pofile_img p {