Skip to content

Commit

Permalink
update plugin name + many updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Sami Kerboute committed Jun 12, 2020
1 parent ba083ab commit 348ca92
Show file tree
Hide file tree
Showing 20 changed files with 244 additions and 69 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
echo "Creating archive..."
cd bin/release
zip -r ../shoppingfeed-for-woocommerce.zip ./*
zip -r ../shoppingfeed.zip ./*
- name: Create Release
id: create_release
uses: actions/create-release@v1
Expand All @@ -58,6 +58,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./bin/shoppingfeed-for-woocommerce.zip
asset_name: shoppingfeed-for-woocommerce.zip
asset_path: ./bin/shoppingfeed.zip
asset_name: shoppingfeed.zip
asset_content_type: application/zip
84 changes: 83 additions & 1 deletion assets/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/notice.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions assets/js/init.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
var sf_options

(function ($, undefined) {

Expand Down
5 changes: 2 additions & 3 deletions assets/scss/app.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import "main/mixins";
@import "main/colors";
@import "main/sf";


@import "multi/multi";
@import "main/sf";
1 change: 1 addition & 0 deletions assets/scss/main/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ $secondary: #1CB69B;
$textcolor: #23282D;
$gray: #9E9E9E;
$blue: #04274D;
$pink: #E91E63;
12 changes: 12 additions & 0 deletions assets/scss/main/_sf.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@
}
}

&__button__logout.button {
color: $white;
text-transform: uppercase;
border-color: $primary;
background-color: $primary;
@include hover {
color: $white;
border-color: darken($primary, 5%);
background-color: darken($primary, 5%);
}
}

&__requirements {
.success,
.failed {
Expand Down
84 changes: 84 additions & 0 deletions assets/scss/multi/_multi.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
.multi-wrapper {
border: 1px solid #ccc;
border-radius: 3px;
width: 100%;
}

.multi-wrapper .non-selected-wrapper,
.multi-wrapper .selected-wrapper {
box-sizing: border-box;
display: inline-block;
height: 200px;
overflow-y: scroll;
padding: 10px;
vertical-align: top;
width: 50%;
}

.multi-wrapper .non-selected-wrapper {
background: #fafafa;
border-right: 1px solid #ccc;
}

.multi-wrapper .selected-wrapper {
background: #fff;
}

.multi-wrapper .header {
color: #4f4f4f;
cursor: default;
font-weight: bold;
margin-bottom: 5px;
padding: 5px 10px;
}

.multi-wrapper .item {
cursor: pointer;
display: block;
padding: 5px 10px;
}

.multi-wrapper .item:hover {
background: #ececec;
border-radius: 2px;
}

.multi-wrapper .item-group {
padding: 5px 10px;
}

.multi-wrapper .item-group .group-label {
display: block;
font-size: 0.875rem;
opacity: 0.5;
padding: 5px 0;
}

.multi-wrapper .search-input {
border: 0;
border-bottom: 1px solid #ccc;
border-radius: 0;
display: block;
font-size: 1em;
margin: 0;
outline: 0;
padding: 10px 20px;
width: 100%;
box-sizing: border-box;
}

.multi-wrapper .non-selected-wrapper .item.selected {
opacity: 0.5;
}

.multi-wrapper .non-selected-wrapper .item.disabled,
.multi-wrapper .selected-wrapper .item.disabled {
opacity: 0.5;
text-decoration: line-through;
}

.multi-wrapper .non-selected-wrapper .item.disabled:hover,
.multi-wrapper .selected-wrapper .item.disabled:hover {
background: inherit;
cursor: inherit;
}
4 changes: 2 additions & 2 deletions bin/build-plugin-zip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ status "Generating build..."
gulp sass

# Remove any existing zip file
rm -f shoppingfeed-for-woocommerce.zip
rm -f shoppingfeed.zip

# Generate the plugin zip file
status "Creating archive..."
cd ../
zip -r shoppingfeed-for-woocommerce.zip \
zip -r shoppingfeed.zip \
shoppingfeed-for-woocommerce* \
--exclude=shoppingfeed-for-woocommerce/.git* \
--exclude=shoppingfeed-for-woocommerce/.distignore \
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "shoppingfeed/shoppingfeed-for-woocommerce",
"name": "shoppingfeed/shoppingfeed",
"description": "WordPress connection Controller Plugin for ShoppingFeed - Sell on Amazon, Ebay, Google, and 1000's of international marketplaces",
"license": "GPL-3.0-or-later",
"type": "wordpress-plugin",
Expand All @@ -10,8 +10,8 @@
],
"authors": [
{
"name": "ShoppingFeed",
"email": "TODO@shopping-feed.com"
"name": "Shopping-Feed",
"email": "support@shopping-flux.com"
},
{
"name": "Be API",
Expand Down
Loading

0 comments on commit 348ca92

Please sign in to comment.