Merge pull request #44 from ivoba-oxid/master

misc fixes
moga-kit · Feb 2, 2022 · 4f20473 · 4f20473
2 parents a979703 + 32cf102
commit 4f20473
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 34 deletions.
diff --git a/build/scss/layout/_base.scss b/build/scss/layout/_base.scss
@@ -64,6 +64,7 @@
 
 .modal.fade.modal-sidebar-right,
 .modal.fade.modal-sidebar-left {
+  z-index: 9999;
   .modal-dialog {
     margin: 0;
     position: absolute;

diff --git a/build/scss/page/shop/_start.scss b/build/scss/page/shop/_start.scss
@@ -8,34 +8,3 @@
     }
   }
 }
-
-.cnc-blogdetail.cnc-blogdetail .blogdetail-image,
-.cnc-authorpage.cnc-authorpage .blogdetail-image {
-  height: auto;
-}
-
-.cnc-blogdetail.cnc-blogdetail .blogdetail-content,
-.cnc-authorpage.cnc-authorpage .blogdetail-content {
-  margin: 0;
-}
-
-.blogcategory-entry {
-  > .mb-3 {
-    height: 100%;
-  }
-
-  .blogarticle-link {
-    height: 100%;
-    text-decoration: none;
-  }
-}
-
-.cl-cncblogdetail .text-image {
-  .text-image_image {
-    background: #000;
-
-    .text-image-picture {
-      opacity: .8;
-    }
-  }
-}
diff --git a/tpl/layout/base.tpl b/tpl/layout/base.tpl
@@ -51,7 +51,7 @@
                 [{assign var="aOGImage" value=$oViewConf->getViewThemeParam('aOGImage')}]
                 <meta property="og:type" content="website">
                 <meta property="og:image" content="[{$oViewConf->getImageUrl($aOGImage)}]">
-                <meta property="og:url" content="[{$oViewConf->getCurrentHomeDir()}]">
+                <meta property="og:url" content="[{$oView->getCanonicalUrl()}]">
             [{/if}]
         [{/block}]
 
@@ -107,7 +107,6 @@
             [{assign var="sSiteManifestFile"  value=$oViewConf->getViewThemeParam('sSiteManifestFile')}]
             [{assign var="sThemeColor"        value=$oViewConf->getViewThemeParam('sThemeColor')}]
 
-            {*todo copy to root*}
             [{if $sFaviconFile}]
                 <link rel="icon" href="[{$oViewConf->getImageUrl("favicons/`$sFaviconFile`")}]" type="image/x-icon" />
             [{/if}]

diff --git a/tpl/page/checkout/payment.tpl b/tpl/page/checkout/payment.tpl
@@ -128,7 +128,7 @@
 
                                                     [{*}]<a href="[{oxgetseourl ident=$oViewConf->getOrderLink()}]" class="btn btn-outline-primary float-left prevStep submitButton largeButton" id="paymentBackStepBottom"><i class="moga-left"></i> [{oxmultilang ident="PREVIOUS_STEP"}]</a>[{*}]
 
-                                                    <button type="submit" name="userform" class="btn btn-primary btn-lg w-100 mt-3">[{oxmultilang ident="CONTINUE_TO_NEXT_STEP"}]</button>
+                                                    <button type="submit" name="userform" class="btn btn-primary btn-lg w-100 mt-3" id="paymentNextStepBottom">[{oxmultilang ident="CONTINUE_TO_NEXT_STEP"}]</button>
 
                                                 [{/if}]
                                             [{/block}]