Abdullah Almsaeed 4169db0857 Resolve conflicts

2017-05-18 08:11:54 -04:00

..

buttons.html

Remove font import from css and add it to html

2017-03-04 18:38:10 -05:00

general.html

Remove font import from css and add it to html

2017-03-04 18:38:10 -05:00

icons.html

Remove font import from css and add it to html

2017-03-04 18:38:10 -05:00

modals.html

Update modal page to add buttons and animation

2017-05-17 19:21:12 -04:00

sliders.html

Resolve conflicts

2017-05-18 08:11:54 -04:00

timeline.html

Remove font import from css and add it to html

2017-03-04 18:38:10 -05:00