From ec2625b96c052612acbcdf377d483bc289a01351 Mon Sep 17 00:00:00 2001 From: Tomasz Dziuda Date: Fri, 10 May 2019 19:34:18 +0200 Subject: [PATCH 1/5] #438 - fixed problems with URLs in the sitemap --- app/back-end/builddata.json | 2 +- app/back-end/modules/render-html/helpers/sitemap.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/back-end/builddata.json b/app/back-end/builddata.json index 7fe4dd6d6..f55b2e403 100644 --- a/app/back-end/builddata.json +++ b/app/back-end/builddata.json @@ -1 +1 @@ -{"version":"0.34.0","build":11726,"status":"Beta"} +{"version":"0.34.0","build":11729,"status":"Beta"} \ No newline at end of file diff --git a/app/back-end/modules/render-html/helpers/sitemap.js b/app/back-end/modules/render-html/helpers/sitemap.js index 210efa6b8..1e3e475a5 100644 --- a/app/back-end/modules/render-html/helpers/sitemap.js +++ b/app/back-end/modules/render-html/helpers/sitemap.js @@ -145,7 +145,7 @@ class Sitemap { * Retrieves media path for the website */ getMediaPath (postObject) { - return this.siteConfig.domain + '/' + path.join('media', 'posts', (postObject.id).toString()); + return this.siteConfig.domain + '/' + path.join('media', 'posts', (postObject.id).toString()) + '/'; } /** @@ -450,7 +450,7 @@ class Sitemap { this.fileList.push({ images: this.postData[file].images, lastMod: this.postData[file].lastMod, - url: file + url: file + '/' }); } else { this.fileList.push(file + '/'); From 644dfbd7480fa7324eef6c921543e685d5165c7b Mon Sep 17 00:00:00 2001 From: Tomasz Dziuda Date: Fri, 10 May 2019 19:38:53 +0200 Subject: [PATCH 2/5] #439 - simple theme update --- .../default-themes/simple/assets/css/main.css | 81 +++++++------ .../simple/assets/css/style.css | 114 ++++++++++-------- .../default-themes/simple/config.json | 2 +- .../default-themes/simple/partials/menu.hbs | 2 +- .../default-themes/simple/visual-override.js | 47 ++++---- 5 files changed, 139 insertions(+), 107 deletions(-) diff --git a/app/default-files/default-themes/simple/assets/css/main.css b/app/default-files/default-themes/simple/assets/css/main.css index e772ce772..bb2892951 100755 --- a/app/default-files/default-themes/simple/assets/css/main.css +++ b/app/default-files/default-themes/simple/assets/css/main.css @@ -791,48 +791,44 @@ textarea { position: relative; text-transform: uppercase; width: auto; } - .navbar .navbar__menu li a { + .navbar .navbar__menu li a, + .navbar .navbar__menu li span[aria-haspopup="true"] { color: #FFFFFF; display: block; padding: 0 0.56667rem; -webkit-transition: all 0.24s ease-out; -o-transition: all 0.24s ease-out; transition: all 0.24s ease-out; } - .navbar .navbar__menu li a:active, .navbar .navbar__menu li a:focus, .navbar .navbar__menu li a:hover { + .navbar .navbar__menu li a:active, .navbar .navbar__menu li a:focus, .navbar .navbar__menu li a:hover, + .navbar .navbar__menu li span[aria-haspopup="true"]:active, + .navbar .navbar__menu li span[aria-haspopup="true"]:focus, + .navbar .navbar__menu li span[aria-haspopup="true"]:hover { color: rgba(255, 255, 255, 0.7); } .navbar .navbar__menu li span { color: #FFFFFF; + cursor: default; display: block; padding: 0 0.56667rem; } .navbar .navbar__menu > li:hover > a, - .navbar .navbar__menu > li:hover > span { + .navbar .navbar__menu > li:hover > span[aria-haspopup="true"] { color: rgba(255, 255, 255, 0.7); } .navbar .has-submenu:active > .navbar__submenu, .navbar .has-submenu:focus > .navbar__submenu, .navbar .has-submenu:hover > .navbar__submenu { - left: 0; } - @media all and (min-width: 56.25em) { - .navbar .has-submenu:active > .navbar__submenu, - .navbar .has-submenu:focus > .navbar__submenu, - .navbar .has-submenu:hover > .navbar__submenu { - opacity: 1; - -webkit-transform-origin: 0 top; - -ms-transform-origin: 0 top; - transform-origin: 0 top; - -webkit-transform: none; - -ms-transform: none; - transform: none; - -webkit-transition: -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - transition: -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - -o-transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1), -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - visibility: visible; } } + left: 0; + opacity: 1; + -webkit-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); + visibility: visible; } .navbar .has-submenu:active > .navbar__submenu.is-right-submenu, .navbar .has-submenu:focus > .navbar__submenu.is-right-submenu, .navbar .has-submenu:hover > .navbar__submenu.is-right-submenu { left: auto; - right: 0; } + right: 0; + -webkit-transform-origin: right top; + -ms-transform-origin: right top; + transform-origin: right top; } .navbar .has-submenu .has-submenu:active > .navbar__submenu, .navbar .has-submenu .has-submenu:focus > .navbar__submenu, .navbar .has-submenu .has-submenu:hover > .navbar__submenu { @@ -851,26 +847,43 @@ textarea { padding: 10px 0; position: absolute; white-space: nowrap; - z-index: 1; } - @media all and (min-width: 56.25em) { - .navbar .navbar__submenu { - -webkit-transform: scale(0.8); - -ms-transform: scale(0.8); - transform: scale(0.8); } } + z-index: 1; + opacity: 0; + -webkit-transform: scale(0.8); + -ms-transform: scale(0.8); + transform: scale(0.8); + -webkit-transform-origin: 0 top; + -ms-transform-origin: 0 top; + transform-origin: 0 top; + -webkit-transition: opacity 0.15s, -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); + transition: opacity 0.15s, -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); + -o-transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); + transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); + transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1), -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); } .navbar .navbar__submenu__submenu { z-index: 2; } .navbar .navbar__submenu li { line-height: 1.5; font-size: 0.7242rem; } - .navbar .navbar__submenu li a { - color: rgba(255, 255, 255, 0.7); - padding: 0.56667rem 1.41667rem; } - .navbar .navbar__submenu li a:active, .navbar .navbar__submenu li a:focus, .navbar .navbar__submenu li a:hover { + .navbar .navbar__submenu li a, + .navbar .navbar__submenu li span[aria-haspopup="true"] { + color: rgba(255, 255, 255, 0.7) !important; + padding: 0.56667rem 1.41667rem; + -webkit-transition: all 0.24s ease; + -o-transition: all 0.24s ease; + transition: all 0.24s ease; } + .navbar .navbar__submenu li a:active, .navbar .navbar__submenu li a:focus, .navbar .navbar__submenu li a:hover, + .navbar .navbar__submenu li span[aria-haspopup="true"]:active, + .navbar .navbar__submenu li span[aria-haspopup="true"]:focus, + .navbar .navbar__submenu li span[aria-haspopup="true"]:hover { background: rgba(255, 255, 255, 0.05); - color: #FFFFFF; } + color: #FFFFFF !important; } .navbar .navbar__submenu li span { - color: rgba(255, 255, 255, 0.7); + color: rgba(255, 255, 255, 0.7) !important; padding: 0.56667rem 1.41667rem; } + .navbar .navbar__submenu li:hover > a, + .navbar .navbar__submenu li:hover > span[aria-haspopup="true"] { + color: #FFFFFF !important; } .navbar .navbar__toggle { background: #17181E; -webkit-box-shadow: none; diff --git a/app/default-files/default-themes/simple/assets/css/style.css b/app/default-files/default-themes/simple/assets/css/style.css index 34ccc3f0e..97d77c86f 100755 --- a/app/default-files/default-themes/simple/assets/css/style.css +++ b/app/default-files/default-themes/simple/assets/css/style.css @@ -791,48 +791,44 @@ textarea { position: relative; text-transform: uppercase; width: auto; } - .navbar .navbar__menu li a { + .navbar .navbar__menu li a, + .navbar .navbar__menu li span[aria-haspopup="true"] { color: #FFFFFF; display: block; padding: 0 0.56667rem; -webkit-transition: all 0.24s ease-out; -o-transition: all 0.24s ease-out; transition: all 0.24s ease-out; } - .navbar .navbar__menu li a:active, .navbar .navbar__menu li a:focus, .navbar .navbar__menu li a:hover { + .navbar .navbar__menu li a:active, .navbar .navbar__menu li a:focus, .navbar .navbar__menu li a:hover, + .navbar .navbar__menu li span[aria-haspopup="true"]:active, + .navbar .navbar__menu li span[aria-haspopup="true"]:focus, + .navbar .navbar__menu li span[aria-haspopup="true"]:hover { color: rgba(255, 255, 255, 0.7); } .navbar .navbar__menu li span { color: #FFFFFF; + cursor: default; display: block; padding: 0 0.56667rem; } .navbar .navbar__menu > li:hover > a, - .navbar .navbar__menu > li:hover > span { + .navbar .navbar__menu > li:hover > span[aria-haspopup="true"] { color: rgba(255, 255, 255, 0.7); } .navbar .has-submenu:active > .navbar__submenu, .navbar .has-submenu:focus > .navbar__submenu, .navbar .has-submenu:hover > .navbar__submenu { - left: 0; } - @media all and (min-width: 56.25em) { - .navbar .has-submenu:active > .navbar__submenu, - .navbar .has-submenu:focus > .navbar__submenu, - .navbar .has-submenu:hover > .navbar__submenu { - opacity: 1; - -webkit-transform-origin: 0 top; - -ms-transform-origin: 0 top; - transform-origin: 0 top; - -webkit-transform: none; - -ms-transform: none; - transform: none; - -webkit-transition: -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - transition: -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - -o-transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - transition: transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1), -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); - visibility: visible; } } + left: 0; + opacity: 1; + -webkit-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); + visibility: visible; } .navbar .has-submenu:active > .navbar__submenu.is-right-submenu, .navbar .has-submenu:focus > .navbar__submenu.is-right-submenu, .navbar .has-submenu:hover > .navbar__submenu.is-right-submenu { left: auto; - right: 0; } + right: 0; + -webkit-transform-origin: right top; + -ms-transform-origin: right top; + transform-origin: right top; } .navbar .has-submenu .has-submenu:active > .navbar__submenu, .navbar .has-submenu .has-submenu:focus > .navbar__submenu, .navbar .has-submenu .has-submenu:hover > .navbar__submenu { @@ -851,26 +847,43 @@ textarea { padding: 10px 0; position: absolute; white-space: nowrap; - z-index: 1; } - @media all and (min-width: 56.25em) { - .navbar .navbar__submenu { - -webkit-transform: scale(0.8); - -ms-transform: scale(0.8); - transform: scale(0.8); } } + z-index: 1; + opacity: 0; + -webkit-transform: scale(0.8); + -ms-transform: scale(0.8); + transform: scale(0.8); + -webkit-transform-origin: 0 top; + -ms-transform-origin: 0 top; + transform-origin: 0 top; + -webkit-transition: opacity 0.15s, -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); + transition: opacity 0.15s, -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); + -o-transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); + transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); + transition: opacity 0.15s, transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1), -webkit-transform 0.3s cubic-bezier(0.275, 1.375, 0.8, 1); } .navbar .navbar__submenu__submenu { z-index: 2; } .navbar .navbar__submenu li { line-height: 1.5; font-size: 0.7242rem; } - .navbar .navbar__submenu li a { - color: rgba(255, 255, 255, 0.7); - padding: 0.56667rem 1.41667rem; } - .navbar .navbar__submenu li a:active, .navbar .navbar__submenu li a:focus, .navbar .navbar__submenu li a:hover { + .navbar .navbar__submenu li a, + .navbar .navbar__submenu li span[aria-haspopup="true"] { + color: rgba(255, 255, 255, 0.7) !important; + padding: 0.56667rem 1.41667rem; + -webkit-transition: all 0.24s ease; + -o-transition: all 0.24s ease; + transition: all 0.24s ease; } + .navbar .navbar__submenu li a:active, .navbar .navbar__submenu li a:focus, .navbar .navbar__submenu li a:hover, + .navbar .navbar__submenu li span[aria-haspopup="true"]:active, + .navbar .navbar__submenu li span[aria-haspopup="true"]:focus, + .navbar .navbar__submenu li span[aria-haspopup="true"]:hover { background: rgba(255, 255, 255, 0.05); - color: #FFFFFF; } + color: #FFFFFF !important; } .navbar .navbar__submenu li span { - color: rgba(255, 255, 255, 0.7); + color: rgba(255, 255, 255, 0.7) !important; padding: 0.56667rem 1.41667rem; } + .navbar .navbar__submenu li:hover > a, + .navbar .navbar__submenu li:hover > span[aria-haspopup="true"] { + color: #FFFFFF !important; } .navbar .navbar__toggle { background: #17181E; -webkit-box-shadow: none; @@ -2000,31 +2013,38 @@ img[data-sizes="auto"] { } .navbar .navbar__menu li a:active, .navbar .navbar__menu li a:focus, - .navbar .navbar__menu li a:hover { + .navbar .navbar__menu li a:hover, + .navbar .navbar__menu li span[aria-haspopup="true"]:active, + .navbar .navbar__menu li span[aria-haspopup="true"]:focus, + .navbar .navbar__menu li span[aria-haspopup="true"]:hover { color: rgba(255,255,255,0.7); } .navbar .navbar__menu > li:hover > a, - .navbar .navbar__menu > li:hover > span { - color: rgba(255,255,255,0.7); - } - - .search__btn:hover > svg, - .search__btn:focus > svg { - fill: rgba(255,255,255,0.7); - } - .navbar .navbar__submenu li a { + .navbar .navbar__menu > li:hover > span[aria-haspopup="true"] { color: rgba(255,255,255,0.7); + } + .navbar .navbar__submenu li a, + .navbar .navbar__submenu li span[aria-haspopup="true"] { + color: rgba(255,255,255,0.7) !important; } .navbar .navbar__submenu li span { - color: rgba(255,255,255,0.7); + color: rgba(255,255,255,0.7) !important; } .navbar .navbar__submenu li a:active, .navbar .navbar__submenu li a:focus, - .navbar .navbar__submenu li a:hover { + .navbar .navbar__submenu li a:hover, + .navbar .navbar__submenu li span[aria-haspopup="true"]:active, + .navbar .navbar__submenu li span[aria-haspopup="true"]:focus, + .navbar .navbar__submenu li span[aria-haspopup="true"]:hover { background: rgba(255,255,255,0.05); - color: #FFFFFF; + color: #FFFFFF !important; + } + + .navbar .navbar__submenu li:hover > a, + .navbar .navbar__submenu li:hover > span[aria-haspopup="true"] { + color: #FFFFFF !important; } .hero__image--overlay::after { background: linear-gradient(to bottom, transparent 0%, rgba(0, 0, 0, 0.64) 100%); diff --git a/app/default-files/default-themes/simple/config.json b/app/default-files/default-themes/simple/config.json index 9a4cf2673..29639dd46 100755 --- a/app/default-files/default-themes/simple/config.json +++ b/app/default-files/default-themes/simple/config.json @@ -1,6 +1,6 @@ { "name": "Simple", - "version": "2.0.0.0", + "version": "2.0.1.0", "author": "TidyCustoms ", "menus": { "mainMenu": "Main menu" diff --git a/app/default-files/default-themes/simple/partials/menu.hbs b/app/default-files/default-themes/simple/partials/menu.hbs index 4586cd813..c48d285d6 100755 --- a/app/default-files/default-themes/simple/partials/menu.hbs +++ b/app/default-files/default-themes/simple/partials/menu.hbs @@ -10,7 +10,7 @@ {{/unless}} -