Merge branch 'master' into master-sassmaps

This commit is contained in:
Holger 2018-03-21 11:58:29 +01:00 committed by GitHub
commit 2f7168c96c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 9238 deletions

View File

@ -1,3 +0,0 @@
body {
margin: 1vw;
}

File diff suppressed because it is too large Load Diff

View File

@ -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;
});

View File

@ -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' );

View File

@ -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";

View File

@ -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