From 81b935cadf4d6941b1614116d824f0662652d8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 24 Jan 2018 12:53:04 +0100 Subject: [PATCH] Enabled setting start and end for a song on mobile --- server/public/assets/css/style.css | 42 ++++++++++++++++-- server/public/assets/js/listeners.js | 17 +++++++- .../public/partials/channel/header.handlebars | 40 +---------------- .../public/partials/channel/search.handlebars | 43 +++++++++++++++++++ 4 files changed, 99 insertions(+), 43 deletions(-) create mode 100644 server/public/partials/channel/search.handlebars diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css index 83a049c1..ae1ef290 100755 --- a/server/public/assets/css/style.css +++ b/server/public/assets/css/style.css @@ -1827,6 +1827,7 @@ nav ul li:hover, nav ul li.active { .search-title{ height: 40px; + width: 70vw; /*padding-top: 33px; margin-bottom: -16px; line-height: initial;*/ @@ -2337,6 +2338,10 @@ nav ul li:hover, nav ul li.active { color: lightgrey !important; } +.result-get-more-info { + display: none; +} + .hamburger-sidenav { width: 24px; height: 24px; @@ -2972,18 +2977,49 @@ nav ul li:hover, nav ul li.active { width: 99%; } + .result-get-more-info { + position: absolute; + right: 0px; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + width: 45px; + } + + .result-info-no-buttons { + width: calc(100% - 200px); + } + + .result-object { + -webkit-transform: translateX(0%); + transform: translateX(0%); + -webkit-transition: transform .5s; + -moz-transition: transform .5s; + transition: transform .5s; + } + + .result-object-slid { + -webkit-transform: translateX(calc(-100% + 45px)) !important; + transform: translateX(calc(-100% + 45px)) !important; + } + .result-start-end-container { - visibility: hidden; - pointer-events: none; + /*visibility: hidden; + pointer-events: none;*/ + margin-left: 120%; + position: relative; + top: -10px; } .result-info-buttons { margin-top: 20px; + width: 200px; } .result .search-title{ white-space: nowrap; - width: calc(100vw - 123px); + width: calc(100vw - 165px); margin-top: -5px; z-index: 9999; } diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index 13328e05..5ea8b577 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -1785,7 +1785,7 @@ $(document).on( "click", ".result-object", function(e){ var $html = $(e.target); var substr = $html.prop('outerHTML').substring(0,4); - if(substr != " {{> channel/panel}} -
-
-
-
-
-
- Thumb - -
-
-
-
- - / - -
-
-
-
- - open_in_new - -
- playlist_add -
-
-
-
-
-
-
- No results found.. -
-
-
- Prev - Next -
-
+ {{> channel/search}} diff --git a/server/public/partials/channel/search.handlebars b/server/public/partials/channel/search.handlebars new file mode 100644 index 00000000..0dc3f34e --- /dev/null +++ b/server/public/partials/channel/search.handlebars @@ -0,0 +1,43 @@ +
+
+
+
+
+
+ Thumb + +
+
+
+
+ Start/End + + / + +
+
+ keyboard_arrow_left +
+
+
+
+ + open_in_new + +
+ playlist_add +
+
+
+
+
+
+
+ No results found.. +
+
+
+ Prev + Next +
+