aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.WebDashboard/Api/PackageCreator.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-01-27 18:05:04 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-01-27 18:05:04 -0500
commit4ba2d73bf7355f11df408529f770a26b311c1e95 (patch)
treee8b67df330f801ef1b63dd6fefc4a5cdd89a93db /MediaBrowser.WebDashboard/Api/PackageCreator.cs
parent8649cbc0cb0b532eda37df23001d90b8c06a4eac (diff)
update drawer
Diffstat (limited to 'MediaBrowser.WebDashboard/Api/PackageCreator.cs')
-rw-r--r--MediaBrowser.WebDashboard/Api/PackageCreator.cs58
1 files changed, 5 insertions, 53 deletions
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index f2df019769..7a788f6f0e 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -33,16 +33,7 @@ namespace MediaBrowser.WebDashboard.Api
string localizationCulture,
string appVersion)
{
- Stream resourceStream;
-
- if (path.Equals("css/all.css", StringComparison.OrdinalIgnoreCase))
- {
- resourceStream = await GetAllCss().ConfigureAwait(false);
- }
- else
- {
- resourceStream = GetRawResourceStream(path);
- }
+ var resourceStream = GetRawResourceStream(path);
if (resourceStream != null)
{
@@ -267,7 +258,10 @@ namespace MediaBrowser.WebDashboard.Api
var files = new[]
{
- "css/all.css" + versionString
+ "css/site.css" + versionString,
+ "css/librarymenu.css" + versionString,
+ "css/librarybrowser.css" + versionString,
+ "thirdparty/paper-button-style.css" + versionString
};
var tags = files.Select(s => string.Format("<link rel=\"stylesheet\" href=\"{0}\" async />", s)).ToArray();
@@ -319,48 +313,6 @@ namespace MediaBrowser.WebDashboard.Api
}
/// <summary>
- /// Gets all CSS.
- /// </summary>
- /// <returns>Task{Stream}.</returns>
- private async Task<Stream> GetAllCss()
- {
- var memoryStream = _memoryStreamFactory.CreateNew();
-
- var files = new[]
- {
- "css/site.css",
- "css/librarymenu.css",
- "css/librarybrowser.css",
- "thirdparty/paper-button-style.css"
- };
-
- var builder = new StringBuilder();
-
- foreach (var file in files)
- {
- var path = GetDashboardResourcePath(file);
-
- using (var fs = _fileSystem.GetFileStream(path, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.ReadWrite, true))
- {
- using (var streamReader = new StreamReader(fs))
- {
- var text = await streamReader.ReadToEndAsync().ConfigureAwait(false);
- builder.Append(text);
- builder.Append(Environment.NewLine);
- }
- }
- }
-
- var css = builder.ToString();
-
- var bytes = Encoding.UTF8.GetBytes(css);
- memoryStream.Write(bytes, 0, bytes.Length);
-
- memoryStream.Position = 0;
- return memoryStream;
- }
-
- /// <summary>
/// Gets the raw resource stream.
/// </summary>
/// <param name="path">The path.</param>