From c9b765942f7086b51debffeb1e72e72dd675abf2 Mon Sep 17 00:00:00 2001 From: janpaulo Date: Wed, 23 Feb 2022 13:55:45 +0800 Subject: [PATCH 1/3] Add side button for subjects and doctrine --- app/javascript/src/application/sidenav.scss | 71 +++++++-------------- app/views/layouts/application.html.erb | 18 +++++- 2 files changed, 40 insertions(+), 49 deletions(-) diff --git a/app/javascript/src/application/sidenav.scss b/app/javascript/src/application/sidenav.scss index d0fea0e..1007335 100644 --- a/app/javascript/src/application/sidenav.scss +++ b/app/javascript/src/application/sidenav.scss @@ -180,22 +180,6 @@ margin-left: -62px; } -.accordion-body { - border: none !important; - padding: 0 !important; -} - -.accordion-body .accordion-button { - border: none !important; - padding: 0 !important; -} - -.accordion-button:focus { - outline: none !important; - box-shadow: none !important; - border-color: transparent !important; -} - .sub1 { padding-left: 10px; font-weight: 500; @@ -204,37 +188,7 @@ font-size: 1.1rem; } -.sub2 { - padding-left: 10px; - padding-bottom: 10px; - padding-right: 10px; -} - -.sub3 { - padding-left: 10px; - padding-bottom: 10px; - padding-right: 10px; -} - -.sub4 { - padding-left: 10px; - padding-bottom: 10px; - padding-right: 10px; -} - -.sub5 { - padding-left: 10px; - padding-bottom: 10px; - padding-right: 10px; -} - -.sub6 { - padding-left: 10px; - padding-bottom: 10px; - padding-right: 10px; -} - -.sub7 { +.sub2, .sub3, .sub4, .sub5, .sub6, .sub7 { padding-left: 10px; padding-bottom: 10px; padding-right: 10px; @@ -249,3 +203,26 @@ color: #ffbca7 !important; } +.navbar-body { + position: fixed !important; + z-index: 1000; + width: 100%; +} + +.for-side-button { + background: darkred; + height: 180px; + padding-left: 0 !important; + position: absolute; + top: 36%; + width: 20px; + z-index: 1; + + svg { + color: #fff !important; + font-size: 35px !important; + padding-left: 2px; + position: absolute !important; + top: 38% !important; + } +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2f9119c..742f2bb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -39,7 +39,21 @@ <%= render(SidenavComponent.new(current_user: current_user, opts: { is_nav_bar: true }))%> - +
"> + <% if params[:is_index_table] === "true" %> +
+ +
+ <% else %> +
+ +
+ <% end %> +
<%= render(SubjectsOffcanvasComponent.new(current_user: current_user, opts: { is_render: true, header_title: "Subjects", element_id: "subjectsOffCanvas", accordion_body_id: "subjectsOffCanvasAccordionBody" })) %> <%= render(SubjectsOffcanvasComponent.new(current_user: current_user, opts: { is_render: true, header_title: "Doctrines", element_id: "doctrinesOffCanvas", accordion_body_id: "doctrinesOffCanvasAccordionBody" })) %> @@ -47,7 +61,7 @@
<%= image_pack_tag 'application/cdasiaonline_logo.png', class:"app-logo" %>
-
+
<% elsif opts[:is_nav_bar].present? %> -