Browse Source

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

Fix indention in offcanvas
pull/57/head
Alexander D. Bondoc 4 years ago committed by GitHub
parent
commit
c8ae5d2c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb
  2. 2
      app/components/subject_accordion_component/subject_accordion_component.html.erb
  3. 6
      app/javascript/src/application/document-search.scss
  4. 7
      app/javascript/src/application/offcanvas.scss
  5. 8
      app/views/documents/show.html.erb

2
app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb

@ -7,7 +7,7 @@
<tbody>
<% search_results.each do |search_result| %>
<tr href="<%= jurisprudence(search_result).present? ? document_path(jurisprudence(search_result).id) : '#' %>" class="clickable-tr">
<tr href="<%= jurisprudence(search_result).present? ? params[:is_index_table] === "true"? document_path(jurisprudence(search_result).id)+ "?is_index_table="+params[:is_index_table] : '#' : "#"%> " class="clickable-tr">
<td> <%= document_reference_number(jurisprudence(search_result)) %> </td>
<td> <%= document_title(jurisprudence(search_result)) %> </td>
<td> <%= date_or_year(jurisprudence(search_result)) %> </td>

2
app/components/subject_accordion_component/subject_accordion_component.html.erb

@ -1,7 +1,7 @@
<% if opts[:accordionFor].present? %>
<div class="accordion accordion-flash offcanvas-item" id="<%= parent_accordion_id %>">
<div class="accordion-item">
<div class="accordion-header d-flex justify-content-between">
<div class="accordion-header d-flex justify-content-between adadadeqe" id="<%= children_accordion_id %>">
<% if search_result["has_children?"].present? %>
<div class="accordion-button collapsed m-0 p-0 sub-label<%= search_result["heirarchy_level"] + 1 %>" data-bs-toggle="collapse" data-bs-target="#<%= children_accordion_id %>"
data-controller="subjects" data-accordion-id="<%= children_accordion_id %>"

6
app/javascript/src/application/document-search.scss

@ -24,4 +24,8 @@ hr.simple {
border-style: none none dotted;
color: #fff;
background-color: #fff;
}
}
.doctrine-index-body {
width: 98% !important;
}

7
app/javascript/src/application/offcanvas.scss

@ -8,7 +8,7 @@
border: none !important;
}
.offcanvas-contents .offcanvas-item.accordion-button:not(.collapsed) {
.offcanvas-contents .offcanvas-item .accordion-button:not(.collapsed) {
background-color: #fff;
a {
color: darkred !important;
@ -76,24 +76,28 @@
width: auto;
max-width: 1200px;
padding-left: 10px !important;
padding-right: 0 !important;
}
.sub-body2{
width: auto;
max-width: 1000px;
padding-left: 20px!important;
padding-right: 0 !important;
}
.sub-body3{
width: auto;
max-width: 1000px;
padding-left: 30px!important;
padding-right: 0 !important;
}
.sub-body4{
width: auto;
max-width: 1000px;
padding-left: 40px!important;
padding-right: 0 !important;
}
.sub-body5{
@ -106,6 +110,7 @@
width: auto;
max-width: 1000px;
padding-left: 60px!important;
padding-right: 0 !important;
}
.sub-body7{

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

@ -1,12 +1,12 @@
<div class="container-fluid row p-0 m-0">
<div class="container col-md-3">
<div class="container-fluid row p-0 m-2">
<div class="<%= params[:is_index_table].present? ? 'd-none': "container col-md-3"%>">
<div class="advanced-search-box">
<%= render(DocumentAdvancedSearchComponent.new(current_user: current_user, opts: {})) %>
</div>
</div>
<div class="container col-md-9">
<div class="<%= params[:is_index_table].present? ? 'container col-md-12': "container col-md-9"%>">
<div class="card mt-1 g-3">
<div class="container p-2 card-header">
<div class="container-fluid p-2 card-header">
<div class="row">
<div class="col-lg-12">
<div class="row">

Loading…
Cancel
Save