From 41261adc76dda21671ce28dd68a621f50bf99d8f Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Thu, 18 Mar 2021 19:44:23 +0100
Subject: [PATCH] Fixed filter dialog menu link. Improved disclaimer title
 wrapping.

---
 assets/components/container/warning.vue | 31 +++++---
 assets/components/header/header.vue     |  2 +-
 assets/components/header/menu.vue       |  1 +
 assets/img/logo.svg                     | 96 +------------------------
 assets/js/ui/actions.js                 |  2 +-
 5 files changed, 24 insertions(+), 108 deletions(-)

diff --git a/assets/components/container/warning.vue b/assets/components/container/warning.vue
index 7f5f0e9e..f6d09390 100644
--- a/assets/components/container/warning.vue
+++ b/assets/components/container/warning.vue
@@ -2,7 +2,7 @@
 	<div class="warning-container">
 		<div class="warning">
 			<strong class="title">
-				<div
+				<span
 					class="logo"
 					v-html="logo"
 				/>contains sexually explicit content
@@ -79,25 +79,29 @@ export default {
 	margin: 1rem;
 }
 
-.logo {
-	width: 8rem;
-    display: inline-flex;
-	fill: var(--primary);
-	margin: -.125rem .5rem 0 0;
-}
-
 .copy,
 .rules {
 	padding: .5rem 1rem;
 }
 
 .title {
-	display: flex;
-	align-items: center;
-	justify-content: center;
+	display: block;
 	font-size: 2rem;
 	margin: 1rem 0 0 0;
 	color: var(--text-light);
+	text-align: center;
+}
+
+.logo {
+	width: 6.5rem;
+    display: inline-block;
+	fill: var(--primary);
+	margin: 0 .6rem 0 0;
+
+	::v-deep(svg) {
+		width: 100%;
+		height: 100%;
+	}
 }
 
 .copy {
@@ -210,6 +214,11 @@ export default {
 	.title {
 		font-size: 1.5rem;
 	}
+
+	.logo {
+		width: 5rem;
+		margin: 0 .5rem 0 0;
+	}
 }
 
 @media(max-width: $breakpoint-small) {
diff --git a/assets/components/header/header.vue b/assets/components/header/header.vue
index 66b73ccb..d1233e6f 100644
--- a/assets/components/header/header.vue
+++ b/assets/components/header/header.vue
@@ -93,7 +93,7 @@
 				</div>
 
 				<template v-slot:tooltip>
-					<Menu />
+					<Menu @show-filters="state => $emit('showFilters', state)" />
 				</template>
 			</Tooltip>
 
diff --git a/assets/components/header/menu.vue b/assets/components/header/menu.vue
index f30ae4b4..bf25e549 100644
--- a/assets/components/header/menu.vue
+++ b/assets/components/header/menu.vue
@@ -114,6 +114,7 @@ export default {
 			me,
 		}),
 	},
