Skip to content

Commit

Permalink
Merge pull request #86 from nfoert/revert-80-changes
Browse files Browse the repository at this point in the history
Revert "Update footer.css", it was in the incorrect base branch
  • Loading branch information
nfoert authored Oct 8, 2024
2 parents aceca0c + 9b687ac commit 001dade
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 37 deletions.
9 changes: 0 additions & 9 deletions cardie/static/main/authentication.css
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,4 @@ html {
#authentication_privacypolicy:hover {
scale: 1.1;
opacity: 1;
}

/* Footer styles */
#footer {
background-color: var(--default-glass-background);
border-top: var(--default-glass-border);
text-align: center;
padding: clamp(1vh, 10px, 1vw);
width: 100%;
}
65 changes: 46 additions & 19 deletions cardie/static/main/footer.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@

@media (min-width: 1000px) {
/* Large screens */

.footer {
position: fixed;
bottom: 20px;
left: 20px;

display: flex;
flex-direction: column;
z-index: 9;
Expand All @@ -16,16 +19,17 @@
border: var(--default-glass-border);
backdrop-filter: var(--default-glass-blur);
border-radius: 50px;

display: flex;
align-items: center;
justify-content: center;
}

.footer_main_button_image {
width: clamp(4vh, 40px, 4vw);
height: auto;
}

.footer_main_button_icon {
color: white;
font-size: clamp(3vh, 30px, 3vw);
Expand All @@ -34,18 +38,21 @@
.footer_main_contents {
display: flex;
flex-direction: row;

background-color: var(--default-glass-background);
border: var(--default-glass-border);
backdrop-filter: var(--default-glass-blur);
border-radius: 10px;

padding: clamp(0.5vh, 5px, 0.5vw);
margin-left: clamp(1vh, 10px, 1vw);

height: fit-content;
}

.footer_main_contents_link {
font-family: var(--default-font-family);
font-size: clamp(1.4vh, 14px, 1.4vw);
font-size: clamp(1.4vh, 14px, 1.4vwS);
color: white;
opacity: 0.7;
text-decoration: none;
Expand All @@ -60,55 +67,64 @@
align-items: center;
margin-bottom: clamp(1vh, 10px, 1vw);
}

.footer_warning_button {
width: clamp(6vh, 60px, 6vw);
height: clamp(6vh, 60px, 6vw);
background-color: rgba(178, 145, 60, 0.4);
border: var(--default-glass-border);
backdrop-filter: var(--default-glass-blur);
border-radius: clamp(5vh, 50px, 5vw);

display: flex;
align-items: center;
justify-content: center;
}

.footer_warning_contents {
display: flex;
flex-direction: column;

background-color: rgba(178, 145, 60, 0.4);
border: var(--default-glass-border);
backdrop-filter: var(--default-glass-blur);
border-radius: 10px;

padding: clamp(1vh, 10px, 1vw);
margin-left: clamp(1vh, 10px, 1vw);

height: fit-content;
}

.footer_warning_contents_title {
color: white;
font-family: var(--default-font-family);
opacity: 0.7;
font-weight: 600;
font-size: clamp(1.4vh, 14px, 1.4vw);

margin: 0px;
}

.footer_warning_contents_text {
color: white;
font-family: var(--default-font-family);
opacity: 0.7;
font-size: clamp(1.2vh, 12px, 1.2vw);
font-size: clamp(1.2vh, 12pv, 1.2vw);

margin: 0px;
}

}

@media (max-width: 1000px) {
/* Small Screens */

.footer {
position: static;
position: fixed;
bottom: 10px;
left: 10px;

display: flex;
flex-direction: column;
z-index: 9;
Expand All @@ -121,16 +137,17 @@
border: var(--default-glass-border);
backdrop-filter: var(--default-glass-blur);
border-radius: 50px;

display: flex;
align-items: center;
justify-content: center;
}

.footer_main_button_image {
width: clamp(4vh, 40px, 4vw);
height: auto;
}

.footer_main_button_icon {
color: white;
font-size: clamp(3vh, 30px, 3vw);
Expand All @@ -139,18 +156,21 @@
.footer_main_contents {
display: flex;
flex-direction: row;

background-color: var(--default-glass-background);
border: var(--default-glass-border);
backdrop-filter: var(--default-glass-blur);
border-radius: 10px;

padding: clamp(0.2vh, 2px, 0.2vw);
margin-left: clamp(0.5vh, 5px, 0.5vw);

height: fit-content;
}

.footer_main_contents_link {
font-family: var(--default-font-family);
font-size: clamp(1.2vh, 12px, 1.2vw);
font-size: clamp(1.2vh, 12px, 1.2vwS);
color: white;
opacity: 0.7;
text-decoration: none;
Expand All @@ -165,47 +185,54 @@
align-items: center;
margin-bottom: clamp(1vh, 10px, 1vw);
}

.footer_warning_button {
width: clamp(5vh, 50px, 5vw);
height: clamp(5vh, 50px, 5vw);
background-color: rgba(178, 145, 60, 0.4);
border: var(--default-glass-border);
backdrop-filter: var(--default-glass-blur);
border-radius: 50px;

display: flex;
align-items: center;
justify-content: center;
}

.footer_warning_contents {
display: flex;
flex-direction: column;

background-color: rgba(178, 145, 60, 0.4);
border: var(--default-glass-border);
backdrop-filter: var(--default-glass-blur);
border-radius: 10px;

padding: clamp(0.2vh, 2px, 0.2vw);
margin-left: clamp(0.5vh, 5px, 0.5vw);

height: fit-content;
}

.footer_warning_contents_title {
color: white;
font-family: var(--default-font-family);
opacity: 0.7;
font-weight: 600;
font-size: 14px;

margin: 0px;
}

.footer_warning_contents_text {
color: white;
font-family: var(--default-font-family);
opacity: 0.7;
font-size: 12px;

margin: 0px;
}

}

.footer_main {
Expand All @@ -232,4 +259,4 @@
.footer_warning_contents_text > a {
color: white;
font-weight: 500;
}
}
9 changes: 0 additions & 9 deletions cardie/static/main/home.css
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,4 @@ html {
#dialog_home_delete {
display: flex;
flex-direction: column;
}

/* Footer styles */
#footer {
background-color: var(--default-glass-background);
border-top: var(--default-glass-border);
text-align: center;
padding: clamp(1vh, 10px, 1vw);
width: 100%;
}

0 comments on commit 001dade

Please sign in to comment.