Skip to content

bug: Fixes scrolling on sidebar mobile view under manage #399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbaudouinjr merged 4 commits into from
Nov 15, 2020
Merged

bug: Fixes scrolling on sidebar mobile view under manage #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d395543
Fixed issue on desktop
peterkos Nov 14, 2020
8ce39f1
Map overflow scroll
peterkos Nov 15, 2020
425f403
Fix scroll issue
peterkos Nov 15, 2020
85cad64
Fixed toggle button; fits screen, sidebar width
peterkos Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 7 additions & 45 deletions app/assets/stylesheets/manage.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,47 +31,6 @@ $grey-med: #999
.CodeMirror
font-size: 12px

// .manage
// padding-left: 20px
// padding-right: 20px
// padding-top: 50px

// .container-half, .container-full
// max-width: none
// @media (max-width: 600px)
// padding-left: 0
// padding-right: 0
// .container-half
// display: inline-block
// width: 49.6% // weird issue with percentaces
// vertical-align: top
// @media (max-width: 600px)
// width: 100%
// .container-full
// display: inline-block
// width: 100%
// vertical-align: top
// margin: 0

// #manageNav
// z-index: 1
// width: 100%
// background: $black
// color: $white
// padding: 16px 20px 6px
// p, a
// margin: 0 5px 10px
// p
// color: $primary
// display: inline-block
// margin-top: 0
// &:first-child
// margin-right: 10px
// a
// color: $white
// display: inline-block
// &:hover
// color: darken($grey-light, 5%)
.center
text-align: center

Expand All @@ -96,6 +55,8 @@ $grey-med: #999

#map
text-align: center
overflow: scroll
width: 100%

.dashboard-container-title
border-bottom: 3px solid #e5e5e5
Expand Down Expand Up @@ -164,16 +125,17 @@ $grey-med: #999
display: inherit

.navbar-mobile-toggle--active
color: black !important
background: #eee
background: #eeeeee
.fa
color: black !important

.sidebar-mobile
display: block !important
bottom: auto


.sidebar-mobile .sidebar-sticky
height: auto
height: calc(100vh - 2.25rem)
overflow: scroll


/*
Expand Down
11 changes: 4 additions & 7 deletions app/assets/stylesheets/manage/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
body {
font-size: 0.875rem;
}

/*
* Sidebar
Expand All @@ -12,14 +9,14 @@ body {
bottom: 0;
left: 0;
z-index: 5; /* Behind the navbar */
padding: 48px 0 0; /* Height of navbar */
padding: 2.25rem 0 0; /* Height of navbar */
box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.1);
}

.sidebar-sticky {
position: relative;
top: 0;
height: calc(100vh - 48px);
height: calc(100vh - 2.25rem);
padding-top: 0.5rem;
overflow-x: hidden;
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
Expand Down Expand Up @@ -83,11 +80,11 @@ body {
.navbar-brand {
padding-top: 0.75rem;
padding-bottom: 0.75rem;
text-overflow: ellipsis;
overflow: hidden;
font-size: 1rem;
background-color: rgba(0, 0, 0, 0.25);
box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25);
text-overflow: ellipsis;
overflow: hidden;
}

.navbar .form-control {
Expand Down
14 changes: 9 additions & 5 deletions app/views/layouts/manage/application.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,23 @@

%body
%nav.navbar.navbar-expand.navbar-dark.fixed-top.bg-dark.flex-nowrap.p-0.shadow
%a.navbar-brand.col-xs-6.col-sm-3.col-md-2.mr-0{href: manage_root_path} #{HackathonConfig['name']} Manager

%span.navbar-mobile-toggle.m-0{onclick: 'toggleMobileNav()'}
.fa.fa-bars.m-3.mx-4.text-white.h-auto

/ TODO: move acc/signin inside the sidebar
%a.navbar-brand.px-3.mr-0{href: manage_root_path} #{HackathonConfig['name']} Manager

/ %input.form-control.form-control-dark.w-100{"aria-label" => "Search", placeholder: "Search", type: "text"}/
%ul.navbar-nav.ml-auto.px-3
%li.nav-item.text-nowrap
= link_to "Account", root_path, class: "nav-link"
%li.nav-item.text-nowrap
= link_to "Sign out", destroy_user_session_path, method: :delete, class: "nav-link"
%span.navbar-brand.navbar-mobile-toggle.mr-0.pl-3.pr-3{onclick: 'toggleMobileNav()'}
.fa.fa-bars.fa-fw.icon-space-r-half

.container-fluid
.row
%nav.col-md-2.d-none.d-md-block.bg-light.sidebar
%nav.col-md-3.d-none.d-md-block.bg-light.sidebar
.sidebar-sticky
%h6.sidebar-heading.d-flex.justify-content-between.align-items-center.px-3.mt-4.mb-1.text-muted
%span
Expand Down Expand Up @@ -131,7 +135,7 @@
= t(:title, scope: 'pages.manage.data-exports')
.nav-item-description
= t(:dataexports, scope: 'layouts.manage.navigation.descriptors')
%main.col-md-10.ml-sm-auto.px-4{role: "main"}
%main.col-md-9.ml-sm-auto.px-4{role: "main"}
= render "layouts/manage/flashes"
= yield
%div.mb-4.text-center
Expand Down