Преглед изворни кода

added static seeker bar to room template

unknown пре 9 година
родитељ
комит
55a0c43b3a
2 измењених фајлова са 75 додато и 2 уклоњено
  1. 28 2
      app/app.css
  2. 47 0
      app/app.html

+ 28 - 2
app/app.css

@@ -32,6 +32,9 @@ body :-ms-input-placeholder {
   font-family: 'Source Sans Pro', sans-serif;
   font-weight: 300;
 }
+ul {
+    list-style: none;
+}
 .landing {
   background: #50a3a2;
   background: -webkit-linear-gradient(top left, #50a3a2 0%, #53e3a6 100%);
@@ -42,7 +45,8 @@ body :-ms-input-placeholder {
   width: 100%;
   height: 100%; /*400px*/
   /*margin-top: -200px;*/
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: scroll;
 }
 .container {
   max-width: 600px;
@@ -133,7 +137,7 @@ form button:hover {
   top: 0;
   left: 0;
   width: 100%;
-  height: 100%;
+  height: 0px;
   z-index: 1;
 }
 .bg-bubbles li {
@@ -308,7 +312,24 @@ footer a:hover{
   height: 300px;
   width: 300px;
   border-radius: 100%;
+  text-align: center;
+  color: white;
+  font-family: Sans-serif;
+  /*float: left;*/
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.station > h3 {
+    line-height: 200px;
+    font-size: 42px;
 }
+
+.station > h5 {
+    margin-top: -40px;
+    font-size: 15px;
+}
+
 .station-top{
   height: 200px;
 }
@@ -365,3 +386,8 @@ footer a:hover{
   margin-top: 30px;
   background-color: black;
 }
+@media (max-width: 992px) {
+    .station {
+        background-color: red;
+    }
+}

+ 47 - 0
app/app.html

@@ -50,9 +50,56 @@
 
 <template name="dashboard">
   <div class="landing">
+<<<<<<< HEAD
     <div class="station">
 
     </div>
+=======
+      <!--ul>
+          <li class="station">
+              <h3>Name</h3>
+              <h5>Song</h5>
+          </li>
+          <li class="station">
+              <h3>Name</h3>
+              <h5>Song</h5>
+          </li>
+          <li class="station">
+              <h3>Name</h3>
+              <h5>Song</h5>
+          </li>
+          <li class="station">
+              <h3>Name</h3>
+              <h5>Song</h5>
+          </li>
+      </ul-->
+      <div class="row">
+          <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+              <div class="station">
+                    <h3>Name</h3>
+                    <h5>Song</h5>
+              </div>
+          </div>
+          <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+              <div class="station">
+                    <h3>Name</h3>
+                    <h5>Song</h5>
+              </div>
+          </div>
+          <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+              <div class="station">
+                    <h3>Name</h3>
+                    <h5>Song</h5>
+              </div>
+          </div>
+          <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+              <div class="station">
+                    <h3>Name</h3>
+                    <h5>Song</h5>
+              </div>
+          </div>
+      </div>
+>>>>>>> 62401d89e4e278a4a04db28644b2306f623b619e
 
     <ul class="bg-bubbles">
     	<li></li>