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

refactor: remove custom fonts #1879

Merged
merged 1 commit into from
Sep 2, 2024
Merged

refactor: remove custom fonts #1879

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
1 change: 0 additions & 1 deletion src/main/webapp/WEB-INF/jsp/admin/layout.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<%-- CSS --%>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins" />
<link rel="stylesheet" href="<spring:url value='/static/css/styles.css' />" />
<link rel="stylesheet" href="<spring:url value='/static/css/admin/styles.css' />" />

Expand Down
1 change: 0 additions & 1 deletion src/main/webapp/WEB-INF/jsp/analytics/layout.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<%-- CSS --%>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins" />
<link rel="stylesheet" href="<spring:url value='/static/css/styles.css' />" />
<link rel="stylesheet" href="<spring:url value='/static/css/analytics/styles.css' />" />

Expand Down
2 changes: 0 additions & 2 deletions src/main/webapp/WEB-INF/jsp/content/layout.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
<%-- CSS --%>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Andika" />
<link rel="stylesheet" href="<spring:url value='/static/css/styles.css' />" />
<link rel="stylesheet" href="<spring:url value='/static/css/content/styles.css' />" />

Expand Down
2 changes: 0 additions & 2 deletions src/main/webapp/WEB-INF/jsp/layout.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
<%-- CSS --%>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Amaranth" />
<link rel="stylesheet" href="<spring:url value='/static/css/styles.css' />" />

<%-- JavaScripts --%>
Expand Down
8 changes: 4 additions & 4 deletions src/main/webapp/static/css/content/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
html[data-content-language="hin"] {
font-family: "Andika", sans-serif;
}

body {
background-image: url(../../../static/img/background.jpg);
}
Expand Down Expand Up @@ -40,13 +36,17 @@ nav {

.card-panel img {
border-radius: 8px;
background-color: rgba(255,255,255, 0.5);
box-shadow: 4px 4px rgba(103,58,183, 0.2); /* deep-purple */
}
#labeledAudios img,
#labeledImages img,
#labeledVideos img {
width: 47%;
margin-right: 2%;
border-radius: 8px;
background-color: rgba(255,255,255, 0.5);
box-shadow: 4px 4px rgba(103,58,183, 0.2); /* deep-purple */
}
#imageEditPage #image img {
display: block;
Expand Down
3 changes: 1 addition & 2 deletions src/main/webapp/static/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
html {
font-family: "Poppins", sans-serif;
font-family: monospace, sans-serif;
}

body {
Expand Down Expand Up @@ -29,7 +29,6 @@ html[data-content-language="tgl"] #index-banner {
}

.container h1 {
font-family: "Amaranth";
text-shadow: 1px 1px rgba(0,0,0, .8),
0 -1rem 3rem rgba(0,0,0, .8),
2rem 0 3rem rgba(0,0,0, .8),
Expand Down