Skip to content

Commit

Permalink
Added bootstrap and changed the overall grid display
Browse files Browse the repository at this point in the history
	new file:   css/bootstrap-grid.min.css
	new file:   css/bootstrap.min.css
	modified:   css/main.css
	modified:   css/todo.css
	modified:   index.php
	modified:   package-lock.json
	modified:   package.json
  • Loading branch information
push42 committed Aug 1, 2023
1 parent 13d02e2 commit 36f65c3
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 28 deletions.
6 changes: 6 additions & 0 deletions css/bootstrap-grid.min.css

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions css/bootstrap.min.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,9 @@ margin-left: 10px;
.header-content {
padding: 25px;
margin-top: -35px;
color: #fff;
font-weight: 800;
font-family: Montserrat, sans-serif;
}

.header-content h1 {
Expand Down
20 changes: 13 additions & 7 deletions css/todo.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ body {
flex: 1;
margin-right: 10px;
padding: 10px;
border-radius: 5px;
border: 1px solid #ffffff;
border-radius: 15px;
border: 2.5px solid #ffffff;
background: #1b1e23;
color: #ffffff;
transition: all 0.3s ease-in-out;
Expand All @@ -51,11 +51,13 @@ body {
}

#add-task-button {
padding: 10px 20px;
padding: 2px 20px;
background: #3949ab;
border: none;
color: #fff;
border-radius: 5px;
font-size: 15px;
font-weight: 700;
border-radius: 50px;
cursor: pointer;
transition: all 0.3s ease-in-out;
}
Expand All @@ -81,6 +83,7 @@ body {
display: flex;
align-items: center;
justify-content: space-between;
color: #fff
}

#task-list li:hover {
Expand All @@ -89,18 +92,21 @@ body {
}

.delete-task-button {
background-color: #f44336;
color: #fff;
background-color: #ececec;
color: #070707;
border: none;
padding: 5px 10px;
border-radius: 5px;
cursor: pointer;
transition: all 0.3s ease-in-out;
font-weight: 700;
}

.delete-task-button:hover {
background-color: #e53935;
background-color: #181818;
transform: scale(1.1);
color: #fff;
font-weight: 700;
}

#task-list li.completed {
Expand Down
27 changes: 6 additions & 21 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,15 @@ function totalAccounts($conn) {
<script crossorigin src="https://unpkg.com/react@17/umd/react.development.js"></script>
<script crossorigin src="https://unpkg.com/react-dom@17/umd/react-dom.development.js"></script>
<script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
<!-- Bootstrap -->
<link rel="stylesheet" href="css/bootstrap-grid.min.css">
<link rel="stylesheet" href="css/bootstrap.min.css">
<title>Rogue-V | Dashboard</title>
</head>

<!-- Navigation -->
<section class="page-section bg-dark-lighter" id="navigation">
<div class="container relative">

<div class="container relative">
<!-- Navigation grid -->
<div class="navigation-grid">
<!-- Navigation -->
Expand All @@ -245,7 +247,6 @@ function totalAccounts($conn) {
</div>
</a>
<!-- End Navigation -->

<!-- Navigation -->
<a href="https://roguev.de" target="_blank">
<div class="navigation-item animate-init" data-anim-type="fade-in" data-anim-delay="100">
Expand All @@ -259,8 +260,7 @@ function totalAccounts($conn) {
</div>
</div>
</a>
<!-- End Navigation -->

<!-- End Navigation -->
<!-- Navigation -->
<a href="https://roguev.de" target="_blank">
<div class="navigation-item animate-init" data-anim-type="fade-in" data-anim-delay="300">
Expand All @@ -275,21 +275,6 @@ function totalAccounts($conn) {
</div>
</a>
<!-- End Navigation -->

<!-- Navigation -->
<a href="#rvdatenbank">
<div class="navigation-item animate-init" data-anim-type="fade-in" data-anim-delay="300">
<div class="navigation-item-descr dark">
<div class="navigation-item-name">
<i class="fa-solid fa-database todoicon"></i>Datenbank
</div>
<div class="navigation-item-role glow-text2">
Siehe dir die wichtigsten Einträge in der Datenbank an
</div>
</div>
</div>
</a>
<!-- End Navigation -->
<!-- Navigation -->
<a href="https://roguev.de" target="_blank">
<div class="navigation-item animate-init" data-anim-type="fade-in" data-anim-delay="300">
Expand Down Expand Up @@ -459,7 +444,7 @@ function totalAccounts($conn) {
<input type="text" id="task-input" placeholder="Neue Aufgabe hinzufügen...">
<button id="add-task-button">Hinzufügen</button>
</div>
<ul id="task-list"></ul>
<ul id="task-list"></ul>
</div>

<div class="wirtschafts-header"><i class="fa-solid fa-chart-simple fa-bounce wheadericon"></i>Wirtschaftsübersicht</div>
Expand Down
29 changes: 29 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"bootstrap": "^5.3.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "5.0.1",
Expand Down

0 comments on commit 36f65c3

Please sign in to comment.