alexdbondoc17
/
cdao-pjet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #14 from lexintegritastech/feature-enhancement-ui 

Enhance ui for login
pull/15/head
Angel Aviel Domaoan 4 years ago committed by GitHub
parent
32945d3de8 2f692fd922
commit
0e3ca58088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      app/javascript/src/application.scss
  2. 6
      app/javascript/src/application/sessions.scss
  3. 8
      app/views/layouts/application.html.erb

1
app/javascript/src/application.scss
Unescape View File

@ -1,5 +1,6 @@
@import "~bootstrap/scss/bootstrap"; @import "~bootstrap/scss/bootstrap";
@import "./application/sidenav"; @import "./application/sidenav";
@import "./application/sessions";
.tableFixHead { .tableFixHead {
overflow: auto; overflow: auto;

6
app/javascript/src/application/sessions.scss
Unescape View File

@ -0,0 +1,6 @@
.login-body-box .content-body {
padding: 26px;
background: #949494ba;
box-shadow: 10px 5px 5px #e8e8e8;
border-radius: 4px;
}

8
app/views/layouts/application.html.erb
Unescape View File

@ -11,17 +11,17 @@
<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="container-fluid h-100 w-100"> <body class="container-fluid h-100 w-100 p-0">
<div class="<%= current_user.present? ? 'row flex-nowrap h-100 w-100 p-0' : 'row h-100 justify-content-center align-items-center' %>"> <div class="<%= current_user.present? ? 'row flex-nowrap h-100 w-100 p-0 ms-0' : 'row h-100 justify-content-center align-items-center' %>">
<% if current_user.present? %> <% if current_user.present? %>
<div class="col-auto col-md-3 col-xl-2 px-sm-2 px-0 bg-secondary min-vh-100" style="padding: 0 !important;"> <div class="col-auto col-md-3 col-xl-2 px-sm-2 px-0 bg-secondary min-vh-100" style="padding: 0 !important;">
<%= render(SidenavComponent.new(current_user: current_user))%> <%= render(SidenavComponent.new(current_user: current_user))%>
</div> </div>
<% end %> <% end %>
<div class="<%= current_user.present? ? 'col py-3' : 'col-sm-3' %>"> <div class="<%= current_user.present? ? 'col py-3' : 'col-sm-3 login-body-box' %>">
<div > <div class="content-body">
<%= yield %> <%= yield %>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save