Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add polish #6138

Merged
merged 4 commits into from
Apr 12, 2018
Merged

Add polish #6138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf0d3b9
Polish link dialog.
Apr 12, 2018
cb7f3ee
Unify markup between More block and Pagination block
Apr 12, 2018
7bc23ba
Unify button sizes, and slim down "Media Library".
Apr 12, 2018
6425897
Change left arrow on breadcrumbs.
Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blocks/image-placeholder/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default function ImagePlaceholder( { className, icon, label, onSelectImag
type="image"
render={ ( { open } ) => (
<Button isLarge onClick={ open }>
{ __( 'Add from Media Library' ) }
{ __( 'Media Library' ) }
</Button>
) }
/>
Expand Down
2 changes: 1 addition & 1 deletion blocks/library/audio/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export const settings = {
value={ id }
render={ ( { open } ) => (
<Button isLarge onClick={ open }>
{ __( 'Add from Media Library' ) }
{ __( 'Media Library' ) }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these duplicated buttons needed if that's the default for the component?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure — I just changed the labels already there.

</Button>
) }
/>
Expand Down
3 changes: 3 additions & 0 deletions blocks/library/image/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
.blocks-format-toolbar__link-modal {
top: 0;
left: 0;
position: absolute;
border: none;
width: 100%;
}
}

Expand Down
20 changes: 14 additions & 6 deletions blocks/library/more/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,40 @@
text-align: center;
}

.gutenberg .wp-block-more {
.gutenberg .wp-block-more { // needs specificity
display: block;
text-align: center;
white-space: nowrap;

// Label
input {
font-size: 12px;
text-transform: uppercase;
font-weight: 600;
font-family: $default-font;
color: $dark-gray-300;
padding-left: 8px;
padding-right: 8px;
background: $white;
border: none;
box-shadow: none;
white-space: nowrap;
text-align: center;
margin: 0;
border-radius: 4px;
background: $white;
padding: 6px 8px;
height: $icon-button-size-small;

&:focus {
box-shadow: none;
}
}

// Dashed line
&:before {
content: '';
position: absolute;
top: calc( 50% );
left: $block-side-ui-padding + $block-padding;
right: $block-side-ui-padding + $block-padding;
left: 0;
right: 0;
border-top: 3px dashed $light-gray-700;
z-index: z-index( '.editor-block-list__block .wp-block-more:before' );
}
Expand Down
53 changes: 24 additions & 29 deletions blocks/library/nextpage/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,31 @@
.wp-block-nextpage {
display: block;
text-align: center;
overflow: hidden;
white-space: nowrap;
}

.wp-block-nextpage > span {
position: relative;
display: inline-block;
font-size: 12px;
text-transform: uppercase;
font-weight: 600;
font-family: $default-font;
color: $dark-gray-300;
}

.wp-block-nextpage > span:before,
.wp-block-nextpage > span:after {
content: '';
position: absolute;
top: 50%;
width: 100vw;
border-top: 3px dashed $light-gray-700;
margin-top: -2px;
}

.wp-block-nextpage > span:before {
right: 100%;
margin-right: 20px;
}
// Label
> span {
position: relative;
display: inline-block;
font-size: 12px;
text-transform: uppercase;
font-weight: 600;
font-family: $default-font;
color: $dark-gray-300;
border-radius: 4px;
background: $white;
padding: 6px 8px;
height: $icon-button-size-small;
}

.wp-block-nextpage > span:after {
left: 100%;
margin-left: 20px;
// Dashed line
&:before {
content: '';
position: absolute;
top: calc( 50% );
left: 0;
right: 0;
border-top: 3px dashed $light-gray-700;
z-index: z-index( '.editor-block-list__block .wp-block-more:before' );
}
}
2 changes: 1 addition & 1 deletion blocks/library/video/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export const settings = {
id={ id }
render={ ( { open } ) => (
<Button isLarge onClick={ open } >
{ __( 'Add from Media Library' ) }
{ __( 'Media Library' ) }
</Button>
) }
/>
Expand Down
7 changes: 4 additions & 3 deletions blocks/rich-text/format-toolbar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
.blocks-format-toolbar__link-modal {
position: relative;
left: -50%;
box-shadow: 0 3px 20px rgba( 18, 24, 30, .1 ), 0 1px 3px rgba( 18, 24, 30, .1 );
border: 1px solid #e0e5e9;
background: #fff;
box-shadow: $shadow-popover;
border: 1px solid $light-gray-500;
background: $white;
display: flex;
flex-direction: column;
font-family: $default-font;
Expand Down Expand Up @@ -39,6 +39,7 @@

input {
padding: $input-padding;
margin: 0;
}
}

Expand Down
4 changes: 4 additions & 0 deletions components/button/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
background-image: linear-gradient( -45deg, $blue-medium-500 28%, $blue-dark-900 28%, $blue-dark-900 72%, $blue-medium-500 72%) !important;
border-color: $blue-dark-900 !important;
}

.wp-core-ui.gutenberg-editor-page & {
font-size: $default-font-size;
}
}

@keyframes components-button__busy-animation {
Expand Down
2 changes: 1 addition & 1 deletion editor/components/block-list/breadcrumb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export class BlockBreadcrumb extends Component {
onFocus={ this.onFocus }
onBlur={ this.onBlur }
>
<Dashicon icon="arrow-left" uid={ uid } />
<Dashicon icon="arrow-left-alt" uid={ uid } />
</Button>
</Tooltip>
) }
Expand Down