From 8ccbf68fd2ed2eb7c849952df93ae6cebed227d9 Mon Sep 17 00:00:00 2001
From: karolinaszczur <me@karolinaszczur.com>
Date: Tue, 15 Oct 2013 11:56:40 -0700
Subject: [PATCH 1/2] [ux] fix bookmark appearance

---
 public/css/app/roster.styl | 5 +++++
 public/css/otalk.css       | 3 +++
 public/x-manifest.cache    | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/css/app/roster.styl b/public/css/app/roster.styl
index f1007cf..cac0d40 100644
--- a/public/css/app/roster.styl
+++ b/public/css/app/roster.styl
@@ -191,6 +191,11 @@
       font-size: 10px
       color: darken($textSecondary, 50%)
 
+#bookmarks
+
+  .name
+    padding: 10px 15px 10px 40px
+
 @keyframes pulsate
   0%
     opacity: 1.0
diff --git a/public/css/otalk.css b/public/css/otalk.css
index 9a03b24..b5919e9 100644
--- a/public/css/otalk.css
+++ b/public/css/otalk.css
@@ -568,6 +568,9 @@ h3 {
   font-size: 10px;
   color: #5c5c5c;
 }
+#bookmarks .name {
+  padding: 10px 15px 10px 40px;
+}
 @-moz-keyframes pulsate {
   0% {
     opacity: 1;
diff --git a/public/x-manifest.cache b/public/x-manifest.cache
index 9f8d00b..a840d1c 100644
--- a/public/x-manifest.cache
+++ b/public/x-manifest.cache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 0.0.1 1381784954237
+# 0.0.1 1381863218449
 
 CACHE:
 /app.js

From d796b8816043e82cca15dbef602b4778c4233c0e Mon Sep 17 00:00:00 2001
From: karolinaszczur <me@karolinaszczur.com>
Date: Tue, 15 Oct 2013 12:14:16 -0700
Subject: [PATCH 2/2] [ux] small visual tweaks: sizes, placement and cancel
 button

---
 clientapp/templates/main.html |  2 +-
 public/css/app/aux.styl       |  4 ++++
 public/css/app/forms.styl     |  5 ++++-
 public/css/app/settings.styl  |  4 ++++
 public/css/otalk.css          | 11 +++++++++++
 public/x-manifest.cache       |  2 +-
 6 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/clientapp/templates/main.html b/clientapp/templates/main.html
index e9b3ae5..d4c08ff 100644
--- a/clientapp/templates/main.html
+++ b/clientapp/templates/main.html
@@ -11,7 +11,7 @@
     </header>
     <section class="box connect">
       <h2>Connecting...</h2> 
-      <a href="/logout">Cancel</a>
+      <a class="button" href="/logout">Cancel</a>
     </section>
   </body>
 </html>
diff --git a/public/css/app/aux.styl b/public/css/app/aux.styl
index 3e742f1..e7aa9d9 100644
--- a/public/css/app/aux.styl
+++ b/public/css/app/aux.styl
@@ -24,6 +24,10 @@
     h2
       padding: 0
 
+    .button
+      float: none
+      margin-top: 20px
+
   .head, .content
     padding: 0 20px
 
diff --git a/public/css/app/forms.styl b/public/css/app/forms.styl
index 8c111bc..57c411a 100644
--- a/public/css/app/forms.styl
+++ b/public/css/app/forms.styl
@@ -59,4 +59,7 @@ button, a.button
   cursor: pointer
 
   &:hover
-    background: darken($activeBlue, 30%)
\ No newline at end of file
+    background: darken($activeBlue, 30%)
+
+.enableAlerts
+  margin-right: 5px
\ No newline at end of file
diff --git a/public/css/app/settings.styl b/public/css/app/settings.styl
index c5b402b..37da7e2 100644
--- a/public/css/app/settings.styl
+++ b/public/css/app/settings.styl
@@ -12,6 +12,7 @@
     padding: 5px
     background: $grayBackground
     roundall(3px)
+    font-size: $fontSmall
 
 .uploadRegion
   padding: 15px
@@ -26,3 +27,6 @@
 
   input
     width: 100%
+
+  img
+    margin: 10px 0
diff --git a/public/css/otalk.css b/public/css/otalk.css
index b5919e9..91085f0 100644
--- a/public/css/otalk.css
+++ b/public/css/otalk.css
@@ -859,6 +859,7 @@ h3 {
   -o-border-radius: 3px;
   -border-radius: 3px;
   border-radius: 3px;
+  font-size: 12px;
 }
 .uploadRegion {
   padding: 15px;
@@ -879,6 +880,9 @@ h3 {
 .uploadRegion input {
   width: 100%;
 }
+.uploadRegion img {
+  margin: 10px 0;
+}
 .aux {
   background: #f7f7f7;
 }
@@ -910,6 +914,10 @@ h3 {
 .box.connect h2 {
   padding: 0;
 }
+.box.connect .button {
+  float: none;
+  margin-top: 20px;
+}
 .box .head,
 .box .content {
   padding: 0 20px;
@@ -1020,3 +1028,6 @@ button:hover,
 a.button:hover {
   background: #007aa7;
 }
+.enableAlerts {
+  margin-right: 5px;
+}
diff --git a/public/x-manifest.cache b/public/x-manifest.cache
index a840d1c..925d3c3 100644
--- a/public/x-manifest.cache
+++ b/public/x-manifest.cache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 0.0.1 1381863218449
+# 0.0.1 1381864437928
 
 CACHE:
 /app.js