made some UI Improvements

- removed debugging output
BowlingX · Jul 15, 2015 · 0c84e62 · 0c84e62
1 parent d27b0a3
commit 0c84e62
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/main/js/styles/main.scss b/src/main/js/styles/main.scss
@@ -22,9 +22,22 @@
  * THE SOFTWARE.
  */
 
+$includeFontello: false;
+$baseFontSize:1rem;
+$h1DesktopFontSize:1.5rem;
+
 $markingColor:#009688;
 $markingRemote:#00BCD4;
 
+@import '~flexcss/assets/base';
+@import '~flexcss/assets/lib/text';
+@import '~flexcss/assets/lib/grid';
+@import '~flexcss/assets/lib/desktop-grid';
+@import '~flexcss/assets/lib/large-grid';
+@import '~flexcss/assets/lib/panel';
+
+
+
 .marking {
   transition:background .5s ease;
   background: $markingColor;
@@ -39,6 +52,10 @@ $markingRemote:#00BCD4;
   background: darken($markingColor, 20%);
 }
 
+.marking, .marking-remote {
+  @include animate(fadeIn, .5s);
+}
+
 
 .marking-remote {
   transition:background .5s ease;
@@ -52,4 +69,4 @@ $markingRemote:#00BCD4;
 
 .marking-remote .marking-remote .marking-remote {
   background: darken($markingRemote, 20%);
-}
+}
diff --git a/src/main/scala/com/bowlingx/commentp/akka/ProtocolActor.scala b/src/main/scala/com/bowlingx/commentp/akka/ProtocolActor.scala
@@ -45,7 +45,6 @@ class ProtocolActor(broadcastFactory: BroadcasterFactory) extends Actor with Log
     case Channel(_@channel, Protocol("mark", id, params), uuid) =>
       params.values.toList match {
         case List(startOffset: JInt, endOffset: JInt, startContainer: JString, endContainer: JString) =>
-          logger.info(channel)
 
           broadcastFactory.lookup(channel, true).asInstanceOf[AkkaBroadcaster].broadcast(
             InitiatedMarkingResponse(uuid,

diff --git a/src/main/webapp/WEB-INF/templates/layouts/default.jade b/src/main/webapp/WEB-INF/templates/layouts/default.jade
@@ -3,7 +3,11 @@
 html
   head
     link(rel="stylesheet" type="text/css" href="/static/build/css/app.min.css")
+    meta(name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no")
   body
-    #content
-      != body
+    main.overall-wrapper.main
+      .content-wrapper
+        .wrapper.wrapper-center
+          .page-content
+            != body
     script(src="/static/build/js/app.min.js" type="text/javascript")
diff --git a/src/main/webapp/WEB-INF/templates/views/index.jade b/src/main/webapp/WEB-INF/templates/views/index.jade
@@ -1,4 +1,6 @@
-p(data-commentp="commentp.com")
+h1 commentp
+
+p.panel(data-commentp="commentp.com")
     | Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt
     | ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
     | rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.