Merge pull request #248 from TreinaDev/fix/layout-bugfix

Conserta alguns detalhes de layout
TreinaDev · Feb 16, 2024 · 2e4ef3b · 2e4ef3b
2 parents 43134f5 + 7e1230b
commit 2e4ef3b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 12 deletions.
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -45,11 +45,13 @@
             <div class="bg-white text-center home-cards my-0 py-0 rounded-1">
               <%= link_to profile_path(profile), class: 'row' do %>
                 <% if profile.photo.present? && profile.valid? %>
-                  <div class="ratio ratio-1x1 rounded-circle overflow-hidden w-25">
+                  <div class="ratio ratio-1x1 rounded-circle overflow-hidden w-25 mx-auto">
                     <%= image_tag profile.photo, alt: t('.alt_text'), width: '70rem', class: 'profile-picture img-cover rounded-circle mx-auto mt-2 col-md-4' %>
                   </div>
                 <% else %>
-                  <%= image_tag 'default_portfoliorrr_photo.png', width: '70rem', alt: t('.alt_text'), class: 'rounded-circle mx-auto mt-2 col-md-4' %>
+                  <div class="ratio ratio-1x1 rounded-circle overflow-hidden w-25 mx-auto">
+                    <%= image_tag 'default_portfoliorrr_photo.png', width: '70rem', alt: t('.alt_text'), class: 'rounded-circle mx-auto mt-2 col-md-4' %>
+                  </div>
                 <% end %>
                 <div class="col-md-8 mt-4">
                   <h5><%= profile.full_name %></h5>

diff --git a/app/views/reports/_comment.html.erb b/app/views/reports/_comment.html.erb
@@ -1,4 +1,4 @@
-<div class="card text-dark d-flex flex-column px-5 shadow mb-4 p-3 rounded justify-content-center">
+<div class="card text-dark d-flex flex-column px-5 mb-4 p-3 rounded justify-content-center">
   <blockquote class="blockquote mb-1">
     <p><%= comment.message %></p>
     <footer class="blockquote-footer">

diff --git a/app/views/reports/_post.html.erb b/app/views/reports/_post.html.erb
@@ -1,4 +1,4 @@
-<div class="card text-dark d-flex flex-column px-5 shadow mb-4 p-3 rounded justify-content-center">
+<div class="card text-dark d-flex flex-column px-5 mb-4 p-3 rounded justify-content-center">
   <div class="card-body">
     <h2 class="card-title"><%= link_to post.title, post_path(post) %></h2>
     <h6 class="card-subtitle mb-2">

diff --git a/app/views/reports/show.html.erb b/app/views/reports/show.html.erb
@@ -26,7 +26,7 @@
       <div class="mt-3">
         <h1><%= Report.model_name.human %></h1>
       </div>
-      <div class="card text-dark d-flex flex-column px-5 shadow mb-4 p-3 rounded justify-content-center">
+      <div class="card text-dark d-flex flex-column px-5 mb-4 p-3 rounded justify-content-center">
         <div class="card-body">
 
           <h2 class="card-title"><%= @report.offence_type %></h2>

diff --git a/app/views/subscriptions/index.html.erb b/app/views/subscriptions/index.html.erb
@@ -14,8 +14,8 @@
         </div>
 
         <% if current_user.subscription.inactive? %>
-          <div class="card-footer bg-success text-white">
-            <h4><%= t('.current_tier') %></h4>
+          <div class="card-footer bg-success text-white rounded">
+            <h3><%= t('.current_tier') %></h3>
           </div>
         <% end %>
       </div>
@@ -33,10 +33,18 @@
         </ul>
 
         <% if current_user.subscription.inactive? %>
-          <%= button_to t('.subscribe_btn'), subscription_path(current_user.subscription), method: :patch, class: "btn btn-primary btn-lg mt-4" %>
+          <div class="d-flex mt-5">
+            <div class="d-flex m-auto align-items-center">
+              <h3 class="mb-0">Apenas R$19,90</h3>
+            <div>
+            <div class="d-flex" style="margin-left: 3rem">
+              <%= button_to t('.subscribe_btn'), subscription_path(current_user.subscription), method: :patch, class: "btn btn-primary btn-lg" %>
+            <div>
+          <div>
+
         <% else %>
-          <div class="card-footer bg-success text-white">
-            <h4><%= t('.current_tier') %></h4>
+          <div class="card-footer bg-success text-white mt-5 rounded">
+            <h3><%= t('.current_tier') %></h3>
           </div>
         <% end %>
       </div>

diff --git a/config/locales/models/reports.pt-BR.yml b/config/locales/models/reports.pt-BR.yml
@@ -11,7 +11,7 @@ pt-BR:
         offence_type: Tipo de ofensa
   reports:
     report_btn: Denunciar
-    removed_account: Sua conta foi removida pelos adminitradores
+    removed_account: Sua conta foi removida pelos administradores
     create:
       self_report: Você não pode denunciar sí mesmo ou o próprio conteúdo.
       success: Sua denúncia foi registrada

diff --git a/spec/system/authentication/visitor_logs_in_spec.rb b/spec/system/authentication/visitor_logs_in_spec.rb
@@ -105,7 +105,7 @@
         click_on 'Entrar'
       end
 
-      expect(page).to have_content 'Sua conta foi removida pelos adminitradores'
+      expect(page).to have_content 'Sua conta foi removida pelos administradores'
     end
   end
 end