Commit Graph

272 Commits

Author SHA1 Message Date
piensaenpixel
744daa0684 update branch with master 2016-02-09 18:32:24 +01:00
piensaenpixel
2c15096d69 fix cr 2016-02-09 18:22:23 +01:00
piensaenpixel
25ea770c26 fix nesting 2016-02-09 18:19:06 +01:00
María Checa
bd7b7db587 Merge pull request #43 from CartoDB/38-carousel_components
Carousel component
2016-02-09 18:15:23 +01:00
Maria Checa
43efadb59c Carousel component: solved conflicts merging master 2016-02-09 18:14:53 +01:00
piensaenpixel
50d67db30b Merge pull request #61 from CartoDB/colors-assets
Colors assets
2016-02-09 18:05:13 +01:00
piensaenpixel
3c96d80ae6 fix cr 2016-02-09 18:04:21 +01:00
Maria Checa
bddf751f04 Carousel component: minor fix 2016-02-09 18:01:02 +01:00
piensaenpixel
7eec296963 fix cr 2016-02-09 17:48:57 +01:00
piensaenpixel
1da800ecef fix vars 2016-02-09 17:25:28 +01:00
piensaenpixel
45c90f9cd9 change vars 2016-02-09 17:17:14 +01:00
Maria Checa
f2652106b3 Carousel component: inside elements horizontal and vertically centered 2016-02-09 16:55:40 +01:00
piensaenpixel
cf97094b8c fix pr 2016-02-09 16:54:05 +01:00
piensaenpixel
7aec38fb55 fix CR 2016-02-09 16:43:54 +01:00
Maria Checa
030d08d1e3 Merge branch 'master' of https://github.com/CartoDB/CartoAssets into 38-carousel_components 2016-02-09 16:02:57 +01:00
piensaenpixel
ab562c2f74 add colors 2016-02-09 15:23:20 +01:00
piensaenpixel
961dc2ef1b add new threePoints 2016-02-09 14:47:28 +01:00
piensaenpixel
32bc500ff0 Merge pull request #54 from CartoDB/53-step_component
Step component
2016-02-09 12:05:27 +01:00
María Checa
d81f930543 Step component: minor fix 2016-02-08 17:54:20 +01:00
piensaenpixel
f38377fa9e use helpers 2016-02-08 17:48:03 +01:00
piensaenpixel
124aaff389 add first commit 2016-02-08 17:01:29 +01:00
María Checa
2024f616ec Step component: improvements 2016-02-08 16:57:27 +01:00
María Checa
8bdc4c712b Step component: added to headers stylesheet 2016-02-08 15:23:14 +01:00
María Checa
c54528bf6a Step component: flex elements fix 2016-02-08 15:07:25 +01:00
María Checa
e8e7ebe04a Carousel component: css fixes 2016-02-08 14:36:03 +01:00
María Checa
6ef85bd46f Step component: syntax minor fix 2016-02-08 12:03:45 +01:00
María Checa
d6de5e8a35 Carousel component: syntax fix 2016-02-08 11:41:46 +01:00
María Checa
6e4ba3fe31 Carousel component: CartoIcon fix 2016-02-08 11:27:14 +01:00
María Checa
8ee48342f2 Carousel component: minor fix 2016-02-08 11:15:56 +01:00
María Checa
f12ee38ca0 Carousel component: syntax minor fixes 2016-02-08 10:52:18 +01:00
piensaenpixel
18712a3472 Merge pull request #59 from CartoDB/is-upper
Is upper
2016-02-05 16:49:31 +01:00
saleiva
95278659e9 Revert "Adding is-upper class to typography"
This reverts commit 5151d8c604.
2016-02-05 16:46:24 +01:00
saleiva
928663d7e4 Adding is-upper class to typography 2016-02-05 16:46:24 +01:00
Javier Arce
2f3e9a5f5b Merge pull request #58 from CartoDB/57-font-protocol
Adds agnostic protocol to fontws
2016-02-05 16:46:19 +01:00
saleiva
ecefc7517c is-upper 2016-02-05 16:45:33 +01:00
Javier Arce
9f67118079 Adds // 2016-02-05 16:44:06 +01:00
saleiva
5182f60f65 Revert "Adding is-upper class to typography"
This reverts commit 5151d8c604.
2016-02-05 16:44:06 +01:00
saleiva
5151d8c604 Adding is-upper class to typography 2016-02-05 16:43:50 +01:00
Javier Arce
071c568bae Closes #57 2016-02-05 16:43:17 +01:00
Javier Álvarez Medina
515112a35a Added gulp instructions for installation 2016-02-05 16:24:31 +01:00
piensaenpixel
a1735c249e Merge pull request #56 from CartoDB/fix-points
fix assets
2016-02-05 16:12:58 +01:00
piensaenpixel
610ef9b3fe fix assets 2016-02-05 16:10:41 +01:00
María Checa
927584918e Minor fix 2016-02-05 11:12:55 +01:00
María Checa
93dde16d98 Minor fix 2016-02-05 10:57:50 +01:00
María Checa
547f68db96 Step component 2016-02-05 10:57:11 +01:00
María Checa
853ee6913a Solved conflicts with master 2016-02-05 10:47:45 +01:00
María Checa
b0166e9cad Several improvements, reduced PR to just carousel component 2016-02-05 10:42:47 +01:00
piensaenpixel
e709907d9d Merge pull request #51 from CartoDB/add-loaders
fix hound
2016-02-04 19:58:16 +01:00
piensaenpixel
597da73511 Merge pull request #50 from CartoDB/three-points-changes
Changing Threepoints usage markup to Button instead of div.
2016-02-04 19:57:56 +01:00
piensaenpixel
b82bd5dbad fix hound 2016-02-04 19:57:38 +01:00