From 6be7b765b25a1259f0d1d12610b091b3f7a658a9 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Fri, 1 Apr 2016 14:24:13 -0700
Subject: [PATCH] Harmonize border radii

// FREEBIE
---
 stylesheets/_conversation.scss | 22 +++++++++++-----------
 stylesheets/_global.scss       |  8 ++++----
 stylesheets/_index.scss        |  3 +--
 stylesheets/_variables.scss    |  3 ++-
 stylesheets/manifest.css       | 15 +++++++--------
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 5b01b1b8..6d1c3411 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -76,7 +76,7 @@
     margin-bottom: 20px;
     background: $grey_l;
     border: solid 1px $grey_l2;
-    border-radius: 5px;
+    border-radius: $border-radius;
   }
   .placeholder {
     font-weight: bold;
@@ -85,11 +85,11 @@
 
 .message-detail {
   .key-conflict-dialogue {
-    border-radius: 5px;
+    border-radius: $border-radius;
     margin: 20px 0;
 
     .header {
-      border-radius: 5px 5px 0 0;
+      border-radius: $border-radius $border-radius 0 0;
       background: #F3F3A7;
       margin: 0;
       padding: 10px 20px
@@ -102,7 +102,7 @@
     button.resolve {
       outline: none;
       border: none;
-      border-radius: 5px;
+      border-radius: $border-radius;
       color: white;
       font-weight: bold;
       line-height: 36px;
@@ -138,7 +138,7 @@
 
     button {
       border: none;
-      border-radius: 5px;
+      border-radius: $border-radius;
       color: white;
       padding: 0.5em;
       font-weight: bold;
@@ -174,7 +174,7 @@
       position: absolute;
       background: black;
       color: white;
-      border-radius: 10px;
+      border-radius: $border-radius;
       padding: 0.5em;
       font-weight: normal;
       bottom: calc(100% + 16px);
@@ -253,7 +253,7 @@
     display: inline-block;
     vertical-align: top;
     padding: 9px 12px;
-    border-radius: 5px;
+    border-radius: $border-radius;
     box-shadow: 0 3px 3px -4px black;
     word-wrap: break-word;
     margin-left: 8px;
@@ -491,7 +491,7 @@
     }
     img {
       border: 2px solid #ddd;
-      border-radius: 5px;
+      border-radius: $border-radius;
       max-height: 100px;
     }
 
@@ -546,7 +546,7 @@
   background: rgba(0, 0, 0, 0.75);
   color: white;
   box-shadow: 0 0 5px 0 black;
-  border-radius: 20px;
+  border-radius: $border-radius;
   font-size: small;
 }
 
@@ -556,7 +556,7 @@
     margin: 100px auto;
     padding: 1em;
     background: white;
-    border-radius: 10px;
+    border-radius: $border-radius;
     overflow: auto;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.2);
 
@@ -571,7 +571,7 @@
         float: right;
         margin-left: 10px;
         background-color: $grey_l;
-        border-radius: 5px;
+        border-radius: $border-radius;
         outline: none;
         padding: 5px 8px;
         border: 1px solid $grey_l2;
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 18f29d6b..fafa871a 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -77,7 +77,7 @@ button.back {
 
 ::-webkit-scrollbar-thumb {
   background: rgba(0,0,0,0.15);
-  border-radius: 10px;
+  border-radius: $border-radius;
 }
 
 .header-buttons {
@@ -279,7 +279,7 @@ $avatar-size: 44px;
     font-size: 12px;
     font-weight: bold;
     text-align: center;
-    border-radius: 5px;
+    border-radius: $border-radius;
     background-color: $blue;
     color: white;
     border: solid 1px rgba(255,255,255,0.6);
@@ -437,7 +437,7 @@ $avatar-size: 44px;
   }
 
   button, input[type=submit] {
-    border-radius: 4px;
+    border-radius: $border-radius;
     border: solid 1px #ccc;
     cursor: pointer;
     margin: 1em auto;
@@ -476,7 +476,7 @@ $avatar-size: 44px;
     margin: 100px auto;
     padding: 1em;
     background: white;
-    border-radius: 10px;
+    border-radius: $border-radius;
     overflow: auto;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.2);
   }
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 18329154..5b74572e 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -166,7 +166,7 @@ input.search {
 .hint {
   margin: 10px;
   padding: 1em;
-  border-radius: 10px;
+  border-radius: $border-radius;
   color: white;
   border: 2px dashed white;
 
@@ -209,7 +209,6 @@ input.search {
   top: 50px;
   left: 0;
   background: transparent;
-  border-radius: 10px;
   color: white;
   border: 2px dashed white;
   overflow: visible;
diff --git a/stylesheets/_variables.scss b/stylesheets/_variables.scss
index 50ab6621..39131140 100644
--- a/stylesheets/_variables.scss
+++ b/stylesheets/_variables.scss
@@ -32,13 +32,14 @@ $roboto-light: Roboto-Light, 'Helvetica Neue', Arial, Helvetica, sans-serif;
 $header-height: 64px;
 $button-height: 24px;
 $header-color: $blue;
-$bubble-border-radius: 20px;
 
 $unread-badge-size: 21px;
 $loading-height: 16px;
 
 $big-avatar-min-width: 900px;
 
+$border-radius: 5px;
+
 @mixin color-svg($svg, $color) {
     -webkit-mask: url($svg) no-repeat center;
     -webkit-mask-size: 100%;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 8f7bf1ba..052ce5e0 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -89,7 +89,7 @@ button.back {
 
 ::-webkit-scrollbar-thumb {
   background: rgba(0, 0, 0, 0.15);
-  border-radius: 10px; }
+  border-radius: 5px; }
 
 .header-buttons {
   height: 0; }
@@ -370,7 +370,7 @@ img.emoji {
       width: 100%;
       resize: none; }
 .debug-log button, .debug-log input[type=submit] {
-  border-radius: 4px;
+  border-radius: 5px;
   border: solid 1px #ccc;
   cursor: pointer;
   margin: 1em auto;
@@ -402,7 +402,7 @@ img.emoji {
     margin: 100px auto;
     padding: 1em;
     background: white;
-    border-radius: 10px;
+    border-radius: 5px;
     overflow: auto;
     box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.2); }
   .modal a.x {
@@ -576,7 +576,7 @@ input.search {
 .hint {
   margin: 10px;
   padding: 1em;
-  border-radius: 10px;
+  border-radius: 5px;
   color: white;
   border: 2px dashed white; }
   .hint h3 {
@@ -611,7 +611,6 @@ input.search {
   top: 50px;
   left: 0;
   background: transparent;
-  border-radius: 10px;
   color: white;
   border: 2px dashed white;
   overflow: visible; }
@@ -759,7 +758,7 @@ input.search {
     position: absolute;
     background: black;
     color: white;
-    border-radius: 10px;
+    border-radius: 5px;
     padding: 0.5em;
     font-weight: normal;
     bottom: calc(100% + 16px);
@@ -1059,7 +1058,7 @@ input.search {
   background: rgba(0, 0, 0, 0.75);
   color: white;
   box-shadow: 0 0 5px 0 black;
-  border-radius: 20px;
+  border-radius: 5px;
   font-size: small; }
 
 .confirmation-dialog .content {
@@ -1067,7 +1066,7 @@ input.search {
   margin: 100px auto;
   padding: 1em;
   background: white;
-  border-radius: 10px;
+  border-radius: 5px;
   overflow: auto;
   box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.2); }
   .confirmation-dialog .content .message {