mirror of
https://github.com/Mistake35/Cedar-Django.git
synced 2026-07-19 00:51:14 +10:00
oh god
- Merge with closedverse-video-support - user_tools moved to forms.py - community_tools moved to forms.py
This commit is contained in:
some weird guy
+2
-6
@@ -230,7 +230,7 @@ form.search input[type="submit"] {
|
||||
display: block;
|
||||
border-right: 1px solid var(--theme-dark, #202030);
|
||||
}
|
||||
#global-menu li#global-menu-mymenu .icon-container img {
|
||||
#global-menu li#global-menu-mymenu .icon-container img:not(.official-tag) {
|
||||
border: 1px solid #000;
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
@@ -414,10 +414,6 @@ form.search {
|
||||
background: #fff;
|
||||
border: 2px solid #000;
|
||||
}
|
||||
.Announcement-content {
|
||||
background: var(--theme-dark, #202030);
|
||||
border: #000 solid 1px;
|
||||
}
|
||||
.sidebar-setting a {
|
||||
color: #ccc;
|
||||
border-top: 1px solid #000;
|
||||
@@ -445,7 +441,7 @@ form.search {
|
||||
.digest .post .icon-container {
|
||||
border: 1px solid rgb(0, 0, 0);
|
||||
}
|
||||
#empathy-content .post-permalink-feeling-icon img {
|
||||
#empathy-content .post-permalink-feeling-icon .user-icon {
|
||||
border: 1px solid #000;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
+41
-17
@@ -623,8 +623,8 @@ body {
|
||||
width: 38px;
|
||||
height: 38px;
|
||||
}
|
||||
#global-menu li#global-menu-mymenu .icon-container img {
|
||||
border: 1px solid #dddddd;
|
||||
#global-menu li#global-menu-mymenu .icon-container img:not(.official-tag) {
|
||||
border: 1px solid #ddd;
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
-webkit-border-radius: 5px;
|
||||
@@ -943,7 +943,7 @@ h2.reply-label {
|
||||
border-left: none;
|
||||
}
|
||||
.community-switcher .community-switcher-tab.selected {
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(var(--theme, #257811)), to(var(--theme-slightly-dark, #1e610e)));
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(var(--theme, #257811)), to(var(--theme, #1e610e)));
|
||||
background: -webkit-linear-gradient(top,#257811 #1e610e);
|
||||
background: -moz-linear-gradient(top,#257811 #1e610e);
|
||||
background: -ms-linear-gradient(top,#257811 #1e610e);
|
||||
@@ -1194,7 +1194,7 @@ h2.label-topic .with-filter-right {
|
||||
color: #FFF;
|
||||
background: url("img/color-button-bg.gif") repeat-x 0 bottom var(--theme, #2e81e5);
|
||||
background-color: #81e52e;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(var(--theme, #257811)), to(var(--theme-slightly-dark, #1e610e)));
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(var(--theme, #257811)), to(var(--theme, #1e610e)));
|
||||
background: -webkit-linear-gradient(top, #257811 #1e610e);
|
||||
background: -moz-linear-gradient(top, #257811 #1e610e);
|
||||
background: -ms-linear-gradient(top, #257811 #1e610e);
|
||||
@@ -1272,10 +1272,19 @@ span.owner-label {
|
||||
-o-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.official-tag {
|
||||
position: absolute;
|
||||
display: block;
|
||||
margin-top: -4px;
|
||||
margin-left: -4px;
|
||||
top: 0;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
}
|
||||
.icon-container.official {
|
||||
position: relative;
|
||||
}
|
||||
.icon-container.official:after {
|
||||
/*.icon-container.official:after {
|
||||
position: absolute;
|
||||
display: block;
|
||||
margin-top: -4px;
|
||||
@@ -1316,7 +1325,7 @@ span.owner-label {
|
||||
.icon-container.verifiedd:after {
|
||||
content: url("img/verified.png");
|
||||
}
|
||||
|
||||
*/
|
||||
.multi-timeline-post-list .post .icon-container.offline:before,
|
||||
.multi-timeline-post-list .post .icon-container.online:before,
|
||||
.multi-timeline-post-list .post .icon-container.afk:before {
|
||||
@@ -1375,7 +1384,7 @@ span.owner-label {
|
||||
width: 9px;
|
||||
height: 9px;
|
||||
}*/
|
||||
|
||||
/*
|
||||
.post-permalink-feeling-icon.administrator {
|
||||
position: relative;
|
||||
}
|
||||
@@ -1486,7 +1495,7 @@ span.owner-label {
|
||||
left: 0;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
}
|
||||
}*/
|
||||
.button {
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: none;
|
||||
@@ -2982,8 +2991,10 @@ body.masked {
|
||||
padding: 30px 25px 40px;
|
||||
}
|
||||
.dialog .dialog-inner {
|
||||
/*
|
||||
-webkit-backdrop-filter: blur(5px);
|
||||
backdrop-filter: blur(5px);
|
||||
*/
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
*display: inline;
|
||||
@@ -6156,7 +6167,10 @@ h2.label-topic_post .label-topic_post-msgid {
|
||||
height: 48px;
|
||||
margin: 2px;
|
||||
}
|
||||
#empathy-content .post-permalink-feeling-icon img {
|
||||
#empathy-content .post-permalink-feeling-icon .official-tag {
|
||||
top: 8px;
|
||||
}
|
||||
#empathy-content .post-permalink-feeling-icon .user-icon {
|
||||
width: 46px;
|
||||
height: 46px;
|
||||
border: 1px solid #222;
|
||||
@@ -6697,7 +6711,7 @@ h2.label-topic_post .label-topic_post-msgid {
|
||||
}
|
||||
.index-memo h2:not(.label) {
|
||||
margin-bottom: 5px;
|
||||
margin-top: 14px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
#help .help-content .num1 h2 {
|
||||
margin-top: 0;
|
||||
@@ -7157,6 +7171,9 @@ h2.label-topic_post .label-topic_post-msgid {
|
||||
box-shadow: none;
|
||||
background-color: #f4f4f4;
|
||||
}
|
||||
#global-menu .official-tag {
|
||||
top: 0px;
|
||||
}
|
||||
#global-menu li#global-menu-feed a,
|
||||
#global-menu li#global-menu-community a {
|
||||
padding-left: 0;
|
||||
@@ -7580,7 +7597,7 @@ margin: 10px 0px 15px !important;
|
||||
.simple-wrapper.simple-wrapper-content #main-body {
|
||||
border: none;
|
||||
}
|
||||
#empathy-content .icon-container.donator:after,
|
||||
/*#empathy-content .icon-container.donator:after,
|
||||
#reply-content .icon-container.donator:after,
|
||||
.news-list .icon-container.donator:after {
|
||||
content: url(img/donator.png);
|
||||
@@ -7643,6 +7660,7 @@ margin: 10px 0px 15px !important;
|
||||
width: 17px;
|
||||
height: 17px;
|
||||
}
|
||||
*/
|
||||
.button {
|
||||
font-size: 14px;
|
||||
width: 85%;
|
||||
@@ -8430,7 +8448,10 @@ margin: 10px 0px 15px !important;
|
||||
height: 38px;
|
||||
margin: 2px 1.5px 1px 1.5px;
|
||||
}
|
||||
#empathy-content .post-permalink-feeling-icon img {
|
||||
#empathy-content .post-permalink-feeling-icon .official-tag {
|
||||
top: 8px;
|
||||
}
|
||||
#empathy-content .post-permalink-feeling-icon .user-icon {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
@@ -8530,7 +8551,7 @@ margin: 10px 0px 15px !important;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
#global-menu #global-menu-logo {
|
||||
padding: 8px 0;
|
||||
padding: 16px 0;
|
||||
}
|
||||
#global-menu #global-menu-logo img {
|
||||
height: auto;
|
||||
@@ -8846,9 +8867,10 @@ margin: 10px 0px 15px !important;
|
||||
}
|
||||
.login-page {
|
||||
text-align: center;
|
||||
padding: 10px;
|
||||
}
|
||||
.login-page > form > img {
|
||||
margin-top: 30px;
|
||||
margin-top: 20px;
|
||||
margin-bottom: 10px;
|
||||
max-width: 95%;
|
||||
}
|
||||
@@ -8858,7 +8880,7 @@ font-size: 20px;
|
||||
}
|
||||
.login-page .ll {
|
||||
margin-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.login-page a:hover {
|
||||
text-decoration: underline;
|
||||
@@ -8869,14 +8891,16 @@ display: block;
|
||||
width: 50%;
|
||||
}
|
||||
.index-memo {
|
||||
margin-top: 10px;
|
||||
text-align: center;
|
||||
}
|
||||
.index-memo > div {
|
||||
padding: 10px;
|
||||
}
|
||||
.index-memo p {
|
||||
width:90%;
|
||||
display:inline-block;
|
||||
}
|
||||
#empathy-content .post-permalink-feeling-icon img {
|
||||
#empathy-content .post-permalink-feeling-icon .user-icon {
|
||||
border: 1px solid #dddddd;
|
||||
}
|
||||
|
||||
|
||||
+20
-3
@@ -508,7 +508,7 @@ var Olv = Olv || {};
|
||||
case 500:
|
||||
errmsg = "An error has been encountered in the server.\n";
|
||||
if(a.getResponseHeader('Content-Type').indexOf('html') < 0) {
|
||||
window.tmpUnescapedHtmlForError = errmsg + "<br>Error information is available; please send this to an administrator:<code>" + b.SimpleDialog.htmlLineBreak(a.responseText) + "</pre>\n";
|
||||
window.tmpUnescapedHtmlForError = errmsg + "<br>Error information is available; please send this to a developer:<code>" + b.SimpleDialog.htmlLineBreak(a.responseText) + "</pre>\n";
|
||||
/*if(innerWidth <= 480) {
|
||||
errmsg += a.responseText.substr(0, 400);
|
||||
} else {
|
||||
@@ -2595,7 +2595,8 @@ var Olv = Olv || {};
|
||||
b.Closed.changesel("news");
|
||||
$('.received-request-button').on('click', function(a) {
|
||||
a.preventDefault()
|
||||
fr = new b.ModalWindow($('div[data-modal-types=accept-friend-request][uuid='+ $(this).parent().parent().attr('id') +']'));fr.open();
|
||||
window.ass = a
|
||||
fr = new b.ModalWindow($('div[data-modal-types=accept-friend-request][data-action="'+ $(this).parent().parent().data('action') +'"]'));fr.open();
|
||||
})
|
||||
$('div[data-modal-types=accept-friend-request] .ok-button.post-button').on('click', function(a){
|
||||
a.preventDefault();
|
||||
@@ -3339,6 +3340,22 @@ mode_post = 0;
|
||||
});
|
||||
})
|
||||
}),
|
||||
b.router.connect("^/my_blacklist$", function() {
|
||||
$('.received-request-button').on('click', function(a) {
|
||||
a.preventDefault()
|
||||
window.fr = new b.ModalWindow($('div#' + a.originalEvent.target.getAttribute('dataaa')));
|
||||
window.fr.open();
|
||||
});
|
||||
$('div[data-modal-types=post-unblock] input.post-button').on('click', function(g){
|
||||
g.preventDefault();
|
||||
b.Form.toggleDisabled($(this), true);
|
||||
b.Form.post(g.target.form.dataset.action).done(function() {
|
||||
window.fr.close();
|
||||
b.Form.toggleDisabled($(this), false);
|
||||
b.Net.reload();
|
||||
});
|
||||
});
|
||||
}),
|
||||
b.router.connect("^/users/[^\/]+/(tools)$", function(c, d, e) {
|
||||
function f(c) {
|
||||
var d = a(this)
|
||||
@@ -3495,7 +3512,7 @@ mode_post = 0;
|
||||
$('.color-thing2').spectrum();
|
||||
b.Net.reload();
|
||||
var updateAvatar = function() {
|
||||
a('#global-menu-mymenu .icon-container img').attr('src', a('#sidebar-profile-body .icon').attr('src'));
|
||||
a('#global-menu-mymenu .icon-container .user-icon').attr('src', a('#sidebar-profile-body .icon').attr('src'));
|
||||
var them = a('[name=theme]').val();
|
||||
if(them === 'None') {
|
||||
toDefault();
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 81 KiB |
Reference in New Issue
Block a user