Merge branch 'master' into nice-urls

FlorianDev · Jan 15, 2021 · e77be94 · e77be94
2 parents cb17169 + bcb4984
commit e77be94
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 26 deletions.
diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml
@@ -1,21 +1,15 @@
-name: CI
+name: Lint PHP
 on:
   pull_request:
     branches: master
 jobs:
-  build:
+  phplint:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1
-      - name: Build and push Docker images
-        uses: docker/[email protected]
+      - name: PHPLint
+        uses: overtrue/phplint@master
         with:
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-          registry: docker.pkg.github.com
-          repository: tum-dev/rbgreateragain/sexy-streams-server
-          tags: dev
-          tag_with_ref: true
-          tag_with_sha: true
-          add_git_labels: true
+          path: .
+          options: --exclude=*.log
diff --git a/css/global.css b/css/global.css
@@ -1,7 +1,8 @@
 :root {
     --background-color: #0b0c10;
     --accent-color: #ccfffc;
-    --primary-color: #FCFCFC;
+    --primary-color: #fcfcfc;
+    --primary-color2: #1565c0;
 }
 
 html,
@@ -19,9 +20,23 @@ a {
 
 
 #page-title {
-    padding-top: 64px;
-    font-size: 3em;
-    color: white;
+    padding: 16px;
     text-align: center;
-    font-weight: 400;
+}
+
+#logo {
+    width: 30rem;
+    min-height: 7.3rem;
+    max-height: 7.4rem;
+}
+
+@media screen and (max-width: 800px) {
+    #page-title {
+        padding-top: 0;
+    }
+    #logo{
+        width: 10rem;
+        min-height: 2.4rem;
+        max-height: 2.5rem;
+    }
 }
diff --git a/css/watch.css b/css/watch.css
@@ -4,10 +4,6 @@
     --primary-color: #FCFCFC;
 }
 
-#page-title {
-    padding-top: 16px;
-}
-
 #stream-frame {
     width: 70%;
     margin: 0 auto;
@@ -40,4 +36,10 @@
     top: 0px;
     left: 0px;
     font-size: 3em;
+}
+
+@media screen and (max-width: 800px) {
+    #page-title {
+        text-align: right;
+    }
 }
diff --git a/index.php b/index.php
@@ -2,11 +2,13 @@
 include_once 'language.php';
 include_once 'api/get_rbg_streams.php';
 
-function td($el) {
+function td($el)
+{
     return "<td>$el</td>";
 }
 
-function tr($el) {
+function tr($el)
+{
     return "<tr>$el</tr>";
 }
 
@@ -44,7 +46,13 @@ function constructLink($type, $link) {
 
 <body>
 <div id="main">
-    <h1 id="page-title"><i>RBGreater</i></h1>
+    <h1 id="page-title">
+        <a href="/" aria-label="RBGreater Logo">
+            <svg id="logo">
+                <use href="static/logo.svg#RGBreaterLogo"/>
+            </svg>
+        </a>
+    </h1>
     <div>
         <h2 class="header"><?php echo $DICT["current_livestreams"]; ?></h2>
         <div id="livestreams">
@@ -152,7 +160,7 @@ function constructLink($type, $link) {
                     foreach ($STREAMS["vod_archive"] as $item) {
                         ?>
                         <div class='spoiler'>
-                            <a target="_blank" href="<?php echo $item["info"]["link"]; ?>">
+                            <a target="_blank" rel="noopener" href="<?php echo $item["info"]["link"]; ?>">
                                 <div class="spoiler-header">
                                     <p class='spoiler-title'><?php echo $item["info"]["name"]; ?></p>
                                     <span class='material-icons md-open_in_new rotate-reset spoiler-button'></span>

diff --git a/static/logo.svg b/static/logo.svg
diff --git a/watch.php b/watch.php
@@ -37,7 +37,13 @@
     </a>
 </div>
 <div id="main">
-    <h1 id="page-title"><i>RBGreater</i></h1>
+    <h1 id="page-title">
+        <a href="/" aria-label="RBGreater Logo">
+            <svg id="logo">
+                <use href="static/logo.svg#RGBreaterLogo"/>
+            </svg>
+        </a>
+    </h1>
     <h2 id="event-title"><?php echo $data["name"]; ?></h2>
     <h3 id="event-date"><?php echo $data["date"] . " " . $data["time"]; ?></h3>