Merge pull request #1148 from dradis/bs5-application

Bootstrap 5 updates (Application layout)
dradis · May 22, 2023 · 2b2bbde · 2b2bbde
2 parents 297d020 + 52b91ad
commit 2b2bbde
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/app/assets/stylesheets/application/sessions.scss b/app/assets/stylesheets/application/sessions.scss
@@ -35,12 +35,16 @@ body.unauthenticated {
 
   .alert {
     margin: 1rem 0;
-    padding: 0.75rem 1.25rem;
   }
 
   .btn {
     text-shadow: 0 0 0;
 
+    &.btn-block {
+      display: block;
+      width: 100%;
+    }
+
     &.btn-primary {
       border: 0px none;
       background: var(--primaryColor);

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -30,7 +30,7 @@
         </div>
         <div class="col-lg-7 d-none d-lg-block">
           <div class="mission-container">
-            <span class="text-monospace" data-behavior="mission-text"></span>
+            <span class="font-monospace" data-behavior="mission-text"></span>
             <span class="mission-text-cursor" data-behavior="mission-text-cursor">&block;</span>
           </div>
         </div>

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
@@ -3,15 +3,15 @@
 <h1>Login</h1>
 
 <%= form_tag session_path do %>
-  <div class="form-group">
-    <%= label_tag :login, 'Username', class: 'col-form-label' %>
+  <div class="mb-3">
+    <%= label_tag :login, 'Username', class: 'form-label' %>
     <%= text_field_tag :login, nil, placeholder: 'Choose any user name you want', class: 'form-control', autofocus: true %>
   </div>
-  <div class="form-group">
-    <%= label_tag :password, nil, class: 'col-form-label' %>
+  <div>
+    <%= label_tag :password, nil, class: 'form-label' %>
     <%= password_field_tag :password, nil, class: 'form-control' %>
   </div>
-  <div class="form-group mb-0 pt-1">
+  <div class="pt-1">
     <%= submit_tag 'Log in', class: 'btn btn-block btn-primary mt-4', data: { behavior: 'animate-click' } %>
   </div>
 <% end %>