Fix the ciroh theme, and add fonts to the other ones

Aquaveo · Mar 10, 2024 · 1aa469b · 1aa469b
1 parent 090e1ac
commit 1aa469b
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 258 deletions.
diff --git a/backend/static/css/bussiness.css b/backend/static/css/bussiness.css
@@ -1,4 +1,9 @@
 @charset "UTF-8";
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 /*!
 * Start Bootstrap - Modern Business v5.0.7 (https://startbootstrap.com/template-overviews/modern-business)
 * Copyright 2013-2023 Start Bootstrap

diff --git a/backend/static/css/ciroh.css b/backend/static/css/ciroh.css
@@ -1,14 +1,12 @@
 /* @import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&family=Ubuntu:wght@400;700&display=swap'); */
 @import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
 
 /* Apply the fonts to your elements */
-body {
-  font-family: 'Open Sans', sans-serif;
-}
 
-h1, h2 {
-  font-family: 'Ubuntu', sans-serif;
-}
+
 #header-navbar{
     background-color: white;
 }
@@ -27,181 +25,9 @@ h1, h2 {
 .flex-logos-header img{    
     height: 45px;
 }
-.text-ciroh{
-    text-wrap: wrap;
-    width: 55%;
-    display: block;
-    text-align: center;
-    font-size: 16px;
-    color: #1c1e21;
-    font-weight: 500;
-    padding-left: 5px;
-    text-rendering: optimizelegibility;
-    font: 100% 1.65 'Roboto', sans-serif;
-}
-.hero-heading {
-    margin-bottom: 30px;
-    color: white;
-    font-size: 60px;
-    line-height: 60px;
-    font-weight: 300;
-    letter-spacing: 4px;
-    text-transform: uppercase;
-}
-
-.hero-subheading {
-    margin-bottom: 40px;
-    color: white;
-    font-size: 25px;
-    line-height: 25px;
-    font-weight: 300;
-    letter-spacing: 3px;
-    text-transform: uppercase;
-}
-.hero-subheading-dark {
-    margin-bottom: 40px;
-    color: white;
-    font-size: 25px;
-    line-height: 25px;
-    font-weight: 300;
-    letter-spacing: 3px;
-    text-transform: uppercase;
-}
-
-
-.section-heading {
-    color: rgb(103, 103, 112);
-    font-size: 30px;
-    font-weight: 300;
-    text-align: center;
-    letter-spacing: 5px;
-    text-transform: uppercase;
-    margin-top: 0px;
-    margin-bottom: 16px;
-}
-
-
-.section-subheading {
-    color: #1c1e21;
-    font-size: 16px;
-    font-weight: 300;
-    text-align: center;
-    letter-spacing: 5px;
-}
-.white-box {
-    padding: 15px;
-    border-style: solid;
-    border-width: 1px;
-    border-color: rgb(220, 235, 247);
-    border-radius: 5px;
-    background-color: white;
-    text-align: center;
-}
-
-.card-h3 {
-    margin-top: 0px;
-    margin-bottom: 0px;
-    color: #1c1e21;
-    font-size: 20px;
-    line-height: 30px;
-    font-weight: 300;
-    letter-spacing: 7px;
-    text-transform: uppercase;
-}
-
-.card-p {
-    margin-top: 10px;
-    margin-bottom: 10px;
-    font-size: 14px;
-    line-height: 25px;
-    font-weight: 300;
-}
-.card-h5 {
-    margin-top: 0px;
-    margin-bottom: 20px;
-    color: #1c1e21;
-    font-size: 18px;
-    line-height: 20px;
-    font-weight: 300;
-    letter-spacing: 4px;
-    text-transform: uppercase;
-}
-
-.white-box-transparent {
-    padding: 15px;
-    border-width: 1px;
-    border-color: rgb(220, 235, 247);
-    border-radius: 5px;
-    text-align: center;
-    border-style: none;
-    background-color: transparent;
-}
-
-.section-heading-white {
-    color: white;
-    font-size: 30px;
-    font-weight: 300;
-    text-align: center;
-    letter-spacing: 5px;
-    text-transform: uppercase;
-    margin-top: 0px;
-    margin-bottom: 16px;
-}
-.section-subheading-white {
-    color: white;
-    font-size: 18px;
-    font-weight: 300;
-    text-align: center;
-    letter-spacing: 3px;
-    text-transform: uppercase;
-}
-
-
-
-.card-h3-white {
-    margin-top: 0px;
-    margin-bottom: 0px;
-    color: white;
-    font-size: 20px;
-    line-height: 30px;
-    font-weight: 300;
-    letter-spacing: 7px;
-    text-transform: uppercase;
-}
-
-.card-p-white {
-    margin-top: 10px;
-    margin-bottom: 10px;
-    color: white;
-    font-size: 14px;
-    line-height: 25px;
-    font-weight: 300;
-}
-
-.card-h2 {
-    margin-top: 0px;
-    margin-bottom: 10px;
-    color: #1c1e21;
-    font-size: 32px;
-    line-height: 36px;
-    font-weight: 300;
-    text-align: center;
-}
-.card-p{
-    margin-top: 10px;
-    margin-bottom: 10px;
-    font-size: 14px;
-    line-height: 25px;
-    font-weight: 300;
-}
-
 
 
 
-/* .site-header .navbar {
-    border-radius: 40px;
-    transition: all .2s ease-in-out;
-} */
 .site-header .navbar.fixed-top {
     border-radius: 0;
     margin: 0 !important;

diff --git a/backend/static/css/darkly.css b/backend/static/css/darkly.css
@@ -1,4 +1,5 @@
 @charset "UTF-8";
+
 /*!
  * Bootswatch v5.3.0 (https://bootswatch.com)
  * Theme: darkly
@@ -12,6 +13,11 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 @import url("https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #375a7f;

diff --git a/backend/static/css/flatly.css b/backend/static/css/flatly.css
@@ -12,6 +12,11 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 @import url("https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;1,400&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #2c3e50;

diff --git a/backend/static/css/lux.css b/backend/static/css/lux.css
@@ -12,6 +12,11 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 @import url("https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@400;600&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #007bff;

diff --git a/backend/static/css/materia.css b/backend/static/css/materia.css
@@ -12,6 +12,11 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 @import url("https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #2196f3;

diff --git a/backend/static/css/minty.css b/backend/static/css/minty.css
@@ -12,6 +12,11 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 @import url("https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;700&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #007bff;

diff --git a/backend/static/css/morph.css b/backend/static/css/morph.css
@@ -12,6 +12,11 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 @import url("https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #378dfc;

diff --git a/backend/static/css/slate.css b/backend/static/css/slate.css
@@ -11,6 +11,11 @@
  * Copyright 2011-2023 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #007bff;

diff --git a/backend/static/css/solar.css b/backend/static/css/solar.css
@@ -12,6 +12,11 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #b58900;

diff --git a/backend/static/css/spacelab.css b/backend/static/css/spacelab.css
@@ -12,6 +12,11 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 @import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #446e9b;

diff --git a/backend/static/css/superhero.css b/backend/static/css/superhero.css
@@ -12,6 +12,11 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 @import url("https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
+
 :root,
 [data-bs-theme=light] {
   --bs-blue: #4c9be8;

diff --git a/backend/static/css/tethys_main.css b/backend/static/css/tethys_main.css
@@ -53,6 +53,10 @@
     font-weight: 700;
     src: local('Open Sans Bold Italic'),local('OpenSans-BoldItalic'),url(https://themes.googleusercontent.com/static/fonts/opensans/v8/PRmiXeptR36kaC0GEAetxhbnBKKEOwRKgsHDreGcocg.woff) format('woff')
 }
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&family=Ubuntu:wght@400;700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Raleway:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Poppins:300,400,700&display=swap');
 
 body {
     position: relative;

diff --git a/backend/templates/ciroh.html b/backend/templates/ciroh.html
@@ -4,22 +4,7 @@
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous"/>
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css" rel="stylesheet" />
     <link href="{% static "css/ciroh.css" %}" rel="stylesheet" />
-    <style>
-        .hero-style{
-            padding-top: 195px;
-            padding-bottom: 195px;
-            background-image: url('{% static  "images/ciroh/hydroinformatics.jpeg" %}');
-            background-size: cover;
-            text-align: center;
-            background-repeat: no-repeat;
-        }
-        .section-accent {
-            padding-top: 195px;
-            padding-bottom: 195px;
-            background-color: url('{% static  "images/ciroh/water_data.jpeg" %}');
-            text-align: center;
-        }
-    </style>
+
 {% endblock %}
 {% block base_js %}
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-u1OknCvxWvY5kfmNBILK2hRnQC3Pr17a+RTT6rIHI7NnikvbZlHgTPOOmMi466C8" crossorigin="anonymous"></script>

diff --git a/backend/templates/single_hs_resource.html b/backend/templates/single_hs_resource.html
@@ -37,7 +37,7 @@
                     <div class="d-flex align-items-baseline gap-2 justify-content-center justify-content-lg-start justify-content-md-start">
                         <h5 class="card-title card-h5">{{ resource.title }}</h5>
                         <div style="width:fit-content;">
-                            <p class="card-text my-2 fs-6 lh-1.5 fw-light d-flex flex-row justify-content-between w-100 gap-3 bg-light rounded p-1"  style="max-width:300px;">
+                            <p class="card-text my-2 fs-6 lh-1.5 fw-light d-flex flex-row justify-content-between w-100 gap-3 rounded p-1"  style="max-width:300px;">
                                 {% if resource.github_url %}
                                 <a href="{{ resource.github_url }}" target="_blank" class="text-decoration-none text-secondary" title="source_code"> <i class="bi bi-github"></i></a>
                                 {% endif %}