From 36fe25ea48e8f34f359217b6f74f0c19440056f1 Mon Sep 17 00:00:00 2001 From: olanicp Date: Tue, 5 Nov 2024 14:19:11 +0100 Subject: [PATCH 1/6] Zmieniona szerokosc pierwszej kolumny na najmniejsza --- zapisy/apps/common/assets/main/index.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zapisy/apps/common/assets/main/index.scss b/zapisy/apps/common/assets/main/index.scss index a9a6df688e..a77952f895 100644 --- a/zapisy/apps/common/assets/main/index.scss +++ b/zapisy/apps/common/assets/main/index.scss @@ -246,8 +246,14 @@ div.loginbox { colgroup col.table-info-type { background-color: #f9f9f9; + width: 1%; } +#table-info th { + white-space: nowrap; +} + + // Required field marker in forms. .asteriskField { padding-left: 0.25em; From 123ec6474de6f27458e5f50fa8692ebaf9286bf3 Mon Sep 17 00:00:00 2001 From: olanicp Date: Tue, 5 Nov 2024 15:15:23 +0100 Subject: [PATCH 2/6] Dodaj zawijanie tekstu na malych ekranach --- zapisy/apps/common/assets/main/index.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zapisy/apps/common/assets/main/index.scss b/zapisy/apps/common/assets/main/index.scss index a77952f895..e15cd6b64b 100644 --- a/zapisy/apps/common/assets/main/index.scss +++ b/zapisy/apps/common/assets/main/index.scss @@ -253,6 +253,11 @@ colgroup col.table-info-type { white-space: nowrap; } +@media (max-width: 992px){ + #table-info th { + white-space: normal; + } +} // Required field marker in forms. .asteriskField { From 3b9e980409afcca8131b868de73f754aa2fa958b Mon Sep 17 00:00:00 2001 From: olanicp Date: Tue, 5 Nov 2024 18:52:22 +0100 Subject: [PATCH 3/6] fix lint issues --- zapisy/apps/common/assets/main/index.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zapisy/apps/common/assets/main/index.scss b/zapisy/apps/common/assets/main/index.scss index e15cd6b64b..fa3d8754ad 100644 --- a/zapisy/apps/common/assets/main/index.scss +++ b/zapisy/apps/common/assets/main/index.scss @@ -253,10 +253,10 @@ colgroup col.table-info-type { white-space: nowrap; } -@media (max-width: 992px){ +@media (max-width: 992px) { #table-info th { white-space: normal; - } + } } // Required field marker in forms. From f5cebe4bc946eeab9ae0b69d03c49f0e9d419eaa Mon Sep 17 00:00:00 2001 From: olanicp Date: Tue, 19 Nov 2024 23:14:03 +0100 Subject: [PATCH 4/6] =?UTF-8?q?zmiana=20breakpointa=20na=20sta=C5=82=C4=85?= =?UTF-8?q?,=20dodanie=20stylowania=20dla=20odpowiedniej=20klasy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zapisy/apps/common/assets/main/index.scss | 16 ++++++++++------ .../courses/course_parts/course_head.html | 4 ++-- .../templates/proposal/proposal_info.html | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/zapisy/apps/common/assets/main/index.scss b/zapisy/apps/common/assets/main/index.scss index fa3d8754ad..182b38ba93 100644 --- a/zapisy/apps/common/assets/main/index.scss +++ b/zapisy/apps/common/assets/main/index.scss @@ -170,7 +170,7 @@ div.top .topbar .inline-inputs label { } #sidebar { - @media (max-width: 992px) { + @include media-breakpoint-down(lg) { #sidebar-inner { /* :after will position itself against nearest positioned parent, so we * need to ensure that it will be this sidebar */ @@ -203,7 +203,7 @@ div.top .topbar .inline-inputs label { text-align: center; } } - @media (min-width: 992px) { + @include media-breakpoint-up(lg) { #fold-toggler { display: none; } @@ -246,15 +246,19 @@ div.loginbox { colgroup col.table-info-type { background-color: #f9f9f9; +} + +colgroup col.table-info-offer { width: 1%; } -#table-info th { +.table-offer th { white-space: nowrap; + background-color: #f9f9f9; } -@media (max-width: 992px) { - #table-info th { +@include media-breakpoint-down(lg) { + #table-offer th { white-space: normal; } } @@ -275,7 +279,7 @@ colgroup col.table-info-type { color: var(--bs-dark); font-style: italic; display: block; - @media (min-width: 992px) { + @include media-breakpoint-up(lg) { float: right; } } diff --git a/zapisy/apps/enrollment/courses/templates/courses/course_parts/course_head.html b/zapisy/apps/enrollment/courses/templates/courses/course_parts/course_head.html index 39896e2ff9..a38fb1776a 100644 --- a/zapisy/apps/enrollment/courses/templates/courses/course_parts/course_head.html +++ b/zapisy/apps/enrollment/courses/templates/courses/course_parts/course_head.html @@ -15,9 +15,9 @@

- +
- + diff --git a/zapisy/apps/offer/proposal/templates/proposal/proposal_info.html b/zapisy/apps/offer/proposal/templates/proposal/proposal_info.html index d58b6e145a..b7b225aab0 100644 --- a/zapisy/apps/offer/proposal/templates/proposal/proposal_info.html +++ b/zapisy/apps/offer/proposal/templates/proposal/proposal_info.html @@ -1,8 +1,8 @@ {% load filters %} -
+
- + From 10d66ffb7e0ff56596b52ba47b54748d98ccdcb2 Mon Sep 17 00:00:00 2001 From: olanicp Date: Tue, 3 Dec 2024 23:42:55 +0100 Subject: [PATCH 5/6] refaktoryzacja --- zapisy/apps/common/assets/main/index.scss | 4 ---- .../apps/offer/proposal/templates/proposal/proposal_info.html | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/zapisy/apps/common/assets/main/index.scss b/zapisy/apps/common/assets/main/index.scss index 182b38ba93..725d801bed 100644 --- a/zapisy/apps/common/assets/main/index.scss +++ b/zapisy/apps/common/assets/main/index.scss @@ -244,10 +244,6 @@ div.loginbox { } } -colgroup col.table-info-type { - background-color: #f9f9f9; -} - colgroup col.table-info-offer { width: 1%; } diff --git a/zapisy/apps/offer/proposal/templates/proposal/proposal_info.html b/zapisy/apps/offer/proposal/templates/proposal/proposal_info.html index b7b225aab0..7997a14d0f 100644 --- a/zapisy/apps/offer/proposal/templates/proposal/proposal_info.html +++ b/zapisy/apps/offer/proposal/templates/proposal/proposal_info.html @@ -2,7 +2,7 @@
- + From a8f5f553a5c2cc2acde8c07bafa4f888f7ac3948 Mon Sep 17 00:00:00 2001 From: olanicp Date: Tue, 17 Dec 2024 21:05:37 +0100 Subject: [PATCH 6/6] change id to class --- zapisy/apps/common/assets/main/index.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zapisy/apps/common/assets/main/index.scss b/zapisy/apps/common/assets/main/index.scss index 725d801bed..3ee107957d 100644 --- a/zapisy/apps/common/assets/main/index.scss +++ b/zapisy/apps/common/assets/main/index.scss @@ -254,8 +254,8 @@ colgroup col.table-info-offer { } @include media-breakpoint-down(lg) { - #table-offer th { - white-space: normal; + .table-offer th { + white-space: wrap; } }