Javier Arce
|
f2d4bfd1da
|
Fixes conflicts
|
2016-02-23 17:21:12 +01:00 |
|
piensaenpixel
|
2dc5456735
|
merge master
|
2016-02-23 17:16:25 +01:00 |
|
Javier Arce
|
3d9c012eef
|
Merge with master
|
2016-02-23 17:12:58 +01:00 |
|
Javier Arce
|
cb9c60ea8c
|
Merge branch 'master' of github.com:CartoDB/CartoAssets
|
2016-02-23 17:07:21 +01:00 |
|
Javier Arce
|
4567fe4141
|
Bump version
|
2016-02-23 17:04:36 +01:00 |
|
Javier Arce
|
a22154e4b3
|
Merge branch 'master' into fix-forms
|
2016-02-23 17:04:15 +01:00 |
|
piensaenpixel
|
a5e41c6762
|
Merge pull request #74 from CartoDB/fake-select
add fake styles
|
2016-02-23 16:45:35 +01:00 |
|
piensaenpixel
|
33c4e81847
|
fix hound
|
2016-02-23 16:35:39 +01:00 |
|
piensaenpixel
|
528684e56a
|
add fake styles
|
2016-02-23 16:32:51 +01:00 |
|
Javier Arce
|
df5f4b7018
|
Merge branch 'master' of github.com:CartoDB/CartoAssets
|
2016-02-23 15:40:22 +01:00 |
|
piensaenpixel
|
78829e693c
|
use flexbox for forms
|
2016-02-23 13:48:27 +01:00 |
|
María Checa
|
008f6aaf8e
|
Merge pull request #49 from CartoDB/47-color_input
Color bar & option input components
|
2016-02-23 11:47:06 +01:00 |
|
María Checa
|
d91131ae16
|
Input option component: minor improvements
|
2016-02-23 11:39:19 +01:00 |
|
María Checa
|
b7847b25ab
|
Color bar & option input component: minor improvements
|
2016-02-23 11:23:49 +01:00 |
|
María Checa
|
231e72cfd9
|
Option input component: minor fix
|
2016-02-23 11:10:43 +01:00 |
|
María Checa
|
bbc4f383c8
|
Color bar component: minor fix
|
2016-02-23 11:03:30 +01:00 |
|
María Checa
|
33608a1197
|
Color bar component: minor fixes
|
2016-02-23 10:51:27 +01:00 |
|
Javier Arce
|
fdc9b62cb5
|
Bump version
|
2016-02-23 10:15:22 +01:00 |
|
María Checa
|
a2b2fd5581
|
Color bar & option input components: fixes
|
2016-02-22 19:35:42 +01:00 |
|
María Checa
|
126b5353ef
|
Option input component: minor fix
|
2016-02-22 18:12:14 +01:00 |
|
María Checa
|
475376be43
|
Option input component: ninja fixes
|
2016-02-22 18:09:52 +01:00 |
|
María Checa
|
e9bdd7017c
|
Option input content: fixes
|
2016-02-22 17:13:50 +01:00 |
|
piensaenpixel
|
0c025acd65
|
Merge pull request #72 from CartoDB/menu-bar
Menu bar
|
2016-02-22 17:12:50 +01:00 |
|
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
|
7cb07e435d
|
Textarea component: minor fix
|
2016-02-16 14:40:22 +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 |
|