cartodb4/CartoAssets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
329 Commits 16 Branches 5 Tags
2dc5456735299cea679a3dffa015bc4e4e126fdc
Commit Graph
91 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
piensaenpixel 2dc5456735 merge master 2016-02-23 17:16:25 +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
piensaenpixel 78829e693c use flexbox for forms 2016-02-23 13:48:27 +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
piensaenpixel 4248fa1738 fix color menu 2016-02-17 10:05:50 +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
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
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
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
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
piensaenpixel cf97094b8c fix pr 2016-02-09 16:54:05 +01:00
piensaenpixel 7aec38fb55 fix CR 2016-02-09 16:43:54 +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
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
piensaenpixel 18712a3472 Merge pull request #59 from CartoDB/is-upper 
Is upper
 2016-02-05 16:49: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
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
piensaenpixel d7d98f18e4 merge branch 2016-02-04 19:54:02 +01:00
piensaenpixel e520071afe Merge pull request #41 from CartoDB/add-loaders 
Add loaders
 2016-02-04 19:52:38 +01:00
piensaenpixel 70844c4012 fix merge 2016-02-04 19:52:36 +01:00
piensaenpixel a1d651acd2 Merge pull request #42 from CartoDB/infoBoxes-assets 
Info boxes assets
 2016-02-04 11:01:10 +01:00
piensaenpixel cc648bb242 fix hound 2016-02-04 09:56:03 +01:00
piensaenpixel 1545b89d68 fix bad merge 2016-02-03 22:56:37 +01:00
piensaenpixel c6e1f2bf18 update branch 2016-02-03 22:51:00 +01:00
piensaenpixel 5c5f41de31 change modify 2016-02-03 22:49:13 +01:00
piensaenpixel 0c08695652 add first infoBoxes 2016-02-03 19:19:42 +01:00
piensaenpixel caaa6bf345 fix hound 2016-02-03 17:07:20 +01:00
piensaenpixel cd027cebd2 fix vars 2016-02-03 16:59:08 +01:00
piensaenpixel e4f5c098e0 add loader and loader box 2016-02-03 16:52:31 +01:00
piensaenpixel 09d08c22d0 update branch 2016-02-03 11:12:15 +01:00
piensaenpixel ab2ad9bb1e minor fixes 2016-02-03 11:10:13 +01:00
piensaenpixel ece198db8f Merge pull request #39 from CartoDB/headers-assets 
Headers assets
 2016-02-02 11:54:46 +01:00
piensaenpixel ac99ac9c48 fix padding 2016-02-02 10:36:40 +01:00
piensaenpixel 11f333651d fix hound 2016-02-02 09:58:47 +01:00
piensaenpixel c6cbf7eeb9 add headers 2016-02-01 23:49:29 +01:00
piensaenpixel a00c77733a Merge pull request #36 from CartoDB/12-fix_shapes 
12 fix shapes
 2016-02-01 18:25:37 +01:00
piensaenpixel bff9be2be6 fix CR 2016-02-01 17:56:03 +01:00
piensaenpixel 033f50300d add headers 2016-02-01 17:16:15 +01:00
piensaenpixel f6dfad3b79 fix hound 2016-02-01 11:19:41 +01:00
piensaenpixel 6257d6032e update package.json 2016-02-01 11:14:08 +01:00
piensaenpixel 09aa476479 merge master 2016-02-01 11:13:40 +01:00
piensaenpixel c11028772e Merge pull request #33 from CartoDB/27-add-default 
create default stylesheet #27
 2016-01-29 17:53:18 +01:00
piensaenpixel 0faf002dff bump package version 2016-01-29 17:51:12 +01:00
piensaenpixel a07ece2e34 Merge branch 'master' of github.com:CartoDB/CartoAssets into 27-add-default 2016-01-29 17:48:39 +01:00
piensaenpixel 3777708330 remove unnecessary css 2016-01-29 17:01:44 +01:00
piensaenpixel d1279336cd fix pr 2016-01-29 16:49:34 +01:00
piensaenpixel 5024e786be add checks 2016-01-29 16:36:32 +01:00
piensaenpixel d8a5d45cc3 add shape circle 2016-01-29 15:42:25 +01:00
piensaenpixel ea8da9d88a add assets 2016-01-29 13:30:23 +01:00
piensaenpixel 340dad9dfe Merge branch 'master' of github.com:CartoDB/CartoAssets into 12-fix_shapes 2016-01-29 13:28:10 +01:00
piensaenpixel ac500fb06e add shapes 2016-01-28 16:14:00 +01:00
piensaenpixel dc4819fe38 add first shapes - #12 2016-01-27 19:17:16 +01:00
piensaenpixel fae5428354 create default stylesheet #27 2016-01-27 16:00:57 +01:00
piensaenpixel ea648f146d Merge pull request #32 from CartoDB/forms-assets 
fix indent and variables names
 2016-01-27 15:37:50 +01:00
piensaenpixel 5aae922044 fix indent and variables names 2016-01-27 15:36:41 +01:00
piensaenpixel 6af4978a17 Merge pull request #21 from CartoDB/forms-assets 
Forms assets
 2016-01-27 15:30:53 +01:00
piensaenpixel 78d0d8f085 Merge branch 'forms-assets' of github.com:CartoDB/CartoAssets into forms-assets 2016-01-27 14:34:30 +01:00
piensaenpixel 632e6b40a0 merge with master 2016-01-27 14:34:23 +01:00
piensaenpixel d17e5386ce Merge pull request #31 from CartoDB/typography-asset 
Typography asset
 2016-01-26 18:07:13 +01:00
piensaenpixel a274de714c fix example 2016-01-26 18:00:58 +01:00
piensaenpixel 4534fb719d fix typography names 2016-01-26 17:40:56 +01:00
piensaenpixel 0e3e65387f add toogle 2016-01-26 17:28:48 +01:00
piensaenpixel bfac0d90d6 Merge pull request #22 from CartoDB/buttons-cartoassets 
add buttons components
 2016-01-26 14:53:36 +01:00
piensaenpixel 04b0c54e3c add info elements 2016-01-26 14:49:38 +01:00
piensaenpixel a1b891824e use vars 2016-01-26 12:22:16 +01:00
piensaenpixel c1143441eb fix PR 2016-01-26 12:16:40 +01:00
piensaenpixel eab88d5904 Merge pull request #3 from CartoDB/first-approach-typography 
add typography
 2016-01-15 14:42:43 +01:00