diff --git a/README.md b/README.md index 29737eff..cfd05eb8 100755 --- a/README.md +++ b/README.md @@ -1,14 +1,8 @@ Zoff ==== -##### The server-side is required for this website, and it's found at: here - ## Zoff supports integrated casting with chromecast -##### Config - -To get the website to run as intended, please enabled mod_rewrite for apache2, and add ```AllowOverride All``` to the directory containing the webserver in Apache2 (it's usually /etc/apache2/sites-enabled/000-default.conf) - ### About Zoff is a shared (free) YouTube based radio service, built upon the YouTube API. @@ -23,20 +17,20 @@ The team can be reached on -frontpage +frontpage
-channel1 +channel1
-channel2 +channel2
-channel3 +channel3 diff --git a/server/README.md b/server/README.md index 8fb022b0..1ba9cc7a 100644 --- a/server/README.md +++ b/server/README.md @@ -1,7 +1,5 @@ # Zoff-Serverside -For the client-side repo, go to
here - ## Install Prerequisites: @@ -18,7 +16,7 @@ Clone this repository into a folder, and navigate to it. Use ```npm install``` Zoff is a shared (free) YouTube based radio service, built upon the YouTube API. -Zoff is mainly a webbased service. The website uses NodeJS with Socket.IO, MongoDB and express on the backend, with JavaScript, jQuery and Materialize on the frontend. +Zoff is mainly a webbased service. The website uses NodeJS with Socket.IO, MongoDB and PHP on the backend, with JavaScript, jQuery and Materialize on the frontend. The team consists of Kasper Rynning-Tønnesen and Nicolas Almagro Tonne, and the project has been worked on since late 2014. diff --git a/server/views/assets/css/style.css b/server/views/assets/css/style.css index cd2499f4..3a74b837 100755 --- a/server/views/assets/css/style.css +++ b/server/views/assets/css/style.css @@ -609,8 +609,8 @@ display: inline-flex; } .navbar-fixed { - z-index:1000; - height: 128px; + z-index: 999999; + height: 128px; } .fullwidth{ @@ -1652,6 +1652,7 @@ nav ul li:hover, nav ul li.active { max-height: calc(100vh - 64px); overflow: overlay; overflow-x: hidden; + /* z-index: 99999999; */ } .result:hover, .hoverResults { background-color: rgba(0,0,0,0.4);