Revert Commit

Revert recent commit but keep a couple changes.
StylusThemes · Jun 12, 2018 · 689c788 · 689c788
1 parent 36e33a7
commit 689c788
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 239 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # YouTube Theater Changelog
 
+## v1.0.2 ... (11 JUNE 18)
+
+### Changes:
+`+` Revert Recent preprocessor change
+
 ## v1.0.1 ... (11 JUNE 18)
 
 ### Changes:

diff --git a/build/build.css b/build/build.css
diff --git a/build/files.js b/build/files.js
@@ -5,7 +5,7 @@ const fs = require( "fs" );
 
 function createUserCss( version ) {
   return Promise.all(
-      [ "./build/template.user.css", "./build/build.css" ].map( name => readFile( name ) )
+      [ "./build/template.user.css", "./style.css" ].map( name => readFile( name ) )
     )
     .then( files => writeFile(
       "style.user.css", processTemplate( files, version ) ) );

diff --git a/build/template.user.css b/build/template.user.css
@@ -1,17 +1,33 @@
 /* ==UserStyle==
-@name           YouTube Theater
-@version        [[VERSION]]
-@namespace      https://github.com/StylusThemes
-@description    Expands videos to fill all free space inside browser window.
-@author         StylusThemes <https://github.com/StylusThemes>
-@homepageURL    https://github.com/StylusThemes/YouTube-Theater
-@supportURL     https://github.com/StylusThemes/YouTube-Theater/issues
-@updateURL      https://raw.githubusercontent.com/StylusThemes/YouTube-Theater/master/style.user.css
-@license        CC-BY-SA-4.0
-@preprocessor   stylus
+@name        YouTube Theater
+@version     [[VERSION]]
+@description Expands videos to fill all free space inside browser window.
+@namespace   github.com/StylusThemes
+@author      StylusThemes <https://github.com/StylusThemes>
+@homepageURL https://github.com/StylusThemes/YouTube-Theater
+@supportURL  https://github.com/StylusThemes/YouTube-Theater/issues
+@updateURL   https://raw.githubusercontent.com/StylusThemes/YouTube-Theater/master/style.user.css
+@license     CC-BY-SA-4.0
 
-@var checkbox   WatchedBadge 'Re-Add Youtube Watched Badge' 1
-@var checkbox   SVTFP 'Stretch Video To Fill Player' 1
-@var checkbox   VMaxWidth 'Real Theater Mode' 1
+@advanced dropdown VMaxWidth "Real Theater Mode?" {
+VMaxWidthY "Yes" <<<EOT
+ytd-app[is-watch-page] ytd-watch[theater] #player{min-height:100vh !important;max-height:100vh !important}ytd-app[is-watch-page] #masthead-container{opacity:0 !important;transition:opacity 0.2s ease-in-out}ytd-app[is-watch-page] #masthead-container:hover{opacity:1 !important}ytd-app[is-watch-page] #page-manager{margin-top:0 !important}ytd-app[is-watch-page] #extra-buttons{display:none !important}ytd-app[is-watch-page] #toast:not(.paper-toast-open){pointer-events:none} EOT;
+VMaxWidthN "No" <<<EOT
+ EOT;
+}
+
+@advanced dropdown SVTFP "Stretch Video To Fill Player?" {
+SVTFPY "Yes" <<<EOT
+video{position:static !important;width:100% !important;object-fit:fill !important} EOT;
+SVTFPN "No" <<<EOT
+ EOT;
+}
+
+@advanced dropdown WatchedBadge "Re-Add Youtube Watched Badge?" {
+WatchedBadgeY "Yes" <<<EOT
+@font-face{font-family:FontAwesome;font-weight:400;font-style:normal;src:url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.eot?v=4.7.0);src:url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0) format("embedded-opentype"),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0) format("woff2"),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.woff?v=4.7.0) format("woff"),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf?v=4.7.0) format("truetype"),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular) format("svg")}.ytd-browse yt-formatted-string.ytd-thumbnail-overlay-playback-status-renderer{display:none}.ytd-browse ytd-thumbnail-overlay-resume-playback-renderer{width:100%;height:100%;background-color:#f0f0f0;opacity:.85;transition:opacity .2s ease-out}html[dark=true] .ytd-browse ytd-thumbnail-overlay-resume-playback-renderer{background-color:#030303;opacity:.95}.ytd-browse #progress.ytd-thumbnail-overlay-resume-playback-renderer{height:100%;background-color:#fff}html[dark=true] .ytd-browse #progress.ytd-thumbnail-overlay-resume-playback-renderer{background-color:#111}.ytd-browse ytd-thumbnail-overlay-resume-playback-renderer div#progress:after{visibility:visible;position:absolute;top:50%;left:50%;margin-top:-14px;margin-left:-14px;font-family:FontAwesome;font-size:32px;color:#999;opacity:.7;content:"\f00c"}html[dark=true] .ytd-browse div#progress:after{color:#fff}.ytd-browse ytd-thumbnail-overlay-resume-playback-renderer:hover{opacity:0!important} EOT;
+WatchedBadgeN "No" <<<EOT
+ EOT;
+}
 ==/UserStyle== */
 /* DO NOT EDIT THIS USERCSS - IT IS GENERATED AUTOMATICALLY */
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "youtube-theater",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Expands videos to fill all free space inside browser window.",
   "devDependencies": {
     "css": "^2.2.3",

diff --git a/style.css b/style.css
@@ -7,9 +7,9 @@
 /* ||                                                                                  || */
 /* ||* Created     : 09 / 11 / 2017                                                    || */
 /* ||                                                                                  || */
-/* ||* Updated     : 05 / 22 / 2018                                                    || */
+/* ||* Updated     : 06 / 11 / 2018                                                    || */
 /* ||                                                                                  || */
-/* ||* Version     : 1.0.0                                                             || */
+/* ||* Version     : 1.0.2                                                             || */
 /* ||                                                                                  || */
 /* ||* Copyright   : 2017-2018                                                         || */
 /* ||                                                                                  || */
@@ -27,14 +27,12 @@
 ::-webkit-scrollbar {
   width: 10px;
   height: 10px;
-
   background-color: #333 !important;
 }
 
 ::-webkit-scrollbar-thumb {
   -webkit-border-radius: 2px;
   border-radius: 2px;
-
   background: #555 !important;
 }
 

diff --git a/style.user.css b/style.user.css
@@ -1,27 +1,55 @@
 /* ==UserStyle==
 @name           YouTube Theater
-@version        1.0.1
+@version        1.0.2
 @namespace      https://github.com/StylusThemes
 @description    Expands videos to fill all free space inside browser window.
 @author         StylusThemes <https://github.com/StylusThemes>
 @homepageURL    https://github.com/StylusThemes/YouTube-Theater
 @supportURL     https://github.com/StylusThemes/YouTube-Theater/issues
 @updateURL      https://raw.githubusercontent.com/StylusThemes/YouTube-Theater/master/style.user.css
 @license        CC-BY-SA-4.0
-@preprocessor   stylus
 
-@var checkbox   WatchedBadge 'Re-Add Youtube Watched Badge' 1
-@var checkbox   SVTFP 'Stretch Video To Fill Player' 1
-@var checkbox   VMaxWidth 'Real Theater Mode' 1
+@advanced dropdown VMaxWidth "Real Theater Mode?" {
+VMaxWidthY "Yes" <<<EOT
+ytd-app[is-watch-page] ytd-watch[theater] #player{min-height:100vh !important;max-height:100vh !important}ytd-app[is-watch-page] #masthead-container{opacity:0 !important;transition:opacity 0.2s ease-in-out}ytd-app[is-watch-page] #masthead-container:hover{opacity:1 !important}ytd-app[is-watch-page] #page-manager{margin-top:0 !important}ytd-app[is-watch-page] #extra-buttons{display:none !important}ytd-app[is-watch-page] #toast:not(.paper-toast-open){pointer-events:none} EOT;
+VMaxWidthN "No" <<<EOT
+ EOT;
+}
+
+@advanced dropdown SVTFP "Stretch Video To Fill Player?" {
+SVTFPY "Yes" <<<EOT
+video{position:static !important;width:100% !important;object-fit:fill !important} EOT;
+SVTFPN "No" <<<EOT
+ EOT;
+}
+
+@advanced dropdown WatchedBadge "Re-Add Youtube Watched Badge?" {
+WatchedBadgeY "Yes" <<<EOT
+@font-face{font-family:FontAwesome;font-weight:400;font-style:normal;src:url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.eot?v=4.7.0);src:url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0) format("embedded-opentype"),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0) format("woff2"),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.woff?v=4.7.0) format("woff"),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf?v=4.7.0) format("truetype"),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular) format("svg")}.ytd-browse yt-formatted-string.ytd-thumbnail-overlay-playback-status-renderer{display:none}.ytd-browse ytd-thumbnail-overlay-resume-playback-renderer{width:100%;height:100%;background-color:#f0f0f0;opacity:.85;transition:opacity .2s ease-out}html[dark=true] .ytd-browse ytd-thumbnail-overlay-resume-playback-renderer{background-color:#030303;opacity:.95}.ytd-browse #progress.ytd-thumbnail-overlay-resume-playback-renderer{height:100%;background-color:#fff}html[dark=true] .ytd-browse #progress.ytd-thumbnail-overlay-resume-playback-renderer{background-color:#111}.ytd-browse ytd-thumbnail-overlay-resume-playback-renderer div#progress:after{visibility:visible;position:absolute;top:50%;left:50%;margin-top:-14px;margin-left:-14px;font-family:FontAwesome;font-size:32px;color:#999;opacity:.7;content:"\f00c"}html[dark=true] .ytd-browse div#progress:after{color:#fff}.ytd-browse ytd-thumbnail-overlay-resume-playback-renderer:hover{opacity:0!important} EOT;
+WatchedBadgeN "No" <<<EOT
+ EOT;
+}
 ==/UserStyle== */
 /* DO NOT EDIT THIS USERCSS - IT IS GENERATED AUTOMATICALLY */
 @-moz-document domain("youtube.com") {
 /* ++----------------------------------------------------------------------------------++ */
+/* ||                                                                                  || */
+/* ||* Name        : YouTube Theater                                                   || */
+/* ||                                                                                  || */
+/* ||* Author      : JourneyOver                                                       || */
+/* ||                                                                                  || */
 /* ||* Created     : 09 / 11 / 2017                                                    || */
 /* ||                                                                                  || */
 /* ||* Updated     : 06 / 11 / 2018                                                    || */
+/* ||                                                                                  || */
+/* ||* Version     : 1.0.2                                                             || */
+/* ||                                                                                  || */
+/* ||* Copyright   : 2017-2018                                                         || */
+/* ||                                                                                  || */
 /* ++----------------------------------------------------------------------------------++ */
+}
 
+@-moz-document domain("youtube.com") {
 /*::::::::::::::::::::::::::::::::::::::::::::::::::::::::: Globals :::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
 
 /*::: Thinner/Darker Scroll bar :::*/
@@ -41,101 +69,13 @@
   background: #555 !important;
 }
 
-if WatchedBadge {
-@font-face {
-  font-family: FontAwesome;
-  font-weight: 400;
-  font-style: normal;
-  src: url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.eot?v=4.7.0);
-  src: url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0) format("embedded-opentype"), url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0) format("woff2"), url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.woff?v=4.7.0) format("woff"), url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf?v=4.7.0) format("truetype"), url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular) format("svg");
-}
-
-.ytd-browse yt-formatted-string.ytd-thumbnail-overlay-playback-status-renderer {
-  display: none;
-}
-
-.ytd-browse ytd-thumbnail-overlay-resume-playback-renderer {
-  width: 100%;
-  height: 100%;
-  background-color: #f0f0f0;
-  opacity: .85;
-  transition: opacity .2s ease-out;
-}
-
-html[dark=true] .ytd-browse ytd-thumbnail-overlay-resume-playback-renderer {
-  background-color: #030303;
-  opacity: .95;
-}
-
-.ytd-browse #progress.ytd-thumbnail-overlay-resume-playback-renderer {
-  height: 100%;
-  background-color: #fff;
-}
-
-html[dark=true] .ytd-browse #progress.ytd-thumbnail-overlay-resume-playback-renderer {
-  background-color: #111;
-}
-
-.ytd-browse ytd-thumbnail-overlay-resume-playback-renderer div#progress:after {
-  visibility: visible;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin-top: -14px;
-  margin-left: -14px;
-  font-family: FontAwesome;
-  font-size: 32px;
-  color: #999;
-  opacity: .7;
-  content: "\f00c";
-}
-
-html[dark=true] .ytd-browse div#progress:after {
-  color: #fff;
-}
-
-.ytd-browse ytd-thumbnail-overlay-resume-playback-renderer:hover {
-  opacity: 0 !important;
-}
-}
+/*[[WatchedBadge]]*/
 }
 
 @-moz-document regexp("https?://www.youtube.com/watch.*") {
 /*::::::::::::::::::::::::::::::::::::::::::::::::::::::::: Video Page :::::::::::::::::::::::::::::::::::::::::::::::::::::::*/
 
-if SVTFP {
-video {
-  position: static !important;
-  width: 100% !important;
-  object-fit: fill !important;
-}
-}
-
-if VMaxWidth {
-ytd-app[is-watch-page] ytd-watch[theater] #player {
-  min-height: 100vh !important;
-  max-height: 100vh !important;
-}
-
-ytd-app[is-watch-page] #masthead-container {
-  opacity: 0 !important;
-  transition: opacity .2s ease-in-out;
-}
+/*[[SVTFP]]*/
 
-ytd-app[is-watch-page] #masthead-container:hover {
-  opacity: 1 !important;
-}
-
-ytd-app[is-watch-page] #page-manager {
-  margin-top: 0 !important;
-}
-
-ytd-app[is-watch-page] #extra-buttons {
-  display: none !important;
-}
-
-ytd-app[is-watch-page] #toast:not(.paper-toast-open) {
-  pointer-events: none;
-}
-}
+/*[[VMaxWidth]]*/
 }