0.2.5

Add Montserrat font family

README.md

@@ -17,7 +17,7 @@ If you want to use any of the CartoAssets components, after the installation jus
 It will generate a UI documentation about the components in this repository:
 - ```grunt dev```
 
-If you want to check the documenation, it is generated in the ```dist``` folder.
+If you want to check the documentation, it is generated in the ```dist``` folder.
 
 ### How to add/update the icon font
 
@@ -43,4 +43,4 @@ Just run this command:
 
 ![Chrome](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/archive/chrome_12-48/chrome_12-48_48x48.png) | ![Firefox](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/archive/firefox_1.5-3/firefox_1.5-3_48x48.png) | ![IE](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/edge-tile/edge-tile_48x48.png) | ![Opera](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/opera/opera_48x48.png) | ![Safari](https://cdnjs.cloudflare.com/ajax/libs/browser-logos/39.3.0/safari/safari_48x48.png)
 --- | --- | --- | --- | --- |
-31+ ✔ | 38+ ✔ | 11+ ✔ | 31+ ✔ | 8+ ✔ |
+31+ ✔ | 38+ ✔ | 11+ ✔ | 31+ ✔ | 8+ ✔ |

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cartoassets",
   "description": "Share frontend assets between different CARTO repositories",
-  "version": "0.2.2",
+  "version": "0.2.5",
   "homepage": "https://github.com/cartodb/CartoAssets",
   "author": {
     "name": "CARTO",

src/scss/cdb-components/_buttons.scss

@@ -175,9 +175,17 @@ Layout Component:
   &.is-disabled {
     opacity: 0.24;
     cursor: default;
+
+    &:active {
+      pointer-events: none;
+    }
   }
 }
 
+.CDB-Button--noPadding {
+  padding: 0;
+}
+
 .CDB-Button--loading {
   .CDB-Button-loader {
     position: absolute;

src/scss/cdb-components/_menu.scss

@@ -242,7 +242,8 @@
   .CDB-NavMenu-link,
   .CDB-NavSubmenu-link {
     margin-bottom: -1px;
-    color: $cAltText;
+    transition: none;
+    color: $cWhite;
 
     &:hover {
       border-bottom: 2px solid darken($cMainLine, 8%);
@@ -256,13 +257,13 @@
   }
 
   .CDB-NavMenu-item.is-selected .CDB-NavMenu-link {
-    border-bottom: 2px solid $cMainLine;
-    color: $cWhite;
+    border-bottom: 2px solid $cAltText;
+    color: $cAltText;
   }
 
   .CDB-NavSubmenu-item.is-selected .CDB-NavSubmenu-link {
-    border-bottom: 2px solid $cMainLine;
-    color: $cWhite;
+    border-bottom: 2px solid $cAltText;
+    color: $cAltText;
   }
 
   .CDB-NavSubmenu-status {

src/scss/cdb-utilities/_fonts.scss

@@ -1,6 +1,7 @@
 // Fonts
 // --------------------------------------------------
 
+// Open Sans
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
@@ -28,3 +29,32 @@
   url('../fonts/OpenSans-Semibold.woff') format('woff'),
   url('../fonts/OpenSans-Semibold.ttf') format('truetype');
 }
+
+// Montserrat
+@font-face {
+  font-family: 'Montserrat';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/Montserrat-Regular.eot');
+  src: url('../fonts/Montserrat-Regular.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/Montserrat-Regular.woff') format('woff'),
+  url('../fonts/Montserrat-Regular.ttf') format('truetype');
+}
+@font-face {
+  font-family: 'Montserrat';
+  font-style: normal;
+  font-weight: 600;
+  src: url('../fonts/Montserrat-Semibold.eot');
+  src: url('../fonts/Montserrat-Semibold.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/Montserrat-Semibold.woff') format('woff'),
+  url('../fonts/Montserrat-Semibold.ttf') format('truetype');
+}
+@font-face {
+  font-family: 'Montserrat';
+  font-style: normal;
+  font-weight: 700;
+  src: url('../fonts/Montserrat-Bold.eot');
+  src: url('../fonts/Montserrat-Bold.eot?#iefix') format('embedded-opentype'),
+  url('../fonts/Montserrat-Bold.woff') format('woff'),
+  url('../fonts/Montserrat-Bold.ttf') format('truetype');
+}

src/scss/cdb-utilities/_helpers.scss

@@ -129,6 +129,13 @@
   @include align-items(flex-end);
 }
 
+/* Clearfix */
+.u-clearfix::after {
+  display: table;
+  clear: both;
+  content: '';
+}
+
 
 /* Media queries*/
 @include media-query-mobile() {