22 Commits

Author SHA1 Message Date
Víctor Velarde
90345a0bad 0.2.5 2018-08-20 13:09:35 +02:00
Víctor Velarde
df7bedd062 Merge pull request #204 from CartoDB/203-montserrat-font
Add Montserrat font family
2018-08-20 13:08:07 +02:00
Víctor Velarde
60927b4c85 Fix typo 2018-08-20 11:45:29 +02:00
Víctor Velarde
a4682b23a3 Add Montserrat font files for regular, semibold and bold 2018-08-20 11:37:59 +02:00
Jesús Arroyo Torrens
289c9d32e2 Merge pull request #202 from CartoDB/fix-dark-links
Fix dark menu links
2018-07-05 12:12:14 +02:00
Jesús Arroyo Torrens
712f4325d5 Fix dark menu links 2018-07-05 06:49:18 +02:00
jesusbotella
b205ec0cc6 0.2.4 2018-06-18 13:23:55 +02:00
Jesús Botella
de813d3070 Merge pull request #201 from CartoDB/wrong-margin-in-paddings
Add Clearfix class
2018-06-18 13:23:35 +02:00
jesusbotella
f567653da3 Fix Hound 2018-06-18 13:19:56 +02:00
jesusbotella
0fbd357b10 Add Clearfix class 2018-06-14 12:59:13 +02:00
jesusbotella
aef4e7f9f5 0.2.3 2018-06-14 12:21:53 +02:00
Jesús Botella
34c8e8c816 Merge pull request #200 from CartoDB/disable-pointerevents-in-disabled-buttons
Disable pointer events in disabled buttons
2018-06-14 12:21:39 +02:00
jesusbotella
54ce151f5f Disable pointer events when disabled button is active 2018-06-14 11:28:37 +02:00
jesusbotella
b225ce7f0c Disable pointer events in disabled buttons 2018-06-14 10:52:47 +02:00
Rubén Moya
3913e9f932 Merge pull request #199 from CartoDB/add-no-padding-button
Add noPadding helper to CDB-Button
2018-05-25 09:33:57 +02:00
rubenmoya
25b418781f Add noPadding helper to CDB-Button 2018-05-25 09:20:46 +02:00
Jesús Botella
4cbe7053b7 Merge pull request #198 from CartoDB/add-left-xxl-margin
Add XXL left space
2018-05-23 12:15:12 +02:00
jesusbotella
75e6927015 Merge branch 'master' into add-left-xxl-margin 2018-05-23 11:57:57 +02:00
Jesús Botella
261ac8a261 Merge pull request #197 from CartoDB/update-select-styles
Update hover and focus styles to match input text
2018-05-21 16:19:55 +02:00
jesusbotella
78f686abd7 Update NodeJS version for Travis checks 2018-05-21 16:07:34 +02:00
jesusbotella
d338a1050c Add XXL left space 2018-05-16 11:51:08 +02:00
jesusbotella
aa5486a1a3 Update hover and focus styles to match input text 2018-05-07 09:53:13 +02:00
17 changed files with 64 additions and 11 deletions

View File

@@ -1,7 +1,7 @@
cache: false
language: node_js
node_js:
- "4.1"
- "6.14.2"
install:
- npm install

View File

@@ -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+ ✔ |

View File

@@ -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",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
src/fonts/Montserrat-Regular.ttf Executable file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
src/fonts/Montserrat-Semibold.ttf Executable file

Binary file not shown.

Binary file not shown.

View File

@@ -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;

View File

@@ -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 {

View File

@@ -77,10 +77,10 @@
box-sizing: border-box;
&:hover {
border: 1px solid $cHoverLine;
border: 1px solid $cBlueHover;
}
&:focus {
border: 1px solid $cBlue;
border: 1px solid $cBlackHover;
outline: none;
}
&:disabled {
@@ -90,6 +90,10 @@
&.has-error {
@include default-form-error-style();
}
&.is-cursor {
cursor: pointer;
}
}
.CDB-FieldError .CDB-Select,

View File

@@ -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');
}

View File

@@ -44,6 +44,9 @@
.u-lSpace--xl {
margin-left: 12px;
}
.u-lSpace--xxl {
margin-left: 16px;
}
.u-ellipsis {
text-overflow: ellipsis;
@@ -126,6 +129,13 @@
@include align-items(flex-end);
}
/* Clearfix */
.u-clearfix::after {
display: table;
clear: both;
content: '';
}
/* Media queries*/
@include media-query-mobile() {