Compare commits

..

No commits in common. "24fb267b40c6035d27f15ea29e8b0b49a2265f7b" and "eb6337f6fbffea3185a887a902dc38dbeda3ed1e" have entirely different histories.

8 changed files with 41 additions and 79 deletions

View File

@ -96,11 +96,11 @@ export default {
.slide-enter-active, .slide-enter-active,
.slide-leave-active { .slide-leave-active {
&.sidebar-container { &.sidebar-container {
transition: background .15s ease-in-out; transition: background .2s ease-in-out;
} }
.sidebar { .sidebar {
transition: transform .15s ease-in-out; transition: transform .2s ease-in-out;
} }
} }
@ -111,7 +111,7 @@ export default {
} }
.sidebar { .sidebar {
transform: translate(100%, 0); transform: translate(-100%, 0);
} }
} }

View File

@ -286,10 +286,6 @@ export default {
} }
} }
.filters {
flex-shrink: 0;
}
.sort { .sort {
display: flex; display: flex;
align-items: center; align-items: center;

View File

@ -1,6 +1,11 @@
<template> <template>
<header class="header"> <header class="header">
<div class="header-nav"> <div class="header-nav">
<div
class="sidebar-toggle noselect"
@click.stop="toggleSidebar"
><Icon icon="menu" /></div>
<router-link <router-link
to="/" to="/"
class="logo-link" class="logo-link"
@ -41,20 +46,6 @@
</router-link> </router-link>
</li> </li>
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/tags"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Tags</a>
</router-link>
</li>
<li class="nav-item"> <li class="nav-item">
<router-link <router-link
v-slot="{ href, isActive, navigate }" v-slot="{ href, isActive, navigate }"
@ -68,16 +59,25 @@
>Movies</a> >Movies</a>
</router-link> </router-link>
</li> </li>
<li class="nav-item">
<router-link
v-slot="{ href, isActive, navigate }"
to="/tags"
>
<a
class="nav-link"
:href="href"
:class="{ active: isActive }"
@click="navigate"
>Tags</a>
</router-link>
</li>
</ul> </ul>
</nav> </nav>
</div> </div>
<div class="header-section"> <div class="header-section">
<div
class="sidebar-toggle noselect"
@click.stop="toggleSidebar"
><Icon icon="menu" /></div>
<div class="header-toggles"> <div class="header-toggles">
<Icon <Icon
v-show="!sfw" v-show="!sfw"
@ -209,7 +209,6 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
height: 100%; height: 100%;
overflow: hidden;
} }
.header-section { .header-section {
@ -245,7 +244,7 @@ export default {
height: 100%; height: 100%;
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
margin: -.25rem 1rem 0 0; margin: 0 1rem 0 0;
} }
.header-logo { .header-logo {
@ -357,29 +356,18 @@ export default {
} }
} }
@media(max-width: $breakpoint-small) { @media(max-width: $breakpoint) {
.nav {
display: none;
}
.sidebar-toggle { .sidebar-toggle {
display: flex; display: flex;
} }
.logo-link { .header-logo {
margin: -.25rem .75rem 0 0; padding: 0 0 0 .5rem;
} }
.nav-link {
padding: 0 .75rem;
}
.search-compact {
display: none;
}
.header-toggles {
display: none;
}
}
@media(max-width: $breakpoint-micro) {
} }
@media(max-width: $breakpoint-nano) { @media(max-width: $breakpoint-nano) {

View File

@ -93,7 +93,7 @@ export default {
.search-input { .search-input {
height: 100%; height: 100%;
width: 100%; width: 100%;
padding: .5rem 0 .5rem .5rem; padding: .5rem;
border: none; border: none;
color: var(--text); color: var(--text);
background: var(--background); background: var(--background);

View File

@ -9,6 +9,12 @@
> >
<div class="sidebar-section"> <div class="sidebar-section">
<div class="sidebar-header"> <div class="sidebar-header">
<Icon
icon="cross2"
class="sidebar-close noselect"
@click.native="$emit('toggle', false)"
/>
<router-link <router-link
to="/updates" to="/updates"
class="logo-link" class="logo-link"
@ -21,19 +27,8 @@
/> />
</h1> </h1>
</router-link> </router-link>
<Icon
icon="cross2"
class="sidebar-close noselect"
@click.native="$emit('toggle', false)"
/>
</div> </div>
<Search
class="search"
@search="$emit('toggle', false)"
/>
<nav class="nav"> <nav class="nav">
<ul class="nolist"> <ul class="nolist">
<li class="nav-item"> <li class="nav-item">
@ -146,8 +141,6 @@
<script> <script>
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import Search from '../header/search.vue';
import logo from '../../img/logo.svg'; import logo from '../../img/logo.svg';
function sfw(state) { function sfw(state) {
@ -167,9 +160,6 @@ function setSfw(enabled) {
} }
export default { export default {
components: {
Search,
},
data() { data() {
return { return {
logo, logo,
@ -203,7 +193,6 @@ export default {
justify-content: space-between; justify-content: space-between;
width: 15rem; width: 15rem;
height: 100%; height: 100%;
margin: 0 0 0 auto;
color: var(--text); color: var(--text);
background: var(--background); background: var(--background);
box-shadow: 0 0 3px var(--darken-weak); box-shadow: 0 0 3px var(--darken-weak);
@ -212,8 +201,9 @@ export default {
.sidebar-header { .sidebar-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 3rem; height: 3rem;
border-bottom: solid 1px var(--shadow-hint); border-bottom: solid 1px var(--shadow-hint);
margin: 0 0 .5rem 0;
} }
.sidebar-close { .sidebar-close {
@ -249,17 +239,6 @@ export default {
fill: var(--primary); fill: var(--primary);
} }
::v-deep .search {
height: 3rem;
border-bottom: solid 1px var(--shadow-hint);
padding: 0;
margin: 0 0 .5rem 0;
.search-input {
padding: .5rem 0 .5rem 1rem;
}
}
.nav-item { .nav-item {
display: block; display: block;
} }

View File

@ -1,6 +1,5 @@
$breakpoint-nano: 320px; $breakpoint-nano: 320px;
$breakpoint-micro: 540px; $breakpoint-micro: 540px;
$breakpoint-small: 620px;
$breakpoint: 720px; $breakpoint: 720px;
$breakpoint-kilo: 900px; $breakpoint-kilo: 900px;
$breakpoint-mega: 1200px; $breakpoint-mega: 1200px;

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.129.0", "version": "1.128.6",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.129.0", "version": "1.128.6",
"description": "All the latest porn releases in one place", "description": "All the latest porn releases in one place",
"main": "src/app.js", "main": "src/app.js",
"scripts": { "scripts": {