Skip to content

Commit

Permalink
Merge branch 'release/1.15.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
GregLeBarbar committed Jun 3, 2020
2 parents f10c99f + ef2dc61 commit 85fa738
Show file tree
Hide file tree
Showing 7 changed files with 148 additions and 36 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# CHANGELOG

*1.15.1* (2020-06-03)
- Hide password visibility settings in editor and Clean up unused editor-styles.css #267
- Improve spacing after '.container-full' element #266

*1.15.0* (2020-05-06)
- Update Elements to 2.9.0

Expand Down
2 changes: 1 addition & 1 deletion wp-theme-2018/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.15.0
1.15.1
33 changes: 3 additions & 30 deletions wp-theme-2018/editor-styles.css
Original file line number Diff line number Diff line change
@@ -1,31 +1,4 @@
body {
background: white;
color: #212121;
font-size: 18px;
font-family: Arial, sans-serif;
box-sizing: border-box;
/* Hide the password visibility post option */
#editor-post-password-0, label[for=editor-post-password-0], #editor-post-password-0-description {
display: none;
}

body > p {
padding: 0 15px;
}

.placeholder {
background: #fafafa;
border: 2px dotted #ccc;
box-sizing: border-box;
padding: 10px;
text-align: center;
}

.placeholder .content h5 {
margin-bottom: 0;
}

.placeholder .content h3 {
margin-top: 0;
}

.wpview.wpview-wrap {
box-sizing: border-box;
}
10 changes: 7 additions & 3 deletions wp-theme-2018/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,14 @@ function init_globals() {
/**
* update CSS within admin
*/
add_action( 'admin_init', 'epfl_add_editor_styles' );
add_action( 'enqueue_block_editor_assets', 'epfl_add_editor_styles' );
function epfl_add_editor_styles() {
add_theme_support( 'editor-style' );
add_editor_style('editor-styles.css');
wp_enqueue_style(
'editor-styles.css',
get_stylesheet_directory_uri() . '/editor-styles.css',
array( 'wp-edit-blocks' ),
filemtime( dirname( __FILE__ ) . '/editor-styles.css' )
);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion wp-theme-2018/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Theme URI:
Author: Antistatique.net
Author URI: http://antistatique.net/
Description: Description
Version: 1.15.0
Version: 1.15.1
License: GNU General Public License v2 or later
License URI: LICENSE
Text Domain: epfl
Expand Down
111 changes: 110 additions & 1 deletion wp-theme-2018/theme/style.min.css

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

21 changes: 21 additions & 0 deletions wp-theme-2018/theme/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,27 @@ $dark-red: #b51f1f;
@extend %sr-only;
}

/* Content */

.entry-content .container-full {

& + p,
& + ul,
& + ol,
& + table,
& + *[class*="wp-block"] {
margin-top: 2rem;
}

& + h2,
& + h3,
& + h4,
& + h5,
& + h6 {
margin-top: 1.5em;
}
}

/* Content images */

.wp-caption {
Expand Down

0 comments on commit 85fa738

Please sign in to comment.