Commit Graph

449 Commits

Author SHA1 Message Date
María Checa
161af4654f Dropdown component: minor fix 2016-02-16 15:03:00 +01:00
María Checa
0aeaa4e904 Dropdown component: solved errors after merging master changes 2016-02-16 15:02:22 +01:00
María Checa
419050431e Merge branch 'master' into 46-input_dropdown 2016-02-16 14:58:23 +01:00
María Checa
0ba08fd8de Dropdown component: minor fixes 2016-02-16 14:58:00 +01:00
María Checa
7cb07e435d Textarea component: minor fix 2016-02-16 14:40:22 +01:00
María Checa
0da897e3b7 Dropdown component: improvements 2016-02-16 14:16:51 +01:00
María Checa
ff637c7b36 Dropdown component: improvements 2016-02-16 14:10:59 +01:00
piensaenpixel
48033c7627 Merge pull request #69 from CartoDB/68-move_uppercase
move helper
2016-02-15 16:52:28 +01:00
piensaenpixel
f1c6baefec move helper 2016-02-15 16:33:43 +01:00
piensaenpixel
3fbad828a7 Merge pull request #67 from CartoDB/66-add_ellipsis
add helper
2016-02-15 11:27:03 +01:00
piensaenpixel
ba5f5c43e0 add helper 2016-02-15 11:26:09 +01:00
piensaenpixel
1a7fc12a51 Merge pull request #65 from CartoDB/add-blue-helper
add blue helper
2016-02-11 19:27:06 +01:00
piensaenpixel
a62b1123aa add blue helper 2016-02-11 19:24:19 +01:00
Nicklas Gummesson
0567b96d83 Merge pull request #64 from CartoDB/add-travis
Add travis to chck grunt build passing
2016-02-09 19:09:31 +01:00
Nicklas Gummesson
e68ee294a7 Fix broken var 2016-02-09 19:06:07 +01:00
Nicklas Gummesson
9b322b6bf2 Force CI failure 2016-02-09 19:02:14 +01:00
Nicklas Gummesson
63b49f2506 Add travis for grunt build 2016-02-09 18:58:14 +01:00
piensaenpixel
11d74c67b1 Merge pull request #63 from CartoDB/Add-shapes
fix weird var
2016-02-09 18:52:28 +01:00
piensaenpixel
feb153bd39 fix weird var 2016-02-09 18:51:06 +01:00
Maria Checa
b1158241b2 Dropdown component: minor fix 2016-02-09 18:45:08 +01:00
Maria Checa
a4878321ad Dropdown component 2016-02-09 18:42:52 +01:00
piensaenpixel
744daa0684 update branch with master 2016-02-09 18:32:24 +01:00
piensaenpixel
aa6a3d5a02 Merge pull request #60 from CartoDB/Add-shapes
add new threePoints
2016-02-09 18:30:42 +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
María Checa
820a4dad42 Dropdown component 2016-02-08 17:46:57 +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