diff --git a/app/Http/Controllers/tmp/test.png b/app/Http/Controllers/tmp/test.png index 3e71d63..0f87524 100644 Binary files a/app/Http/Controllers/tmp/test.png and b/app/Http/Controllers/tmp/test.png differ diff --git a/public/css/w0bmcustom.css b/public/css/w0bmcustom.css index 9ee3b75..6ead960 100644 --- a/public/css/w0bmcustom.css +++ b/public/css/w0bmcustom.css @@ -4167,4 +4167,14 @@ pre { .vidinfo { display: grid; justify-content: center; +} + +#nutti > p { + text-align: center; + margin: 5px; + background: #383737; +} +#nutti { + border: 1px solid #383737; + background: #212121; } \ No newline at end of file diff --git a/public/fonts/reich.ttf b/public/fonts/reich.ttf new file mode 100644 index 0000000..8b5490e Binary files /dev/null and b/public/fonts/reich.ttf differ diff --git a/public/njum/css/cstms.css b/public/njum/css/cstms.css index a260ca9..fce362d 100644 --- a/public/njum/css/cstms.css +++ b/public/njum/css/cstms.css @@ -1310,7 +1310,7 @@ button#togglebg:hover, button.bg-toggle:hover, button#fav:hover, button#webm_edi } .btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active, .show>.btn-dark.dropdown-toggle { - color: #fff; + color: #007053; background-color: transparent; border-color: transparent; } @@ -1561,11 +1561,11 @@ div.comment_header { right: 0; } -.btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active, .show > .btn-dark.dropdown-toggle { +/* .btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active, .show > .btn-dark.dropdown-toggle { color: #fff; background-color: #171616; border-color: #101010; -} +} */ /*blah */ .stuck { @@ -1622,7 +1622,8 @@ div.comment_header { } #layout1:hover, #layout3:hover { - opacity: 0.8; + opacity: 1; + background: #282828; } #layout3 { @@ -1630,6 +1631,12 @@ div.comment_header { color: white; } +#layoutSwitcher { + min-width: 6rem; +} + + + .uploadButton { background: #121214; padding: 5px; @@ -1747,4 +1754,172 @@ hr { .scrollToTop{ display:none; +} + +.spoiler { + background: black; + color: black; + font-family: monospace; + padding-left: 2px; + padding-right: 2px; +} + +.spoiler:hover { + color: white; + transition: all .2s ease-in-out; +} + +@font-face { + font-family: "reich"; + src: url("/fonts/reich.ttf") format("truetype"); +} + +.reich { + font-family: 'reich', cursive; + color: #F2F5F4; +} + +blockquote { + padding: 0; + margin: 0; + border-left: 0; + color: #789922; + word-wrap: break-word; +} + +.anim { + margin: 0; + animation: color 0.6s linear infinite !important; +} + +.krebs { + margin: 0; + animation: color 0.6s linear infinite !important; +} + +@keyframes color { + 0% {color:red;} + 25% {color:yellow;} + 50% {color:#1FB2B0;} + 75% {color:#23dd06;} + 100% {color:red;} + } + +@-webkit-keyframes color { + 0% {color:red;} + 25% {color:yellow;} + 50% {color:#1FB2B0;} + 75% {color:#23dd06;} + 100% {color:red;} +} + +.rainbow { + animation: rainbold 1s linear infinite; + color: red; + letter-spacing: 0.33em; + margin-left: 7px; + text-shadow: -1px 0px orange, -2px 0px yellow, -3px 0px green, -4px 0px blue, -5px 0px indigo, -6px 0px violet; +} + +@keyframes rainbold { + 0% { + color: red; + text-shadow: -1px 0px orange, -2px 0px yellow, -3px 0px green, -4px 0px blue, -5px 0px indigo, -6px 0px violet; + } + 14% { + color: orange; + text-shadow: -1px 0px yellow, -2px 0px green, -3px 0px blue, -4px 0px indigo, -5px 0px violet, -6px 0px red; + } + 28% { + color: yellow; + text-shadow: -1px 0px green, -2px 0px blue, -3px 0px indigo, -4px 0px violet, -5px 0px red, -6px 0px orange; + } + 43% { + color: green; + text-shadow: -1px 0px blue, -2px 0px indigo, -3px 0px violet, -4px 0px red, -5px 0px orange, -6px 0px yellow; + } + 57% { + color: blue; + text-shadow: -1px 0px indigo, -2px 0px violet, -3px 0px red, -4px 0px orange, -5px 0px yellow, -6px 0px green; + } + 71% { + color: indigo; + text-shadow: -1px 0px violet, -2px 0px red, -3px 0px orange, -4px 0px yellow, -5px 0px green, -6px 0px blue; + } + 85% { + color: violet; + text-shadow: -1px 0px red, -2px 0px orange, -3px 0px yellow, -4px 0px green, -5px 0px blue, -6px 0px indigo; + } + 100% { + color: red; + text-shadow: -1px 0px orange, -2px 0px yellow, -3px 0px green, -4px 0px blue, -5px 0px indigo, -6px 0px violet; + } +} +@-moz-keyframes rainbold { + 0% { + color: red; + text-shadow: -1px 0px orange, -2px 0px yellow, -3px 0px green, -4px 0px blue, -5px 0px indigo, -6px 0px violet; + } + 14% { + color: orange; + text-shadow: -1px 0px yellow, -2px 0px green, -3px 0px blue, -4px 0px indigo, -5px 0px violet, -6px 0px red; + } + 28% { + color: yellow; + text-shadow: -1px 0px green, -2px 0px blue, -3px 0px indigo, -4px 0px violet, -5px 0px red, -6px 0px orange; + } + 43% { + color: green; + text-shadow: -1px 0px blue, -2px 0px indigo, -3px 0px violet, -4px 0px red, -5px 0px orange, -6px 0px yellow; + } + 57% { + color: blue; + text-shadow: -1px 0px indigo, -2px 0px violet, -3px 0px red, -4px 0px orange, -5px 0px yellow, -6px 0px green; + } + 71% { + color: indigo; + text-shadow: -1px 0px violet, -2px 0px red, -3px 0px orange, -4px 0px yellow, -5px 0px green, -6px 0px blue; + } + 85% { + color: violet; + text-shadow: -1px 0px red, -2px 0px orange, -3px 0px yellow, -4px 0px green, -5px 0px blue, -6px 0px indigo; + } + 100% { + color: red; + text-shadow: -1px 0px orange, -2px 0px yellow, -3px 0px green, -4px 0px blue, -5px 0px indigo, -6px 0px violet; + } +} +@-webkit-keyframes rainbold { + 0% { + color: red; + text-shadow: -1px 0px orange, -2px 0px yellow, -3px 0px green, -4px 0px blue, -5px 0px indigo, -6px 0px violet; + } + 14% { + color: orange; + text-shadow: -1px 0px yellow, -2px 0px green, -3px 0px blue, -4px 0px indigo, -5px 0px violet, -6px 0px red; + } + 28% { + color: yellow; + text-shadow: -1px 0px green, -2px 0px blue, -3px 0px indigo, -4px 0px violet, -5px 0px red, -6px 0px orange; + } + 43% { + color: green; + text-shadow: -1px 0px blue, -2px 0px indigo, -3px 0px violet, -4px 0px red, -5px 0px orange, -6px 0px yellow; + } + 57% { + color: blue; + text-shadow: -1px 0px indigo, -2px 0px violet, -3px 0px red, -4px 0px orange, -5px 0px yellow, -6px 0px green; + } + 71% { + color: indigo; + text-shadow: -1px 0px violet, -2px 0px red, -3px 0px orange, -4px 0px yellow, -5px 0px green, -6px 0px blue; + } + 85% { + color: violet; + text-shadow: -1px 0px red, -2px 0px orange, -3px 0px yellow, -4px 0px green, -5px 0px blue, -6px 0px indigo; + } + 100% { + color: red; + text-shadow: -1px 0px orange, -2px 0px yellow, -3px 0px green, -4px 0px blue, -5px 0px indigo, -6px 0px violet; + } } \ No newline at end of file diff --git a/public/njum/js/newscript.js b/public/njum/js/newscript.js index 136fa79..00e3b4f 100644 --- a/public/njum/js/newscript.js +++ b/public/njum/js/newscript.js @@ -1330,6 +1330,7 @@ function Copy() { } /* Floating Video */ +if (typeof video !== 'undefined') { var $window = $(window); var $videoWrap = $('.video-wrap'); var $video = $('.video'); @@ -1359,6 +1360,7 @@ $window.on('scroll', function() { $video.removeClass('stuck'); } }); +}; function bottomArrow() { window.scrollTo(0,document.body.scrollHeight); } diff --git a/resources/views/layout1/partials/comments.blade.php b/resources/views/layout1/partials/comments.blade.php index b0a267d..22abc0f 100644 --- a/resources/views/layout1/partials/comments.blade.php +++ b/resources/views/layout1/partials/comments.blade.php @@ -1,8 +1,8 @@ - -{{--
- [matrix] It's time for your redpill honey -
--}} +
+

Please check out the overhauled Njum Layout and give me some feedback!

+
@if(Auth::check()) @if($video->id == '30186') @include('partials.thread_closed') diff --git a/resources/views/layout2/layout.blade.php b/resources/views/layout2/layout.blade.php index d7666b8..c01c018 100644 --- a/resources/views/layout2/layout.blade.php +++ b/resources/views/layout2/layout.blade.php @@ -47,12 +47,8 @@ - - - +