FilePlayer
diff --git a/‎.gitignore
Lines changed: 4 additions & 0 deletions b/‎.gitignore
Lines changed: 4 additions & 0 deletions
diff --git a/‎_config.yml
Lines changed: 3 additions & 0 deletions b/‎_config.yml
Lines changed: 3 additions & 0 deletions
diff --git a/‎player/css/controls.css renamed to ‎_sass/player/controls.scss b/‎player/css/controls.css renamed to ‎_sass/player/controls.scss
diff --git a/‎player/css/menu.css renamed to ‎_sass/player/menu.scss b/‎player/css/menu.css renamed to ‎_sass/player/menu.scss
diff --git a/‎player/css/placeholder.css renamed to ‎_sass/player/placeholder.scss b/‎player/css/placeholder.css renamed to ‎_sass/player/placeholder.scss
diff --git a/‎player/css/player.css renamed to ‎_sass/player/player.scss b/‎player/css/player.css renamed to ‎_sass/player/player.scss
diff --git a/‎player/css/position.css renamed to ‎_sass/player/position.scss b/‎player/css/position.css renamed to ‎_sass/player/position.scss
diff --git a/‎player/css/screen.css renamed to ‎_sass/player/screen.scss b/‎player/css/screen.css renamed to ‎_sass/player/screen.scss
diff --git a/‎player/css/subtitles.css renamed to ‎_sass/player/subtitles.scss b/‎player/css/subtitles.css renamed to ‎_sass/player/subtitles.scss
diff --git a/‎playlist/css/list.css renamed to ‎_sass/playlist/list.scss b/‎playlist/css/list.css renamed to ‎_sass/playlist/list.scss
diff --git a/‎playlist/css/nav.css renamed to ‎_sass/playlist/nav.scss b/‎playlist/css/nav.css renamed to ‎_sass/playlist/nav.scss
diff --git a/‎playlist/css/playlist.css renamed to ‎_sass/playlist/playlist.scss b/‎playlist/css/playlist.css renamed to ‎_sass/playlist/playlist.scss
diff --git a/‎css/body.css renamed to ‎_sass/reset/body.scss b/‎css/body.css renamed to ‎_sass/reset/body.scss
diff --git a/‎css/btn.css renamed to ‎_sass/reset/btn.scss b/‎css/btn.css renamed to ‎_sass/reset/btn.scss
diff --git a/‎css/overwrite-cuteslider.css renamed to ‎_sass/reset/overwrite-cuteslider.scss b/‎css/overwrite-cuteslider.css renamed to ‎_sass/reset/overwrite-cuteslider.scss
diff --git a/‎css/overwrite-tooltip.css renamed to ‎_sass/reset/overwrite-tooltip.scss b/‎css/overwrite-tooltip.css renamed to ‎_sass/reset/overwrite-tooltip.scss
diff --git a/‎css/reset.css renamed to ‎_sass/reset/reset.scss b/‎css/reset.css renamed to ‎_sass/reset/reset.scss
diff --git a/‎index.html
Lines changed: 2 additions & 16 deletions b/‎index.html
Lines changed: 2 additions & 16 deletions
diff --git a/‎player/css/loading.gif renamed to ‎loading.gif b/‎player/css/loading.gif renamed to ‎loading.gif
diff --git a/‎style.scss
Lines changed: 22 additions & 0 deletions b/‎style.scss
Lines changed: 22 additions & 0 deletions
@@ -0,0 +1,4 @@
+# The CSS files will be compiled automatically.
+.sass-cache/
+*.css.map
+*.css
@@ -0,0 +1,3 @@
+sass:
+  sass_dir: css
+  style: compressed
@@ -5,21 +5,7 @@
 	<meta charset="UTF-8"/>
 	<link rel="icon" type="image/x-icon" href="favicon.png"/>
 	<link rel="stylesheet" href="../dep/fa/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="css/reset.css"/>
-	<link rel="stylesheet" href="css/body.css"/>
-	<link rel="stylesheet" href="css/btn.css"/>
-	<link rel="stylesheet" href="css/overwrite-cuteslider.css"/>
-	<link rel="stylesheet" href="css/overwrite-tooltip.css"/>
-	<link rel="stylesheet" href="player/css/player.css"/>
-	<link rel="stylesheet" href="player/css/screen.css"/>
-	<link rel="stylesheet" href="player/css/placeholder.css"/>
-	<link rel="stylesheet" href="player/css/menu.css"/>
-	<link rel="stylesheet" href="player/css/controls.css"/>
-	<link rel="stylesheet" href="player/css/position.css"/>
-	<link rel="stylesheet" href="player/css/subtitles.css"/>
-	<link rel="stylesheet" href="playlist/css/playlist.css"/>
-	<link rel="stylesheet" href="playlist/css/nav.css"/>
-	<link rel="stylesheet" href="playlist/css/list.css"/>
+	<link rel="stylesheet" href="style.css"/>
 </head>
 <body>
 
@@ -34,7 +20,7 @@ <h1 class="title">
 				</h1>
 				<span class="version">
 					<i class="fa fa-terminal"></i>
-					version 0.1.0
+					version 0.1.1
 				</span>
 			</div>
 			<div id="screen" class="no-select">
 
@@ -0,0 +1,22 @@
+---
+---
+
+// Merge all the CSS files in only one.
+
+@import 'reset/reset';
+@import 'reset/body';
+@import 'reset/btn';
+@import 'reset/overwrite-cuteslider';
+@import 'reset/overwrite-tooltip';
+
+@import 'player/player';
+@import 'player/screen';
+@import 'player/placeholder';
+@import 'player/menu';
+@import 'player/controls';
+@import 'player/position';
+@import 'player/subtitles';
+
+@import 'playlist/playlist';
+@import 'playlist/nav';
+@import 'playlist/list';
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+sass:`
	`2`	`+ sass_dir: css`
	`3`	`+ style: compressed`