1
0
mirror of https://github.com/webslides/WebSlides.git synced 2025-08-26 22:44:45 +02:00

Merge branch 'CKGrafico-feature/sass' into sass

# Conflicts:
#	package.json
#	static/js/webslides.js
#	static/js/webslides.min.js
This commit is contained in:
Antonio Laguna
2017-05-01 12:52:38 +02:00
13 changed files with 129 additions and 7888 deletions

View File

@@ -25,11 +25,8 @@
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,700,700i%7CMaitree:200,300,400,600,700&amp;subset=latin-ext" rel="stylesheet">
<!-- CSS Base -->
<link rel="stylesheet" type='text/css' media='all' href="static/css/base.css">
<!-- CSS Colors -->
<link rel="stylesheet" type='text/css' media='all' href="static/css/colors.css">
<!-- CSS WebSlides -->
<link rel="stylesheet" type='text/css' media='all' href="static/css/webslides.css">
<!-- Optional - CSS SVG Icons (Font Awesome) -->
<link rel="stylesheet" type='text/css' media='all' href="static/css/svg-icons.css">