Rebranding

CONTRIBUTING.md

@@ -145,7 +145,7 @@ Once a new Pull Request is started,
 
 ## Submitting contributions
 
-Before opening a pull request (or submitting a contribution) you will need to sign a Contributor License Agreement (CLA) before making a submission, [learn more here](https://cartodb.com/contributing).
+Before opening a pull request (or submitting a contribution) you will need to sign a Contributor License Agreement (CLA) before making a submission, [learn more here](https://carto.com/contributing).
 
 After that, there are several rules you should follow when a new pull request is created:
 

README.md

@@ -9,7 +9,7 @@ visualization of geospatial data on the web.
 It was built to make it easier for people to tell their stories by
 providing them with flexible and intuitive ways to create maps and design
 geospatial applications. CartoDB can be installed on your own server
-and we also offer a hosted service at [cartodb.com](https://cartodb.com).
+and we also offer a hosted service at [carto.com](https://carto.com).
 
 If you would like to see some live demos, check out our
 [videos](http://www.vimeo.com/channels/cartodb) on Vimeo.
@@ -25,12 +25,12 @@ etc) using a web form and then make it public or private.
 
 After it is uploaded, you can visualize it in a table or on a map, search
 it using SQL, and apply map styles using CartoCSS. You can even access it
-using the CartoDB [APIs](http://docs.cartodb.com/#cartodb-platform), or export it
+using the CartoDB [APIs](https://docs.carto.com/#cartodb-platform), or export it
 to a file.
 
 In other words, with CartoDB you can make awesome maps and build
 powerful geospatial applications! Definitely check out the [CartoDB
-Platform](https://cartodb.com/platform) for interactive examples
+Platform](https://carto.com/platform) for interactive examples
 and code.
 
 
@@ -47,7 +47,7 @@ documentation.
 
 ## Developing & Contributing to CartoDB
 
-See [our contributing doc](CONTRIBUTING.md) for how you can improve CartoDB, but you will need to sign a Contributor License Agreement (CLA) before making a submission, [learn more here](https://cartodb.com/contributing).
+See [our contributing doc](CONTRIBUTING.md) for how you can improve CartoDB, but you will need to sign a Contributor License Agreement (CLA) before making a submission, [learn more here](https://carto.com/contributing).
 
 ## Testing
 

app/assets/stylesheets/common/account_forms.css.scss

@@ -20,22 +20,17 @@ $sLabel-width: 140px;
 .FormAccount-title {
   display: inline-block;
   width: 100%;
-  margin: 30px 0;
+  margin: 30px 0 28px 0;
 }
 .FormAccount-titleHeader {
   display: block;
   margin-bottom: $sMargin-section;
   padding-bottom: 12px;
   border-bottom: 1px solid $cStructure-mainLine;
   color: $cTypography-headers;
-  font-size: $sFontSize-normal;
-  font-weight: $sFontWeight-bold;
 }
 .FormAccount-titleText {
   color: $cTypography-paragraphs;
-  font-size: $sFontSize-large;
-  font-style: normal;
-  font-weight: $sFontWeight-lighter;
 }
 .FormAccount-titleText--negative {
   color: $cHighlight-negative;
@@ -48,8 +43,6 @@ $sLabel-width: 140px;
 }
 .FormAccount-listItem {
   color: $cTypography-paragraphs;
-  font-size: 14px;
-  font-weight: $sFontWeight-lighter;
 }
 .VerticalAligned--FormRow {
   @include display-flex();
@@ -60,7 +53,7 @@ $sLabel-width: 140px;
   @include display-flex();
   @include flex-direction(column);
   @include justify-content(flex-start, start);
-  margin: 0 0 20px;
+  margin: 0 0 32px;
 }
 .FormAccount-row--wideMarginBottom {
   margin-bottom: 100px;
@@ -83,9 +76,6 @@ $sLabel-width: 140px;
     border: 1px solid $cStructure-mainLine;
     border-radius: 50px;
     color: $cTypography-paragraphs;
-    font-size: $sFontSize-smallUpperCase;
-    font-weight: $sFontWeight-small;
-    line-height: $sLineHeight-small;
     content: '';
   }
   &:first-child:before {
@@ -138,8 +128,6 @@ $sLabel-width: 140px;
 }
 .FormAccount-label {
   color: $cTypography-paragraphs;
-  font-size: $sFontSize-normal;
-  font-weight: $sFontWeight-normal;
   text-transform: capitalize;
 }
 .FormAccount-label.FormAccount-label--verticalAlignTop {
@@ -162,7 +150,7 @@ $sLabel-width: 140px;
   position: relative;
   width: 100%;
   height: 1px;
-  margin-bottom: 25px;
+  margin-bottom: 16px;
   background-color: $cStructure-darkGrey;
   z-index: 0;
 }
@@ -183,8 +171,6 @@ $sLabel-width: 140px;
   border-radius: 4px;
   background-color: $cHighlight-positive;
   color: #FFFFFF;
-  font-size: 13px;
-  font-weight: normal;
 }
 
 .FormAccount-rowData.FormAccount-rowData--alignLeft {
@@ -236,7 +222,6 @@ $sLabel-width: 140px;
   border-radius: 4px;
   outline: none;
   color: #666666;
-  font-weight: $sFontWeight-lighter;
   z-index: 2;
 
   &:focus {
@@ -269,19 +254,19 @@ $sLabel-width: 140px;
 }
 // Sizes
 .FormAccount-input--totalwidth {
-  width: 100%;
+  width: 100% !important;
 }
 .FormAccount-input--longer {
-  width: 434px;
+  width: 434px !important;
 }
 .FormAccount-input--long {
-  width: 354px;
+  width: 354px !important;
 }
 .FormAccount-input--med {
-  min-width: 274px;
+  width: 274px !important;
 }
 .FormAccount-input--short {
-  width: 114px;
+  width: 114px !important;
 }
 // Types
 .FormAccount-input.has-icon {
@@ -352,7 +337,6 @@ $sLabel-width: 140px;
   border-radius: 4px;
   background: #FFF4F4;
   color: $cHighlight-negative;
-  font-size: $sFontSize-normal;
   line-height: 38px;
   z-index: 1;
 }
@@ -407,11 +391,11 @@ $sLabel-width: 140px;
   @include justify-content(space-between, justify);
 }
 .FormAccount-userRole {
+  margin-top: 20px;
   @include display-flex();
   @include flex-direction(column);
   @include align-items(baseline, baseline);
   @include justify-content(space-between, justify);
-  padding-top: 10px;
 }
 .FormAccount-avatarPreview {
   @include display-flex();
@@ -452,8 +436,8 @@ $sLabel-width: 140px;
 }
 .FormAccount-avatar .input-group {
   position: absolute;
-  top: 10px;
-  left: 120px;
+  top: 14px;
+  left: 114px;
 }
 .FormAccount-avatar .form-control {
   display: none;
@@ -468,8 +452,8 @@ $sLabel-width: 140px;
   position: absolute;
   top: 0;
   left: 0;
-  width: 85px;
-  margin-left: 2px;
+  width: 120px;
+  font-size: 12px;
   color: $cTypography-link;
   &:hover {
     color: $cTypography-linkHover;
@@ -556,7 +540,8 @@ $sLabel-width: 140px;
   @include display-flex();
 
   &.FormAccount-rowInfo--marginLeft {
-    margin-left: 20px;
+    margin-left: 12px;
+    width: 224px;
   }
   &.FormAccount-rowInfoText--multipleLines {
     width: 500px;
@@ -616,6 +601,7 @@ $sLabel-width: 140px;
   color: $cTypography-secondary;
   font-size: $sFontSize-normal;
   font-weight: $sFontWeight-lighter;
+  line-height: 22px;
 }
 .FormAccount-footerIcon {
   width: 20px;
@@ -663,6 +649,7 @@ $sLabel-width: 140px;
   }
 }
 .FormAccount-tagsList.tagit .tagit-new {
+  width: 160px;
   padding: 7px 4px 2px 7px;
 }
 .FormAccount-tagsList.tagit .ui-autocomplete-input::-webkit-input-placeholder {
@@ -696,12 +683,9 @@ $sLabel-width: 140px;
 
 .FormAccount-tagsList--placeholder {
   position: absolute;
-  left: 0;
-  padding: 0 0 0 12px;
-  color: #AAAAAA;
+  top: 12px;
+  left: 12px;
   font-style: italic;
-  font-weight: 300;
-  line-height: 38px;
 }
 
 .FormAccount-button--deleteAccount {

app/assets/stylesheets/common/background-polling/background-polling-item.css.scss

@@ -25,7 +25,6 @@
   @include css3-prefix(text-overflow, ellipsis);
   white-space: nowrap;
   overflow: hidden;
-  font-size: $sFontSize-normal;
   color: $cTypography-paragraphs;
 }
 .ImportItem-text.is-long {

app/assets/stylesheets/common/badge.css.scss

@@ -1,6 +1,8 @@
 @import "../variables/mixins";
 @import "../variables/colors";
 @import "../variables/sizes";
+@import 'cdb-variables/colors';
+
 
 .Badge {
   position: absolute;
@@ -22,5 +24,5 @@
     right: auto;
   }
 }
-.Badge--negative { background-color: $cHighlight-negative }
+.Badge--negative { background-color: $cError }
 .Badge--positive { background-color: $cHighlight-positive }

app/assets/stylesheets/common/buttons.css.scss

@@ -187,7 +187,7 @@ $cHighlight-mainHover: rgba(#007FBD, 1);
   height: 24px;
   padding: 0 11px;
   border: 1px solid #CCC;
-  border-radius: 40px;
+  border-radius: $sButton-borderRadius;
   background: transparent;
   color: $cTypography-paragraphs;
   font-size: $sFontSize-smallUpperCase;
@@ -203,7 +203,7 @@ $cHighlight-mainHover: rgba(#007FBD, 1);
   margin: auto;
   transition: opacity 150ms ease-in-out;
   border: 1px solid #CCC;
-  border-radius: 40px;
+  border-radius: $sButton-borderRadius;
   background-color: transparent;
   color: $cTypography-linkSecondaryHover;
   font-size: $sFontSize-smallUpperCase;

app/assets/stylesheets/common/content-result.css.scss

@@ -1,8 +1,8 @@
 // Content Result
-// 
+//
 // Show the result of any action made in the
 // dashboard, example (search, no results, error,
-// loading, ...) 
+// loading, ...)
 // --------------------------------------------------
 
 @import "compass/css3/images";
@@ -31,8 +31,7 @@
   min-height: 0;
   margin: 0 auto;
   padding: 28px 0 0 0;
-  @include background(image-url('layout/no_datasets_bkg.png') center center no-repeat $blueBkg);
-  box-shadow: 1px 0 0 1px $cStructure-softLine;
+  border-bottom: 1px solid $cStructure-softLine;
   overflow: hidden;
   z-index: 9;
 
@@ -43,21 +42,6 @@
     top: 0;
     bottom: 0;
     z-index: 0;
-  }  
-
-  &:after {
-    left: 50%;
-    right: 0;
-    margin-left: 470px;
-    @include background-horizontal(rgba($blueBkg,0), rgba($blueBkg,1));
-  }
-
-  &:before {
-    left: 0;
-    right: 50%;
-    margin-right: 470px;
-    background-color: transparent!important;
-    @include background-horizontal(rgba($blueBkg,1), rgba($blueBkg,0));
   }
 
   .NoDatasets-illustration {
@@ -67,7 +51,10 @@
     width: 671px;
     height: 195px;
     margin-left: -335px;
-    @include background(image-url('layout/search_lens_bkg.png') center center no-repeat);
+    background-image: image-url('layout/search_lens_background.png');
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 100%;
   }
   .NoDatasets-illustration--secondary { @include background(image-url('layout/connect-dataset.png') center center no-repeat) }
 }
@@ -90,7 +77,7 @@
     right: 0;
     height: 2px;
     background: rgba(black, 0.55);
-    @include animation(pulsate 1.5s linear infinite);      
+    @include animation(pulsate 1.5s linear infinite);
   }
 }
 .ContentResult-icon {