Merge pull request #10021 from DavidKang/footer

Move footer legal to bottom
openSUSE · Aug 20, 2020 · 0ffffd2 · 0ffffd2
2 parents a336fbf + 43b387a
commit 0ffffd2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/src/api/app/assets/stylesheets/webui/responsive_ux/layout.scss b/src/api/app/assets/stylesheets/webui/responsive_ux/layout.scss
@@ -79,18 +79,19 @@
 
 // FOOTER
 
-#footer {
-  strong { color: $gray-700; }
-
+#footer, #footer-legal {
   & a {
     color: $gray-700;
     &:hover { color: $gray-900; }
   }
+}
 
+#footer {
+  strong { color: $gray-700; }
   li { @extend .my-2; }
+}
 
-  #footer-legal {
-    font-size: .9rem;
-    p { color: $gray-700; }
-  }
+#footer-legal {
+  font-size: .9rem;
+  p { color: $gray-700; }
 }
diff --git a/src/api/app/assets/stylesheets/webui/responsive_ux/sponsors.scss b/src/api/app/assets/stylesheets/webui/responsive_ux/sponsors.scss
@@ -3,6 +3,7 @@
     @extend .mb-2;
 
     font-size: 0.9rem;
+    text-transform: uppercase;
     color: $gray-700;
     font-weight: bold;
 }

diff --git a/src/api/app/views/layouts/webui/responsive_ux.html.haml b/src/api/app/views/layouts/webui/responsive_ux.html.haml
@@ -45,7 +45,7 @@
       .bg-dark#left-navigation-area
         = render partial: 'layouts/webui/responsive_ux/left_navigation'
       .d-flex.flex-column#content-area
-        .container-xxl.flex-grow-1.pb-3.border-bottom.border-gray-300
+        .container-xxl.flex-grow-1.pb-3.border-bottom.border-gray-400
           .sticky-top.flash-and-announcement.text-break
             = render partial: 'layouts/webui/status_message_announcement', locals: { current_announcement: @current_announcement }
             #flash= render partial: 'layouts/webui/flash', object: flash
@@ -57,14 +57,16 @@
             .col#content
               = yield
 
-        .container-fluid.mt-4.py-2#footer
-          .row
-            .col
-              = render partial: 'layouts/webui/responsive_ux/footer'
+        .container-fluid.mt-4.mb-2.py-2#footer
+          = render partial: 'layouts/webui/responsive_ux/footer'
         .container-fluid.py-2#sponsors
-          .row
-            .col
-              = render partial: 'layouts/webui/responsive_ux/sponsors'
+          = render partial: 'layouts/webui/responsive_ux/sponsors'
+        .container-fluid.mt-2.py-2#footer-legal
+          %p.text-center
+            = link_to('Open Build Service (OBS)', 'http://openbuildservice.org')
+            is an
+            = succeed '.' do
+              = link_to('openSUSE project', 'http://www.opensuse.org')
 
       - if !current_page?(signup_path) && !current_page?(new_session_path)
         #bottom-navigation-area

diff --git a/src/api/app/views/layouts/webui/responsive_ux/_footer.html.haml b/src/api/app/views/layouts/webui/responsive_ux/_footer.html.haml
@@ -31,10 +31,3 @@
       %li= link_to('Forums', 'http://forums.opensuse.org/forumdisplay.php/692-Open-Build-Service-%28OBS%29')
       %li= link_to('Chat (IRC)', 'irc://irc.opensuse.org/opensuse-buildservice')
       %li= link_to('Twitter', 'http://twitter.com/OBShq')
-.row.mt-4#footer-legal
-  .col.px-0
-    %p.text-center
-      = link_to('Open Build Service (OBS)', 'http://openbuildservice.org')
-      is an
-      = succeed '.' do
-        = link_to('openSUSE project', 'http://www.opensuse.org')