Commit Graph

86 Commits

Author SHA1 Message Date
piensaenpixel
09aa476479 merge master 2016-02-01 11:13:40 +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
xavijam
266e5ef057 Added new generated icon-font stylesheet 2016-01-28 17:06:31 +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
5aae922044 fix indent and variables names 2016-01-27 15:36:41 +01:00
piensaenpixel
632e6b40a0 merge with master 2016-01-27 14:34:23 +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
Javier Arce
ae9e74712c Updates icons 2016-01-26 12:19:10 +01:00
piensaenpixel
c1143441eb fix PR 2016-01-26 12:16:40 +01:00
Javier Arce
a0219db646 Adds new icons 2016-01-26 12:09:40 +01:00
Javier Arce
8bb0d57256 Adds new icons from Editor 2016-01-26 12:07:25 +01:00
Emilio García
6d41387a97 change radio names 2016-01-26 10:37:11 +01:00
Emilio García
c9664adfae fix slider style 2016-01-26 10:31:13 +01:00
Emilio García
b5d5bc2a78 fix hound 2016-01-25 23:53:56 +01:00
Emilio García
f0313766b3 clean html 2016-01-25 23:51:01 +01:00
Emilio García
a89f32b569 add buttons components 2016-01-25 23:37:58 +01:00
Emilio García
37f5c9df9d fix hound 2016-01-25 15:59:18 +01:00
Emilio García
5472801a8f fix hound 2016-01-25 15:53:58 +01:00
Emilio García
0d76981cd1 fix hound 2016-01-25 15:45:56 +01:00
Emilio García
aeb83952d2 add missing shapes 2016-01-25 15:18:47 +01:00
Emilio García
31c75b057f add menu component 2016-01-25 15:12:32 +01:00
Emilio García
b14cf93fca add forms elements 2016-01-25 11:44:43 +01:00
Javier Arce
a94f57a5a0 Removes extra dash 2016-01-25 10:31:54 +01:00
Javier Arce
de2d5fc4ab Fixes casing 2016-01-22 18:45:23 +01:00
Javier Arce
f92109cbdb Fixes case of some icons 2016-01-22 18:39:44 +01:00
Emilio García
959c546982 add labels 2016-01-22 18:01:26 +01:00
Emilio García
2ae455d7de use vars 2016-01-22 17:40:28 +01:00
Emilio García
4203b5d675 add more components 2016-01-22 17:25:38 +01:00
Emilio García
23f512b82d Merge branch 'master' of github.com:CartoDB/CartoAssets into forms-assets 2016-01-22 13:09:14 +01:00
Javier Arce
1a8e5ff3bd Fixes conflicts 2016-01-22 11:58:46 +01:00
Javier Arce
fb589083bc Adds namespace to font 2016-01-22 11:53:57 +01:00
xavijam
b39ec115dc Upgraded font icon with new modifiers 2016-01-21 18:38:59 +01:00
xavijam
87da7d1a5a Merge branch 'master' into reset-stylesheet 2016-01-21 12:26:32 +01:00
xavijam
796657d609 Adding necessary reset stylesheet 2016-01-21 12:25:53 +01:00
Javier Arce
bc8e8f6669 Adds namespace 2016-01-21 12:11:39 +01:00
xavijam
00cfe3afe0 Icon font re-generated 2016-01-20 18:35:15 +01:00
xavijam
78ebf3d9a9 Moving generated css to a css folder and changing all routes related with fonts due to this change 2016-01-20 18:29:22 +01:00