changed looks of footer buttons, and how the copyright text is placed

This commit is contained in:
Kasper Rynning-Tønnesen
2016-02-10 15:59:41 +01:00
parent 8fffd16aa1
commit 402b949643
8 changed files with 48 additions and 20 deletions

View File

@@ -140,7 +140,7 @@
</div> </div>
<div id="help" class="modal"> <div id="help" class="modal">
<div class="modal-header-fixed"> <div class="modal-header-fixed">
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a> <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div> </div>
<div class="modal-content"> <div class="modal-content">
<h4>So you need help?</h4> <h4>So you need help?</h4>
@@ -154,7 +154,7 @@
</div> </div>
<div id="embed" class="modal"> <div id="embed" class="modal">
<div class="modal-header-fixed"> <div class="modal-header-fixed">
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a> <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div> </div>
<div class="modal-content"> <div class="modal-content">
<h4>Embed code (in beta)</h4> <h4>Embed code (in beta)</h4>
@@ -168,7 +168,7 @@
</div> </div>
<main class="container center-align main"> <main class="container center-align main">
<div id="main-row" class="row"> <div id="main-row" class="row">
<div class="col s12 m9 video-container hide-on-small-only"> <div class="col s12 m9 video-container no-opacity hide-on-small-only">
<ul class="side-nav left-aligned chat-bar" id="chat-bar"> <ul class="side-nav left-aligned chat-bar" id="chat-bar">
<li id="chat-log"> <li id="chat-log">

View File

@@ -1,11 +1,10 @@
<div id="contact" class="modal"> <div id="contact" class="modal">
<div class="modal-header-fixed"> <div class="modal-header-fixed">
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a> <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div> </div>
<div class="modal-content"> <div class="modal-content">
<h4>Want to contact us?</h4> <h4>Want to contact us?</h4>
<div id="contact-container"> <div id="contact-container">
<a href="mailto"
<form id="contact-form" method="post" onsubmit="return false;"> <form id="contact-form" method="post" onsubmit="return false;">
<input id="contact-form-from" name="from" type="email" placeholder="your@mail.com" autocomplete="off" class="validate"> <input id="contact-form-from" name="from" type="email" placeholder="your@mail.com" autocomplete="off" class="validate">
<input id="contact-form-message" name="message" type="text" placeholder="Your message to us..." autocomplete="off"> <input id="contact-form-message" name="message" type="text" placeholder="Your message to us..." autocomplete="off">
@@ -70,9 +69,17 @@
<br /> <br />
Enjoy! Enjoy!
</p> </p>
<ul id="footer-buttons">
<li>
<a class="modal-trigger waves-effect help-button-footer" title="Need help with the site?" onclick="$('#help').openModal()">Help, how does this work?!</a> <a class="modal-trigger waves-effect help-button-footer" title="Need help with the site?" onclick="$('#help').openModal()">Help, how does this work?!</a>
<a class="modal-trigger waves-effect red help-button-footer" id="contact-button" title="Contact us" onclick="$('#contact').openModal()">Contact us</a> </li>
<li>
<a class="modal-trigger waves-effect green help-button-footer" id="embed-button" title="Want to embed? (In beta)" onclick="$('#embed').openModal()">Embed this channel</a> <a class="modal-trigger waves-effect green help-button-footer" id="embed-button" title="Want to embed? (In beta)" onclick="$('#embed').openModal()">Embed this channel</a>
</li>
<li>
<a class="modal-trigger waves-effect red help-button-footer" id="contact-button" title="Contact us" onclick="$('#contact').openModal()">Contact us</a>
</li>
</ul>
<p id="latest-commit" class="grey-text text-lighten-4 truncate"></p> <p id="latest-commit" class="grey-text text-lighten-4 truncate"></p>
</div> </div>
<div class="col l4 offset-l2 s12 valign-wrapper"> <div class="col l4 offset-l2 s12 valign-wrapper">

View File

