Skip to content

Migrate css #77

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

Merged
Quarterpie3141 merged 5 commits into from
May 16, 2025
Merged

Migrate css #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d238e0
remove redundant css files
nathanbkim May 16, 2025
a568e5f
move z index attribute search input to tailwind utility class
nathanbkim May 16, 2025
c4b3a51
replace dropdown css styling with tailwind class
nathanbkim May 16, 2025
60f8a62
translate final css to tailwind utility classes
nathanbkim May 16, 2025
7bb3088
remove redundant stylesheets
nathanbkim May 16, 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
8 changes: 0 additions & 8 deletions src/app/static/css/colours.css
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/app/static/css/dashboard.css
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/app/static/css/discover.css
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions src/app/static/css/dropdown.css
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions src/app/static/css/tailwindglobals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
:root {
--success: #22c55e;
--info: #0ea5e9;
--warning: #f97316;
--help: #a855f7;
--error: #ef4444;
--default-dark-theme-text: #d1d7e0;
}
body {
font-family: 'Inter', sans-serif;
}
Expand Down
1 change: 1 addition & 0 deletions src/app/static/js/friends.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ document.addEventListener("DOMContentLoaded", function() {
results.innerHTML = '';
data.forEach(person => {
const li = document.createElement('li');
li.classList.add("px-3", "py-2", "cursor-pointer", "text-white", "hover:bg-[#333]");
li.textContent = `${person.username}`;
li.addEventListener('click', () => {
input.value = '';
Expand Down
3 changes: 0 additions & 3 deletions src/app/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
<script src="{{ url_for('static', filename='js/tailwindconfig.js') }}" defer></script>
<script src="{{ url_for('static', filename='js/darkmode.js') }}" defer></script>
<link rel="stylesheet" href="{{ url_for('static', filename='css/tailwindglobals.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/dashboard.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/discover.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/dropdown.css') }}">

<link href="https://fonts.googleapis.com/icon?family=Material+Icons+Outlined" rel="stylesheet" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap">
Expand Down
4 changes: 2 additions & 2 deletions src/app/templates/discover_unit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ <h1 class="text-2xl font-bold">{{ unit_code }} - {{ unit_name }}</h1>
<div class="flex flex-col w-full h-[80vh]">
<div class="w-full flex flex-row gap-4 transition-colors duration-300">
<div class="flex flex-col flex-grow" style="position: relative;">
<input type="text" id="searchInput" placeholder="Search units..." autocomplete="off" class="w-full px-4 py-3 rounded-lg border border-gray-200 dark:border-dark-border
<input type="text" id="searchInput" placeholder="Search units..." autocomplete="off" class="w-full px-4 py-3 rounded-lg border border-gray-200 dark:border-dark-border relative z-[1]
bg-gray-50 dark:bg-dark-fg text-gray-900 dark:text-dark-primary
focus:outline-none focus:border-blue-500 dark:focus:border-blue-400
transition">
<ul id="results" class="dropdown-list" style="width: 100%;"></ul>
<ul id="results" class="dropdown-list list-none p-0 m-0 absolute top-full w-[200px] bg-[#111] z-[2]" style="width: 100%;"></ul>
</div>
</div>
<div class="flex flex-col mt-4 w-full overflow-y-auto">
Expand Down
4 changes: 2 additions & 2 deletions src/app/templates/friends.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
class="w-full px-4 py-3 rounded-lg border border-gray-200 dark:border-dark-border
bg-gray-50 dark:bg-dark-fg text-gray-900 dark:text-dark-primary
focus:outline-none focus:border-blue-500 dark:focus:border-blue-400
transition">
<ul id="results" class="dropdown-list" style="width: 100%;"></ul>
transition relative z-[1]" >
<ul id="results" class="dropdown-list list-none p-0 m-0 absolute top-full w-[200px] bg-[#111] z-[2]" style="width: 100%;"></ul>
</div>
</div>
<div class="flex flex-col mt-4 w-full">
Expand Down
4 changes: 2 additions & 2 deletions src/app/templates/unitplans.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
class="w-full px-4 py-3 rounded-lg border border-gray-200 dark:border-dark-border
bg-gray-50 dark:bg-dark-fg text-gray-900 dark:text-dark-primary
focus:outline-none focus:border-blue-500 dark:focus:border-blue-400
transition">
<ul id="results" class="dropdown-list" style="width: 100%;"></ul>
transition relative z-[1]" >
<ul id="results" class="dropdown-list list-none p-0 m-0 absolute top-full w-[200px] bg-[#111] z-[2]" style="width: 100%;"></ul>
</div>
</div>
<div class="flex flex-col mt-4 w-full">
Expand Down