1.1-Indev Final commit before merging to master. Everything seems to
work fine, while being reasonably preformant and pretty.
This commit is contained in:
rainbownapkin
parent
85fbe6bb5a
commit
adab2eb3f9
24 changed files with 25117 additions and 756 deletions
|
|
@ -91,7 +91,7 @@ html(lang="en")
|
|||
#videowrap
|
||||
.embed-responsive.embed-responsive-16by9
|
||||
#ytapiplayer.embed-responsive-item
|
||||
div#subliminaltoke
|
||||
div#st
|
||||
img(src="/img/tokeleaf.png")
|
||||
h3 Take a <a onclick="chatsmack('!toke')">Toke!</a>
|
||||
#chatwrap
|
||||
|
|
@ -134,10 +134,10 @@ html(lang="en")
|
|||
span.glyphicon.glyphicon-search
|
||||
button#showplaylistmanager.btn.btn-sm.btn-default(title="Manage playlists", data-toggle="collapse", data-target="#playlistmanager")
|
||||
span.glyphicon.glyphicon-list
|
||||
button#scrollitm.btn.btn-sm.btn-default(title="Scroll to Current Item",onclick="javascript:scrollQueue()")
|
||||
button#scrollitm.btn.btn-sm.btn-default(title="Scroll to Current Item",onclick="javascript:scrollQueue(true)")
|
||||
span.glyphicon.glyphicon-hand-right
|
||||
button#getplaylist.btn.btn-sm.btn-default(title="Retrieve playlist links")
|
||||
span.glyphicon.glyphicon-link
|
||||
button#getplaylist.btn.btn-sm.btn-default(title="Export Queue")
|
||||
span.glyphicon.glyphicon-export
|
||||
button#shuffleplaylist.btn.btn-sm.btn-default(title="Shuffle the playlist")
|
||||
span.glyphicon.glyphicon-sort
|
||||
button#clearplaylist.btn.btn-sm.btn-default(title="Clear the playlist")
|
||||
|
|
@ -151,62 +151,63 @@ html(lang="en")
|
|||
span#plcount 0 items
|
||||
br
|
||||
span#pllength 00:00:00
|
||||
#searchcontrol.collapse.plcontrol-collapse.col-lg-12.col-md-12
|
||||
.vertical-spacer
|
||||
.input-group
|
||||
input#library_query.form-control(type="text", placeholder="Search query")
|
||||
span.input-group-btn
|
||||
button#library_search.btn.btn-default Library
|
||||
span.input-group-btn
|
||||
button#youtube_search.btn.btn-default YouTube
|
||||
.checkbox
|
||||
label
|
||||
input.add-temp(type="checkbox")
|
||||
| Add as temporary
|
||||
ul#library.videolist.col-lg-12.col-md-12
|
||||
#addfromurl.collapse.plcontrol-collapse.col-lg-12.col-md-12
|
||||
.vertical-spacer
|
||||
.input-group
|
||||
input#mediaurl.form-control(type="text", placeholder="Media URL")
|
||||
span.input-group-btn
|
||||
button#queue_next.btn.btn-default Queue next
|
||||
span.input-group-btn
|
||||
button#queue_end.btn.btn-default Queue last
|
||||
span.input-group-btn#showcustomembed
|
||||
button#showcustomembed.btn.btn-default(title="Embed a custom frame", data-toggle="collapse", data-target="#customembed")
|
||||
span.glyphicon.glyphicon-th-large
|
||||
.checkbox
|
||||
label
|
||||
input.add-temp(type="checkbox")
|
||||
| Add as temporary
|
||||
div#addfromurl-queue
|
||||
#customembed.collapse.plcontrol-collapse.col-lg-12.col-md-12
|
||||
.vertical-spacer
|
||||
.input-group
|
||||
input#customembed-title.form-control(type="text", placeholder="Title (optional)")
|
||||
span.input-group-btn
|
||||
button#ce_queue_next.btn.btn-default Queue next
|
||||
span.input-group-btn
|
||||
button#ce_queue_end.btn.btn-default Queue last
|
||||
.checkbox
|
||||
label
|
||||
input.add-temp(type="checkbox")
|
||||
| Add as temporary
|
||||
| Paste the embed code below and click Next or At End.
|
||||
| Acceptable embed codes are <code><iframe></code> and <code><object></code> tags. <strong>CUSTOM EMBEDS CANNOT BE SYNCHRONIZED.</strong>
|
||||
textarea#customembed-content.input-block-level.form-control(rows="3")
|
||||
#playlistmanager.collapse.plcontrol-collapse.col-lg-12.col-md-12
|
||||
.vertical-spacer
|
||||
.input-group
|
||||
input#userpl_name.form-control(type="text", placeholder="Playlist Name")
|
||||
span.input-group-btn
|
||||
button#userpl_save.btn.btn-default Save
|
||||
.checkbox
|
||||
label
|
||||
input.add-temp(type="checkbox")
|
||||
| Add as temporary
|
||||
ul#userpl_list.videolist
|
||||
#queuefail.col-lg-12.col-md-12
|
||||
#plmenus
|
||||
#searchcontrol.collapse.plcontrol-collapse.col-lg-12.col-md-12
|
||||
.vertical-spacer
|
||||
.input-group
|
||||
input#library_query.form-control(type="text", placeholder="Search query")
|
||||
span.input-group-btn
|
||||
button#library_search.btn.btn-default Library
|
||||
span.input-group-btn
|
||||
button#youtube_search.btn.btn-default YouTube
|
||||
.checkbox
|
||||
label
|
||||
input.add-temp(type="checkbox")
|
||||
| Add as temporary
|
||||
ul#library.videolist.col-lg-12.col-md-12
|
||||
#addfromurl.collapse.plcontrol-collapse.col-lg-12.col-md-12
|
||||
.vertical-spacer
|
||||
.input-group
|
||||
input#mediaurl.form-control(type="text", placeholder="Media URL")
|
||||
span.input-group-btn
|
||||
button#queue_next.btn.btn-default Queue next
|
||||
span.input-group-btn
|
||||
button#queue_end.btn.btn-default Queue last
|
||||
span.input-group-btn#showcustomembed
|
||||
button#showcustomembed.btn.btn-default(title="Embed a custom frame", data-toggle="collapse", data-target="#customembed")
|
||||
span.glyphicon.glyphicon-th-large
|
||||
.checkbox
|
||||
label
|
||||
input.add-temp(type="checkbox")
|
||||
| Add as temporary
|
||||
div#addfromurl-queue
|
||||
#customembed.collapse.plcontrol-collapse.col-lg-12.col-md-12
|
||||
.vertical-spacer
|
||||
.input-group
|
||||
input#customembed-title.form-control(type="text", placeholder="Title (optional)")
|
||||
span.input-group-btn
|
||||
button#ce_queue_next.btn.btn-default Queue next
|
||||
span.input-group-btn
|
||||
button#ce_queue_end.btn.btn-default Queue last
|
||||
.checkbox
|
||||
label
|
||||
input.add-temp(type="checkbox")
|
||||
| Add as temporary
|
||||
| Paste the embed code below and click Next or At End.
|
||||
| Acceptable embed codes are <code><iframe></code> and <code><object></code> tags. <strong>CUSTOM EMBEDS CANNOT BE SYNCHRONIZED.</strong>
|
||||
textarea#customembed-content.input-block-level.form-control(rows="3")
|
||||
#playlistmanager.collapse.plcontrol-collapse.col-lg-12.col-md-12
|
||||
.vertical-spacer
|
||||
.input-group
|
||||
input#userpl_name.form-control(type="text", placeholder="Playlist Name")
|
||||
span.input-group-btn
|
||||
button#userpl_save.btn.btn-default Save
|
||||
.checkbox
|
||||
label
|
||||
input.add-temp(type="checkbox")
|
||||
| Add as temporary
|
||||
ul#userpl_list.videolist
|
||||
#queuefail.col-lg-12.col-md-12
|
||||
.col-lg-12.col-md-12
|
||||
ul#queue.videolist
|
||||
//#leftpane.col-lg-5.col-md-5
|
||||
|
|
|
|||
|
|
@ -30,11 +30,17 @@ mixin us-general
|
|||
label.control-label.col-sm-4(for="#us-theme") Theme
|
||||
.col-sm-8
|
||||
select#us-theme.form-control
|
||||
option(value="/css/themes/fore.st.css") fore.st
|
||||
option(value="/css/themes/fore.st.css") Dawn [Frosted Glass]
|
||||
option(value="/css/themes/fore.st.lite.css") Dawn [Smoked Quartz]
|
||||
option(value="/css/themes/fore.st.dusk.css") Dusk [Frosted Glass]
|
||||
option(value="/css/themes/fore.st.dusk.lite.css") Dusk [Smoked Quartz]
|
||||
option(value="/css/themes/fore.st.neon.css") Neon [Frosted Glass]
|
||||
option(value="/css/themes/fore.st.neon.lite.css") Neon [Smoked Quartz]
|
||||
.col-sm-4
|
||||
.col-sm-8
|
||||
+rcheckbox("us-no-channelcss", "Ignore Channel CSS")
|
||||
+rcheckbox("us-no-channeljs", "Ignore Channel Javascript")
|
||||
+textbox("us-chat-min", "Chat Width Minimum (Locked to Aspect only.)", "30")
|
||||
.clear
|
||||
|
||||
mixin us-scripts
|
||||
|
|
@ -124,3 +130,5 @@ mixin us-mod
|
|||
+rcheckbox("us-shadowchat", "Show shadowmuted messages")
|
||||
+rcheckbox("us-show-ip-in-tooltip", "Show IP addresses in profile tooltip")
|
||||
+rcheckbox("us-show-playlist", "Legacy Playlist")
|
||||
+rcheckbox("us-scroll-playlist", "Scroll playlist on change.")
|
||||
+rcheckbox("us-add-invid", "Queue Invidious links as YT links (may cause issues when queueing raw files).")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue