Tmp

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)

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%;
+        max-width: 65%;
-        margin-left: 10%;
+        margin-left: 13%;
     }
 
     .blog-sidebar, .right-sidebar {
-        width: 18%;
+        width: 20%;
     }
 
     .left-sidebar {
-        width: 8%;
+        width: 11%;
-        margin-right: 1em;
         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-left: 1.4px solid lightgray;
-        border-right: 2px solid black;
+        // 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;
-}

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 {

resources/problem.scss

@@ -318,7 +318,7 @@ ul.problem-list {
 }
 
 .problem-feed-option-item.active {
-    background: goldenrod;
+    background: lightblue;
     color: darkblue;
 }
 

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 {

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;

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;

templates/blog/blog.html

@@ -6,6 +6,11 @@
 
 {% block media %}
     {% include "comments/media-css.html" %}
+    <style>
+        #page-container {
+            background: white;
+        }
+    </style>
 {% endblock %}
 
 {% block header %}

templates/common-content.html

@@ -2,6 +2,11 @@
 
 {% block media %}
     {% block content_media %}{% endblock %}
+    <style>
+        #page-container {
+            background: white;
+        }
+    </style>
 {% endblock %}
 
 {% block js_media %}

templates/contest/list.html

@@ -237,7 +237,7 @@
         </form>
         {% if active_participations %}
             <h4>{{ _('Active Contests') }}</h4>
-            <table class="contest-list table striped">
+            <table class="contest-list table">
                 <thead>
                 <tr>
                     <th style="width:90%">{{ _('Contest') }}</th>
@@ -291,7 +291,7 @@
                 </button>
             </h4>
             <div id="ongoing-table">
-                <table class="contest-list table striped">
+                <table class="contest-list table">
                     <thead>
                     <tr>
                         <th style="width:90%">{{ _('Contest') }}</th>
@@ -330,7 +330,7 @@
 
         <h4>{{ _('Upcoming Contests') }}</h4>
         {% if future_contests %}
-            <table class="contest-list table striped">
+            <table class="contest-list table">
                 <thead>
                 <tr>
                     <th>{{ _('Contest') }}</th>
@@ -368,7 +368,7 @@
                     {% include "list-pages.html" %}
                 </div>
             {% endif %}
-            <table class="contest-list table striped">
+            <table class="contest-list table">
                 <thead>
                 <tr>
                     <th style="width:90%">

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 %}
-        <div class="blog-sidebox sidebox">
-            <h3>{{ _('About') }}<i class="fa fa-info-circle"></i></h3>
-            <div class="sidebox-content">
-                <div style="margin: 0.3em;">
-                    {% cache 3600 'organization_html' organization.id MATH_ENGINE %}
-                        {{ organization.about|markdown('organization-about', MATH_ENGINE)|reference|str|safe }}
-                    {% endcache %}
-                </div>
-            </div>
-        </div>
-    {% endif %}
     {% if can_edit or is_member %}
         <div id="control-panel" class="blog-sidebox sidebox no-dot-blog-sidebox">
             <h3>{{ _('Controls') }} <i class="fa fa-cog"></i></h3>
@@ -71,6 +59,16 @@
                 {% endif %}
             </ul>
         </div>
+        <div class="blog-sidebox sidebox">
+            <h3>{{ _('About') }}<i class="fa fa-info-circle"></i></h3>
+            <div class="sidebox-content">
+                <div style="margin: 0.3em;">
+                    {% cache 3600 'organization_html' organization.id MATH_ENGINE %}
+                        {{ organization.about|markdown('organization-about', MATH_ENGINE)|reference|str|safe }}
+                    {% endcache %}
+                </div>
+            </div>
+        </div>
     {% endif %}
     {% include 'top-users.html' %}
 </div>

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 %}
         <style>
             td.sub-prop, col.sub-prop {

templates/three-column-content.html

@@ -31,8 +31,7 @@
             })
             $('.blog-description').each(function() {
                 if ($(this).prop('scrollHeight') > $(this).height() ) {
-                    $(this).parent().css('background-image', '-webkit-linear-gradient(bottom, gray, lightgray 3%, transparent 8%, transparent 100%)');
+                    $(this).parent().addClass('pre-expand-blog');
-                    $(this).parent().css('padding-bottom', '0');
                     $(this).css('cursor', 'pointer');
                 }
             });
@@ -43,8 +42,8 @@
 
 {% 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">
-        <div class="sidebar-icon"><i class="{{ fa }}"></i></div>
+        <span class="sidebar-icon"><i class="{{ fa }}"></i></span>
-        {{ text }}
+        <span>{{ text }}</span>
     </div>
 {% endmacro %}
 

templates/user/base-users.html

@@ -64,7 +64,7 @@
     </script>
 {% endblock %}
 
-{% block media %}
+{% block content_media %}
     <link href="http://fonts.cdnfonts.com/css/jersey-m54" rel="stylesheet">
     {% block users_media %}{% endblock %}
 {% endblock %}