Просмотр исходного кода

Move the CSS files of the HTML uploader to the root folder

This lets us test the HTML document in the browser and still load
the css files

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
Romain Goyet 12 лет назад
Родитель
Сommit
e6ea99d66f
3 измененных файлов с 8 добавлено и 16 удалено
  1. 0 0
      Resources/web/reset.css
  2. 0 0
      Resources/web/style.css
  3. 8 16
      VLC for iOS.xcodeproj/project.pbxproj

Resources/web/css/reset.css → Resources/web/reset.css


Resources/web/css/style.css → Resources/web/style.css


+ 8 - 16
VLC for iOS.xcodeproj/project.pbxproj

@@ -37,6 +37,8 @@
 		2915544317490D4A00B86CAD /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2915544217490D4A00B86CAD /* Security.framework */; };
 		293DF2F417494F8200BB880F /* DropboxSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D05ADEA174945CE0087550C /* DropboxSDK.framework */; };
 		29CE2D44174912C600922D8F /* VLCHTTPUploaderController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CE2D42174912C600922D8F /* VLCHTTPUploaderController.m */; };
+		7AC8629C1765DC560011611A /* reset.css in Resources */ = {isa = PBXBuildFile; fileRef = 7AC8629A1765DC560011611A /* reset.css */; };
+		7AC8629D1765DC560011611A /* style.css in Resources */ = {isa = PBXBuildFile; fileRef = 7AC8629B1765DC560011611A /* style.css */; };
 		7D07A4E9174EA47800759D10 /* VLCSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D07A4E7174EA47800759D10 /* VLCSettingsController.m */; };
 		7D07A4ED174EB81200759D10 /* VLCDropboxController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D07A4EC174EB81200759D10 /* VLCDropboxController.m */; };
 		7D07F708175665ED00CDE21C /* navBarBackground@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F706175665ED00CDE21C /* navBarBackground@2x.png */; };
@@ -115,8 +117,6 @@
 		7D47D72F1761101700E86BAD /* VLCSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D47D72E1761101700E86BAD /* VLCSlider.m */; };
 		7D5262C41764D4EE00E0E30C /* padLibBg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D5262C01764D4EE00E0E30C /* padLibBg@2x.png */; };
 		7D5262C51764D4EE00E0E30C /* padLibBg.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D5262C11764D4EE00E0E30C /* padLibBg.png */; };
-		7D5262C91764DEB500E0E30C /* reset.css in Resources */ = {isa = PBXBuildFile; fileRef = 7D5262C71764DEB500E0E30C /* reset.css */; };
-		7D5262CA1764DEB500E0E30C /* style.css in Resources */ = {isa = PBXBuildFile; fileRef = 7D5262C81764DEB500E0E30C /* style.css */; };
 		7D5DD5C717590ABF001421E3 /* About Contents.html in Resources */ = {isa = PBXBuildFile; fileRef = 7D5DD5C617590ABF001421E3 /* About Contents.html */; };
 		7D5E39C0174FB95A007DAFA1 /* dropbox-black.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D5E39BF174FB95A007DAFA1 /* dropbox-black.png */; };
 		7D5E39C2174FBA28007DAFA1 /* dropbox-black@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D5E39C1174FBA28007DAFA1 /* dropbox-black@2x.png */; };
@@ -317,6 +317,8 @@
 		2915544217490D4A00B86CAD /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		29CE2D41174912C600922D8F /* VLCHTTPUploaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHTTPUploaderController.h; sourceTree = "<group>"; };
 		29CE2D42174912C600922D8F /* VLCHTTPUploaderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHTTPUploaderController.m; sourceTree = "<group>"; };
+		7AC8629A1765DC560011611A /* reset.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = reset.css; sourceTree = "<group>"; };
+		7AC8629B1765DC560011611A /* style.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = style.css; sourceTree = "<group>"; };
 		7D05ADEA174945CE0087550C /* DropboxSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DropboxSDK.framework; path = ImportedSources/Dropbox/DropboxSDK.framework; sourceTree = "<group>"; };
 		7D07A4E6174EA47800759D10 /* VLCSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCSettingsController.h; sourceTree = "<group>"; };
 		7D07A4E7174EA47800759D10 /* VLCSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCSettingsController.m; sourceTree = "<group>"; };
@@ -408,8 +410,6 @@
 		7D4BE737175F82CA00861CD4 /* fi */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fi; path = "fi.lproj/badgeUnread~iphone.png"; sourceTree = "<group>"; };
 		7D5262C01764D4EE00E0E30C /* padLibBg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "padLibBg@2x.png"; sourceTree = "<group>"; };
 		7D5262C11764D4EE00E0E30C /* padLibBg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = padLibBg.png; sourceTree = "<group>"; };
-		7D5262C71764DEB500E0E30C /* reset.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = reset.css; sourceTree = "<group>"; };
-		7D5262C81764DEB500E0E30C /* style.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = style.css; sourceTree = "<group>"; };
 		7D5DD5C617590ABF001421E3 /* About Contents.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "About Contents.html"; sourceTree = "<group>"; };
 		7D5E39BF174FB95A007DAFA1 /* dropbox-black.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "dropbox-black.png"; sourceTree = "<group>"; };
 		7D5E39C1174FBA28007DAFA1 /* dropbox-black@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "dropbox-black@2x.png"; sourceTree = "<group>"; };
@@ -666,7 +666,8 @@
 		29125E5317492219003F03E5 /* web */ = {
 			isa = PBXGroup;
 			children = (
-				7D5262C61764DEB500E0E30C /* css */,
+				7AC8629A1765DC560011611A /* reset.css */,
+				7AC8629B1765DC560011611A /* style.css */,
 				29125E5417492219003F03E5 /* index.html */,
 				29125E5517492219003F03E5 /* upload.html */,
 			);
@@ -947,15 +948,6 @@
 			name = "Movie VIew";
 			sourceTree = "<group>";
 		};
-		7D5262C61764DEB500E0E30C /* css */ = {
-			isa = PBXGroup;
-			children = (
-				7D5262C71764DEB500E0E30C /* reset.css */,
-				7D5262C81764DEB500E0E30C /* style.css */,
-			);
-			path = css;
-			sourceTree = "<group>";
-		};
 		7D5E39CC174FCDBE007DAFA1 /* Dropbox Integration */ = {
 			isa = PBXGroup;
 			children = (
@@ -1533,8 +1525,8 @@
 				7DEB3B8D1764A4F40038FC70 /* blank@2x.png in Resources */,
 				7D5262C41764D4EE00E0E30C /* padLibBg@2x.png in Resources */,
 				7D5262C51764D4EE00E0E30C /* padLibBg.png in Resources */,
-				7D5262C91764DEB500E0E30C /* reset.css in Resources */,
-				7D5262CA1764DEB500E0E30C /* style.css in Resources */,
+				7AC8629C1765DC560011611A /* reset.css in Resources */,
+				7AC8629D1765DC560011611A /* style.css in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};