diff --git a/resources/base.scss b/resources/base.scss index dfadbcb..9fb33f1 100644 --- a/resources/base.scss +++ b/resources/base.scss @@ -564,7 +564,7 @@ noscript #noscript { margin: 0 auto; border-right: 1px solid $border_gray; border-left: 1px solid $border_gray; - background: white; + background: #f3f3f3; } // border-bottom: 1px solid rgb(204, 204, 204) diff --git a/resources/blog.scss b/resources/blog.scss index 5db8d5f..40bbe92 100644 --- a/resources/blog.scss +++ b/resources/blog.scss @@ -39,6 +39,8 @@ .left-sidebar-item.active { color: green; + font-weight: bold; + background-color: lightgreen; .sidebar-icon { color: green; } @@ -101,6 +103,106 @@ color: #555; } +#mobile.tabs { + margin: 0; + margin-bottom: 1em; +} + +.rssatom { + text-align: right; + padding: 0.25em; + display: block; + + span { + width: 1em; + height: 1em; + padding: 0.1em; + font-size: 0.8em; + color: white; + border-radius: 0.2em; + display: inline-block; + margin-right: 0.2em; + border: 1px solid rgb(201, 90, 18); + background: #fb9e39; + background: linear-gradient(135deg, #e46d27 0, #fb9e39 47%, #e46d27 100%); + + i { + text-align: center; + display: block; + } + } +} + +.blog-box { + // border-bottom: 1.4px solid lightgray; + // border-top: 1.4px solid lightgray; + margin-bottom: 1.5em; + width: 90%; + padding: 1em 1.75em 0.5em 1.75em; + background-color: white; + margin-left: auto; + margin-right: auto; + + .title { + margin-bottom: 0.2em; + font-weight: 500; + } +} + +.blog-description { + max-height: 30em; + overflow: hidden; + overflow-wrap: anywhere; + padding-bottom: 1em; +} +.problem-feed-name { + display: inline; + font-weight: bold; +} +.problem-feed-name a { + color: #0645ad; +} +.problem-feed-info-entry { + display: inline; + float: right; +} +.problem-feed-types { + color: gray; +} + +.left-sidebar-item { + padding: 0.8em 0.2em 0.8em 1em; + .sidebar-icon { + width: 1.2em; + display: inline-block; + } +} +.left-sidebar-item:hover { + background-color: #e3e3e3; + cursor: pointer; +} +.left-sidebar-item.active:hover { + background-color: lightgreen; +} +.sidebar-icon { + color: black; +} +.left-sidebar-header { + text-align: center; + padding-bottom: 1em; + border-bottom: 1px solid black; + color: black; + border-radius: 0; +} +.feed-table { + margin: 0; +} +.pre-expand-blog { + background-image: -webkit-linear-gradient(bottom, gray, lightgray 3%, transparent 8%, transparent 100%); + padding-bottom: 0; +} + + @media (max-width: 799px) { .left-sidebar-header { display: none; @@ -134,22 +236,24 @@ } .middle-content { - max-width: 71.5%; - margin-left: 10%; + max-width: 65%; + margin-left: 13%; } .blog-sidebar, .right-sidebar { - width: 18%; + width: 20%; } .left-sidebar { - width: 8%; - margin-right: 1em; + width: 11%; position: fixed; height: 100%; margin-top: -4em; padding-top: 4em; - border-right: 3px solid black; + } + + .left-sidebar-item { + border-radius: 0 2em 2em 0; } .feed-table { @@ -157,104 +261,8 @@ } .blog-box { - border-left: 2px solid black; - border-right: 2px solid black; + // border-left: 1.4px solid lightgray; + // border-right: 1.4px solid lightgray; border-radius: 8px; } } - -#mobile.tabs { - margin: 0; - margin-bottom: 1em; -} - -.rssatom { - text-align: right; - padding: 0.25em; - display: block; - - span { - width: 1em; - height: 1em; - padding: 0.1em; - font-size: 0.8em; - color: white; - border-radius: 0.2em; - display: inline-block; - margin-right: 0.2em; - border: 1px solid rgb(201, 90, 18); - background: #fb9e39; - background: linear-gradient(135deg, #e46d27 0, #fb9e39 47%, #e46d27 100%); - - i { - text-align: center; - display: block; - } - } -} - -.blog-box { - border-bottom: 1px solid black; - border-top: 2px solid black; - margin-bottom: 1em; - width: 90%; - padding: 1em 1.25em 0.5em 1.25em; - background-color: white; - margin-left: auto; - margin-right: auto; - - .title { - margin-bottom: 0.2em; - font-weight: 500; - } -} - -.blog-description { - max-height: 30em; - overflow: hidden; - overflow-wrap: anywhere; - padding-bottom: 1em; -} -.problem-feed-name { - display: inline; - font-weight: bold; -} -.problem-feed-name a { - color: #0645ad; -} -.problem-feed-info-entry { - display: inline; - float: right; -} -.problem-feed-types { - color: gray; -} - -.left-sidebar { - background-color: #f0f1f3; - color: #616161; -} - -.left-sidebar-item { - padding: 1em 0.5em; - text-align: center; -} -.left-sidebar-item:hover { - background-color: lightgray; - cursor: pointer; -} -.sidebar-icon { - font-size: x-large; - margin-bottom: 0.1em; - color: black; -} -.left-sidebar-header { - text-align: center; - padding-bottom: 1em; - border-bottom: 1px solid black; - color: black; - border-radius: 0; -} -.feed-table { - margin: 0; -} \ No newline at end of file diff --git a/resources/comments.scss b/resources/comments.scss index 8494cf1..83f5a42 100644 --- a/resources/comments.scss +++ b/resources/comments.scss @@ -96,7 +96,7 @@ a { border-radius: $widget_border_radius; padding: 5px 10px 10px 15px; border: 1px solid $border_gray; - background: rgba(0, 0, 0, 0.01); + background: white; } .comment { diff --git a/resources/problem.scss b/resources/problem.scss index 63d4a55..804ca69 100644 --- a/resources/problem.scss +++ b/resources/problem.scss @@ -318,7 +318,7 @@ ul.problem-list { } .problem-feed-option-item.active { - background: goldenrod; + background: lightblue; color: darkblue; } diff --git a/resources/submission.scss b/resources/submission.scss index a1dff72..b9359cd 100644 --- a/resources/submission.scss +++ b/resources/submission.scss @@ -5,7 +5,7 @@ } #submissions-table { - background: rgba(0, 0, 0, .01); + background: white; } .submission-row { @@ -241,6 +241,7 @@ label[for="language"], label[for="status"] { border: 1px solid grey; border-radius: 0.5em; border-spacing: 0; + background: white; thead td:first-child { border-top-left-radius: 0.5em; @@ -352,6 +353,10 @@ label[for="language"], label[for="status"] { a:active .line .highlighter { background: rgba(255, 212, 0, 0.48); } + + background: white; + padding: 0.5em; + border-radius: 8px; } .submission-info { diff --git a/resources/table.scss b/resources/table.scss index d313bfc..06cc70f 100644 --- a/resources/table.scss +++ b/resources/table.scss @@ -6,7 +6,7 @@ margin-left: auto; margin-right: auto; margin-bottom: 0.5em; - background: rgba(0, 0, 0, 0.01); + background: white; &.striped tr:nth-child(even) { background: #f7f7f7; diff --git a/resources/widgets.scss b/resources/widgets.scss index 1bd5d46..dc42d36 100644 --- a/resources/widgets.scss +++ b/resources/widgets.scss @@ -433,10 +433,11 @@ ul.select2-selection__rendered { } .sidebox-content { - border: 1px solid $border_gray; + // border: 1px solid $border_gray; border-top: none; margin: 0 -5px; padding: 1px 0.5em 3px; + background: white; &.sidebox-table { border: none; diff --git a/templates/blog/blog.html b/templates/blog/blog.html index 9689f92..5af4675 100644 --- a/templates/blog/blog.html +++ b/templates/blog/blog.html @@ -6,6 +6,11 @@ {% block media %} {% include "comments/media-css.html" %} + {% endblock %} {% block header %} diff --git a/templates/common-content.html b/templates/common-content.html index 5d68048..63daf5e 100644 --- a/templates/common-content.html +++ b/templates/common-content.html @@ -2,6 +2,11 @@ {% block media %} {% block content_media %}{% endblock %} + {% endblock %} {% block js_media %} diff --git a/templates/contest/list.html b/templates/contest/list.html index 36f81bb..c57221c 100644 --- a/templates/contest/list.html +++ b/templates/contest/list.html @@ -237,7 +237,7 @@ {% if active_participations %}

