mirror of
https://github.com/IrosTheBeggar/mStream.git
synced 2025-10-27 07:31:02 +00:00
remove foundation, add modal and responsive design
This commit is contained in:
Paul Sori
parent
0c46bbe546
commit
239c187572
1
public/css/foundation.min.css
vendored
1
public/css/foundation.min.css
vendored
File diff suppressed because one or more lines are too long
2
public/css/izi-modal.min.css
vendored
Normal file
2
public/css/izi-modal.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -87,12 +87,9 @@ background-color: #E6EBFA !important;
|
||||
}
|
||||
|
||||
#panel1, #panel2 {
|
||||
/*overflow: scroll;*/
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.ohidden {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
410
public/css/normalize.css
vendored
410
public/css/normalize.css
vendored
@ -1,410 +0,0 @@
|
||||
/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
|
||||
|
||||
/* ==========================================================================
|
||||
HTML5 display definitions
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Correct `block` display not defined in IE 8/9.
|
||||
*/
|
||||
|
||||
article,
|
||||
aside,
|
||||
details,
|
||||
figcaption,
|
||||
figure,
|
||||
footer,
|
||||
header,
|
||||
hgroup,
|
||||
main,
|
||||
nav,
|
||||
section,
|
||||
summary {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct `inline-block` display not defined in IE 8/9.
|
||||
*/
|
||||
|
||||
audio,
|
||||
canvas,
|
||||
video {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prevent modern browsers from displaying `audio` without controls.
|
||||
* Remove excess height in iOS 5 devices.
|
||||
*/
|
||||
|
||||
audio:not([controls]) {
|
||||
display: none;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address `[hidden]` styling not present in IE 8/9.
|
||||
* Hide the `template` element in IE, Safari, and Firefox < 22.
|
||||
*/
|
||||
|
||||
[hidden],
|
||||
template {
|
||||
display: none;
|
||||
}
|
||||
|
||||
script {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
Base
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* 1. Set default font family to sans-serif.
|
||||
* 2. Prevent iOS text size adjust after orientation change, without disabling
|
||||
* user zoom.
|
||||
*/
|
||||
|
||||
html {
|
||||
font-family: sans-serif; /* 1 */
|
||||
-ms-text-size-adjust: 100%; /* 2 */
|
||||
-webkit-text-size-adjust: 100%; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove default margin.
|
||||
*/
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
Links
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove the gray background color from active links in IE 10.
|
||||
*/
|
||||
|
||||
a {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address `outline` inconsistency between Chrome and other browsers.
|
||||
*/
|
||||
|
||||
a:focus {
|
||||
outline: thin dotted;
|
||||
}
|
||||
|
||||
/**
|
||||
* Improve readability when focused and also mouse hovered in all browsers.
|
||||
*/
|
||||
|
||||
a:active,
|
||||
a:hover {
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
Typography
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Address variable `h1` font-size and margin within `section` and `article`
|
||||
* contexts in Firefox 4+, Safari 5, and Chrome.
|
||||
*/
|
||||
|
||||
h1 {
|
||||
font-size: 2em;
|
||||
margin: 0.67em 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address styling not present in IE 8/9, Safari 5, and Chrome.
|
||||
*/
|
||||
|
||||
abbr[title] {
|
||||
border-bottom: 1px dotted;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
|
||||
*/
|
||||
|
||||
b,
|
||||
strong {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address styling not present in Safari 5 and Chrome.
|
||||
*/
|
||||
|
||||
dfn {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address differences between Firefox and other browsers.
|
||||
*/
|
||||
|
||||
hr {
|
||||
-moz-box-sizing: content-box;
|
||||
box-sizing: content-box;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address styling not present in IE 8/9.
|
||||
*/
|
||||
|
||||
mark {
|
||||
background: #ff0;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct font family set oddly in Safari 5 and Chrome.
|
||||
*/
|
||||
|
||||
code,
|
||||
kbd,
|
||||
pre,
|
||||
samp {
|
||||
font-family: monospace, serif;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
/**
|
||||
* Improve readability of pre-formatted text in all browsers.
|
||||
*/
|
||||
|
||||
pre {
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set consistent quote types.
|
||||
*/
|
||||
|
||||
q {
|
||||
quotes: "\201C" "\201D" "\2018" "\2019";
|
||||
}
|
||||
|
||||
/**
|
||||
* Address inconsistent and variable font size in all browsers.
|
||||
*/
|
||||
|
||||
small {
|
||||
font-size: 80%;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
|
||||
*/
|
||||
|
||||
sub,
|
||||
sup {
|
||||
font-size: 75%;
|
||||
line-height: 0;
|
||||
position: relative;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
sup {
|
||||
top: -0.5em;
|
||||
}
|
||||
|
||||
sub {
|
||||
bottom: -0.25em;
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
Embedded content
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove border when inside `a` element in IE 8/9.
|
||||
*/
|
||||
|
||||
img {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Correct overflow displayed oddly in IE 9.
|
||||
*/
|
||||
|
||||
svg:not(:root) {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
Figures
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Address margin not present in IE 8/9 and Safari 5.
|
||||
*/
|
||||
|
||||
figure {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
Forms
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Define consistent border, margin, and padding.
|
||||
*/
|
||||
|
||||
fieldset {
|
||||
border: 1px solid #c0c0c0;
|
||||
margin: 0 2px;
|
||||
padding: 0.35em 0.625em 0.75em;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct `color` not being inherited in IE 8/9.
|
||||
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
|
||||
*/
|
||||
|
||||
legend {
|
||||
border: 0; /* 1 */
|
||||
padding: 0; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Correct font family not being inherited in all browsers.
|
||||
* 2. Correct font size not being inherited in all browsers.
|
||||
* 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
|
||||
*/
|
||||
|
||||
button,
|
||||
input,
|
||||
select,
|
||||
textarea {
|
||||
font-family: inherit; /* 1 */
|
||||
font-size: 100%; /* 2 */
|
||||
margin: 0; /* 3 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
|
||||
* the UA stylesheet.
|
||||
*/
|
||||
|
||||
button,
|
||||
input {
|
||||
line-height: normal;
|
||||
}
|
||||
|
||||
/**
|
||||
* Address inconsistent `text-transform` inheritance for `button` and `select`.
|
||||
* All other form control elements do not inherit `text-transform` values.
|
||||
* Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
|
||||
* Correct `select` style inheritance in Firefox 4+ and Opera.
|
||||
*/
|
||||
|
||||
button,
|
||||
select {
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
|
||||
* and `video` controls.
|
||||
* 2. Correct inability to style clickable `input` types in iOS.
|
||||
* 3. Improve usability and consistency of cursor style between image-type
|
||||
* `input` and others.
|
||||
*/
|
||||
|
||||
button,
|
||||
html input[type="button"], /* 1 */
|
||||
input[type="reset"],
|
||||
input[type="submit"] {
|
||||
-webkit-appearance: button; /* 2 */
|
||||
cursor: pointer; /* 3 */
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-set default cursor for disabled elements.
|
||||
*/
|
||||
|
||||
button[disabled],
|
||||
html input[disabled] {
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Address box sizing set to `content-box` in IE 8/9.
|
||||
* 2. Remove excess padding in IE 8/9.
|
||||
*/
|
||||
|
||||
input[type="checkbox"],
|
||||
input[type="radio"] {
|
||||
box-sizing: border-box; /* 1 */
|
||||
padding: 0; /* 2 */
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
|
||||
* 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
|
||||
* (include `-moz` to future-proof).
|
||||
*/
|
||||
|
||||
input[type="search"] {
|
||||
-webkit-appearance: textfield; /* 1 */
|
||||
-moz-box-sizing: content-box;
|
||||
-webkit-box-sizing: content-box; /* 2 */
|
||||
box-sizing: content-box;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove inner padding and search cancel button in Safari 5 and Chrome
|
||||
* on OS X.
|
||||
*/
|
||||
|
||||
input[type="search"]::-webkit-search-cancel-button,
|
||||
input[type="search"]::-webkit-search-decoration {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove inner padding and border in Firefox 4+.
|
||||
*/
|
||||
|
||||
button::-moz-focus-inner,
|
||||
input::-moz-focus-inner {
|
||||
border: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 1. Remove default vertical scrollbar in IE 8/9.
|
||||
* 2. Improve readability and alignment in all browsers.
|
||||
*/
|
||||
|
||||
textarea {
|
||||
overflow: auto; /* 1 */
|
||||
vertical-align: top; /* 2 */
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
Tables
|
||||
========================================================================== */
|
||||
|
||||
/**
|
||||
* Remove most spacing between table cells.
|
||||
*/
|
||||
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
}
|
||||
@ -1,113 +0,0 @@
|
||||
|
||||
body {
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
margin: 0;
|
||||
}
|
||||
a {
|
||||
color: #06f;
|
||||
}
|
||||
h1 {
|
||||
font-size: 2.2em;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.4em;
|
||||
}
|
||||
h2, h3, h4 {
|
||||
margin-top: 0;
|
||||
}
|
||||
h3, h4 {
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
p, ul {
|
||||
font-size: 0.8125em;
|
||||
line-height: 1.5;
|
||||
margin: 0 0 1.5em;
|
||||
}
|
||||
code {
|
||||
font-size: 1.2727em;
|
||||
color: #777;
|
||||
}
|
||||
iframe {
|
||||
border: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.container {
|
||||
margin: 0 auto;
|
||||
max-width: 90em;
|
||||
padding: 1em 0;
|
||||
}
|
||||
|
||||
.footer {
|
||||
padding-top: 1.5em;
|
||||
}
|
||||
.desc {
|
||||
color: #888;
|
||||
}
|
||||
.intro {
|
||||
border-bottom: 1px dotted #bbb;
|
||||
padding-bottom: 1.5em;
|
||||
}
|
||||
.social {
|
||||
border-top: 1px dotted #bbb;
|
||||
padding-top: 1.5em;
|
||||
}
|
||||
|
||||
/* minor responsive adjustments */
|
||||
|
||||
.footer {
|
||||
border-top: 1px dotted #aaa;
|
||||
}
|
||||
.content {
|
||||
border-bottom: 1px dotted #aaa;
|
||||
margin-bottom: 1.5em;
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 34em) {
|
||||
p, ul {
|
||||
font-size: 0.875em;
|
||||
}
|
||||
.feature:first-child,
|
||||
.info:first-child {
|
||||
border-right: 1px dotted #aaa;
|
||||
}
|
||||
.container {
|
||||
padding: 1em;
|
||||
}
|
||||
h1 {
|
||||
font-size: 2.6em;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.6em;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 54em) {
|
||||
.content {
|
||||
border: none;
|
||||
border-right: 1px dotted #aaa;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.info:first-child {
|
||||
border: none;
|
||||
}
|
||||
h1 {
|
||||
font-size: 3em;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.7em;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (min-width: 76em) {
|
||||
.info:first-child {
|
||||
border-right: 1px dotted #aaa;
|
||||
}
|
||||
h1 {
|
||||
font-size: 3.2em;
|
||||
}
|
||||
h2 {
|
||||
font-size: 1.8em;
|
||||
}
|
||||
}
|
||||
9
public/js/foundation.min.js
vendored
9
public/js/foundation.min.js
vendored
File diff suppressed because one or more lines are too long
2
public/js/lib/modal.js
Normal file
2
public/js/lib/modal.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,4 +1,43 @@
|
||||
$(document).ready(function () {
|
||||
// Responsive active content
|
||||
$(document).on('click', '.activate-panel-1', function(event) {
|
||||
$('.activate-panel-1').addClass('active');
|
||||
$('.activate-panel-2').removeClass('active');
|
||||
|
||||
$('#panel1').addClass('active');
|
||||
$('#panel2').removeClass('active');
|
||||
});
|
||||
|
||||
$(document).on('click', '.activate-panel-2', function(event) {
|
||||
$('.activate-panel-2').addClass('active');
|
||||
$('.activate-panel-1').removeClass('active');
|
||||
|
||||
$('#panel2').addClass('active');
|
||||
$('#panel1').removeClass('active');
|
||||
});
|
||||
|
||||
// Modals
|
||||
$("#sharePlaylist").iziModal({
|
||||
title: 'Share Playlist',
|
||||
setBottom: 100
|
||||
});
|
||||
$('#savePlaylist').iziModal({
|
||||
title: 'Save Playlist',
|
||||
setBottom: 100
|
||||
});
|
||||
$(document).on('click', '.trigger-share', function (event) {
|
||||
event.preventDefault();
|
||||
// $('#modal').iziModal('setZindex', 99999);
|
||||
// $('#modal').iziModal('open', { zindex: 99999 });
|
||||
$('#sharePlaylist').iziModal('open');
|
||||
});
|
||||
$(document).on('click', '.trigger-save', function (event) {
|
||||
event.preventDefault();
|
||||
// $('#modal').iziModal('setZindex', 99999);
|
||||
// $('#modal').iziModal('open', { zindex: 99999 });
|
||||
$('#savePlaylist').iziModal('open');
|
||||
});
|
||||
$('#savePlaylist').iziModal('setTop', '15%');
|
||||
|
||||
const myDropzone = new Dropzone(document.body, {
|
||||
previewsContainer: false,
|
||||
@ -563,7 +602,13 @@ $(document).ready(function () {
|
||||
return boilerplateFailure(response, error);
|
||||
}
|
||||
$('#save_playlist').prop("disabled", false);
|
||||
$('#close_save_playlist').trigger("click");
|
||||
$('#savePlaylist').iziModal('close');
|
||||
iziToast.success({
|
||||
title: 'Playlist Saved',
|
||||
position: 'topCenter',
|
||||
timeout: 3000
|
||||
});
|
||||
|
||||
if (programState[0].state === 'allPlaylists') {
|
||||
getAllPlaylists();
|
||||
}
|
||||
|
||||
@ -33,7 +33,6 @@
|
||||
<link rel="stylesheet" href="/public/css/master.css">
|
||||
<link rel="stylesheet" href="/public/css/mstream-player.css">
|
||||
|
||||
<script src="/public/js/modernizr.js"></script>
|
||||
<script src="/public/js/lib/jquery-2.2.4.min.js"></script>
|
||||
|
||||
<!-- iziToast -->
|
||||
@ -71,10 +70,12 @@
|
||||
|
||||
<script src="/public/js/t.js"></script>
|
||||
<script src="/public/js/lib/dropzone.js"></script>
|
||||
|
||||
<script src="/public/js/lib/modal.js"></script>
|
||||
<link rel="stylesheet" href="/public/css/izi-modal.min.css">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<!-- Login Overlay -->
|
||||
<div id="login-overlay" class="login-overlay hide">
|
||||
<div class="row">
|
||||
@ -101,25 +102,21 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Size Classes: [small medium large xlarge expand] -->
|
||||
<!-- Save Playlist Modal -->
|
||||
<div id="savePlaylist" class="reveal-modal small" data-reveal>
|
||||
<h2>Save Playlist</h2>
|
||||
<div id="savePlaylist" class="hide">
|
||||
<form id="save_playlist_form">
|
||||
<input id="playlist_name" type="text" required placeholder="Enter your playlist name" pattern="[a-zA-Z0-9 _-]+">
|
||||
<input id="save_playlist" type="submit" class="button small" value="Save Playlist">
|
||||
</form>
|
||||
<a id="close_save_playlist" class="close-reveal-modal">×</a>
|
||||
</div>
|
||||
|
||||
<!-- Share Modal -->
|
||||
<div id="sharePlaylist" class="reveal-modal medium" data-reveal>
|
||||
<h2>Share Playlist</h2>
|
||||
<div id="sharePlaylist" class="hide">
|
||||
<form id="share_playlist_form">
|
||||
<div class="row collapse">
|
||||
<div class="small-6 large-6 columns">
|
||||
<label>Experation Time</label>
|
||||
<label>Expiration Time</label>
|
||||
<input id="share_time" value="14" class="form-control" type="text" pattern="[0-9]+">
|
||||
<span class="share-time-post postfix radius">Days</span>
|
||||
</div>
|
||||
@ -128,7 +125,6 @@
|
||||
</form>
|
||||
|
||||
<textarea class="share-textarea" rows="8" cols="60" placeholder="Your URL will be put here" readonly="readonly"></textarea>
|
||||
<a id="close_share_modal" class="close-reveal-modal">×</a>
|
||||
</div>
|
||||
|
||||
|
||||
@ -222,22 +218,20 @@
|
||||
|
||||
|
||||
<!-- Tabs for Mobile -->
|
||||
<dl class="tabs show-for-small-only" data-tab>
|
||||
<dd class="active">
|
||||
<a class="panel_one_name" href="#panel1">Library</a>
|
||||
<dl class="tabs show-for-small-only">
|
||||
<dd class="active activate-panel-1">
|
||||
<a class="panel_one_name" href="javascript:void(0);">Library</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="#panel2">Now Playing</a>
|
||||
<dd class="activate-panel-2">
|
||||
<a href="javascript:void(0);">Now Playing</a>
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
<div class="tabs-content">
|
||||
|
||||
<div class="content active" id="panel1">
|
||||
<div id="libraryColumn" class="large-12 columns libraryColumn">
|
||||
<div class="columnHeader">
|
||||
|
||||
<div class="libraryHeaderContainer">
|
||||
<div class="large-12 medium-12 small-12 columns noPaddingLeft">
|
||||
<h3 class="panel_one_name noselect hide-for-small"> </h3>
|
||||
@ -286,10 +280,10 @@
|
||||
</div>
|
||||
<div class="large-6 medium-6 small-12 columns">
|
||||
<div class="controls rightControls">
|
||||
<a title="Save Playlist" class="save" data-reveal-id="savePlaylist">
|
||||
<a title="Save Playlist" class="trigger-save">
|
||||
<img src="/public/img/glyphicons/png/glyphicons_443_floppy_disk.png" alt="" width="27" height="27">
|
||||
</a>
|
||||
<a title="Share Playlist" id="share-button" data-reveal-id="sharePlaylist">
|
||||
<a title="Share Playlist" id="share-button" class="trigger-share">
|
||||
<img src="/public/img/share-black.svg">
|
||||
</a>
|
||||
<a title="Download Playlist" class="downloadPlaylist" id="downloadPlaylist">
|
||||
@ -451,11 +445,6 @@
|
||||
<!-- close the off-canvas menu -->
|
||||
<a class="exit-off-canvas"></a>
|
||||
|
||||
<script src="/public/js/foundation.min.js"></script>
|
||||
<script>
|
||||
$(document).foundation();
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" src="/public/js/lib/lazy-load.js"></script>
|
||||
<script>
|
||||
// Lazy load all images in scroallable areas
|
||||
|
||||
Loading…
Reference in New Issue
Block a user