Fixed positions

sbstjn · sbstjn · commit 5a7c93906a8a · 2014-05-23T22:00:31.000+02:00
diff --git a/config.rb b/config.rb
@@ -4,6 +4,8 @@
 set :js_dir, 'javascripts'
 set :images_dir, 'images'
 
+activate :livereload
+
 configure :build do
   activate :minify_css
   activate :minify_javascript
diff --git a/source/index.haml b/source/index.haml
@@ -1 +1,3 @@
-#timeline
+#box
+  #box-inner
+    #timeline
diff --git a/source/javascripts/timesheet.js b/source/javascripts/timesheet.js
@@ -36,7 +36,7 @@
         '<span class="label">',
         cur.label,
         '</span>'
-      ];
+      ].join('');
 
       html.push('<li>' + line + '</li>');
     }
diff --git a/source/stylesheets/all.css.sass b/source/stylesheets/all.css.sass
@@ -5,18 +5,21 @@ html, body
   padding: 0
   width: 100%
   height: 100%
-  background-color: rgba(51, 51, 51, 0.9)
+  background-color: rgba(61, 61, 61, 1)
 
 #container
+  height: 100%
+
+#box
   display: table
   width: 100%
   height: 100%
 
-#content
-  display: table-cell
-  height: 100%
-  text-align: center
-  vertical-align: middle
+  #box-inner
+    display: table-cell
+    height: 100%
+    text-align: center
+    vertical-align: middle
 
 #timeline
   width: 800px
@@ -25,6 +28,7 @@ html, body
 
 .timeline
   border-top: 1px solid rgba(250, 250, 250, 0.5)
+  background-color: rgba(51, 51, 51, 1)
   position: relative
 
   .scale
@@ -50,7 +54,7 @@ html, body
         border-right: 1px dashed rgba(250, 250, 250, 0.3)
 
   .data
-    margin: 24px 0 0 0
+    margin: 28px 0 0 0
     padding: 0
     text-align: left
     list-style-type: none
@@ -60,10 +64,10 @@ html, body
     overflow: hidden
 
     li
-      // background-color: rgba(251, 251, 251, 0.1)
-      margin: 0 0 4px -3px
-      line-height: 24px
-      height: 24px
+      background-color: rgba(251, 251, 251, 0.1)
+      margin: 0 0 3px -3px
+      line-height: 21px
+      height: 21px
       display: block
       cursor: pointer
       clear: both
@@ -87,7 +91,7 @@ html, body
         display: block
         float: left
         position: relative
-        top: 8px
+        top: 7px
         border-radius: 3px
         margin: 0 10px 0 0
         opacity: 0.7

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`'<span class="label">',`
`37`	`37`	`cur.label,`
`38`	`38`	`'</span>'`
`39`		`- ];`
	`39`	`+ ].join('');`
`40`	`40`
`41`	`41`	`html.push('<li>' + line + '</li>');`
`42`	`42`	`}`