Browse Source

Merge pull request #64 from lexintegritastech/feature-enhance-ui

Feature enhance UI
pull/65/head
Alexander D. Bondoc 4 years ago committed by GitHub
parent
commit
09db635fa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      app/components/pagination_component/pagination_component.html.erb
  2. BIN
      app/javascript/images/application/bg2.png
  3. 4
      app/javascript/src/application.scss
  4. 8
      app/javascript/src/application/sessions.scss
  5. 7
      app/views/documents/show.html.erb
  6. 1
      app/views/home/index.html.erb
  7. 4
      app/views/layouts/application.html.erb

4
app/components/pagination_component/pagination_component.html.erb

@ -1,6 +1,6 @@
<header class="header bg-white b-b clearfix">
<div class="row m-t-sm align-items-end pagination-body">
<div class="<%=data.present? ? "col-md-8 mb-0 " : "col-md-12 mb-0"%>">
<div class="<%=data.present? ? "col-md-8 mb-0 " : "col-md-12 mb-0"%> <%= opts[:is_cited_in_doc].present? ? 'd-none': ""%> ">
<% if opts[:is_subject_breadcrums].present? && subjects.present? %>
<ol class="breadcrumb mb-0">
<% subjects.each do |subject| %>
@ -22,7 +22,7 @@
<% end %>
</div>
<div class="<%=data.present? ? "col-md-4 position-relative" : "d-none"%>">
<div class="text-center pagination justify-content-end">
<div class="text-center pagination justify-content-end me-3">
<%= (paginate data) if data.present? %>
</div>
</div>

BIN
app/javascript/images/application/bg2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 508 KiB

4
app/javascript/src/application.scss

@ -111,9 +111,9 @@
}
.sessions-body-bg {
background-image: url('../../javascript/images/application/cdao-bg.png');
background-image: url('../../javascript/images/application/bg2.png');
background-repeat: no-repeat;
background-size: cover;
overflow-x: hidden;
box-shadow: inset 0 0 0 2000px rgb(154 107 107 / 30%);
// box-shadow: inset 0 0 0 2000px rgba(251, 251, 251, 0.3);
}

8
app/javascript/src/application/sessions.scss

@ -3,8 +3,8 @@
background: #9494946b;
box-shadow: 10px 5px 5px #7a6346;
border-radius: 4px;
width: 350px;
margin-top: -100px;
width: 380px;
margin-left: 40px;
}
.login-logo {
@ -13,7 +13,7 @@
.login-logo {
.app-logo {
width: 370px;
margin-top: 30px;
width: 330px;
margin-top: 15px;
}
}

7
app/views/documents/show.html.erb

@ -37,7 +37,7 @@
Title :
</div>
<div class="col-lg-9">
<strong> <%= @document.title %> </strong>
<strong> <%= @document.short_title %> </strong>
</div>
</div>
</div>
@ -79,7 +79,10 @@
</div>
<div class="tab-pane fade cited-table-body" id="ciatatonTabContent" role="tabpanel">
<div class="mt-3 ps-3"> <h4> Cited Ins Documents </h4> </div>
<div class="d-flex align-items-baseline">
<div class="col-md-6 mt-3 ps-3"> <h4> Cited Ins Documents </h4> </div>
<div class="col-md-6"> <%= render PaginationComponent.new(data: @cited_in_documents, opts: { is_cited_in_doc: true}) %> </div>
</div>
<table class="table table-hover mb-0 table-width">
<thead style="position: sticky;top: 0">
<th class="bg-light"> Reference No. </th>

1
app/views/home/index.html.erb

@ -1 +0,0 @@
<h1>Home</h1>

4
app/views/layouts/application.html.erb

@ -58,10 +58,10 @@
<%= render(SubjectsOffcanvasComponent.new(current_user: current_user, opts: { is_render: true, header_title: "Doctrines", element_id: "doctrinesOffCanvas", accordion_body_id: "doctrinesOffCanvasAccordionBody" })) %>
<div class="<%= current_user.present? ? 'row flex-nowrap h-100 w-100 p-0 ms-0' : 'row h-100 justify-content-end align-items-center' %>">
<div class="<%= current_user.present? ? 'd-none' : 'col-sm-8 login-logo' %>">
<div class="<%= current_user.present? ? 'd-none' : 'col-sm-7 login-logo' %>">
<%= image_pack_tag 'application/cdasiaonline_logo.png', class:"app-logo" %>
</div>
<div class="<%= current_user.present? ? 'col py-3 main-content-body mt-5' : 'col-sm-4 login-body-box' %>">
<div class="<%= current_user.present? ? 'col py-3 main-content-body mt-5' : 'col-sm-5 login-body-box' %>">
<div class="content-body">
<%= yield %>
</div>

Loading…
Cancel
Save