Merge branch 'master' of https://github.com/unizar-30226-2019-03/proy…

…ecto_software_web
unizar-30226-2019-03 · May 30, 2019 · 203b731 · 203b731
2 parents 5a01cd5 + 702c480
commit 203b731
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -11,6 +11,9 @@
 # production
 /build
 
+#Comprimidos
+*.zip
+
 #vscode settings
 /.vscode
 

diff --git a/app/build.zip b/app/build.zip
diff --git a/app/public/favicon-16x16.png b/app/public/favicon-16x16.png
diff --git a/app/public/index.html b/app/public/index.html
@@ -2,18 +2,24 @@
 <html lang="es">
   <head>
     <meta charset="utf-8" />
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link
+      rel="icon"
+      type="image/png"
+      href="%PUBLIC_URL%/favicon-16x16.png"
+      sizes="16x16"
+    />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1, shrink-to-fit=no"
     />
-    <meta name="theme-color" content="#000000" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
 
+    <meta name="theme-color" content="#ffffff" />
+
     <link
       rel="stylesheet"
       href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"

diff --git a/app/public/manifest.json b/app/public/manifest.json
@@ -3,13 +3,13 @@
   "name": "Aplicación Web UniCast",
   "icons": [
     {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
+      "src": "favicon-16x16.png",
+      "sizes": "16x16",
+      "type": "image/png"
     }
   ],
   "start_url": ".",
   "display": "standalone",
-  "theme_color": "#000000",
+  "theme_color": "#ffffff",
   "background_color": "#ffffff"
 }
diff --git a/app/src/components/Video.jsx b/app/src/components/Video.jsx
@@ -141,7 +141,7 @@ class Video extends Component {
             <CurrentTimeDisplay order={4.1} />
             <TimeDivider order={4.2} />
             <PlaybackRateMenuButton rates={[5, 2, 1, 0.5, 0.1]} order={7.1} />
-            <VolumeMenuButton disabled />
+            <VolumeMenuButton vertical />
           </ControlBar>
         </Player>
       </div>