bugfix: webkit scroll #826
This commit is contained in:
+15
-3
@@ -422,9 +422,9 @@ section[role="main-content"]{
|
|||||||
}
|
}
|
||||||
|
|
||||||
>nav{
|
>nav{
|
||||||
padding-bottom: 0;
|
|
||||||
$pager_h:2em;
|
$pager_h:2em;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
span.nav-title{ display:none; }
|
span.nav-title{ display:none; }
|
||||||
|
|
||||||
section#toc{
|
section#toc{
|
||||||
@@ -490,7 +490,7 @@ section[role="main-content"]{
|
|||||||
height:$pager_h;
|
height:$pager_h;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
box-sizing: content-box;
|
box-sizing: content-box;
|
||||||
padding:0 1.5em;
|
padding:1em 0 0 1.5em;
|
||||||
select{
|
select{
|
||||||
option{
|
option{
|
||||||
padding:0;
|
padding:0;
|
||||||
@@ -985,6 +985,12 @@ footer[role="tools"]{
|
|||||||
input[type="search"]{
|
input[type="search"]{
|
||||||
margin:0;
|
margin:0;
|
||||||
padding:0;
|
padding:0;
|
||||||
|
-webkit-appearance:textfield;
|
||||||
|
-webkit-box-sizing:content-box;
|
||||||
|
}
|
||||||
|
input::-webkit-search-decoration,
|
||||||
|
input::-webkit-search-cancel-button {
|
||||||
|
display: none;
|
||||||
}
|
}
|
||||||
.vs__search{
|
.vs__search{
|
||||||
&, &:focus{
|
&, &:focus{
|
||||||
@@ -995,6 +1001,12 @@ footer[role="tools"]{
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.vs__dropdown-toggle{
|
||||||
|
input::placeholder{background-color: #fff;}
|
||||||
|
}
|
||||||
|
.vs__selected-options{
|
||||||
|
background-color: #fff;
|
||||||
|
}
|
||||||
.vs__actions{
|
.vs__actions{
|
||||||
padding:1px 3px;
|
padding:1px 3px;
|
||||||
svg[role="presentation"]{
|
svg[role="presentation"]{
|
||||||
|
|||||||
@@ -33,13 +33,17 @@ body{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
section[role="main-content"]{
|
section[role="main-content"]{
|
||||||
|
display: flex;
|
||||||
flex:1 1 auto;
|
flex:1 1 auto;
|
||||||
@extend %layout-element;
|
@extend %layout-element;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
>.wrapper{
|
>.wrapper{
|
||||||
position: relative;
|
position: relative;
|
||||||
padding:0 $side-padding 0 $side-padding;
|
padding:0 $side-padding 0 $side-padding;
|
||||||
height:100%; max-height:100%;
|
// height:100%; max-height:100%;
|
||||||
|
display: flex;
|
||||||
|
flex: 1;
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
>*{
|
>*{
|
||||||
@@ -51,16 +55,21 @@ body{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.main-content-layout{
|
.main-content-layout{
|
||||||
height: 100%;
|
position: relative;
|
||||||
|
// https://stackoverflow.com/a/33644245
|
||||||
|
display: flex;
|
||||||
|
flex: 1;
|
||||||
|
>section{
|
||||||
|
max-height: 100%;
|
||||||
|
}
|
||||||
>header,
|
>header,
|
||||||
>section,
|
>section>.wrapper,
|
||||||
>nav{
|
>nav{
|
||||||
|
box-sizing: border-box;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
padding-top:1em;
|
padding-top:1em;
|
||||||
padding-bottom:1em;
|
|
||||||
}
|
}
|
||||||
|
>section>.wrapper,
|
||||||
>section,
|
|
||||||
>nav{
|
>nav{
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
|||||||
@@ -46,14 +46,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// .fade-enter,
|
|
||||||
// .fade-leave-to{
|
|
||||||
// opacity: 0;
|
|
||||||
// }
|
|
||||||
// .fade-enter-to,
|
|
||||||
// .fade-leave{
|
|
||||||
// opacity:1;
|
|
||||||
// }
|
|
||||||
.fade-enter-active{
|
.fade-enter-active{
|
||||||
transition: all 300ms ease-in-out;
|
transition: all 300ms ease-in-out;
|
||||||
}
|
}
|
||||||
@@ -61,13 +53,6 @@
|
|||||||
transition: all 200ms ease-in-out;
|
transition: all 200ms ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
// .fade-enter-active,
|
|
||||||
// .fade-leave-active {
|
|
||||||
// transition-duration: 0.3s;
|
|
||||||
// transition-property: opacity;
|
|
||||||
// transition-timing-function: ease;
|
|
||||||
// }
|
|
||||||
|
|
||||||
.fade-enter,
|
.fade-enter,
|
||||||
.fade-leave-active {
|
.fade-leave-active {
|
||||||
opacity: 0
|
opacity: 0
|
||||||
|
|||||||
@@ -7,8 +7,16 @@
|
|||||||
<slot name="header" />
|
<slot name="header" />
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<section ref="scrollablecenter" class="med-col-6 large-col-6" @scroll.passive="onScrollCenter">
|
<section
|
||||||
<slot />
|
class="med-col-6 large-col-6"
|
||||||
|
@scroll.passive="onScrollCenter"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="wrapper"
|
||||||
|
ref="scrollablecenter"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<nav class="med-col-3 large-col-3" :class="{ opened: navopened }">
|
<nav class="med-col-3 large-col-3" :class="{ opened: navopened }">
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<nav id="header-menu">
|
<nav id="header-menu">
|
||||||
<!-- <span v-if="!corpusLoaded" class="loading">Loading ...</span> -->
|
<!-- <span v-if="!corpusLoaded" class="loading">Loading ...</span> -->
|
||||||
<ul>
|
<ul>
|
||||||
<li >
|
<li>
|
||||||
<span v-if="!corpusLoaded" class="loading">Loading ...</span>
|
<span v-if="!corpusLoaded" class="loading">Loading ...</span>
|
||||||
<router-link v-else to="/corpus">Corpus</router-link>
|
<router-link v-else to="/corpus">Corpus</router-link>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
+6
-2
@@ -34,8 +34,12 @@ Vue.use(VueScrollTo)
|
|||||||
Vue.component('v-select', VueSelect)
|
Vue.component('v-select', VueSelect)
|
||||||
Vue.use(Vue2TouchEvents)
|
Vue.use(Vue2TouchEvents)
|
||||||
|
|
||||||
window.apipath = process.env === 'prod' ? `http://${window.location.hostname}/api` : 'http://localhost:8984'
|
// https://apple.stackexchange.com/questions/17077/add-a-hosts-file-entry-without-jailbreaking
|
||||||
|
window.apipath = process.env === 'prod' || window.location.hostname === 'dev.gdp.fr' ? `http://${window.location.hostname}/api` : 'http://localhost:8984'
|
||||||
|
// if (window.location.hostname === 'dev.gdp.fr') {
|
||||||
|
// window.apipath = `http://${window.location.hostname}/api`
|
||||||
|
// }
|
||||||
|
// window.apipath = `http://${window.location.hostname}:8984`
|
||||||
// sync(store, router) // done. Returns an unsync callback fn
|
// sync(store, router) // done. Returns an unsync callback fn
|
||||||
|
|
||||||
new Vue({
|
new Vue({
|
||||||
|
|||||||
Reference in New Issue
Block a user