Skip to content
This repository has been archived by the owner on Jan 17, 2025. It is now read-only.

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmadbilaldev committed Aug 1, 2019
2 parents fe2d79b + ccbf917 commit 5d0dcd0
Show file tree
Hide file tree
Showing 28 changed files with 360 additions and 242 deletions.
Binary file modified assets/screenshot-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screenshot-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screenshot-4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screenshot-5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screenshot-6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 4 additions & 6 deletions creativecommons.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
/**
* Plugin Name: Creative Commons
* Plugin URI: https://github.com/creativecommons/wp-plugin-creativecommons
* Description: Official Creative Commons plugin for licensing your content.
* With Creative Commons licenses, keep your copyright AND share
* your creativity.
* Version: v2019.7.1
* Author: Ahmad Bilal, Bjorn Wijers, Matt Lee, Rob Myers, Tarmo Toikkanen,
* Timid Robot Zehta
* Description: Official Creative Commons plugin for licensing your content. With Creative Commons licenses, keep your copyright AND share your creativity.
* Version: v2019.7.2
* Author: Ahmad Bilal (https://ahmadbilal.dev), Bjorn Wijers <[email protected]>, Tarmo Toikkanen <[email protected]>, Matt Lee <[email protected]>, Rob Myers <[email protected]>, Timid Robot Zehta
* Author URI: http://CreativeCommons.org/
* License: GPLv2 or later versions
* License URI: http://www.gnu.org/licenses/gpl-2.0.txt
*
Expand Down
2 changes: 1 addition & 1 deletion dist/blocks.build.js

Large diffs are not rendered by default.

48 changes: 40 additions & 8 deletions dist/blocks.editor.build.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,40 @@
.wp-block-cgb-cc-by{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-sa{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-nd{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-nc{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-nc-nd{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-nc-sa{background:#ff6;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc0{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-pdm{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-sa {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-nd {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-nc {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-nc-nd {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-nc-sa {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc0 {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-pdm {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
48 changes: 40 additions & 8 deletions dist/blocks.style.build.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,40 @@
.wp-block-cgb-cc-by{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-sa{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-nd{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-nc{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-nc-nd{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by-nc-sa{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc0{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-pdm{background:#dedede;border:0.2rem solid #292929;color:#292929;margin:0 auto;max-width:740px;padding:2rem}
.wp-block-cgb-cc-by {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-sa {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-nd {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-nc {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-nc-nd {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc-by-nc-sa {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-cc0 {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
.wp-block-cgb-pdm {
margin: 0 auto;
max-width: 740px;
padding: 1rem;
}
Loading

0 comments on commit 5d0dcd0

Please sign in to comment.