From e68b367f3f26bc03a38e94a389dc7e70e446ed73 Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Mon, 25 Sep 2017 11:48:42 +0100
Subject: [PATCH] Common variables; refactor some Bootstrap hard-coded stuff
 into new variables.

---
 .../public/stylesheets/components/card.less   | 12 ++---
 .../stylesheets/core/_common-variables.less   |  2 +
 .../public/stylesheets/core/ol-variables.less | 47 +++++++++++++++----
 .../public/stylesheets/core/scaffolding.less  |  2 +-
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/services/web/public/stylesheets/components/card.less b/services/web/public/stylesheets/components/card.less
index 2619686b0a..f906d68daf 100644
--- a/services/web/public/stylesheets/components/card.less
+++ b/services/web/public/stylesheets/components/card.less
@@ -1,6 +1,6 @@
 .card {
   background-color: white;
-  border-radius: @border-radius-base;
+  border-radius: @card-border-radius-base;
   -webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.1);
   box-shadow: 0 2px 4px rgba(0,0,0,0.15);
   padding: @line-height-computed;
@@ -39,16 +39,16 @@
             z-index: 1;
             // Make it taller and card like
             margin-top: 0;
-            border-radius: @border-radius-base;
+            border-radius: @card-border-radius-base;
         }
 
         &.card-first {
-            border-top-left-radius: @border-radius-base;
-            border-bottom-left-radius: @border-radius-base;
+            border-top-left-radius: @card-border-radius-base;
+            border-bottom-left-radius: @card-border-radius-base;
         }
         &.card-last {
-            border-top-right-radius: @border-radius-base;
-            border-bottom-right-radius: @border-radius-base;
+            border-top-right-radius: @card-border-radius-base;
+            border-bottom-right-radius: @card-border-radius-base;
         }
     }
 }
\ No newline at end of file
diff --git a/services/web/public/stylesheets/core/_common-variables.less b/services/web/public/stylesheets/core/_common-variables.less
index 6274b265f9..0481b4ae5e 100644
--- a/services/web/public/stylesheets/core/_common-variables.less
+++ b/services/web/public/stylesheets/core/_common-variables.less
@@ -86,6 +86,7 @@
 @border-radius-large:       5px;
 @border-radius-small:       2px;
 
+@card-border-radius-base:   @border-radius-base;
 //** Global color for active items (e.g., navs or dropdowns).
 @component-active-color:    #fff;
 //** Global background color for active items (e.g., navs or dropdowns).
@@ -793,6 +794,7 @@
 @content-margin-top: @line-height-computed;
 
 // Custom
+@content-alt-bg-color: lighten(@gray-lightest, 2.5%);
 
 @left-menu-width: 260px;
 @left-menu-animation-duration: 0.35s;
diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less
index 23151bd9c4..45c18b5d65 100644
--- a/services/web/public/stylesheets/core/ol-variables.less
+++ b/services/web/public/stylesheets/core/ol-variables.less
@@ -1,11 +1,45 @@
-@ol-green:      #4A9F48;
-@ol-dark-green: #1C5B26;
+@import "./_common-variables.less";
+
+// Styleguide colors
+@ol-blue-gray-1 : #E4E8EE;
+@ol-blue-gray-2 : #9DA7B7;
+@ol-blue-gray-3 : #5D6879;
+@ol-blue-gray-4 : #485973;
+@ol-blue-gray-5 : #2C3645;
+@ol-blue-gray-6 : #1E2530;
+
+@ol-green       : #4F9C45;
+@ol-dark-green  : #1C5B26;
+@ol-blue        : #4B7FD1;
+@ol-dark-blue   : #2857A1;
+@ol-red         : #C9453E;
+@ol-dark-red    : #A6312B;
+
+@ol-type-color  : @ol-blue-gray-3;
+
+// Navbar customization
+@navbar-default-color   : #FFF;
+@navbar-default-bg      : @ol-blue-gray-6;
+@navbar-default-border  : transparent;
+@navbar-brand-image-url : url(/img/ol-brand/logo-horizontal.png);
+
+// Backgrounds
+@body-bg                : @ol-blue-gray-1;
+@content-alt-bg-color   : @ol-blue-gray-1;
+
+// Typography
+@text-color             : @ol-type-color;
+
+// Border radius (used for components, e.g. buttons)
+@border-radius-base     : 999px; // Large enough value to be fully rounded everywhere
+@border-radius-large    : 999px; // As above
+@border-radius-small    : 999px; // As above
+
+@card-border-radius-base: 3px;
 
 //== Colors
 //
 //## Gray and brand colors for use across Bootstrap.
-
-
 @gray-darker:           #252525;
 @gray-dark:             #505050;
 @gray:                  #7a7a7a;
@@ -28,10 +62,7 @@
 @brand-warning:         @orange;
 @brand-danger:          #E03A06;
 
-@navbar-brand-image-url: url(/img/ol-brand/logo-horizontal.png);
 
 @editor-loading-logo-padding-top: 115.44%;
 @editor-loading-logo-background-url: url(/img/ol-brand/overleaf-o-grey.svg);
-@editor-loading-logo-foreground-url: url(/img/ol-brand/overleaf-o.svg);
-
-@import "./_common-variables.less";
+@editor-loading-logo-foreground-url: url(/img/ol-brand/overleaf-o.svg);
\ No newline at end of file
diff --git a/services/web/public/stylesheets/core/scaffolding.less b/services/web/public/stylesheets/core/scaffolding.less
index b6dc68363d..0d433739db 100755
--- a/services/web/public/stylesheets/core/scaffolding.less
+++ b/services/web/public/stylesheets/core/scaffolding.less
@@ -142,7 +142,7 @@ hr {
 }
 
 .content-alt {
-  background-color: lighten(@gray-lightest, 2.5%);
+  background-color: @content-alt-bg-color;
 }
 
 .row-spaced {