Merge branch 'master' into master-sassmaps
This commit is contained in:
commit
2f7168c96c
|
@ -1,3 +0,0 @@
|
|||
body {
|
||||
margin: 1vw;
|
||||
}
|
File diff suppressed because it is too large
Load Diff
|
@ -88,7 +88,6 @@ gulp.task( 'sass', function() {
|
|||
.pipe( autoprefixer( 'last 2 versions' ) )
|
||||
.pipe(sourcemaps.write(undefined, { sourceRoot: null }))
|
||||
.pipe( gulp.dest( paths.css ) )
|
||||
.pipe( rename( 'custom-editor-style.css' ) );
|
||||
return stream;
|
||||
});
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
*/
|
||||
function understrap_wpdocs_theme_add_editor_styles() {
|
||||
add_editor_style( 'css/custom-editor-style.css' );
|
||||
add_editor_style( 'css/custom-editor-overwrite-style.css' );
|
||||
}
|
||||
add_action( 'admin_init', 'understrap_wpdocs_theme_add_editor_styles' );
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
//Add your own editor styles here or comment out the next line if you want to pull in the whole Bootstrap stuff
|
||||
//@import "theme";
|
|
@ -2,6 +2,7 @@
|
|||
@import "assets/bootstrap4";// <--------- Loads Bootstrap3 or Bootstrap4. Change from /bootstrap3 to /bootstrap4 Watch out! just for testing in the moment!
|
||||
@import "understrap/understrap";// <-------- Loads the UnderStrap defaults. Just a few classes to incorporate BS in WP
|
||||
|
||||
|
||||
//Optional files - If you dont use the corresponding scripts/fonts comment em out
|
||||
@import "assets/font-awesome"; // <------- Font Awesome Icon font
|
||||
@import "assets/underscores"; // <------- Underscores media styles
|
||||
|
|
Reference in New Issue