diff --git a/ckanext/datacity/fanstatic/datacity-theme.css b/ckanext/datacity/fanstatic/datacity-theme.css index 4d19d0f..1d36006 100644 --- a/ckanext/datacity/fanstatic/datacity-theme.css +++ b/ckanext/datacity/fanstatic/datacity-theme.css @@ -1,5 +1,5 @@ body { - font-family: 'Arimo', Tahoma, "Helvetica Neue", Arial, Helvetica, sans-serif; + font-family: 'Rubik', Tahoma, "Helvetica Neue", Arial, Helvetica, sans-serif; background: initial; } @@ -8,31 +8,50 @@ body { font-weight: bold; } -hgroup.header-image.navbar-right { - padding-left: 50px; -} - .homepage .module-search .module-content .heading { - margin-top: 70px; - margin-bottom: 70px; - margin-left: 25%; - margin-right: 25%; + margin: -36px 25% 170px; font-size: 3em; line-height: initial; text-align: center; - background-color: rgba(255,255,255,0.5); - border-radius: 10px; + border-radius: 35px; width: 50%; - padding: 20px; + padding: 70px 20px 30px; } .homepage .module-search { padding: 0; } +.homepage .module-search h3.heading { + font-weight: bold; + font-size: 40px; +} + .homepage .module-search .module-content { background-color: initial; - padding-bottom: 120px; + padding-bottom: 20px; + margin-top: 0; + padding-top: 0; +} + +.homepage .module-search .search-title { + font-weight: bold; + font-size: 16px; + padding-bottom: 10px; +} + +.search-form .search-input.search-giant { + margin: 0 25%; +} + +.search-form .search-input.search-giant button { + margin-top: 0; +} + +.homepage .module-search .search-giant input { + border-color: #0058a9; + border-width: 2px; + border-radius: 15px; } .box { @@ -55,30 +74,32 @@ hgroup.header-image.navbar-right { -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; + margin-bottom: 55px; } @media (min-width: 768px) { .search-by-cat { - padding: 10px 105px; + padding: 10px 40px; } } @media (min-width: 992px) { .search-by-cat { - padding: 10px 190px; + padding: 10px 140px; } } @media (min-width: 1200px) { .search-by-cat { - padding: 10px 320px; + padding: 10px 245px; } } .search-by-cat h3{ - margin-top: 0; - margin-bottom: 7px; - font-size: 24px; + margin-top: 30px; + margin-bottom: 30px; + font-size: 16px; + font-weight: bold; line-height: 40px; text-align: center; } @@ -101,10 +122,17 @@ hgroup.header-image.navbar-right { .surrey-media-item { position: relative; - width: 125px; + width: 160px; padding: 10px 10px 10px 13px; text-align: center; - height: 125px; + height: 160px; +} + +.surrey-media-item-wrap { + background-color: #37678c; + border-radius: 30px; + height: 130px; + padding-top: 10px; } .surrey-media-item span { @@ -123,26 +151,49 @@ ul.surrey-media-grid { padding: 0; } -.SectionTitle { - font-size: 16px; - color: #1D2F3B; +.homepage-datasets-top-container .SectionTitle { + font-size: 24px; + color: #1c4f7c; line-height: 26px; position: relative; display: inline-block; vertical-align: middle; text-transform: uppercase; - font-weight: normal; - margin: 0 0 50px 0; + font-weight: bold; + margin: 50px 0 35px 0; } -.SectionTitle:after { - content: ''; - display: block; - position: absolute; - bottom: -5px; - width: 100%; - height: 3px; - background-color: #D0021B; +.homepage-datasets-top-container h3.dataset-heading a { + font-weight: bold; + font-size: 16px; + color: #1c4f7c; +} + +.homepage-datasets-top-container div { + font-size: 14px; + color: #1c4f7c; +} + +.homepage-datasets-top-container .show-all-datasets-wrap { + display: flex; + justify-content: center; + margin-bottom: 50px; + margin-top: 30px; +} + +.homepage-datasets-top-container .show-all-datasets-wrap h3 { + padding-top:20px; + border: 2px solid #1c4f7c; + border-radius: 9px; + text-align: center; + width: 230px; + font-size: 18px; + font-weight: bold; + padding-bottom: 20px; +} + +.homepage-datasets-top-container .show-all-datasets-wrap h3 a { + color: #1c4f7c; } .module-heading { @@ -175,25 +226,13 @@ ul.nav-facet li.nav-item { margin-bottom: 1em; } -footer.site-footer .attribution strong { - font-weight: normal; -} - -.site-footer .footer-links ul { - margin: 0; - list-style: none; - padding-right: 0; - padding-left: 0; -} - .wrapper { border: 0; box-shadow: initial; } -[role=main] { - background: initial; - background-color: #fff; +.homepage [role=main] { + padding-top: 0; } .media-grid { @@ -231,4 +270,130 @@ div#content.container .row.wrapper { form.lang-select label { font-weight: normal; -} \ No newline at end of file +} + +.dc-flex-navbar { + display: flex; + flex-direction: row-reverse; + align-items: center; +} + +.dc-flex-navbar .dcfn-item { + flex-grow: 2; +} + +.dc-flex-navbar .dcfn-item.dcfni-navbar { + flex-grow: 6; + display: flex; +} + +.dc-flex-navbar .dcfn-item.dcfni-navbar a { + font-size: 16px; + padding-bottom: 3px; +} + +.dc-flex-navbar .dcfn-item.dcfni-navbar a:hover::after { + position: absolute; + content: ""; + width: 100%; + height: 3px; + top: 100%; + left: 0; +} + +.dc-flex-navbar .dcfn-item.dcfni-navbar li.active a::after { + position: absolute; + content: ""; + width: 100%; + height: 3px; + top: 100%; + left: 0; +} + +.masthead .navigation .nav-pills li a:hover, .masthead .navigation .nav-pills li a:focus, .masthead .navigation .nav-pills li.active a { + background-color: transparent; +} + +.dc-flex-navbar .dcfn-item.dcfni-navbar nav.section.navigation { + margin: 0 auto; +} + +.masthead .logo { + margin-right: 0 !important; +} + +.dcfni-city-logo hgroup { + text-align: right; +} + +.dcfni-datacity-logo { + text-align: left; +} + +.footer-row { + display: flex; + margin-top: 50px; +} + +.footer-col { + flex-grow: 3; + font-size: 14px; + font-weight: bold; + color: white; +} + +.footer-col a { + color: white; +} + +.footer-col-iia { + text-align: left; + flex-grow: 1; + margin-right: 25px; + margin-left: 25px; +} + +.footer-col-iia div { + margin-bottom: 35px; +} + +.footer-col-hasadna { + text-align: center; + flex-grow: 1; +} + +.footer-col-hasadna div { + margin-bottom: 35px; +} + +.footer-col-code div { + margin-bottom: 15px; +} + +.footer-col-code .github-logo-icon { + padding-right: 15px; + padding-left: 15px; + height:1.5em; +} + +.footer-col-code .ckan-logo-icon { + padding-right: 15px; + padding-left: 15px; + height:1.5em; +} + +.footer-col-site ul { + margin: 0; + padding: 0; + list-style: none; +} + +.footer-col-site li { + margin-bottom: 15px; +} + +form.lang-select label { + font-weight: bold; + color: white; + font-size: 14px; +} diff --git a/ckanext/datacity/helpers.py b/ckanext/datacity/helpers.py index af998fc..e3eb22a 100644 --- a/ckanext/datacity/helpers.py +++ b/ckanext/datacity/helpers.py @@ -56,14 +56,14 @@ def get_setting(setting, default=None): def get_color(color): value = get_setting(color, { - "top_header_background_color": "d6edd2", - "menu_background_color": "d6edd2", - "menu_text_color": "05396b", - "menu_highlight_color": "eeeeee", - "homepage_title_text_color": "005d7a", - "homepage_groups_background_color": "005d7a", - "homepage_groups_text_color": "edf5e1", - "footer_background_color": "05386b", + "top_header_background_color": "ffffff", + "menu_background_color": "ffffff", + "menu_text_color": "1c4f7c", + "menu_highlight_color": "f1ae89", + "homepage_title_text_color": "1c4f7c", + "homepage_groups_background_color": "1c4f7c", + "homepage_groups_text_color": "ffffff", + "footer_background_color": "1c4f7c", }.get(color, "#000000")) if not value.startswith("#"): value = "#" + value diff --git a/ckanext/datacity/public/ckan-logo-small.png b/ckanext/datacity/public/ckan-logo-small.png new file mode 100644 index 0000000..b02537b Binary files /dev/null and b/ckanext/datacity/public/ckan-logo-small.png differ diff --git a/ckanext/datacity/public/hasadna-logo-small.png b/ckanext/datacity/public/hasadna-logo-small.png new file mode 100644 index 0000000..ec38c9f Binary files /dev/null and b/ckanext/datacity/public/hasadna-logo-small.png differ diff --git a/ckanext/datacity/public/logoInnovationAuthority.png b/ckanext/datacity/public/logoInnovationAuthority.png new file mode 100644 index 0000000..d8d2870 Binary files /dev/null and b/ckanext/datacity/public/logoInnovationAuthority.png differ diff --git a/ckanext/datacity/templates/base.html b/ckanext/datacity/templates/base.html index 2391cff..49c0f67 100644 --- a/ckanext/datacity/templates/base.html +++ b/ckanext/datacity/templates/base.html @@ -3,7 +3,7 @@ {% block styles %} {{ super() }} {% resource 'datacity/datacity-theme.css' %} - + {% endblock %} {%- block title -%} @@ -43,6 +43,12 @@ color: {{ h.color("menu_text_color") }}; background-color: {{ h.color("menu_highlight_color") }}; } + .dc-flex-navbar .dcfn-item.dcfni-navbar a:hover::after { + background: {{ h.color("menu_highlight_color") }}; + } + .dc-flex-navbar .dcfn-item.dcfni-navbar li.active a::after { + background: {{ h.color("menu_highlight_color") }}; + } .masthead { background-color: {{ h.color("menu_background_color") }}; } @@ -52,9 +58,6 @@ .masthead .nav > li > a:focus, .masthead .nav > li > a:hover, .masthead .nav > .active > a, .masthead .nav > .active > a:hover, .masthead .nav > .active > a:focus { color: {{ h.color("menu_text_color") }}; } - .masthead .navigation .nav-pills li a:hover, .masthead .navigation .nav-pills li a:focus, .masthead .navigation .nav-pills li.active a { - background-color: {{ h.color("menu_highlight_color") }}; - } .homepage .module-search .module-content .heading { color: {{ h.color('homepage_title_text_color') }}; } @@ -95,5 +98,20 @@ .masthead .logo { margin-{{ 'right' if h.is_rtl_language() else 'left' }}: 20px; } + {% if (h.setting('header_navbar_style') != 'city-logo-left' and not h.is_rtl_language()) or (h.is_rtl_language() and h.setting('header_navbar_style') == 'city-logo-left') %} + .dcfni-city-logo hgroup { + text-align: left; + } + .dcfni-datacity-logo { + text-align: right; + } + {% endif %} + {% if h.setting('header_navbar_style') == 'city-logo-left' %}.dc-flex-navbar {flex-direction: row;}{% endif %} + .homepage .module-search .module-content .heading { + background-color: {{ h.color("menu_background_color") }}; + } + .homepage .module-search .search-title { + color: {{ h.color('homepage_title_text_color') }}; + } {% endblock %} \ No newline at end of file diff --git a/ckanext/datacity/templates/footer.html b/ckanext/datacity/templates/footer.html index 6189df9..5a8a7a7 100644 --- a/ckanext/datacity/templates/footer.html +++ b/ckanext/datacity/templates/footer.html @@ -1,39 +1,18 @@ {% ckan_extends %} {% block footer_content %} -
-
- {% block footer_nav %} - {% if h.setting('footer_links_markdown_' + h.lang()) %} - {{ h.render_markdown(h.setting('footer_links_markdown_' + h.lang())) }} -
- {% elif h.setting('footer_links_markdown_he') %} -
- {{ h.render_markdown(h.setting('footer_links_markdown_he')) }} -
-
- {% endif %} - - {% endblock %} -
-
-
-
-

- {{ _('Developed by') }}
-
- {{ _('Support from Israel Innovation Authority') }}
- {{ _('Site source code') }} -

- {% block footer_attribution %} -

{% trans %}Powered by {% endtrans %}

- {% endblock %} +
+
+ {% if h.setting('footer_links_markdown_' + h.lang()) %} + {{ h.render_markdown(h.setting('footer_links_markdown_' + h.lang())) }} + {% elif h.setting('footer_links_markdown_he') %} +
+ {{ h.render_markdown(h.setting('footer_links_markdown_he')) }} +
+ {% endif %} +
{% block footer_lang %} @@ -42,5 +21,30 @@
+
+
+ {{ _('Site source code in GitHub') }} + GitHub Logo +
+
+ {% trans %}Powered by {% endtrans %} + CKAN Logo +
+
+ {{ _('CKAN API') }} +
+
+
+
+ {{ _('Developed by') }} +
+ The Public Knowledge Workshop Logo +
+
+
+ {{ _('Support from Israel Innovation Authority') }} +
+ Innovation Authority Logo +
{% endblock %} \ No newline at end of file diff --git a/ckanext/datacity/templates/home/snippets/datasets.html b/ckanext/datacity/templates/home/snippets/datasets.html index 2c3b1e7..140c350 100644 --- a/ckanext/datacity/templates/home/snippets/datasets.html +++ b/ckanext/datacity/templates/home/snippets/datasets.html @@ -1,24 +1,29 @@
-
+
+

{{ _('Popular datasets') }}

{% snippet 'snippets/package_list.html', packages=h.popular_datasets() %}
-

{{ _('Show all Datasets') }}

-
+

{{ _('Recently updated datasets') }}

{% snippet 'snippets/package_list.html', packages=h.last_updated_datasets() %}
-

{{ _('Show all Datasets') }}

+
+
+
+
+

{{ _('Show all Datasets') }}       >

+
diff --git a/ckanext/datacity/templates/home/snippets/groups.html b/ckanext/datacity/templates/home/snippets/groups.html index 2a4df30..b9c84ff 100644 --- a/ckanext/datacity/templates/home/snippets/groups.html +++ b/ckanext/datacity/templates/home/snippets/groups.html @@ -1,11 +1,13 @@
-

{{ _('Search By Group') }}

+

{{ _('Or, Search By Group') }}:

diff --git a/ckanext/datacity/templates/home/snippets/search.html b/ckanext/datacity/templates/home/snippets/search.html index b68180a..ac7e8b7 100644 --- a/ckanext/datacity/templates/home/snippets/search.html +++ b/ckanext/datacity/templates/home/snippets/search.html @@ -8,6 +8,7 @@

{{ h.setting('homepage_title_text_line_2', h.site_title()) }}

+
{{ _('Free-form search') }}
-
- -
- {% block header_logo %} - - {% endblock %} -
- -