Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added basic button #1769

Open
wants to merge 3 commits into
base: master-dev
Choose a base branch
from
Open

Added basic button #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4113d23
Added basic button
Strzelacz48 Nov 27, 2024
d8a8b7c
Semi-Working Darkmode
Strzelacz48 Jan 8, 2025
3db1578
fixed_formatting
Strzelacz48 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions zapisy/apps/common/assets/main/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ $h5-font-size: $font-size-base * 1.25 !default;
$h6-font-size: $font-size-base !default;

$enable-responsive-font-sizes: true;
$breadcrumb-bg: #ffffff;

$input-placeholder-color: #adb5bd; // gray-500

$primary: rgb(0, 102, 158) !default;
$success: rgb(0, 115, 54) !default;
$primary: rgb(0, 102, 158) !default; // rgb(0, 102, 158) !default;
$success: rgb(0, 115, 54) !default; //rgb(0, 115, 54) !default;

$blue: #007bff !default;
$link-color: $blue !default;
85 changes: 68 additions & 17 deletions zapisy/apps/common/assets/main/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,44 @@
@import "~bootstrap/scss/bootstrap";
@import "~bootstrap-print-css/css/bootstrap-print";

:root {
--banner-color: #d95900; //kolor górnego paska (pomarańczowy w developmencie)
--primary-color: #007bff; /* Jasny tryb - kolor główny #007bff*/
--secondary-color: #6c757d;
--background-color: #ffffff;
--breadcrumb-bg: var(
--main-background-color
); //background "folderu na linki" (był w variables)
--text-color: #000000;
--tab-background-color: #0077b7;
--tab-text-color: #0077b7;
--main-background-color: #ffffff;
--tag-highliht-color: #ffffff;
--loginbox-background-color: #f5f5f5;
--dropdown-background-color: #848484bf;
--news--background-color: #f9f9f9;
--news--date-color: #000000;
--footer-text-color: #000000;
}

body.dark-mode {
--banner-color: #893809;
--primary-color: #0d6efd; /* Ciemny tryb - kolor główny */
--secondary-color: #938a82;
--background-color: #000000;
--breadcrumb-bg: var(--main-background-color); //background "folderu na linki"
--text-color: #ffffff;
--tab-background-color: #005f92;
--tab-text-color: #41ace5;
--main-background-color: #1e1e1e;
--tag-highliht-color: #ffffff;
--loginbox-background-color: #504d4d;
--dropdown-background-color: #848484bf;
--news--background-color: #4d4747;
--news--date-color: #ffffff;
--footer-text-color: #ffffff;
}

@page {
size: auto;
}
Expand All @@ -15,14 +53,19 @@ html {
}

footer {
//chcę ustawić kolor stopki
margin-top: auto;
padding-top: 5rem;
.container-fluid {
// trzeba znaleźć klasę stopki
background-color: #00401e;
padding: 1rem 0;
p {
margin: 0.5rem 0;
}
}

color: var(--footer-text-color); // kolor tekstu w stopce
}

.form-group {
Expand All @@ -49,19 +92,19 @@ footer {
}

.btn-link {
color: #007bff;
color: #1bb300; //var(--primary-color); // literki na pracownikach na filtrowaniu
text-decoration: none;
}

.btn-link:hover,
.btn-link:focus {
color: #0056b3;
color: #0056b3; //nwm co to
text-decoration: underline;
}

.btn-outline-info:hover,
.btn-outline-info:active {
color: white !important;
color: rgb(175, 5, 5) !important; //nwm co to
}

a {
Expand All @@ -78,7 +121,7 @@ a.badge {
}

a.badge:hover {
color: #fff;
color: var(--tag-highliht-color); // podświetlenie tagów (przedmioty)
}

a.bg-secondary:hover,
Expand Down Expand Up @@ -138,19 +181,23 @@ div.header {
// Developement runs will flash orange top bar.
body.debug {
.top {
background-color: rgb(217, 89, 0);
background-color: var(--banner-color); //tutaj trzeba zedytować
}
background-color: var(
--main-background-color
); /* Do rozpatrzenia inne kolory */
color: var(--text-color);
}

div.top .topbar .inline-inputs label {
float: none;
color: #ffffff;
color: #ffffff; // kolor tekstu w górnym pasku
}

#login-dropdown {
.dropdown-menu {
padding: 12px;
background: rgba($light, 0.75);
background: var(--dropdown-background-color); //rgba($light, 0.75);

.btn {
padding: 10px 5px;
Expand Down Expand Up @@ -211,7 +258,9 @@ div.top .topbar .inline-inputs label {
}

div.loginbox {
background-color: #f5f5f5;
background-color: var(
--loginbox-background-color
); // okienko logowania dla niedostępnych dla każdego stron
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
Expand All @@ -230,38 +279,40 @@ div.loginbox {
flex: 0 0 auto;
margin: 0 2px;
a {
background-color: #005f92;
color: #ffffff;
// nieaktywna zakładka
background-color: var(--tab-background-color); //kolor tła zakładek
color: #ffffff; // kolor tekstu na zakładkach
margin-right: 1px;
}

&.active a {
background-color: #ffffff;
color: #005f92;
// aktywna zakładka
background-color: var(--main-background-color);
color: var(--tab-text-color);
margin-right: 1px;
}
}
}
}

colgroup col.table-info-type {
background-color: #f9f9f9;
background-color: #ab0202; // tutaj trzeba zedytować (nwm co to zmienia)
}

// Required field marker in forms.
.asteriskField {
padding-left: 0.25em;
color: var(--bs-red);
color: var(--bs-red); // tutaj trzeba zedytować
}

// News items on the main page and the news page.
.od-news-item {
margin: 2rem 0;
padding: 4rem;
background: var(--bs-light);
background: var(--news--background-color); // tutaj trzeba zedytować

.od-news-date {
color: var(--bs-dark);
color: var(--news--date-color); // tutaj trzeba zedytować
font-style: italic;
display: block;
@media (min-width: 992px) {
Expand All @@ -287,5 +338,5 @@ colgroup col.table-info-type {
}

.background-gray {
background-color: $gray-200;
background-color: #ff1e00//$gray-200; // tutaj trzeba zedytować
}
18 changes: 18 additions & 0 deletions zapisy/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,24 @@
<a href="{% url 'theses:main' %}" class="nav-link">Prace dyplomowe</a>
</li>
{% endif %}
<button id="theme-toggler" class="btn btn-secondary">Dark Mode</button>
<script>
document.addEventListener("DOMContentLoaded", () => {
const button = document.getElementById("theme-toggler");
const isDarkMode = localStorage.getItem("theme") === "dark";

if (isDarkMode) {
document.body.classList.add("dark-mode");
button.textContent = "Light Mode";
}

button.addEventListener("click", () => {
const isDark = document.body.classList.toggle("dark-mode");
localStorage.setItem("theme", isDark ? "dark" : "light");
button.textContent = isDark ? "Light Mode" : "Dark Mode";
});
});
</script>
</ul>
{% if user.is_authenticated %}
<div class="navbar-nav ms-auto">
Expand Down
Loading