Merge pull request #12 from eHealthAfrica/fix/bsa-31

fix: added correct link to show all button
eHealthAfrica · Jan 19, 2021 · f020e71 · f020e71
2 parents c3408d9 + 22ff31c
commit f020e71
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/ckanext/biskit/fanstatic/styles/biskit.css b/ckanext/biskit/fanstatic/styles/biskit.css
@@ -3,61 +3,61 @@
   font-family: 'Roboto Condensed';
   font-style: italic;
   font-weight: 300;
-  src: local('Roboto Condensed Light Italic'), local('RobotoCondensed-LightItalic'), url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVg2ZhZI2eCN5jzbjEETS9weq8-19eDpCEobdNc.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVg2ZhZI2eCN5jzbjEETS9weq8-19eDpCEobdNc.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Roboto Condensed';
   font-style: italic;
   font-weight: 400;
-  src: local('Roboto Condensed Italic'), local('RobotoCondensed-Italic'), url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVj2ZhZI2eCN5jzbjEETS9weq8-19eLDwM4.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVj2ZhZI2eCN5jzbjEETS9weq8-19eLDwM4.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Roboto Condensed';
   font-style: italic;
   font-weight: 700;
-  src: local('Roboto Condensed Bold Italic'), local('RobotoCondensed-BoldItalic'), url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVg2ZhZI2eCN5jzbjEETS9weq8-19eDtCYobdNc.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVg2ZhZI2eCN5jzbjEETS9weq8-19eDtCYobdNc.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Roboto Condensed';
   font-style: normal;
   font-weight: 300;
-  src: local('Roboto Condensed Light'), local('RobotoCondensed-Light'), url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVi2ZhZI2eCN5jzbjEETS9weq8-33mZGCQYag.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVi2ZhZI2eCN5jzbjEETS9weq8-33mZGCQYag.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Roboto Condensed';
   font-style: normal;
   font-weight: 400;
-  src: local('Roboto Condensed'), local('RobotoCondensed-Regular'), url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19K7CA.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19K7CA.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Roboto Condensed';
   font-style: normal;
   font-weight: 700;
-  src: local('Roboto Condensed Bold'), local('RobotoCondensed-Bold'), url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVi2ZhZI2eCN5jzbjEETS9weq8-32meGCQYag.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVi2ZhZI2eCN5jzbjEETS9weq8-32meGCQYag.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 300;
-  src: local('Open Sans Light'), local('OpenSans-Light'), url(https://fonts.gstatic.com/s/opensans/v18/mem5YaGs126MiZpBA-UN_r8OUuhs.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/opensans/v18/mem5YaGs126MiZpBA-UN_r8OUuhs.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 400;
-  src: local('Open Sans Regular'), local('OpenSans-Regular'), url(https://fonts.gstatic.com/s/opensans/v18/mem8YaGs126MiZpBA-UFVZ0e.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/opensans/v18/mem8YaGs126MiZpBA-UFVZ0e.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 600;
-  src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), url(https://fonts.gstatic.com/s/opensans/v18/mem5YaGs126MiZpBA-UNirkOUuhs.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/opensans/v18/mem5YaGs126MiZpBA-UNirkOUuhs.ttf) format('truetype');
 }
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
   font-weight: 700;
-  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(https://fonts.gstatic.com/s/opensans/v18/mem5YaGs126MiZpBA-UN7rgOUuhs.ttf) format('truetype');
+  src: url(https://fonts.gstatic.com/s/opensans/v18/mem5YaGs126MiZpBA-UN7rgOUuhs.ttf) format('truetype');
 }
 .site-footer {
   border-top: 7px solid #2222227e;
@@ -636,13 +636,11 @@ body {
   background-color: #CB200C11;
   transition: right 250ms;
 }
-
 .card:hover {
   -webkit-box-shadow: 0px 6px 12px rgba(152, 54, 39, 0.1);
   -moz-box-shadow: 0px 6px 12px rgba(152, 54, 39, 0.1);
   box-shadow: 0px 6px 12px rgba(152, 54, 39, 0.1);
 }
-
 .card:hover::after {
   right: 0;
 }
@@ -708,26 +706,26 @@ body {
   justify-content: center;
   margin: 30px auto;
 }
-.show-all button {
+.show-all .show-all-button {
   border: none;
   border-radius: none;
   padding: 10px 20px;
   background-color: #CB200C;
   color: white;
   transition: all 0.3s;
+  text-decoration: none;
 }
-.show-all button:hover {
+.show-all .show-all-button:hover {
   background-color: #b11b0b;
+  text-decoration: none;
 }
 .side-rule {
   border-top: 1px solid #CB200C;
   width: 30%;
 }
 .partners {
   margin: 50px auto;
-
 }
-
 .pat-img-con {
   display: flex;
   justify-content: center;

diff --git a/ckanext/biskit/fanstatic/styles/less/biskit.less b/ckanext/biskit/fanstatic/styles/less/biskit.less
@@ -287,16 +287,18 @@ body {
   justify-content: center;
   margin: 30px auto;
 
-  & button {
+  & .show-all-button {
     border: none;
     border-radius: none;
     padding: 10px 20px;
     background-color: #CB200C;
     color: white;
     transition: all .3s;
+    text-decoration: none;
 
     &:hover {
       background-color: #b11b0b;
+      text-decoration: none;
     }
   }
 }

diff --git a/ckanext/biskit/templates/home/layout1.html b/ckanext/biskit/templates/home/layout1.html
@@ -51,7 +51,7 @@ <h3>
       {% snippet 'home/snippets/stats.html' %}
 
       <div class="show-all">
-        <hr class="side-rule"> <button>Show all datasets</button> <hr class="side-rule">
+        <hr class="side-rule"> <a href="{{ h.url_for('/dataset') }}" class="show-all-button">Show all datasets</a> <hr class="side-rule">
       </div>
     </div>
   </div>