reorder segs, some styling

chrishokamp · May 13, 2014 · dae2db5 · dae2db5
1 parent 150bae4
commit dae2db5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/app/scripts/services/segmentOrder.js b/app/scripts/services/segmentOrder.js
@@ -13,8 +13,14 @@ angular.module('services').factory('SegmentOrder', ['$http', '$rootScope', 'base
  // if we don't have the segment order service, the order is 0, 1, 2, ...
  for (var i = 0; i < segments.length; ++i)
  this.order.push(i);
- },
 
+ // testing only
+ this.order = this.shuffle(this.order);
+ },
+ shuffle: function(o){
+ for(var j, x, i = o.length; i; j = Math.floor(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x);
+ return o;
+ },
  nextSegment: function(current) {
  var index = this.order.indexOf(current);
  if (index != -1) {

diff --git a/app/styles/style.scss b/app/styles/style.scss
@@ -10,7 +10,8 @@
 body {
  // background: rgb(236, 236, 236);
 // background: slategray;
- background: #ffffff;
+// background: #ffffff;
+ background: lightgrey;
 // background-image:url('../images/ricepaper.png');
  background-image:url('../images/broken_noise.png');
  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
@@ -116,9 +117,6 @@ ul.nav-tabs > li {
  font-size: 10px;
 }
 
-%ace-editor-height {
- min-height: 100px;
-}
 
 // highlight recent changes in the marker layer
 .changed_range {
@@ -131,11 +129,15 @@ ul.nav-tabs > li {
  left: -30px;
 }
 
+%ace-editor-height {
+ min-height: 100px;
+}
+
 .content-card {
  @extend %ace-editor-height;
  background-color: white;
 // height: 100px;
- overflow-y: auto;
+ overflow-y: hidden;
  overflow-x: hidden;
  padding-left: 3px;
  // leave a little space between the two