Merge branch 'master' of https://github.com/CartoDB/CartoAssets into 47-color_input

src/scss/cdb-components/forms/textarea.scss

@@ -0,0 +1,42 @@
+// Textarea styles
+// ----------------------------------------------
+
+/* SG
+# Forms/Textareas
+
+```
+<textarea name="textarea" placeholder="DejaVu Sans" class="CDB-Textarea CDB-Text"></textarea>
+<textarea name="textarea" placeholder="DejaVu Sans" class="CDB-Textarea has-error CDB-Text"></textarea>
+<textarea name="textarea" placeholder="DejaVu Sans" class="CDB-Textarea is-disabled CDB-Text" disabled></textarea>
+```
+*/
+
+@import '../../cdb-variables/sizes';
+@import '../../cdb-variables/colors';
+
+.CDB-Textarea {
+  width: 100%;
+  padding: 7px 8px 6px;
+  border: 1px solid $cMainLine;
+  border-radius: $baseSize / 2;
+  font-size: $sFontSize-medium;
+  line-height: $sLineHeight-medium;
+
+  &:hover {
+    border: 1px solid $cHoverLine;
+  }
+  &:focus {
+    border: 1px solid $cBlue;
+    outline-color: transparent;
+    outline-style: none;
+  }
+  &:disabled {
+    border-color: $cSecondaryLine;
+    background: $cThirdBackground;
+  }
+}
+.CDB-Textarea.has-error {
+  border: 1px solid rgba($cError, 0.48);
+  background: rgba($cError, 0.04);
+  color: $cError;
+  }

src/scss/cdb-components/forms/toggle.scss

@@ -33,7 +33,7 @@
     height: $baseSize * 2;
     margin: 0 2px;
     border-radius: 50px;
-    background: $cTypo4;
+    background: $cHintText;
 
     &::before {
       position: absolute;
@@ -49,7 +49,7 @@
   }
 
   &:checked + .CDB-ToggleFace {
-    background: $cMainDark;
+    background: $cMainBg;
 
     &::before {
       right: 2px;