Merge pull request #109 from yaena1223/main

0710 디자인 변경 반영
LikeLion-at-DGU · Jul 10, 2022 · ebc2ed6 · ebc2ed6
2 parents ae9ae55 + f62673f
commit ebc2ed6
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 9 deletions.
diff --git a/runningmate/addproject/__pycache__/models.cpython-310.pyc b/runningmate/addproject/__pycache__/models.cpython-310.pyc
diff --git a/runningmate/addproject/__pycache__/views.cpython-310.pyc b/runningmate/addproject/__pycache__/views.cpython-310.pyc
diff --git a/runningmate/mateapp/__pycache__/models.cpython-310.pyc b/runningmate/mateapp/__pycache__/models.cpython-310.pyc
diff --git a/runningmate/mateapp/__pycache__/urls.cpython-310.pyc b/runningmate/mateapp/__pycache__/urls.cpython-310.pyc
diff --git a/runningmate/mateapp/__pycache__/views.cpython-310.pyc b/runningmate/mateapp/__pycache__/views.cpython-310.pyc
diff --git a/runningmate/mateapp/templates/mateapp/calendar.html b/runningmate/mateapp/templates/mateapp/calendar.html
@@ -156,9 +156,9 @@
     <div class="item2" id="today_date">
       <!-- <button class="nav-btn go-prev" onclick="preDay()">&lt;</button> -->
       <div id="today_day">
-        <div class="day_week">
+        <div class="day_week"  style="margin-bottom:3px">
         </div>
-        <div class="date_week">
+        <div class="date_week" style="margin-bottom:0 ;" >
         </div>
       </div>
       <!-- <button class="nav-btn go-next" onclick="nextDay()">&gt;</button> -->

diff --git a/runningmate/mateapp/templates/mateapp/project.html b/runningmate/mateapp/templates/mateapp/project.html
@@ -124,8 +124,9 @@ <h3>{{project.summary}}</h3>
         <div class = "item3" id = "{{post.id}}">
             <a href = "{% url 'mateapp:post_detail' project.id post.id %}" style="display: inline-block;width: 100%; height: 100%;text-decoration: none;" >
             <div id = "mimoji_place" >
-            <section id = "mimoji" style="width: 70px; height:70px; border-radius: 50%; background-color: {{project.color}};; ;margin:10px;">
-
+            <section id = "mimoji" style="width: 70px; height:70px; border-radius: 50%; background-color: {{project.color}};; ;margin:10px; background-image: url({{ post.user.profile.profile.url }});
+            background-size: contain; background-repeat: no-repeat; background-position: center;" >
+
             </section>
             </div>
             <section id = "meeting_date">{{post.day}}</section>

diff --git a/runningmate/mateapp/templates/mateapp/project_post.html b/runningmate/mateapp/templates/mateapp/project_post.html
@@ -95,12 +95,12 @@ <h3>{{project.summary}}</h3>
         <div class = "item3" id = "pro_runningspace">
                 <section id = "post_date">{{post.day}}</section>
                 <section id = "post_title">{{post.title}}</section>
-                <section id = "post_body">{{post.body}}</section>
+                <section id = "post_body" >{{post.body}}</section>
 
 
         <form action="{% url 'mateapp:create_comment' project.id post.id %}" method="POST" enctype="multipart/form-data">
             {%csrf_token%}
-            <div style="width: 100%;text-align:center;margin-top: 35vmin;">
+            <div style="width: 100%;text-align:center;margin-top: 33vmin;">
 
                 <input type="text" name="content" id='content' required placeholder="  댓글을 입력해주세요" style="width: 80%;">
                 <input type="submit" value="전송" id = "submit_title2" >
@@ -112,8 +112,9 @@ <h3>{{project.summary}}</h3>
         <div class = "item3" id = "{{comment.id}}">
             <div id = "mimoji_place" >
 
-                <section id = "mimoji" style="width: 70px; height:70px; border-radius: 50%; background:{{project.color}}; ;margin:10px;">
-                    <img src="{{ comment.user.profile.profile.url }}" width="50px" height="50px">
+                <section id = "mimoji" style="width: 70px; height:70px; border-radius: 50%; background-color: {{project.color}};; ;margin:10px; background-image: url({{ comment.user.profile.profile.url }});
+                background-size: contain; background-repeat: no-repeat; background-position: center;" >
+
                 </section>
             </div>
             <section id = "name" style="color:{{project.color}}">{{comment.user}}</section>

diff --git a/runningmate/runningmate/static/css/calender.css b/runningmate/runningmate/static/css/calender.css
@@ -3,7 +3,7 @@
 .container2{
     display:grid;
     grid-template-columns: 2fr 1.5fr 2fr;
-    grid-template-rows: 1fr 5fr 1fr 2.5fr 1.5fr 1.5fr 1.5fr 15px;
+    grid-template-rows: 1fr 5fr 1fr 1.5fr 1.5fr 1.5fr 1.5fr 15px;
     height: 100%;
     row-gap: 15px;
     column-gap: 20px;

diff --git a/runningmate/runningmate/static/css/project.css b/runningmate/runningmate/static/css/project.css
@@ -389,4 +389,15 @@ h4{
     font-family: 'AppleSDGothicNeoM';
     font-weight: 500;
     font-size: 1.8vmin;
+}
+
+#post_body{
+    margin-left: 20px;
+
+    font-family: 'AppleSDGothicNeoM';
+    font-style: normal;
+    font-weight: 400;
+    font-size: 20px;
+    line-height: 30px;
+    color: #222B45;
 }