Skip to content

Commit

Permalink
Merge pull request #80 from Automattic/polish/event
Browse files Browse the repository at this point in the history
  • Loading branch information
ajlende authored Apr 24, 2020
2 parents c23b545 + 2ab6482 commit 9e3c50e
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 20 deletions.
5 changes: 5 additions & 0 deletions blocks/event/editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
.wp-block-a8c-event {
.event__date-select {
display: inline;

.components-button {
height: auto;
background: white;
}
}

// Fixes for overriding editor styles
Expand Down
2 changes: 1 addition & 1 deletion blocks/event/src/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ export const Icon = () => (
height="24"
viewBox="0 0 24 24"
>
<Path d="M17 12h-5v5h5v-5zM16 1v2H8V1H6v2H5c-1.11 0-1.99.9-1.99 2L3 19a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2h-1V1h-2zm3 18H5V8h14v11z" />
<Path d="M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3z M19.5,19c0,0.3-0.2,0.5-0.5,0.5H5 c-0.3,0-0.5-0.2-0.5-0.5V7h15V19z M17,13h-4v4h4V13z" />
</SVG>
);
19 changes: 4 additions & 15 deletions blocks/event/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,17 @@
flex-direction: row;

padding: 18px;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;

transition: box-shadow 0.1s ease;
box-shadow: 0 0 0 rgba( 0, 0, 0, 0.2 );
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
box-shadow: inset 0 0 0 4px rgba(0,0,0,.1);

.event__datebox {
float: left;
width: 40px;
height: 40px;
box-shadow: 0 1px 2px rgba( 0, 0, 0, 0.2 );
background: white;
color: black;
background: black;
color: white;
margin: 0 18px 18px 0;
padding: 4px;
border-radius: 4px;
text-align: center;

> span {
Expand Down Expand Up @@ -74,11 +69,5 @@

.event__image--save {
float: right;
border-radius: 4px;
}

&:hover,
.is-selected & {
box-shadow: 0 10px 20px rgba( 0, 0, 0, 0.2 );
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions bundler/resources/a8c-event/assets/icon.svg
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 bundler/resources/a8c-event/assets/screenshot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions bundler/resources/a8c-event/readme.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
=== Event Block ===
Contributors: automattic, ajlende, jasmussen
Stable tag: 1.0.0
Tested up to: 5.3.2
Requires at least: 5.3
Tested up to: 5.4
Requires at least: 5.4
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html

Feature an event in your post
Quickly create simple event cards and invitations

== Description ==

Expand All @@ -19,8 +19,9 @@ You can follow development, file an issue, suggest features, and view the source
== Screenshots ==

1. Event Block
2. Customizing the Event Block

== Changelog ==

= 1.0.0 - 17th February 2020 =
= 1.0.0 - 24th April 2020 =
* Initial release

0 comments on commit 9e3c50e

Please sign in to comment.