Merge pull request #5 from keitaroinc/improve-design

Improve design
keitaroinc · Dec 21, 2023 · 9ed24a3 · 9ed24a3
2 parents 2941cbc + efd1e1a
commit 9ed24a3
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 30 deletions.
diff --git a/ckanext/kepa/assets/css/kepa.css b/ckanext/kepa/assets/css/kepa.css
diff --git a/ckanext/kepa/assets/css/kepa.css.map b/ckanext/kepa/assets/css/kepa.css.map
diff --git a/ckanext/kepa/assets/scss/_mixins.scss b/ckanext/kepa/assets/scss/_mixins.scss
@@ -0,0 +1,15 @@
+@mixin center-flex {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+@mixin align-center {
+    align-items: center;
+    text-align: center;
+}
+
+@mixin column {
+    display: flex;
+    flex-direction: column;
+}
diff --git a/ckanext/kepa/assets/scss/kepa.scss b/ckanext/kepa/assets/scss/kepa.scss
@@ -1,18 +1,12 @@
 @import "variables";
+@import "mixins";
 
 .center-flex {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.align-center {
-    text-align: center;
+    @include center-flex;
 }
 
 .column {
-    display: flex;
-    flex-direction: column;
+    @include column;
 }
 
 .masthead {
@@ -57,11 +51,9 @@
 .homepage .hero-placeholder .container {
     min-height: 600px;
     width: 50%;
-    display: flex;
-    flex-direction: column;
+    @include column;
     justify-content: center;
-    align-items: center;
-    text-align: center;
+    @include align-center;
 }
 
 .homepage .hero-placeholder .container img {
@@ -74,16 +66,14 @@
     }
 }
 
-.heading {
+.search-form .heading {
     color: $white;
     font-size: $xxl-size;
     text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
 }
 
 .search-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
+    @include center-flex;
     min-height: 400px;
 }
 
@@ -104,9 +94,28 @@
     padding: 0;
 }
 
+.search-form .search-input button i {
+    color: $white;
+}
+
 .form-control {
     border: none;
     border-radius: 0;
+    margin-right: 0 !important;
+    width: 80%;
+}
+
+.site-search .btn {
+    background-color: white;
+    border: none;
+    border-radius: 0 !important;
+    margin-left: 0 !important;
+}
+
+@media screen and (max-width: 980px) {
+    .form-control {
+        width: 100%;
+    }
 }
 
 .tags {
@@ -129,16 +138,14 @@
 
 .card {
     width: 200px;
-    align-items: center;
-    text-align: center;
+    @include align-center;
     background-color: $secondary-color;
 }
 
 .card a {
     color: $white;
     height: 100%;
-    display: flex;
-    flex-direction: column;
+    @include column;
     justify-content: center;
     text-decoration: none;
 }
@@ -157,7 +164,7 @@
 @media screen and (max-width: 650px) {
     .module-stats-center-flex {
         flex-direction: column;
-        align-items: center; 
+        align-items: center;
     }
 
     .module-feeds {
@@ -191,6 +198,13 @@
     align-items: center;
     color: $white;
     font-weight: $bold;
+    margin-top: 30px;
+}
+
+@media screen and (max-width: 750px) {
+    .address {
+        justify-content: start;
+    }
 }
 
 .address img {
@@ -214,8 +228,14 @@
 
 .site-footer {
     padding: 40px;
+    background-color: $primary-color;
 }
 
 .item-count {
     background-color: $secondary-color !important;
 }
+
+.heading {
+    color: black;
+    text-shadow: none;
+}
diff --git a/ckanext/kepa/templates/footer.html b/ckanext/kepa/templates/footer.html
@@ -41,8 +41,6 @@ <h2>{{_('Social')}}</h2>
 
 
 <script>
-  console.log("ovde");
-
   document.addEventListener("DOMContentLoaded", function () {
     calculateSpaceToBottom();
   });