diff --git a/studyguides/static/base.css b/studyguides/static/base.css index 01c58fe..e03843c 100644 --- a/studyguides/static/base.css +++ b/studyguides/static/base.css @@ -2,13 +2,27 @@ * { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; + box-sizing: border-box; + -moz-box-sizing: border-box; +} + +@font-face { + font-family: "Josefin Sans"; + src: url("/static/josefin-sans-regular.ttf"); +} + +@font-face { + font-family: "Sofia Pro"; + src: url("/static/sofia-pro-regular.otf"); } html, body { - font-family: "Red Hat Text", "Segoe UI", Tahoma, Geneva, Verdana, sans-serif; - background-color: #fffbfb; - color: #090302; + font-family: "Sofia Pro", "Segoe UI", Tahoma, Geneva, Verdana, sans-serif; + /* background-color: #fffbfb; */ + background-color: #221f3d; + /* color: #090302; */ + color: #eee; font-size: 1.2em; } a, @@ -22,11 +36,8 @@ a:hover { } main { - margin: 30px; -} - -.item { - color: #568ea3; + width: max(1000px, 50vw); + margin: 30px auto; } .teacher { @@ -34,10 +45,142 @@ main { font-weight: bold; } -h1 { +.hoverable { opacity: 0.5; transition: all 0.2s ease; } -h1:hover { +.hoverable:hover { opacity: 1; } + +.bold { + font-weight: bold; +} + +.josefin-sans { + font-family: "Josefin Sans"; +} + +.text-center { + display: block; + text-align: center; +} + +.sofia-pro { + font-family: "Sofia Pro"; +} + +.size-075 { + font-size: 0.75em; +} + +.size-1 { + font-size: 1em; +} + +.size-2 { + font-size: 1.5em; +} + +.size-3 { + font-size: 2em; +} + +.size-4 { + font-size: 4em; +} + +.my-1 { + margin-top: 5px; + margin-bottom: 5px; +} + +.my-2 { + margin-top: 10px; + margin-bottom: 10px; +} + +.mx-auto { + margin-left: auto; + margin-right: auto; +} + +.m-2 { + margin: 10px; +} + +.p-2 { + padding: 10px; +} + +.flex-row { + display: flex; + flex-direction: row; +} + +.flex-col { + display: flex; + flex-direction: column; +} + +.space-between { + justify-content: space-between; +} + +.align-center { + align-items: center; +} + +div.subject-grid { + display: grid; + /* grid-template-columns: 1fr 1fr 1fr; */ +} + +/* Styles for groups within a subject */ +div.subject { + border-radius: 10px; + margin: 5px; + padding: 10px; + /* width: 400px; */ + background-color: rgba(255, 255, 255, 0.1); +} + +div.guide { + /* color: #568ea3; */ + border-radius: 10px; + margin: 5px; + padding: 10px; + color: #eee; + background-color: rgba(255, 255, 255, 0.1); +} + +.lighter { + background-color: rgba(255, 255, 255, 0.1); +} + +.round { + border-radius: 10px; +} + +a.subject-name { + text-align: center; + display: block; +} + +a.open-guide-button { + padding: 3px; + border-radius: 5px; + background-color: white; + color: #707070; +} + +a.tag { + padding: 5px; + border-radius: 1em; + border: 2px solid white; + margin: 0px 5px; +} + +span { + display: block; +} diff --git a/studyguides/static/josefin-sans-regular.ttf b/studyguides/static/josefin-sans-regular.ttf new file mode 100644 index 0000000..89d36f8 Binary files /dev/null and b/studyguides/static/josefin-sans-regular.ttf differ diff --git a/studyguides/static/login.css b/studyguides/static/login.css index 9e0c8ee..993fa4f 100644 --- a/studyguides/static/login.css +++ b/studyguides/static/login.css @@ -37,7 +37,6 @@ .login-box { text-align: center; padding: 15px; - border: 1px solid rgb(24, 82, 103); margin: 15px auto; max-width: 438px; } \ No newline at end of file diff --git a/studyguides/static/sofia-pro-regular.otf b/studyguides/static/sofia-pro-regular.otf new file mode 100644 index 0000000..66d2515 Binary files /dev/null and b/studyguides/static/sofia-pro-regular.otf differ diff --git a/studyguides/templates/base.html b/studyguides/templates/base.html index 4a1956b..06e99b2 100644 --- a/studyguides/templates/base.html +++ b/studyguides/templates/base.html @@ -23,6 +23,16 @@ {% block head %}{% endblock %} - {% block main %}{% endblock %} + + TJHSST Study Guide Collection + +
+ {% block disclaimer %}{% endblock %} + +
+ {% block path %}{% endblock %} +
+ {% block content %}{% endblock %} +
diff --git a/studyguides/templates/course.html b/studyguides/templates/course.html index 6a3693e..6d9db13 100644 --- a/studyguides/templates/course.html +++ b/studyguides/templates/course.html @@ -1,8 +1,40 @@ -{% extends "base.html" %} {% load static %} {% block main %} -
-

All / {{subject.name}} / {{course.name}}

- {% for guide, tags in guides %} -

{{ guide.name }}    {% for t in tags %}{{ t }} {% endfor %}

- {% endfor %} -
+{% extends "base.html" %} {% load static %} +{% block path %} + + + All + / + + {{subject.name}} + / + + {{course.name}} + + +{% endblock %} + +{% block content %} + {% if guides %} + {% for guide, tags in guides %} +
+
+ + 📰 {{ guide.name }} + +

+ + + {% for t in tags %} + + {{ t }} + + {% endfor %} + +
+ {% endfor %} + {% else %} + No guides are uploaded yet for this course. + {% endif %} {% endblock %} diff --git a/studyguides/templates/home.html b/studyguides/templates/home.html index 38e6c62..d4a9661 100644 --- a/studyguides/templates/home.html +++ b/studyguides/templates/home.html @@ -1,17 +1,31 @@ -{% extends "base.html" %} {% load static %} {% block main %} -
-

DISCLAIMER: Please note these materials are student-made study guides over the past years. Some information may be outdated or not 100% reflective of the content your teacher is teaching. It is also possible the information is not 100% accurate. Therefore, make sure to not solely rely on these study guides. If you see an inconsistency in a study guide that confuses you, ask your teacher to clarify. SGA maintains this site but is not liable for the credibility of the information found. To contact SGA, please email SGA.tjhsst@gmail.com.

- -
- -

All

- - {% for subject, courses in subjects %} -

{{ subject.name }}

- - {% for course in courses %} -

{{ course.name }}

- - {% endfor %} {% endfor %} -
+{% extends "base.html" %} {% load static %} +{% block disclaimer %} +

+ DISCLAIMER: Please note these materials are student-made study guides over the past years. Some information may be outdated or not 100% reflective of the content your teacher is teaching. It is also possible the information is not 100% accurate. Therefore, make sure to not solely rely on these study guides. If you see an inconsistency in a study guide that confuses you, ask your teacher to clarify. SGA maintains this site but is not liable for the credibility of the information found. To contact SGA, please email SGA.tjhsst@gmail.com. +

+{% endblock %} + +{% block path %} + All +{% endblock %} + +{% block content %} +
+ {% for subject, courses in subjects %} +
+ + 📚 {{ subject.name }} + + +
+ {% endfor %} +
{% endblock %} diff --git a/studyguides/templates/login.html b/studyguides/templates/login.html index fb2e1b5..c6d5a73 100644 --- a/studyguides/templates/login.html +++ b/studyguides/templates/login.html @@ -6,12 +6,12 @@ {% endblock %} -{% block main %} -
-

Study Guides

-
-

Login in with your Intranet account to access the Study Guide website.

- Log in with Ion -
-
+{% block content %} +
+ + Login in with your Intranet account + to access the Study Guide website. +
+ Log in with Ion +
{% endblock %} \ No newline at end of file diff --git a/studyguides/templates/subject.html b/studyguides/templates/subject.html index ffab1ec..aec460f 100644 --- a/studyguides/templates/subject.html +++ b/studyguides/templates/subject.html @@ -1,8 +1,25 @@ -{% extends "base.html" %} {% load static %} {% block main %} -
-

All / {{subject.name}}

- {% for course in courses %} -

{{ course.name }}

- {% endfor %} -
+{% extends "base.html" %} {% load static %} +{% block path %} + + + All + / + + {{subject.name}} + + +{% endblock %} + +{% block content %} +
+ {% for course in courses %} +
+ + 📖 {{ course.name }} + +
+ {% endfor %} +
{% endblock %} diff --git a/studyguides/templates/tag.html b/studyguides/templates/tag.html index fe8beac..c424e2b 100644 --- a/studyguides/templates/tag.html +++ b/studyguides/templates/tag.html @@ -2,13 +2,36 @@ {% load static %} -{% block main %} -
-

All / {{ tag }}

- {% for guide, tags in guides %} -

- {{ guide.name }}    {% for t in tags %}{{ t }} {% endfor %} -

- {% endfor %} +{% block path %} + + + All + / + + {{ tag }} + + +{% endblock %} + +{% block content %} + {% for guide, tags in guides %} +
+
+ + 📰 {{ guide.name }} + +

+ + + {% for t in tags %} + + {{ t }} + + {% endfor %} + +
+ {% endfor %}
{% endblock %} \ No newline at end of file