w0bm/Gw0bm
4
0
Fork 0
Code Pull Requests Activity

njum update

Browse Source
This commit is contained in:
jkhsjdhjs
2021-06-25 18:04:49 +00:00
parent 37d34c2bab
commit b48a45c16a
10 changed files with 202 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/Http/Controllers/tmp/test.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 240 KiB

10
public/css/w0bmcustom.css vendored
View File

@@ -4168,3 +4168,13 @@ pre {
display: grid;
justify-content: center;
}
#nutti > p {
text-align: center;
margin: 5px;
background: #383737;
}
#nutti {
border: 1px solid #383737;
background: #212121;
}

BIN
public/fonts/reich.ttf Normal file
View File

Binary file not shown.

183
public/njum/css/cstms.css vendored
View File

@@ -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;
@@ -1748,3 +1755,171 @@ 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;
}
}

2
public/njum/js/newscript.js
View File

@@ -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);
}

10
resources/views/layout1/partials/comments.blade.php
View File

@@ -1,8 +1,8 @@
<!--<div id="motd" class="panel panel-info hidden-xs">
@if(null === $banner)
<div class="panel-body motd">
<!--<span style="color:red;">f0ck you!</span>-->
<!--<iframe style="width: 342px; height: 50px; border: 0!important;display: flex;"src="/0x40"></iframe>
<span style="color:red;">f0ck you!</span>
<iframe style="width: 342px; height: 50px; border: 0!important;display: flex;"src="/0x40"></iframe>
</div>
@else
<a href="{{ $banner->url }}" target="_blank" rel="noopener">
@@ -11,9 +11,9 @@
</a>
@endif
</div>-->
{{--<div id="matrix">
<span id="bluepill"></span> <a href="/matrix">[matrix] It's time for your redpill honey</a> <span id="redpill"></span>
</div>--}}
<div id="nutti">
<p>Please check out the overhauled <a href="https://w0bm.com/api/user/layout?layout=2">Njum</a> Layout and give me some feedback!</p>
</div>
@if(Auth::check())
@if($video->id == '30186')
@include('partials.thread_closed')

8
resources/views/layout2/layout.blade.php
View File

@@ -47,12 +47,8 @@
<script type="text/javascript" src="/njum/js/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" src="/js/clipboard.min.js"></script>
<script type="text/javascript" src="/njum/js/newscript.js?v={{ filemtime("njum/js/newscript.js") }}"></script>
<script src="/njum/js/sticky_video.js"></script>
<script>
// Initialize
//new StickyVideo('sticky-container')
</script>
<script type="text/javascript">
<script src="/njum/js/sticky_video.js"></script>
<script type="text/javascript">
var clipboard = new ClipboardJS('.copylink');
clipboard.on('success', function(e) {

2
resources/views/layout2/partials/navigation.blade.php
View File

@@ -50,7 +50,7 @@
Layout
</a>
<div id="layoutSwitcher" class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" id="layout1" href="#">w0bm.com</a>
<a class="dropdown-item" id="layout1" href="#">Atmos</a>
<a class="dropdown-item" id="layout3" href="#">z0mb</a>
</div>
</li>

6
resources/views/layout2/partials/tags.blade.php
View File

@@ -24,11 +24,11 @@
@if(count($video->tags))
@foreach($video->tags as $tag)
@if($tag == 'sfw')
@if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-sfw"><a href="/index?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-sfw"><a href="/index?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a></span>@endif
@if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-sfw"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-sfw"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a></span>@endif
@elseif($tag == 'nsfw')
@if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-nsfw"><a href="/index?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-nsfw"><a href="/index?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a></span>@endif
@if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-nsfw"><a href="/main?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-nsfw"><a href="/main?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a></span>@endif
@else
@if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-secondary"><a href="/index?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-secondary"><a href="/index?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a></span>@endif
@if(Auth::check() && Auth::user()->can('edit_video'))<span class="badge badge-secondary"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a><a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@else<span class="badge badge-secondary"><a href="/main?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a></span>@endif
@endif
@endforeach
@else

2
resources/views/layout2/profilelayout.blade.php
View File

@@ -10,7 +10,6 @@
<link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-dark.css">
<link rel="stylesheet" type="text/css" href="/njum/css/bootstrap-tagsinput.css">
<link rel="stylesheet" type="text/css" href="/njum/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="/njum/css/simplebar.css" />
<link rel="stylesheet" type="text/css" href="/njum/css/cstms.css?v={{ filemtime("njum/css/cstms.css") }}">
</head>
<body>
@@ -28,7 +27,6 @@
</div>
</div>
</body>
<script src="/js/simplebar.min.js"></script>
<script type="text/javascript" defer src="/njum/js/jquery.min.js"></script>
<script type="text/javascript" defer src="/njum/js/jquery.timeago.js"></script>
<script type="text/javascript" defer src="/njum/js/popper.min.js"></script>