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

Jump to bottom

Update CSS and UI #125

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Update CSS and UI #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions app/static/css/analytics.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ body{
.container{
margin: auto;
display: flex;
width: 1300px;
width: 1275px;
}

nav{
width: 425px;
height: 120vh;
width: 450px;
height: 125vh;
background: #ffffff;
}

Expand All @@ -35,7 +35,7 @@ nav i{

.nav-title{
margin: 1.5rem;
padding-bottom: 1.25rem;
padding-bottom: 1.2rem;
display: flex;
align-items: center;
color: #000000;
Expand Down Expand Up @@ -75,7 +75,7 @@ li a{

.card{
width: 97%;
padding: 12px;
padding: 14px;
cursor: pointer;
background: #fff;
margin-bottom: 15px;
Expand All @@ -85,4 +85,4 @@ li a{

.card_container .text{
margin-left: 2rem;
}
}
10 changes: 5 additions & 5 deletions app/static/css/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ body{
.container{
margin: auto;
display: flex;
width: 1300px;
width: 1275px;
}

nav{
width: 425px;
height: 120vh;
width: 450px;
height: 125vh;
background: #ffffff;
}

Expand All @@ -35,7 +35,7 @@ nav i{

.nav-title{
margin: 1.5rem;
padding-bottom: 1.25rem;
padding-bottom: 1.2rem;
display: flex;
align-items: center;
color: #000000;
Expand Down Expand Up @@ -67,4 +67,4 @@ li a{
background: #ffffff;
padding: 12px;
text-align: center;
}
}
78 changes: 39 additions & 39 deletions app/static/css/homepage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ body{
.container{
margin: auto;
display: flex;
width: 1300px;
width: 1275px;
}

nav{
width: 425px;
height: 120vh;
width: 450px;
height: 125vh;
background: #ffffff;
}

Expand All @@ -29,14 +29,14 @@ nav{
}

nav i{
width: 50px;
width: 45px;
font-size: 18px;
text-align: center;
}

.nav-title{
margin: 1.5rem;
padding-bottom: 1.25rem;
padding-bottom: 1.2rem;
display: flex;
align-items: center;
color: #000000;
Expand Down Expand Up @@ -81,7 +81,7 @@ li a:hover{

.card{
width: 97%;
padding: 12px;
padding: 14px;
cursor: pointer;
background: #fff;
margin-bottom: 15px;
Expand Down Expand Up @@ -137,55 +137,55 @@ tr:nth-child(even) {
}
/* for popup in my_cases */
.overlay {
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: rgba(102, 36, 132, 0.8);
transition: opacity 500ms;
visibility: hidden;
opacity: 0;
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: rgba(102, 36, 132, 0.8);
transition: opacity 500ms;
visibility: hidden;
opacity: 0;
}
.overlay:target {
visibility: visible;
opacity: 1;
visibility: visible;
opacity: 1;
}

.wrapper {
margin: 70px auto;
padding: 20px;
background: #e7e7e7;
border-radius: 5px;
width: 30%;
margin: 70px auto;
padding: 20px;
background: #e7e7e7;
border-radius: 5px;
width: 30%;
height: 100%;
position: relative;
transition: all 5s ease-in-out;
position: relative;
transition: all 5s ease-in-out;
}
.wrapper h2 {
margin-top: 0;
margin-top: 0;
}
.wrapper .close {
position: absolute;
top: 20px;
right: 30px;
transition: all 200ms;
font-size: 30px;
font-weight: bold;
text-decoration: none;
color: #662484;
position: absolute;
top: 20px;
right: 30px;
transition: all 200ms;
font-size: 30px;
font-weight: bold;
text-decoration: none;
color: #662484;
}
.wrapper .close:hover {
color: yellow;
color: yellow;
}
.wrapper .content {
height: 70%;
overflow-y: scroll;
overflow-y: scroll;
}

.popupContent {
margin-bottom: 20px;
border-radius: 5px;
background-color: #e7e7e7;
padding: 20px 0;
}
border-radius: 5px;
background-color: #e7e7e7;
padding: 20px 0;
}
11 changes: 11 additions & 0 deletions app/static/css/manage-users.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.purple-button{
margin: 10px;
background-color: #662484;
border: none;
color: white;
text-align: center;
cursor: pointer;
padding: 5px 10px;
font-size: 16px;
border-radius: 4px;
}
1 change: 1 addition & 0 deletions app/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script src="https://cdn.datatables.net/1.13.7/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/1.11.5/js/jquery.dataTables.js"></script>
{% block addhead %}{% endblock %}
</head>

<body>
Expand Down
9 changes: 7 additions & 2 deletions app/templates/manage_users.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{% extends 'base.html' %}

{% block addhead %}
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/manage-users.css') }}"/>
{% endblock %}

{% block header %}
<div style="display: flex; justify-content: space-between; align-items: center;">
<h2>{% block title %}Manage Users{% endblock %}</h2>
<button id="addUser" class="btn btn-primary">Add User</button>
<button id="addUser" class="btn btn-primary purple-button">Add User</button>
</div>
{% endblock %}

Expand Down Expand Up @@ -60,7 +64,7 @@ <h5 class="modal-title" id="userModalLabel">Add/Edit User</h5>
<!-- Options for roles -->
</select>
</div>
<button type="button" id="saveUser" class="btn btn-primary">Save</button>
<button type="button" id="saveUser" class="btn btn-primary purple-button">Save</button>
</form>
</div>
</div>
Expand All @@ -74,4 +78,5 @@ <h5 class="modal-title" id="userModalLabel">Add/Edit User</h5>
let users = JSON.parse('{{ users | tojson | safe }}');
</script>
<script src="{{ url_for('static', filename='js/manage_users.js') }}"></script>

{% endblock %}
Loading