데이터 상세 화면에서 문의하기 배경색을 바꾸고 링크를 묶습니다 (#56)

* 데이터 상세 화면에서 문의하기 링크 배너 배경색을 바꿉니다. * 화면 맨 아래 영역의 데이터 활동가 그룹 링크를 하나로 묶습니다. * CSS 변수 사용방법을 바꿉니다.
parti-coop · Feb 17, 2021 · f39d1d0 · f39d1d0
1 parent 7af1511
commit f39d1d0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss
@@ -44,6 +44,7 @@ $grays: map-merge(
 
 $blue:    #007bff !default;
 $violet:  #4d1b9b !default;
+$violet-2: #4d1b9d !default;
 $violet-4: #6624d1 !default;
 $indigo:  #6610f2 !default;
 $purple:  #6f42c1 !default;
@@ -62,6 +63,7 @@ $colors: map-merge(
   (
     "blue":       $blue,
     "violet":     $violet,
+    "violet-2":   $violet-2,
     "violet-4":   $violet-4,
     "indigo":     $indigo,
     "purple":     $purple,
@@ -1144,4 +1146,4 @@ $positions: static, relative, absolute, fixed, sticky !default;
 // Printing
 
 $print-page-size:                   a3 !default;
-$print-body-min-width:              map-get($grid-breakpoints, "lg") !default;
+$print-body-min-width:              map-get($grid-breakpoints, "lg") !default;
diff --git a/app/assets/stylesheets/parti.scss b/app/assets/stylesheets/parti.scss
@@ -22,7 +22,7 @@ header nav.navbar.fixed-top {
   bottom: 0;
   width: 100%;
   overflow-y: auto;
-  background-color: var(--dark);
+  background-color: $dark;
   transition: -webkit-transform .05s ease-in-out;
   transition: transform .05s ease-in-out;
   transition: transform .05s ease-in-out, -webkit-transform .05s ease-in-out;
@@ -54,7 +54,7 @@ header nav.navbar.fixed-top {
     border-radius: 4px;
     text-align: center;
     .nav-link{
-      color: #4d1b9d;
+      color: $violet-2;
     }
   }
 }
@@ -85,16 +85,16 @@ header nav.navbar.fixed-top {
   padding-top: .75rem;
   padding-bottom: .75rem;
   font-size: .875rem;
-  color: var(--secondary);
+  color: $secondary;
 }
 
 .nav-underline .nav-link:hover {
-  color: var(--blue);
+  color: $blue;
 }
 
 .nav-underline .active {
   font-weight: 500;
-  color: var(--gray-dark);
+  color: $dark;
 }
 
 .navbar-toggler-icon {
@@ -179,7 +179,7 @@ header nav.navbar.fixed-top {
 .btn-full-white{
   margin: 0 2.125rem;
   background-color: $white;
-  color: #4d1b9d !important;
+  color: $violet-2 !important;
 }
 
 .btn-outline-no{
@@ -196,7 +196,7 @@ header nav.navbar.fixed-top {
 }
 
 .close-header{
-  background-color: #4d1b9d;
+  background-color: $violet-2;
   padding: 1.25rem 2.125rem;
   button{
     border: 0px;
@@ -272,7 +272,9 @@ footer{
 
 .text-white-50 { color: rgba(255, 255, 255, .5); }
 
-.bg-purple { background-color: var(--purple); }
+.bg-purple { background-color: $purple; }
+
+.bg-violet-2 { background-color: $violet-2; }
 
 .bg-cyan-2 {
   background-color: $cyan-2;
@@ -328,17 +330,23 @@ footer{
 }
 
 .foot-parti{
-  background-color: #4d1b9d;
+  background-color: $violet-2;
   padding: 32px 0;
 
   small{
     border-left: 1px solid #ffffff;
   }
 
   a{
-    margin: 0 1rem;
     color: #ffffff !important;
   }
+
+  h4 {
+    text-decoration: none;
+    span {
+      margin: 0 1rem;
+    }
+  }
 }
 
 .my-5{

diff --git a/app/views/application/_footer.html.haml b/app/views/application/_footer.html.haml
@@ -15,7 +15,7 @@
       .d-flex.mb-3.align-items-center
         = image_tag 'parti_symbol_new.png', width: 30, class: "mr-2"
         %h4.m-0
-          = link_to '빠띠 데이터 활동가 그룹', "https://democracy-activists.parti.xyz/p/data_activists", target: "_blank", class: "text-dark font-weight-bold"
-          %small= link_to "시민 주도로 모두의 데이터를 만듭니다", "https://democracy-activists.parti.xyz/p/data_activists", target: "_blank", class: "text-dark"
-
-
+          = link_to "https://democracy-activists.parti.xyz/p/data_activists", target: "_blank", class: "text-dark font-weight-bold" do
+            %span.font-weight-bold 빠띠 데이터 활동가 그룹
+            %small
+              %span 서민 주도로 모두의 데이터를 만듭니다
diff --git a/app/views/data_sets/show.html.haml b/app/views/data_sets/show.html.haml
@@ -79,11 +79,11 @@
             = link_to t('link.destroy'), @data_set, method: :delete, data: { confirm: "정말 삭제하시겠습니까?" }, class: "btn btn-outline-danger ml-2"
 
     .my-4
-      .my-4.p-4.border.bg-cyan-2.text-white.d-flex.align-items-center.justify-content-center
+      .my-4.p-4.border.bg-violet-2.text-white.d-flex.align-items-center.justify-content-center
         %span.font-weight-bolder.pr-3
           데이터에 관한 의견이 있으세요?
         빠띠 커뮤니티에서 서로 의견을 나눠보세요.
-        = link_to "바로가기", "https://democracy-activists.parti.xyz/p/data_activists", target: "_blank", class: "btn btn-white text-info ml-3"
+        = link_to "바로가기", "https://democracy-activists.parti.xyz/p/data_activists", target: "_blank", class: "btn btn-white ml-3"
 
     %hr.mb-4.mt-0.hr-style-3