Commit Graph

518 Commits

Author SHA1 Message Date
piensaenpixel
73a3675b5f fix CR 2016-02-22 17:12:18 +01:00
piensaenpixel
5cdfb1e328 change icon and fix hound 2016-02-22 16:54:08 +01:00
piensaenpixel
137e5d28d0 change markup 2016-02-22 16:44:00 +01:00
piensaenpixel
6ab6774119 add menu editor 2016-02-22 16:39:56 +01:00
María Checa
533dd3b167 Input option component: minor changes 2016-02-22 15:43:26 +01:00
María Checa
9e0a1d463e Input option component: flexbox fixed 2016-02-22 12:46:12 +01:00
Maria Checa
ff89163f58 Input option markup improvements 2016-02-19 16:35:49 +01:00
María Checa
3a2513e2a2 Color bar & option input components: syntax fixes 2016-02-18 20:06:30 +01:00
María Checa
89f0e13fae Color bar component: style fixes 2016-02-18 20:05:07 +01:00
María Checa
bde6ec4559 Option input component: improvements 2016-02-18 20:02:29 +01:00
María Checa
444cb84331 Color bar component: improvements and gradient border fix 2016-02-18 14:34:02 +01:00
María Checa
55fae253d2 Color bar component: several improvements 2016-02-18 12:14:54 +01:00
Javier Arce
1d207bdf5c Bump version 2016-02-17 10:10:56 +01:00
Javier Arce
e3b40a2a41 Merge pull request #71 from CartoDB/70-menu-changes
Menu fixes
2016-02-17 10:10:33 +01:00
piensaenpixel
4248fa1738 fix color menu 2016-02-17 10:05:50 +01:00
María Checa
351b645ac8 Improvements: Option input & color bar components 2016-02-16 19:10:37 +01:00
María Checa
fee10f9e2e Merge branch 'master' of https://github.com/CartoDB/CartoAssets into 47-color_input 2016-02-16 17:50:38 +01:00
María Checa
dd463d605b Merge pull request #48 from CartoDB/45-textarea_input
Textarea component
2016-02-16 17:49:30 +01:00
Javier Arce
3d14a09b12 Closes #70 2016-02-16 16:47:33 +01:00
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