Merge branch 'main' into issue111_download_file_with_tokens

60685cc2 · cbytl1 · GitHub · 14724e94 · 6e4181f3 · 60685cc2
--- a/portal/static/css/admin_menu/admin.css
+++ b/portal/static/css/admin_menu/admin.css
@@ -25,7 +25,8 @@

 .search{
    margin-bottom: 20px;
-    width: 80%;
+    width: calc(100% - 200px);
+    max-width: 80%;
    display: flex;
    justify-content: center;
    align-items: center;

--- a/portal/static/css/global/footer.css
+++ b/portal/static/css/global/footer.css
@@ -12,7 +12,7 @@
    padding-top: 40px;
    display: flex;
    align-items: flex-start;
-    justify-content: space-between;
+    justify-content: space-around;
 }

 .footer-title {
@@ -26,12 +26,10 @@
 .long-logo {
    display: inline-block;
    align-self: center;
-    margin-left: 10%;
 }

 .footer-contact {
    font-style: normal;
-    width: 35%;
 }

 .footer-contact > div {
@@ -44,6 +42,7 @@
    list-style: none;
    padding: 0;
    margin: 0;
+    margin-right: 40px
 }

 .footer-contact-item {
@@ -86,8 +85,6 @@
 }

 .footer-links {
-    margin-left: 150px;
-    margin-right: 10%;
    text-align: center;
 }


--- a/portal/static/css/profile/profile.css
+++ b/portal/static/css/profile/profile.css
@@ -10,7 +10,8 @@

 .main {
    display: block;
-    width: 1215px;
+    max-width: 1215px;
+    width: 80%;
    margin: 55px auto;
    margin-bottom: 0;
    padding-bottom: 10px;
@@ -23,11 +24,16 @@
 }

 .main-div {
+    position: relative;
    display: flex;
    width: 100%;
    justify-content: space-between;
 }

+.right-block {
+    width: calc(100% - 420px);
+}
+
 .section {
    padding: 24px 30px;
    background: #fff;
@@ -220,7 +226,8 @@
 }

 .info {
-    width: 790px;
+    width: 100%;
+    max-width: 790px;
 }

 .input {
@@ -383,7 +390,8 @@
 /* for teachers */

 .section-projects {
-    width: 790px;
+    width: 100%;
+    max-width: 790px;
    background-color: transparent;
 }


--- a/portal/static/css/theme_list/theme_list.css
+++ b/portal/static/css/theme_list/theme_list.css
@@ -18,7 +18,7 @@

 .container {
    display: flex;
-    justify-content: space-between;
+    justify-content: space-around;
    width: 1200px;
 }


--- a/portal/templates/home.html
+++ b/portal/templates/home.html
@@ -40,7 +40,7 @@
                    <a href="{% url 'theme_list' %}">Список тем</a>
                </li>
                <li class="nav-item">
-                    <a href="{% url 'theme_list' %}">Управление проектом</a>
+                    <a href="{% url 'projects' %}">Управление проектом</a>
                </li>
                {% if user.is_superuser %}
                <li class="nav-item">

--- a/portal/templates/profile/profile.html
+++ b/portal/templates/profile/profile.html
@@ -37,7 +37,7 @@
            </div>
        </section>
    </div>
-    <div>
+    <div class="right-block">
        <section class="section-projects">
            <div class="projects now-project">
                <button class="btn btn-projects">Текущие проекты</button>