diff --git a/deployment/.env b/deployment/.env index ea49860..932dfa0 100644 --- a/deployment/.env +++ b/deployment/.env @@ -248,7 +248,7 @@ PYTHONPATH=/home/web/django_project:/geonode USE_DEFAULT_GEOSERVER_STYLE=False INITIAL_FIXTURES=True -VERSION=4.5.0 +VERSION=4.6.1 ISTSOS_VERSION=2.4.1-4 # ------ GEOSERVER ------ diff --git a/django_project/core/settings/base.py b/django_project/core/settings/base.py index 9d2b4b5..95a6707 100644 --- a/django_project/core/settings/base.py +++ b/django_project/core/settings/base.py @@ -175,7 +175,7 @@ } CELERY_BEAT_SCHEDULE['clean_download_file'] = { 'task': 'gwml2.tasks.clean.clean_download_file', - 'schedule': crontab(hour=0), + 'schedule': crontab(hour='*/1'), } GWML2_FOLDER = os.getenv( diff --git a/django_project/gwml2 b/django_project/gwml2 index e81d1e7..5f17636 160000 --- a/django_project/gwml2 +++ b/django_project/gwml2 @@ -1 +1 @@ -Subproject commit e81d1e7e9dbcc57885556aeb7e871008dabc5898 +Subproject commit 5f17636c95c57cc8044594745d2cf69bc5c0bb1a diff --git a/django_project/igrac/static/css/base-igrac.css b/django_project/igrac/static/css/base-igrac.css index 72b1792..82e618e 100644 --- a/django_project/igrac/static/css/base-igrac.css +++ b/django_project/igrac/static/css/base-igrac.css @@ -1,16 +1,23 @@ +@import url('https://fonts.cdnfonts.com/css/neue-haas-grotesk-display-pro'); +@import url('https://fonts.cdnfonts.com/css/baskerville'); html { height: 100%; } :root { --white: #fff; - --primary: #2c689c; - --secondary: #ff6b0d; - --primaryBold: #005198 + --white-font: #F8F0DF; + --primary: #08384F; + --bg-hover-color: #00A5B6; + --secondary: #00777D; + --primary-bold: #08384F; + --gn-font-family-base: "Montserrat", sans-serif; + --font-medium: 500; + --font-semi-bold: 600; } body { - font-family: nimbus-sans, sans-serif; + font-family: var(--gn-font-family-base) !important; } body.igrac-home { @@ -58,10 +65,6 @@ body.igrac-home { line-height: 50px; } -#branding .logo:hover i { - color: #ff6b0d; -} - .navbar > li { height: 100%; @@ -82,6 +85,10 @@ body.igrac-home { padding: 5px 0; } +header #logo-branding { + padding: 2px 0; +} + .navbar-nav > li > a { padding-top: 14px !important; padding-bottom: 14px !important; @@ -134,6 +141,8 @@ h1, h2, h5 { .banner-text h2 { font-size: 36px; margin-bottom: 20px; + font-family: 'Neue Haas Grotesk Display Pro', sans-serif; + text-transform: uppercase; } .banner-text a { @@ -141,6 +150,10 @@ h1, h2, h5 { text-decoration: underline; } +.banner-text p { + font-family: 'Baskerville', sans-serif; +} + .banner-text a:hover { color: #f18903; text-decoration: underline; @@ -168,27 +181,32 @@ h1, h2, h5 { justify-content: space-between; } -.btn.btn-orange { - color: #fff; - border: 1px solid #ff6b0d; - background: #ff6b0d; +.msgapi .btn-primary { + background: var(--white); + color: var(--primary-bold); + border: var(--white); } -.btn.btn-orange:hover, .btn.btn-orange:focus { - color: #ff6b0d; - background: white; - box-shadow: inset 12em 0 0 0 #fff; +.msgapi form .btn-primary, +.btn.btn-orange { + font-weight: var(--font-medium); + color: var(--white-font); + border: 1px solid var(--secondary); + background: var(--secondary); } .btn.btn-blue { - color: #fff; - border: 1px solid #005198; - background: #005198; + color: var(--white-font); + border: 1px solid var(--primary); + background: var(--primary); } +form .btn-primary:hover, form .btn-primary:focus, +.btn.btn-orange:hover, .btn.btn-orange:focus, .btn.btn-blue:hover, .btn.btn-blue:focus { - color: #005198; - background-color: white; + color: white !important; + border: 1px solid var(--bg-hover-color) !important;; + background: var(--bg-hover-color) !important;; } .btn.btn-white { @@ -312,12 +330,12 @@ h1, h2, h5 { } .map-abstract:hover::-webkit-scrollbar-thumb { - background: #ff6b0d; + background: var(--primary); } /* Handle on hover */ .map-abstract::-webkit-scrollbar-thumb:hover { - background: #e05600; + background: var(--primary); } /* Hide scrollbar for IE, Edge and Firefox */ @@ -376,23 +394,6 @@ h1, h2, h5 { margin-right: 20px; } -.msgapi .btn-primary { - background: var(--white); - color: var(--primaryBold); - border: var(--white); -} - -form .btn-primary { - color: #fff !important; - background-color: #2c689c !important; - border-color: #265a88 !important; -} - -form .btn-primary:hover { - background-color: var(--secondary) !important; - box-shadow: unset !important; -} - form .row { display: flex; margin-left: 0 !important; @@ -401,7 +402,12 @@ form .row { .footer-item { - color: var(--primaryBold) + color: var(--primary-bold) +} + +.footer-item[target] { + padding-top: 0 !important; + margin-top: 2px; } .msgapi .btn-primary:hover, @@ -412,6 +418,7 @@ form .row { .msgapi .open > .dropdown-toggle.btn-primary, .msgapi .open > .dropdown-toggle.btn-primary:focus, .dropdown-menu a:focus { + color: var(--white-font); background-color: var(--secondary); box-shadow: unset !important; } @@ -419,12 +426,12 @@ form .row { .msgapi .btn-primary:focus { background-color: white; - color: var(--primaryBold); + color: var(--primary-bold); } .msgapi body, [data-ms2-container] { - font-family: nimbus-sans, sans-serif !important; + font-family: var(--gn-font-family-base) !important; -ms-text-size-adjust: 100% !important;; -webkit-text-size-adjust: 100% !important;; } @@ -449,6 +456,27 @@ form .row { background-color: #f2f0f0; } +.msgapi .gn-resource-card .card-title a { + color: var(--primary); + font-weight: bold; + font-family: 'Neue Haas Grotesk Display Pro', sans-serif; +} + +.gn-home-section .gn-card-description { + white-space: initial !important; + font-family: 'Baskerville', sans-serif; +} + +.map-abstract { + font-family: 'Baskerville', sans-serif; + font-size: .69rem; +} + +.gn-home-section .map-abstract { + height: 100px !important; + overflow-y: auto !important; +} + .gn-search-bar-li { padding-right: 1rem !important; } @@ -465,6 +493,7 @@ form .row { .gn-user-menu-dropdown button:hover, .gn-user-menu-dropdown button:focus { + color: var(--white-font); background-color: var(--secondary) !important; } @@ -540,12 +569,16 @@ form .row { } .geostory-button-container .btn:hover, .geostory-button-container .btn:focus { - color: #ff6b0d !important; + color: var(--primary); !important; +} + +.home-menu a { + height: 48px; + padding: 0.9rem 0.5rem; } -.home-menu a:hover { - background-color: white !important; - color: #ff6b0d !important; +.home-menu a i { + margin-top: -2px; } .fa-home { @@ -553,22 +586,23 @@ form .row { } .dropdown-menu { - background-color: #2c689c !important; - border-top: 1px solid #2c689c !important; + background-color: var(--secondary) !important; + border-top: 1px solid var(--secondary) !important; border: unset !important; } .dropdown-menu li > a:hover, .dropdown-menu li > a:focus { - background-color: #ff6b0d !important; + color: white !important; + background-color: var(--bg-hover-color) !important; } .dropdown-menu a { - color: white !important; + color: var(--white-font) !important; } .dropdown-menu .divider { - background-color: #204d74 !important; + background-color: var(--primary) !important; } /*.dropdown-submenu>.dropdown-menu {*/ @@ -656,4 +690,36 @@ form .row { #footer-attribution-container .ol-attribution { padding: 4px 2px; +} + +.msgapi a { + color: var(--primary) +} + +.explore-viewer-title { + font-size: 30px !important; + font-weight: 700 !important; + margin: 25px 10px 15px !important; + color: var(--secondary) !important; + text-transform: uppercase; + font-family: 'Neue Haas Grotesk Display Pro', sans-serif; +} + +.msgapi .gn-action-navbar-title { + background-color: var(--primary); + color: var(--white-font); +} + +.toc-group-title { + font-weight: var(--font-semi-bold); +} + +.form-group strong, +.form-group label, +.gn-filter-form-group-title strong { + color: var(--secondary); + font-weight: var(--font-semi-bold); +} +.form-group ul label { + color: black; } \ No newline at end of file diff --git a/django_project/igrac/static/css/default.css b/django_project/igrac/static/css/default.css index 950f775..35294a0 100644 --- a/django_project/igrac/static/css/default.css +++ b/django_project/igrac/static/css/default.css @@ -57,7 +57,7 @@ table { /****** Main CSS *******/ body { font-size: 16px; - font-family: nimbus-sans, sans-serif; + font-family: var(--gn-font-family-base); font-weight: 300; font-style: normal; } @@ -181,8 +181,8 @@ body { } #gn-topbar .dropdown-menu>li>a:focus, #gn-topbar .dropdown-menu>li>a:hover { + color: var(--white-font); background-color: var(--secondary); - color: var(--white); } #branding, .branding { @@ -191,7 +191,6 @@ body { #branding .logo, .branding .logo { height: 50px; - line-height: 50px; } .footer-wrapper { @@ -305,26 +304,6 @@ body { margin-top: 20px !important; } -.msgapi .gn-resource-card .card-title a { - color: var(--primary); -} - -.explore-viewer-title { - font-size: 30px !important; - font-weight: 700 !important; - margin: 25px 10px 15px !important; - color: var(--primaryBold) !important; -} - -.gn-home-section .gn-card-description { - white-space: initial !important; -} - -.gn-home-section .map-abstract { - height: 50px !important; - overflow-y: auto !important; -} - .gn-home-section .gn-resource-card .card-body { pointer-events: unset; } diff --git a/django_project/igrac/static/css/manual-page-style.css b/django_project/igrac/static/css/manual-page-style.css index 9d6955e..2e9245d 100644 --- a/django_project/igrac/static/css/manual-page-style.css +++ b/django_project/igrac/static/css/manual-page-style.css @@ -7,14 +7,14 @@ body { body { padding-top: 0; width: 100%; - font-family: nimbus-sans, sans-serif; + font-family: var(--gn-font-family-base) !important; } #wrap { - padding-top: 50px; - padding-bottom: 35px; - height: 100%; + padding-top: 0 !important; + padding-bottom: 100px !important; margin-top: 0 !important; + height: 100%; } .menu-container { @@ -69,7 +69,7 @@ body { font-size: 2em !important; font-style: normal !important; font-weight: 700 !important; - color: #24619d !important; + color: var(--secondary) !important; line-height: 1 !important; } @@ -79,9 +79,9 @@ body { .menu-sidebar { height: 100%; - background-color: #24619d; + background-color: var(--secondary); overflow-y: auto; - color: white; + color: var(--white-font); padding-right: 0 !important; padding-left: 0 !important; } @@ -90,14 +90,10 @@ body { padding-left: 32px; padding-top: 34px; padding-bottom: 32px; - border-bottom: 1px solid #17497b; + border-bottom: 1px solid var(--primary); margin: 0; } -.jstree .jstree-open > .jstree-children { - background-color: #1b5289; -} - .container-fluid { height: 100%; } @@ -109,12 +105,12 @@ body { .jstree-default .jstree-wholerow-clicked { background: #1b5289 !important; - background: -webkit-linear-gradient(top, #1b5289 0, #1b5289 100%) !important; - background: linear-gradient(to bottom, #1b5289 0, #1b5289 100%) !important; + background: -webkit-linear-gradient(top, var(--primary) 0, var(--primary) 100%) !important; + background: linear-gradient(to bottom, var(--primary) 0, var(--primary) 100%) !important; } .jstree-clicked { - color: #F48020 !important; + color: white !important; } .jstree-default-large .jstree-node { @@ -142,15 +138,10 @@ body { background-position: -32px 8px; } -.jstree-default .jstree-hovered { - background: #1b5289; - border-radius: 2px; - color: #F48020 !important; -} - +.jstree-default .jstree-hovered, .jstree-default .jstree-wholerow-hovered { - background: #1b5289; - color: #F48020 !important; + background: var(--bg-hover-color); + color: white !important; } .manual-header { diff --git a/django_project/igrac/static/img/favicon.svg b/django_project/igrac/static/img/favicon.svg new file mode 100644 index 0000000..28de798 --- /dev/null +++ b/django_project/igrac/static/img/favicon.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/django_project/igrac/static/img/logo.svg b/django_project/igrac/static/img/logo.svg new file mode 100644 index 0000000..8a92de3 --- /dev/null +++ b/django_project/igrac/static/img/logo.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/django_project/igrac/templates/base.html b/django_project/igrac/templates/base.html index f2f0d10..35c6aab 100644 --- a/django_project/igrac/templates/base.html +++ b/django_project/igrac/templates/base.html @@ -38,7 +38,7 @@ rel="stylesheet"/> - + {% include './geonode-mapstore-client/snippets/custom_theme.html' %}