Merge branch 'Bootstrap4'

# Conflicts:
#	css/theme.css
#	css/theme.min.css
This commit is contained in:
Holger Könemann 2016-04-06 13:21:39 +02:00
commit 0caa86ea67
4 changed files with 2081 additions and 5 deletions

File diff suppressed because it is too large Load Diff

4
css/theme.min.css vendored

File diff suppressed because one or more lines are too long

View File

@ -66,7 +66,7 @@ class wp_bootstrap_navwalker extends Walker_Nav_Menu {
$class_names = $value = ''; $class_names = $value = '';
$classes = empty( $item->classes ) ? array() : (array) $item->classes; $classes = empty( $item->classes ) ? array() : (array) $item->classes;
$classes[] = 'menu-item-' . $item->ID; $classes[] = 'nav-item menu-item-' . $item->ID;
$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args ) ); $class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args ) );

View File

@ -61,12 +61,15 @@ img.wp-post-image, article img, figure {
// Skip to content link // Skip to content link
a.skip-link{ a.skip-link{
z-index: 1000; z-index: 1000;
margin-bottom: -20px; position: fixed;
position: relative; top: 0px;
display: block; right: 0px;
} }
// Reset Jumbotron default margin // Reset Jumbotron default margin
.jumbotron { .jumbotron {
margin-bottom:0px; margin-bottom:0px;
} }
//Bootstrap3 to Bootstrap4 "translation"
.menu-item {float:left; width:auto; display:inline;}