@@ -14,7 +14,7 @@ if(isset($_GET['chan'])){
<header> <header>
<nav id="fp-nav"> <nav id="fp-nav">
<div class="nav-wrapper"> <div class="nav-wrapper">
<a href="#" class="brand-logo hide-on-small-only noselect"> <a href="#!" class="brand-logo hide-on-small-only noselect">
<img id="zicon" src="static/images/squareicon_small.png" alt="zöff" title="Zöff" /> <img id="zicon" src="static/images/squareicon_small.png" alt="zöff" title="Zöff" />
</a> </a>
<span id="frontpage-viewer-counter" class="hide-on-small-only noselect" title="Divided among all channels. Hidden or not"></span> <span id="frontpage-viewer-counter" class="hide-on-small-only noselect" title="Divided among all channels. Hidden or not"></span>
@@ -40,7 +40,7 @@ if(isset($_GET['chan'])){
<br> <br>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a> <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div> </div>
</div> </div>
<div id="about" class="modal"> <div id="about" class="modal">
@@ -53,7 +53,7 @@ if(isset($_GET['chan'])){
</p> </p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a> <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div> </div>
</div> </div>
<div id="donation" class="modal"> <div id="donation" class="modal">
@@ -67,12 +67,12 @@ if(isset($_GET['chan'])){
</p> </p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">I'm awesome! (Close)</a> <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">I'm awesome! (Close)</a>
</div> </div>
</div> </div>
<div id="help" class="modal"> <div id="help" class="modal">
<div class="modal-header-fixed"> <div class="modal-header-fixed">
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a> <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div> </div>
<div class="modal-content"> <div class="modal-content">
<h4>So you need help?</h4> <h4>So you need help?</h4>

View File

@@ -119,9 +119,14 @@ footer{
.help-button-footer{ .help-button-footer{
padding: 10px; padding: 10px;
background: white; background: #1e88e5;
border-radius: 2px; border-radius: 2px;
color:#2d2d2d; color:white;
width:200px;
}
#footer-buttons li{
padding-top:10px;
} }
footer.page-footer, footer.page-footer,
@@ -199,6 +204,10 @@ nav .brand-logo{
background-color: #38803C !important; background-color: #38803C !important;
} }
.footer-copyright{
text-align: center;
}
.footer-copyright a { color: #fff;} .footer-copyright a { color: #fff;}
.footer-copyright a:hover{color:#6699FF} .footer-copyright a:hover{color:#6699FF}
@@ -317,7 +326,7 @@ hide mdi-action-visibility mdi-action-visibility-off
#latest-commit{ #latest-commit{
font-size: 12px !important; font-size: 12px !important;
padding-left: 15px !important; padding-left: 15px !important;
padding-top: 40px !important; /*padding-top: 40px !important;*/
} }
#latest-commit a{ #latest-commit a{
@@ -572,6 +581,17 @@ hide mdi-action-visibility mdi-action-visibility-off
float:left; float:left;
} }
.video-container{
-webkit-transition: opacity 0.5s;
-moz-transition: opacity 0.5s;
-o-transition: opacity 0.5s;
transition: opacity 0.5s;
}
.no-opacity{
opacity:0;
}
.suggest_bar { .suggest_bar {
/*margin-left:5px !important;*/ /*margin-left:5px !important;*/
color:rgb(68,68,68); color:rgb(68,68,68);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -398,7 +398,7 @@ function onepage_load(){
var url_split = window.location.href.split("/"); var url_split = window.location.href.split("/");
if(url_split[3] != "#" && url_split[3] != ""){ if(url_split[3].substr(0,1) != "#!" && url_split[3] != "" && !(url_split.length == 5 && url_split[4].substr(0,1) == "#")){
socket.emit("change_channel"); socket.emit("change_channel");
Admin.beginning = true; Admin.beginning = true;

View File

@@ -187,6 +187,7 @@ var Youtube = {
Playercontrols.initYoutubeControls(Youtube.ytplayer); Playercontrols.initYoutubeControls(Youtube.ytplayer);
Playercontrols.initSlider(); Playercontrols.initSlider();
Youtube.ytplayer.setVolume(Crypt.get_volume()); Youtube.ytplayer.setVolume(Crypt.get_volume());
$(".video-container").removeClass("no-opacity");
}catch(e){} }catch(e){}
}, },