lkva/NDOJ
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update layout UI

Browse source
This commit is contained in:
cuom1999 2023-02-07 23:14:48 -06:00
parent 993309d56b
commit 2ee279098f
11 changed files with 193 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/base.scss
View file

@ -36,7 +36,7 @@ img {
}
* {
-webkit-tap-highlight-color: transparent;
-webkit-tap-highlight-color: transparent;
}
.full {
@ -377,7 +377,7 @@ hr {
}
#content {
margin: 4.5em auto 1em auto;
margin: 3.2em auto 1em auto;
// Header
width: 90%;
@ -390,6 +390,12 @@ hr {
}
}
#content.wrapper {
background: white;
padding: 2em;
border-radius: 1em;
}
footer {
text-align: center;
height: 40px;
@ -558,7 +564,7 @@ noscript #noscript {
margin: 0 auto;
border-right: 1px solid $border_gray;
border-left: 1px solid $border_gray;
background: white;
background: #f1f2f2;
}
// border-bottom: 1px solid rgb(204, 204, 204)

15
resources/blog.scss
View file

@ -257,6 +257,12 @@
}
}
.middle-right-content.wrapper {
padding: 1em 0;
background: white;
border-radius: 1em;
}
@media (max-width: 799px) {
.actionbar-box {
@ -332,14 +338,15 @@
.left-sidebar {
width: 11%;
max-width: 11%;
min-width: 11%;
position: fixed;
height: 100%;
margin-top: -4em;
padding-top: 4em;
}
.left-sidebar-item {
border-radius: 0 0.5em 0.5em 0;
border-right: 1px solid lightgray;
box-shadow: 0px -10px 2px 0px rgb(0 0 0 / 50%);
background: white;
}
.feed-table {

3
resources/chatbox.scss
View file

@ -1,3 +1,6 @@
.chat {
background: white;
}
#chat-log p {
margin: 0;
padding-top: 0.1em;

38
resources/darkmode.css
View file

@ -1622,6 +1622,10 @@ hr {
#content .title {
color: rgb(199, 194, 187);
}
#content.wrapper {
background-image: initial;
background-color: rgb(24, 26, 27);
}
footer {
border-top-color: rgb(62, 68, 70);
background-image: initial;
@ -1687,7 +1691,7 @@ noscript #noscript {
border-right-color: rgb(62, 68, 70);
border-left-color: rgb(62, 68, 70);
background-image: initial;
background-color: rgb(24, 26, 27);
background-color: rgb(32, 34, 36);
}
.MathJax:focus {
outline-color: initial;
@ -1803,6 +1807,10 @@ noscript #noscript {
background-image: initial;
background-color: rgb(29, 31, 32);
}
.table.striped tr:nth-child(2n+1) {
background-image: initial;
background-color: rgb(24, 26, 27);
}
.table td:first-child {
border-color: rgb(62, 68, 70);
}
@ -1919,6 +1927,9 @@ noscript #noscript {
border-top-color: rgb(60, 65, 68);
background-color: rgb(24, 26, 27);
}
.blog-box:hover {
border-color: rgb(81, 88, 91);
}
.problem-feed-name a {
color: rgb(102, 177, 250);
}
@ -1939,11 +1950,22 @@ noscript #noscript {
color: rgb(232, 230, 227);
}
.show-more {
color: white;
background: linear-gradient(rgba(0, 0, 0, 0), rgb(24, 26, 27));
color: rgb(232, 230, 227);
background-image: linear-gradient(rgba(0, 0, 0, 0),
rgb(24, 26, 27));
background-color: initial;
}
.middle-right-content.wrapper {
background-image: initial;
background-color: rgb(24, 26, 27);
}
@media (min-width: 800px) {
.left-sidebar {
border-right-color: rgb(60, 65, 68);
box-shadow: rgba(0, 0, 0, 0.5) 0px -10px 2px 0px;
background-image: initial;
background-color: rgb(24, 26, 27);
}
.blog-box {
border-left-color: rgb(60, 65, 68);
border-right-color: rgb(60, 65, 68);
@ -2570,6 +2592,8 @@ a.close:hover {
border-bottom-color: rgb(62, 68, 70);
border-left-color: rgb(62, 68, 70);
border-top-color: initial;
background-image: initial;
background-color: rgb(24, 26, 27);
}
.sidebox-content.sidebox-table {
border-color: initial;
@ -2732,7 +2756,7 @@ a.voted {
}
#submissions-table {
background-image: initial;
background-color: rgba(0, 0, 0, 0.01);
background-color: rgb(24, 26, 27);
}
.submission-row {
border-left-color: rgb(62, 68, 70);
@ -2971,6 +2995,10 @@ a.voted {
background-color: rgba(204, 0, 0, 0.8);
color: rgb(232, 230, 227);
}
.chat {
background-image: initial;
background-color: rgb(24, 26, 27);
}
#emoji-button {
color: rgb(204, 200, 193);
}

6
resources/submission.scss
View file

@ -5,7 +5,7 @@
}
#submissions-table {
background: rgba(0, 0, 0, .01);
background: white;
}
.submission-row {
@ -212,8 +212,8 @@ label[for="language"], label[for="status"] {
}
// .batch-cases .case-row td b {
// font-weight: 500;
// }
// font-weight: 500;
// }
.case-info {
margin: 0;

4
resources/table.scss
View file

@ -12,6 +12,10 @@
background: #f7f7f7;
}
&.striped tr:nth-child(odd) {
background: white;
}
td:first-child {
border-color: $border_gray;
border-width: 1px 1px 0 1px;

1
resources/widgets.scss
View file

@ -495,6 +495,7 @@ ul.select2-selection__rendered {
border-top: none;
margin: 0 -5px;
padding: 1px 0.5em 3px;
background: white;
&.sidebox-table {
border: none;

2
templates/base.html
View file

@ -332,7 +332,7 @@
<div id="noscript">{{ _('This site works best with JavaScript enabled.') }}</div>
</noscript>
<br>
<main id="content">
<main id="content" class="{{'wrapper' if layout != 'no_wrapper'}}">
{% block title_row %}
<h2 class="title-row">
{% block content_title %}

1
templates/chat/chat.html
View file

@ -1,3 +1,4 @@
{% set layout = "no_wrapper" %}
{% extends "base.html" %}
{% block title_row %}{% endblock %}
{% block title_ruler %}{% endblock %}

229
templates/three-column-content.html
View file

@ -1,143 +1,150 @@
{% set layout = 'no_wrapper' %}
{% extends "base.html" %}
{% block title_row %}{% endblock %}
{% block title_ruler %}{% endblock %}
{% block media %}
<style>
@media(min-width: 800px) {
#content {
width: 98%;
margin-left: 0;
<style>
@media(min-width: 800px) {
#content {
width: 98%;
margin-left: 0;
}
.middle-right-content {
margin-left: 13%;
display: inline-flex;
}
}
.middle-right-content {
margin-left: 13%;
display: inline-flex;
}
}
@media(max-width: 799px) {
#content {
width: 100%;
margin-left: 0;
}
@media(max-width: 799px) {
#content {
width: 100%;
margin-left: 0;
.middle-right-content {
display: block;
}
}
.middle-right-content {
display: block;
}
}
</style>
</style>
{% endblock %}
{% block js_media %}
<script type="text/javascript">
function activateBlogBoxOnClick() {
$('.blog-box').on('click', function () {
var $description = $(this).children('.blog-description');
var max_height = $description.css('max-height');
if (max_height !== 'fit-content') {
$description.css('max-height', 'fit-content');
$(this).css('cursor', 'auto');
$(this).removeClass('pre-expand-blog');
$(this).children().children('.show-more').hide();
}
});
<script type="text/javascript">
function activateBlogBoxOnClick() {
$('.blog-box').on('click', function () {
var $description = $(this).children('.blog-description');
var max_height = $description.css('max-height');
if (max_height !== 'fit-content') {
$description.css('max-height', 'fit-content');
$(this).css('cursor', 'auto');
$(this).removeClass('pre-expand-blog');
$(this).children().children('.show-more').hide();
}
});
$('.blog-box').each(function () {
var $precontent = $(this).children('.blog-description').height();
var $content = $(this).children().children('.content-description').height();
if ($content == undefined) {
$content = $(this).children().children('.md-typeset').height()
}
if ($content > $precontent - 30) {
$(this).addClass('pre-expand-blog');
$(this).css('cursor', 'pointer');
} else {
$(this).children().children('.show-more').hide();
}
});
}
function navigateTo($elem, update_sidebar = false) {
var url = $elem.attr('data-href') || $elem.attr('href');
if (url === '#') return;
if (update_sidebar) {
$('.left-sidebar-item').removeClass('active');
$elem.addClass('active');
$('.blog-box').each(function () {
var $precontent = $(this).children('.blog-description').height();
var $content = $(this).children().children('.content-description').height();
if ($content == undefined) {
$content = $(this).children().children('.md-typeset').height()
}
if ($content > $precontent - 30) {
$(this).addClass('pre-expand-blog');
$(this).css('cursor', 'pointer');
} else {
$(this).children().children('.show-more').hide();
}
});
}
$('.middle-right-content').html(loading_page);
$.get(url, function (data) {
var reload_content = $(data).find('.middle-right-content');
if (reload_content.length) {
window.history.pushState("", "", url);
$('.middle-right-content').html(reload_content.first().html());
$(document).prop('title', $(data).filter('title').text());
MathJax.typeset($('.middle-right-content')[0]);
onWindowReady();
activateBlogBoxOnClick();
$('.xdsoft_datetimepicker').hide();
registerNavigation();
}
else {
window.location.href = url;
}
});
}
function navigateTo($elem, update_sidebar = false) {
var url = $elem.attr('data-href') || $elem.attr('href');
function registerNavigation() {
const links = ['.pagination a', '.tabs li a', '.problem-feed-option a'];
for (link of links) {
$(link).on('click', function (e) {
e.preventDefault();
navigateTo($(this));
})
if (url === '#') return;
if (update_sidebar) {
$('.left-sidebar-item').removeClass('active');
$elem.addClass('active');
}
$('.middle-right-content').html(loading_page);
$.get(url, function (data) {
var reload_content = $(data).find('.middle-right-content');
if (reload_content.length) {
window.history.pushState("", "", url);
$('.middle-right-content').html(reload_content.first().html());
if (reload_content.hasClass("wrapper")) {
$('.middle-right-content').addClass("wrapper");
}
else {
$('.middle-right-content').removeClass("wrapper");
}
$(document).prop('title', $(data).filter('title').text());
MathJax.typeset($('.middle-right-content')[0]);
onWindowReady();
activateBlogBoxOnClick();
$('.xdsoft_datetimepicker').hide();
registerNavigation();
}
else {
window.location.href = url;
}
});
}
}
$(function () {
window.addEventListener('popstate', (e) => {
window.location.href = e.currentTarget.location.href;
});
activateBlogBoxOnClick();
function registerNavigation() {
const links = ['.pagination a', '.tabs li a', '.problem-feed-option a'];
for (link of links) {
$(link).on('click', function (e) {
e.preventDefault();
navigateTo($(this));
})
}
}
$('.left-sidebar-item').on('click', function () {
navigateTo($(this), true);
$(function () {
window.addEventListener('popstate', (e) => {
window.location.href = e.currentTarget.location.href;
});
activateBlogBoxOnClick();
$('.left-sidebar-item').on('click', function () {
navigateTo($(this), true);
});
registerNavigation();
});
registerNavigation();
});
</script>
</script>
{% endblock %}
{% macro make_tab_item(name, fa, url, text) %}
<div class="left-sidebar-item {% if page_type == name %}active{% endif %}" data-href="{{ url }}" id="{{ name }}-tab">
<span class="sidebar-icon"><i class="{{ fa }}"></i></span>
<span>{{ text }}</span>
</div>
<div class="left-sidebar-item {% if page_type == name %}active{% endif %}" data-href="{{ url }}" id="{{ name }}-tab">
<span class="sidebar-icon"><i class="{{ fa }}"></i></span>
<span>{{ text }}</span>
</div>
{% endmacro %}
{% block body %}
{% block before_posts %}{% endblock %}
<div id="three-col-container">
{% block left_sidebar %}{% endblock %}
<div class="middle-right-content">
{% block three_col_media %}{% endblock %}
{% block three_col_js %}{% endblock %}
<div class="middle-content">
{% block middle_title %}{% endblock %}
{% block middle_content %}{% endblock %}
{% block before_posts %}{% endblock %}
<div id="three-col-container">
{% block left_sidebar %}{% endblock %}
<div class="middle-right-content {{'wrapper' if is_two_column}}">
{% block three_col_media %}{% endblock %}
{% block three_col_js %}{% endblock %}
<div class="middle-content">
{% block middle_title %}{% endblock %}
{% block middle_content %}{% endblock %}
</div>
{% block right_sidebar %}{% endblock %}
</div>
{% block right_sidebar %}{% endblock %}
</div>
</div>
{% block after_posts %}{% endblock %}
{% block after_posts %}{% endblock %}
{% endblock %}
{% block bodyend %}
{{ super() }}
{% if REQUIRE_JAX %}
{% include "mathjax-load.html" %}
{% endif %}
{% include "comments/math.html" %}
{{ super() }}
{% if REQUIRE_JAX %}
{% include "mathjax-load.html" %}
{% endif %}
{% include "comments/math.html" %}
{% endblock %}

1
templates/two-column-content.html
View file

@ -1,3 +1,4 @@
{% set is_two_column = true %}
{% extends "three-column-content.html" %}
{% block three_col_js %}