Merge pull request #47 from Fang-/master

Two issue fixes
urbit · Jan 18, 2018 · d1a9549 · d1a9549
2 parents 1db8511 + 01f3c72
commit d1a9549
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/css/_grams.scss b/css/_grams.scss
@@ -85,6 +85,21 @@ div.gram.same:hover div.meta {
   position: absolute;
   z-index: 1;
   margin-left: $grid-gutter-width;
+
+  .fat {
+    max-height: 0;
+    transition: max-height .1s ease-in-out;
+    overflow: hidden;
+  }
+
+  .fat pre { color: #fff; }
+
+  &:hover .fat {
+      max-height: 16rem;
+      overflow: scroll;
+      background-color: #000;
+      color: #fff;
+  }
 }
 
 .exp {
@@ -101,21 +116,6 @@ div.gram.same:hover div.meta {
     background-color: #000;
     padding: .3rem;
   }
-
-  .fat {
-    max-height: 0;
-    transition: max-height .1s ease-in-out;
-    overflow: hidden;
-  }
-
-  .fat pre { color: #fff; }
-
-  &:hover .fat {
-      max-height: 16rem;
-      overflow: scroll;
-      background-color: #000;
-      color: #fff;
-  }
 }
 
 .comment {

diff --git a/js/components/StationComponent.coffee b/js/components/StationComponent.coffee
@@ -50,6 +50,10 @@ module.exports = recl
       v = $input.val().toLowerCase()
       if v[0] isnt "~" then v = "~#{v}"
       if @validateSource v
+        # to avoid waiting on thousands of messages, just load in the backlog
+        # from the past day.
+        d = new Date (new Date() - 24*3600*1000)
+        v = v + "/" + window.urb.util.toDate(d)
         StationActions.addSources @state.station,[v]
         $input.val('')
         $input.blur()