Revert "Adds commit before merging css2"

This reverts commit d3d2fa3, reversing changes made to 226f966.
sf-wdi-25 · Mar 7, 2016 · f7dc50a · f7dc50a
1 parent 462b3ad
commit f7dc50a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 88 deletions.
diff --git a/public/css/styles.css b/public/css/styles.css
@@ -15,7 +15,6 @@ body {
   margin: -20px;
   position: relative;
 }
-
 .jumbotron .container {
   height: 350px;
 }
@@ -26,17 +25,20 @@ body {
   margin-right: 12px;
 }
 
+
 @font-face {
   font-family: vapor;
   src: url('/fonts/vapor.ttf'); 
 }
 
-
 .btn-color {
+
   background-color: #C5BCB0;
 }
 
+
 .btn-color {
+
   background-color: #C5BCB0;
 }
 
@@ -64,57 +66,16 @@ font-family: vapor;
 .aFonts {
 
   font-size: 20px;
-
-/*---- Splash Style ----*/
-
-.splash-title {
-  color: white;
-  font-size: 3em;
-  margin-top: 100px;
-  text-shadow: 0 2px 10px #000;
-  -webkit-animation-delay: 1s;
-  -moz-animation-delay: 1s;
-  animation-delay: 1s;
 }
 
-.splash{
-  position:absolute;
-  top:0;
-  left:0;
-  height:100%;
-  width:100%;
-  background-color:#252525;
-  background-repeat:no-repeat;
-  text-align:center;
-  z-index: 100;
+.container-fluid {
+ background-color: #5AFFF7;
+ border-color: #5AFFF7;
 }
 
-#vinyl {
-  width: 300px;
-  margin-top: 50px;
-}
 
-@-webkit-keyframes rotate {
-  from {
-    -webkit-transform: rotate(0deg);
-  }
-  to { 
-    -webkit-transform: rotate(360deg);
-  }
-}
 
-.rotate:hover {
-    -webkit-animation-name: rotate; 
-    -webkit-animation-duration: 1.3s; 
-    -webkit-animation-iteration-count: infinite;
-    -webkit-animation-timing-function: linear;
-    cursor: pointer;
-}
 
-.container-fluid {
- background-color: #5AFFF7;
- border-color: #5AFFF7;
-}
 
 .statue {
 
@@ -160,14 +121,3 @@ font-family: vapor;
 
 
 
-=======
-.navbar-brand {
-	padding: 0px;
-	padding-left: 10px;
-	padding-top: 8px;
-}
-
-.navbar-brand > img {
-	height: 32px;
-}
->>>>>>> master
diff --git a/public/images/vinyl.png b/public/images/vinyl.png
diff --git a/public/js/app.js b/public/js/app.js
@@ -33,21 +33,8 @@ sampleAlbums.push({
 /* end of hard-coded data */
 
 $(document).ready(function() {
-
-  //splash page fadein
   console.log('app.js loaded!');
 
-  if($(".splash").is(":visible"))
-  {
-    $(".wrapper").css({"opacity":"0"});
-  }
-  $("#vinyl").click(function()
-  {
-    $(".splash").slideUp("800", function() {
-        $(".wrapper").delay(200).animate({"opacity":"1.0"});
-     });
-  });
-
 // AJAX album methods
   //get method
   $.get('/api/albums').success(function (albums) {
@@ -347,12 +334,4 @@ function renderGenre(genre){
   $("#genres").append(genreHtml);
 }
 
-$(window).scroll(function() {
-      $(window).off("scroll");
-    $(".splash").slideUp("800", function() {
-    $("html, body").animate({"scrollTop":"0px"},100);
-    $(".wrapper").delay(100).animate({"opacity":"1.0"},800);
- });
- });
-
 
diff --git a/views/index.ejs b/views/index.ejs
@@ -8,7 +8,6 @@
 
     <!-- STYLESHEETS -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../public/css/splashscreen.css">
     <link rel="stylesheet" href="css/styles.css">
 
     <!-- VENDOR SCRIPTS -->
@@ -22,13 +21,6 @@
   <% include ./partials/header %>
 
   <body>
-
-    <div class="splash fade-in">
-      <h1 class="splash-title fade-in"> Enter Tunely</h1>    
-        <img id="vinyl" class="rotate" src="images/vinyl.png" alt="lp-record">
-    </div>
-
-  <div class="wrapper">
     <div class="jumbotron">
 
 
@@ -161,7 +153,6 @@
         </div><!-- /.modal-content -->
       </div><!-- /.modal-dialog -->
     </div><!-- /.modal -->
-    </div>
 
 
   </body>

diff --git a/views/partials/header.ejs b/views/partials/header.ejs
@@ -7,7 +7,7 @@
 		        <span class="icon-bar"></span>
 		        <span class="icon-bar"></span>
 	      	</button>
-      	<a class="navbar-brand" id="tunelyicon" href="/"><img src="/images/vinyl.png"</a>
+      	<a class="navbar-brand" id="tunelyicon" href="/">Tunely</a>
 	</div>