Skip to content
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

style: layout improvement #253

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

style: layout improvement #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions public/app/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,8 @@ body {
overflow-y: hidden;
}

.sidebar, main {
max-height: calc(100vh - 45px);
overflow-y: scroll;
}

.joblist {
overflow-y: scroll;
overflow-y: auto;
}
.sortable{
float: right
Expand Down Expand Up @@ -230,4 +225,4 @@ code {
color: white;
padding: 5px 0 0 0;
border: none;
}
}
50 changes: 25 additions & 25 deletions public/app/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,28 +68,28 @@ const app = Vue.component("app", {
},
searchForm(name, search, property, limit, skip, refresh, state, object) {
this.pagesize = limit ? limit : this.pagesize
this.name = name
this.search = search
this.property = property
this.skip = skip
this.refresh = refresh
this.state = state
this.object = object ? object : this.object
this.name = name
this.search = search
this.property = property
this.skip = skip
this.refresh = refresh
this.state = state
this.object = object ? object : this.object

// Form changed, reset the pagination state
this.pagenumber = 1
this.totalPages = 1
// Form changed, reset the pagination state
this.pagenumber = 1
this.totalPages = 1

this.fetchData(
this.name,
this.search,
this.property,
this.pagesize,
this.skip,
this.refresh,
this.state,
this.object
);
this.fetchData(
this.name,
this.search,
this.property,
this.pagesize,
this.skip,
this.refresh,
this.state,
this.object
);
},
refreshData() {
this.fetchData(
Expand Down Expand Up @@ -197,7 +197,7 @@ const app = Vue.component("app", {
},
template: `

<div class="container-fluid">
<div class="container-fluid min-vh-100">
<div class="">
<div class="navbar navbar-dark fixed-top bg-dark flex-md-nowrap p-0 shadow">
<div class="d-flex">
Expand All @@ -207,7 +207,7 @@ const app = Vue.component("app", {
<div class='d-md-none w-50'>
<div id="mySidebar" class="sidebar-collapse" @click="closeNav()">
<a href="javascript:void(0)" class="closebtn" @click="closeNav()">&times;</a>
<div v-if="hideSlide === false" class="bg-light overflow-auto">
<div v-if="hideSlide === false" class="bg-light overflow-auto" style="max-height:calc(100vh - 45px);min-height:calc(100vh - 45px)">
<sidebar
v-on:search-sidebar="searchForm"
v-on:new-job="newJob"
Expand All @@ -225,8 +225,8 @@ const app = Vue.component("app", {
</div>
</div>
</div>
<div class="row pt-5">
<div v-if="hideSlide === true" class="col-md-2 d-none d-md-block bg-light overflow-auto">
<div class="row pt-5" style="height:calc(100vh - 50px)">
<div v-if="hideSlide === true" class="col-md-2 d-none d-md-block bg-light overflow-auto h-100 pb-3">
<sidebar
v-on:search-sidebar="searchForm"
v-on:new-job="newJob"
Expand All @@ -236,7 +236,7 @@ const app = Vue.component("app", {
>
</sidebar>
</div>
<main role="main" class="col-md-10 ml-sm-auto col-lg-10 px-4 pt-3 pb-5">
<main role="main" class="col-md-10 ml-sm-auto col-lg-10 px-4 pt-3 pb-5 mh-100 overflow-auto">
<div class="col-12">
<topbar v-on:search-form="searchForm"
:name='name'
Expand Down
2 changes: 1 addition & 1 deletion public/app/js/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const sidebar = Vue.component("sidebar", {
},
},
template: `
<div class="col sidebar pt-4">
<div class="col sidebar pt-4 overflow-hidden">
<div class="row">
<div class="col ">
<button data-toggle="modal" data-target="#modalNewJob" @click="$emit('new-job')" data-placement="top" title="Add a new job" class="btn btn-block btn-outline-success"><i class="oi oi-plus IcoInButton"></i> New Job</button>
Expand Down