{{ _('Active Contests') }}

- +
@@ -291,7 +291,7 @@
-
{{ _('Contest') }}
+
@@ -330,7 +330,7 @@

{{ _('Upcoming Contests') }}

{% if future_contests %} -
{{ _('Contest') }}
+
@@ -368,7 +368,7 @@ {% include "list-pages.html" %} {% endif %} -
{{ _('Contest') }}
+
diff --git a/templates/organization/org-right-sidebar.html b/templates/organization/org-right-sidebar.html index bd5c572..496115b 100644 --- a/templates/organization/org-right-sidebar.html +++ b/templates/organization/org-right-sidebar.html @@ -2,18 +2,6 @@ {% if (is_member or can_edit) %} {% include 'contests-countdown.html' %} {% endif %} - {% if is_member or can_edit %} - - {% endif %} {% if can_edit or is_member %} + {% endif %} {% include 'top-users.html' %} \ No newline at end of file diff --git a/templates/submission/list.html b/templates/submission/list.html index 07cb775..634e4fb 100644 --- a/templates/submission/list.html +++ b/templates/submission/list.html @@ -260,7 +260,7 @@ {% include "submission/submission-list-tabs.html" %} {% endblock %} -{% block media %} +{% block content_media %} {% if perms.judge.change_submission and perms.judge.rejudge_submission %}