Merge remote-tracking branch 'origin/lsgdev' into dev

pirogramming · Mar 11, 2020 · 742ab4a · 742ab4a
2 parents 7c0eaaa + 9b189b8
commit 742ab4a
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 16 deletions.
diff --git a/accounts/templates/accounts/signup.html b/accounts/templates/accounts/signup.html
@@ -27,6 +27,7 @@
     th{
         vertical-align: text-top;
         line-height: 60px;
+        text-align: left;
     }
 
     input {

diff --git a/accounts/templates/accounts/signup_profile.html b/accounts/templates/accounts/signup_profile.html
@@ -59,7 +59,11 @@
     }
     tr:nth-child(4) span{
         font-size: 14px;
-        color: ;
+    }
+    th{
+        vertical-align: text-top;
+        line-height: 60px;
+        text-align: left;
     }
 
 

diff --git a/log_share/templates/base.html b/log_share/templates/base.html
@@ -31,7 +31,7 @@
         }
 
         .logo {
-            margin-left: 200px;
+            margin-left: 15%;
             display: inline-block;
         }
 
@@ -53,7 +53,6 @@
             width: 50px;
             line-height: 80px;
             position: absolute;
-            left: 340px;
             top: 17px;
         }
 
@@ -65,7 +64,7 @@
             text-align: center;
             text-decoration: none;
             box-sizing: border-box;
-            margin-right: 20px;
+            margin-right: 10px;
             vertical-align: text-top;
         }
 
@@ -78,7 +77,7 @@
         }
 
         .menu {
-            margin-right: 140px;
+            margin-right: 10%;
         }
 
         /*드롭 다운 서브메뉴 */
@@ -95,7 +94,7 @@
             font-family: 나눔스퀘어;
         }
 
-        .menu > li .sub3 {
+        .menu > li .sub2 {
             position: absolute;
             width: 100px;
             top: 80px;
@@ -115,7 +114,7 @@
 
         }
 
-        .menu > li:hover .sub3 {
+        .menu > li:hover .sub2 {
             display: block;
             color: black;
 
@@ -136,7 +135,7 @@
 
         }
 
-        .sub3 > li:hover {
+        .sub2 > li:hover {
             background-color: dodgerblue;
             border-bottom-left-radius: 5px;
             border-bottom-right-radius: 5px;
@@ -167,7 +166,7 @@
 
         }
 
-        .sub3 {
+        .sub2 {
             border-bottom-left-radius: 5px;
             border-bottom-right-radius: 5px;
             list-style: none;
@@ -182,6 +181,7 @@
 
         #menufont{
             font-size: 14px;
+            font-family: 나눔스퀘어;
         }
         .logout_icon{
             border: 2px solid white;
@@ -191,10 +191,65 @@
             margin-top: 17px;
             line-height: 40px;
             border-radius: 5px;
+            font-family: 나눔스퀘어;
         }
         .logout_icon:hover{
             background-color: #c4dce8;
         }
+        #br{
+            display: inline-block;
+        }
+        #logout_icon{
+            display: none;
+            font-size: 25px;
+            line-height: 25px;
+            margin-top: 30px;
+        }
+
+        @media screen and (max-width: 1400px){
+            .logo {
+                margin-left: 8%;
+            }
+        }
+        @media screen and (max-width: 1300px) {
+            #menufont{
+                display: none;
+            }
+            #icon{
+                margin-top: 30px;
+            }
+            .logo {
+                margin-left: 3%;
+            }
+            #logout_icon{
+                display: block;
+            }
+             .logout_icon{
+               display: none;
+           }
+        }
+       @media screen and (max-width: 880px){
+           ul.menu > li{
+             width: 70px;
+           }
+           .menu > li .sub1,.menu > li .sub2{
+               width: 70px;
+           }
+           #br{
+               display: none;
+           }
+           #logoimg{
+               display: none;
+           }
+       }
+         @media screen and (max-width: 690px){
+             ul.menu{
+                 display: none;
+             }
+         }
+        *{
+            font-family: 나눔스퀘어;
+        }
 
     </style>
     {% block header %}
@@ -216,21 +271,21 @@
             <li><a href="{% url 'search:main_search' %}"><i class="fas fa-home" id="icon"><p id="menufont">홈</p></i></a></li>
             <li><a href="{% url 'group_management:create_group' %}" id="group"><i class="fas fa-users" id="icon"><p id="menufont">그룹</p></i></a>
                 <ul class="sub1">
-                    <li><a href="{% url 'group_management:create_group' %}">그룹 리스트</a></li>
-                    <li><a href="{% url 'group_management:search_group' %}">그룹 검색</a></li>
+                    <li><a href="{% url 'group_management:create_group' %}"><div id="br">그룹</div> 리스트</a></li>
+                    <li><a href="{% url 'group_management:search_group' %}"><div id="br">그룹</div> 검색</a></li>
                 </ul>
             </li>
             <li><a href="{% url 'myprofile:profile_detail' request.user.pk %}"><i class="fas fa-id-card" id="icon"><p id="menufont">포트폴리오</p></i></a>
-                <ul class="sub3">
-                    <li><a href="{% url 'myprofile:profile_detail' request.user.pk %}">나의 포폴</a></li>
-                    <li><a href="{% url 'post:post_create' %}">포폴 작성</a></li>
+                <ul class="sub2">
+                    <li><a href="{% url 'myprofile:profile_detail' request.user.pk %}"><div id="br">나의</div> 포폴</a></li>
+                    <li><a href="{% url 'post:post_create' %}"><div id="br">포폴</div>작성</a></li>
                 </ul>
             </li>
             {% if user.is_authenticated %}
                 <li><a href="{% url 'myprofile:my_profile' request.user.pk %}"><i class="fas fa-user-cog" id="icon"><p id="menufont">계정관리</p></i></a>
                 </li>
             {% endif %}
-            <li id="last_li"><div class="logout_icon"><a href="{% url "accounts:logout" %}">로그아웃</a></div></li>
+            <li id="last_li"><i class="fas fa-sign-out-alt" id="logout_icon"></i><div class="logout_icon"><a href="{% url "accounts:logout" %}">로그아웃</a></div></li>
         </ul>
     </div>
 </div>

diff --git a/post/templates/post/post_create.html b/post/templates/post/post_create.html
@@ -69,6 +69,9 @@
     strong{
         display: none;
     }
+    .logofont{
+        font-family: 나눔스퀘어;
+    }
 
     .post-form .helptext{
         color: #c2185b;

diff --git a/search/templates/search/post_list_css.html b/search/templates/search/post_list_css.html
@@ -170,7 +170,8 @@
         height: 0;
         margin-top: 1rem;
         margin-bottom: 1rem;
-        border-top: 1px solid;
+
+        overflow: hidden;
     }
 
     {#---------------------------------add post feed css-------------------------------------#}
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ @@
         th{
             vertical-align: text-top;
             line-height: 60px;
+            text-align: left;
         }
         input {
@@ Expand Down @@