+	emits: ['showFilters'],
 	methods: {
 		setSfw,
 		setTheme,
diff --git a/assets/img/logo.svg b/assets/img/logo.svg
index 2384a4e1..a657ea33 100644
--- a/assets/img/logo.svg
+++ b/assets/img/logo.svg
@@ -1,95 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="logo.svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 69.132355 14.439899"
-   height="14.439899mm"
-   width="69.132355mm">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     fit-margin-bottom="0"
-     fit-margin-right="0"
-     fit-margin-left="0"
-     fit-margin-top="0"
-     inkscape:window-maximized="1"
-     inkscape:window-y="932"
-     inkscape:window-x="1182"
-     inkscape:window-height="1024"
-     inkscape:window-width="1920"
-     showguides="false"
-     showgrid="false"
-     inkscape:document-rotation="0"
-     inkscape:current-layer="text835"
-     inkscape:document-units="mm"
-     inkscape:cy="41.103987"
-     inkscape:cx="128.82469"
-     inkscape:zoom="2.8"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base">
-    <sodipodi:guide
-       id="guide837"
-       orientation="0.70710678,-0.70710678"
-       position="-151.83279,131.09395" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-31.294238,-94.737942)"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
-    <g
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.05px;line-height:1.25;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';letter-spacing:0px;word-spacing:0px;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       id="text835"
-       aria-label="traxxx">
-      <path
-         id="path839"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.05px;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';stroke-width:0.264583;"
-         d="m 33.923138,109.17784 q -1.08585,0 -1.8669,-0.762 -0.762,-0.78105 -0.762,-1.8669 V 94.737942 h 2.49555 v 3.3909 h 4.3053 v 2.495548 h -4.3053 v 5.39115 q 0,0.5334 0.05715,0.6096 0.0762,0.0571 0.6096,0.0571 h 3.63855 v 2.49555 z" />
-      <path
-         id="path841"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.05px;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';stroke-width:0.264583;"
-         d="m 39.752431,109.17784 v -8.4201 q 0,-1.085848 0.762,-1.847848 0.78105,-0.78105 1.8669,-0.78105 h 6.1341 v 2.495548 h -5.6007 q -0.5334,0 -0.6096,0.0762 -0.05715,0.0571 -0.05715,0.59055 v 7.8867 z" />
-      <path
-         id="path843"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.05px;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';stroke-width:0.264583;"
-         d="m 52.592118,109.17784 q -1.08585,0 -1.8669,-0.762 -0.762,-0.78105 -0.762,-1.8669 v -4.1529 h 8.7249 v -1.1049 q 0,-0.5334 -0.0762,-0.59055 -0.05715,-0.0762 -0.59055,-0.0762 h -8.05815 v -2.495548 h 8.59155 q 1.08585,0 1.84785,0.78105 0.78105,0.762 0.78105,1.847848 v 8.4201 z m 0.5334,-2.49555 h 5.5626 v -2.03835 h -6.22935 v 1.3716 q 0,0.5334 0.05715,0.6096 0.0762,0.0571 0.6096,0.0571 z" />
-      <path
-         id="path845"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.05px;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';stroke-width:0.264583;"
-         d="m 62.707616,109.17784 v -0.66675 l 4.05765,-4.953 -4.05765,-4.762498 v -0.66675 h 2.7051 l 2.9718,3.505198 2.9718,-3.505198 h 2.7051 v 0.66675 l -4.05765,4.762498 4.05765,4.953 v 0.66675 h -2.68605 l -2.99085,-3.6576 -2.9718,3.6576 z" />
-      <path
-         id="path847"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.05px;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';stroke-width:0.264583;"
-         d="m 75.890205,109.17784 v -0.66675 l 4.057649,-4.953 -4.057649,-4.762498 v -0.66675 h 2.705099 l 2.9718,3.505198 2.9718,-3.505198 h 2.7051 v 0.66675 l -4.05765,4.762498 4.05765,4.953 v 0.66675 h -2.68605 l -2.99085,-3.6576 -2.9718,3.6576 z" />
-      <path
-         id="path849"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.05px;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';stroke-width:0.264583;"
-         d="m 89.072791,109.17784 v -0.66675 l 4.05765,-4.953 -4.05765,-4.762498 v -0.66675 h 2.7051 l 2.9718,3.505198 2.9718,-3.505198 h 2.705099 v 0.66675 l -4.057649,4.762498 4.057649,4.953 v 0.66675 h -2.686049 l -2.99085,-3.6576 -2.9718,3.6576 z" />
-    </g>
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 69.132 14.44" height="54.576" width="261.288"><path d="M33.923 109.178q-1.086 0-1.867-.762-.762-.781-.762-1.867V94.738h2.496v3.39h4.305v2.496H33.79v5.392q0 .533.057.61.076.056.61.056h3.638v2.496zM39.752 109.178v-8.42q0-1.086.762-1.848.781-.781 1.867-.781h6.134v2.495h-5.6q-.534 0-.61.077-.057.057-.057.59v7.887zM52.592 109.178q-1.086 0-1.867-.762-.762-.781-.762-1.867v-4.153h8.725v-1.105q0-.533-.076-.59-.057-.077-.59-.077h-8.059V98.13h8.592q1.086 0 1.848.78.78.763.78 1.849v8.42zm.534-2.496h5.562v-2.038h-6.23v1.372q0 .533.058.61.076.056.61.056zM62.708 109.178v-.667l4.057-4.953-4.057-4.762v-.667h2.705l2.972 3.505 2.971-3.505h2.705v.667l-4.057 4.762 4.057 4.953v.667h-2.686l-2.99-3.658-2.972 3.658zM75.89 109.178v-.667l4.058-4.953-4.058-4.762v-.667h2.705l2.972 3.505 2.972-3.505h2.705v.667l-4.058 4.762 4.058 4.953v.667h-2.686l-2.99-3.658-2.973 3.658zM89.073 109.178v-.667l4.057-4.953-4.057-4.762v-.667h2.705l2.972 3.505 2.971-3.505h2.706v.667l-4.058 4.762 4.058 4.953v.667H97.74l-2.991-3.658-2.972 3.658z" transform="translate(-31.294 -94.738)"/></svg>
diff --git a/assets/js/ui/actions.js b/assets/js/ui/actions.js
index ede89382..402ea015 100644
--- a/assets/js/ui/actions.js
+++ b/assets/js/ui/actions.js
@@ -40,7 +40,7 @@ function initUiActions(_store, _router) {
 					orderBy: RANK_DESC
 					filter: {
 						rank: {
-							greaterThan: 0.025
+							greaterThan: 0.015
 						}
 					}
                 ) {