chore: merge conflict

ledyer · Dec 15, 2023 · 00d32db · 00d32db
2 parents eebcbf2 + e0e9060
commit 00d32db
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -5,8 +5,8 @@ name: Prerelease
 on:
   push:
     branches:
-      - beta
-      - alpha
+      # - beta
+      # - alpha
 jobs:
   calculate-next-version:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ name: Release to WordPress plugin repository
 on:
   push:
     branches:
-      - main
+      # - main pause for now
 jobs:
   calculate-next-version:
     runs-on: ubuntu-latest
@@ -80,4 +80,4 @@ jobs:
           tag_name: v${{ needs.calculate-next-version.outputs.new-release-version }}
           files: ./${{ github.event.repository.name }}.zip
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 # macOS crap
 .DS_Store
 
+# ignore minified output
+build
+
 # ignore everything in the root except the "wp-content" directory.
 !wp-content/
 

diff --git a/assets/scss/ledyer-checkout-for-woocommerce.scss b/assets/scss/ledyer-checkout-for-woocommerce.scss
@@ -0,0 +1,15 @@
+#lco-wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  #lco-order-review,
+  #lco-iframe {
+    width: 100%;
+  }
+
+  #lco-iframe {
+    display: flex;
+    justify-content: center;
+  }
+}
diff --git a/build/ledyer-checkout-for-woocommerce.asset.php b/build/ledyer-checkout-for-woocommerce.asset.php
diff --git a/build/ledyer-checkout-for-woocommerce.css b/build/ledyer-checkout-for-woocommerce.css
diff --git a/build/ledyer-checkout-for-woocommerce.css.map b/build/ledyer-checkout-for-woocommerce.css.map
diff --git a/build/ledyer-checkout-for-woocommerce.js b/build/ledyer-checkout-for-woocommerce.js
diff --git a/build/ledyer-checkout-for-woocommerce.js.map b/build/ledyer-checkout-for-woocommerce.js.map