diff --git a/bootstrap_barrio.theme b/bootstrap_barrio.theme
index 462da22a14316029a0c54b06ff91d73170f0ff51..3df311510f386a06edc4bc7d7b49b85d682b6600 100644
--- a/bootstrap_barrio.theme
+++ b/bootstrap_barrio.theme
@@ -112,6 +112,7 @@ function bootstrap_barrio_preprocess_page(&$variables) {
$variables['navbar_attributes'] = array(
'class' => array (
'navbar',
+ theme_get_setting('bootstrap_barrio_navbar_toggle'),
),
'id' => array ( 'navbar-main' ),
);
@@ -171,7 +172,7 @@ function bootstrap_barrio_preprocess_page(&$variables) {
// Define column layout classes
switch (theme_get_setting('bootstrap_barrio_sidebar_position')) {
case 'left':
- $variables['content_attributes']['class'][] = 'pull-right';
+ $variables['content_attributes']['class'][] = 'float-right';
break;
case 'both':
if (!empty($variables['page']['sidebar_first'])) {
@@ -207,7 +208,7 @@ function bootstrap_barrio_preprocess_page(&$variables) {
$variables['navbar_top_attributes']['class'][] = 'navbar-light';
break;
case 'dark':
- $variables['navbar_top_attributes']['class'][] = 'navbar-dark';
+ $variables['navbar_top_attributes']['class'][] = 'navbar-inverse';
break;
default:
$variables['navbar_top_attributes']['class'][] = 'navbar-default';
@@ -217,8 +218,8 @@ function bootstrap_barrio_preprocess_page(&$variables) {
case 'light':
$variables['navbar_attributes']['class'][] = 'navbar-light';
break;
- case 'dark':
- $variables['navbar_attributes']['class'][] = 'navbar-dark';
+ case 'inverse':
+ $variables['navbar_attributes']['class'][] = 'navbar-inverse';
break;
default:
$variables['navbar_attributes']['class'][] = 'navbar-default';
@@ -263,6 +264,7 @@ function bootstrap_barrio_preprocess_page(&$variables) {
$variables['sidebar_second_attributes'] = new Attribute($variables['sidebar_second_attributes']);
// Declare container layout
+ $variables['container_navbar'] = theme_get_setting('bootstrap_barrio_navbar_container');
$variables['container'] = theme_get_setting('bootstrap_barrio_fluid_container') ? 'container-fluid' : 'container';
}
diff --git a/config/install/bootstrap_barrio.settings.yml b/config/install/bootstrap_barrio.settings.yml
index cb725f5fccb3bdf609f30f2526202dd58a76eede..668810b6a980e188b631d596655d6bbb6b5a58fe 100644
--- a/config/install/bootstrap_barrio.settings.yml
+++ b/config/install/bootstrap_barrio.settings.yml
@@ -21,6 +21,8 @@ bootstrap_barrio_button_outline: 0
# Navbar
# --------------
+bootstrap_barrio_navbar_toggle: 1
+bootstrap_barrio_navbar_container: 'navbar-toggleable-md'
bootstrap_barrio_navbar_top_position: ''
bootstrap_barrio_navbar_top_color: 0
bootstrap_barrio_navbar_top_background: 'faded'
diff --git a/css/components/alerts.css b/css/components/alerts.css
new file mode 100644
index 0000000000000000000000000000000000000000..9533af81910b6db757742ab1c1ea813aa7858e00
--- /dev/null
+++ b/css/components/alerts.css
@@ -0,0 +1,10 @@
+/**
+ * @file
+ * Visual styles for comments in Bartik.
+ */
+
+.alert {
+ position: fixed;
+ bottom: 0;
+ max-width: 50%;
+}
diff --git a/subtheme/templates/page.html.twig b/subtheme/templates/page.html.twig
index c435b2713e4d20b3ba80744a67eec0430c09b3e1..687a0454909b0a39e57f1ec64926a89795087c07 100644
--- a/subtheme/templates/page.html.twig
+++ b/subtheme/templates/page.html.twig
@@ -70,38 +70,46 @@
#}
{% block head %}
+ {% if page.secondary_menu or page.page.top_header or page.top_header_form %}
<nav{{ navbar_top_attributes }}>
- <div class="section {{ container }} clearfix">
- <div class="navbar-brand">
+ {% if container_navbar %}
+ <div class="container">
+ {% endif %}
+ <div class="navbar-brand">
{{ page.header }}
</div>
{% if page.top_header_form %}
- <div class="form-inline navbar-form pull-right">
+ <div class="form-inline navbar-form float-right">
{{ page.top_header_form }}
</div>
{% endif %}
{% if page.secondary_menu or page.top_header %}
- <div class="navbar-nav pull-right">
+ <div class="navbar-nav float-right">
{{ page.secondary_menu }}
{{ page.top_header }}
</ div>
{% endif %}
+ {% if container_navbar %}
</div>
+ {% endif %}
</nav>
+ {% endif %}
<nav{{ navbar_attributes }}>
- <div class="section {{ container }} clearfix">
- <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#CollapsingNavbar">
- ☰
- </button>
- <div class="collapse navbar-toggleable-xs navbar-nav" id="CollapsingNavbar">
+ {% if container_navbar %}
+ <div class="container">
+ {% endif %}
+ <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+ <div class="collapse navbar-collapse" id="CollapsingNavbar">
{{ page.primary_menu }}
+ {% if page.header_form %}
+ <div class="form-inline navbar-form float-right">
+ {{ page.header_form }}
+ </div>
+ {% endif %}
</div>
- {% if page.header_form %}
- <div class="form-inline navbar-form pull-right">
- {{ page.header_form }}
- </div>
- {% endif %}
+ {% if container_navbar %}
</div>
+ {% endif %}
</nav>
{% endblock %}
diff --git a/templates/block/block--system-branding-block.html.twig b/templates/block/block--system-branding-block.html.twig
index bed946ac96270e71bea3ee7c0bcd5a0b8f19b95e..37ed894b24dbd38782d8c2a50b852e1414dd4c89 100644
--- a/templates/block/block--system-branding-block.html.twig
+++ b/templates/block/block--system-branding-block.html.twig
@@ -14,12 +14,12 @@
#}
{% set attributes = attributes.addClass('site-branding') %}
{% if site_logo %}
- <a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home" class="pull-left site-logo">
+ <a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home" class="float-left site-logo">
<img src="{{ site_logo }}" alt="{{ 'Home'|t }}" />
</a>
{% endif %}
{% if site_name or site_slogan %}
- <div class="pull-left site-name-slogan">
+ <div class="float-left site-name-slogan">
{% if site_name %}
<a href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
{% endif %}
diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig
index 25120d4e28000ecd0a5d87b5fc3af7c7ec76c94a..335280e549104bd753c8a62b9bce68976993065c 100644
--- a/templates/layout/page.html.twig
+++ b/templates/layout/page.html.twig
@@ -73,43 +73,47 @@
{% block head %}
{% if page.secondary_menu or page.page.top_header or page.top_header_form %}
<nav{{ navbar_top_attributes }}>
- <div class="section {{ container }} clearfix">
+ {% if container_navbar %}
+ <div class="container">
+ {% endif %}
<div class="navbar-nav">
{{ page.secondary_menu }}
{{ page.top_header }}
</div>
{% if page.top_header_form %}
- <div class="form-inline navbar-form pull-right">
+ <div class="form-inline navbar-form float-right">
{{ page.top_header_form }}
</div>
{% endif %}
- </div>
+ {% if container_navbar %}
+ </div>
+ {% endif %}
</nav>
{% endif %}
<nav{{ navbar_attributes }}>
- <div class="section {{ container }} clearfix">
+ {% if container_navbar %}
+ <div class="container">
+ {% endif %}
<div class="navbar-brand">
{{ page.header }}
</div>
- {% if page.primary_menu %}
- <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#CollapsingNavbar">
- ☰
- </button>
- <div class="collapse navbar-toggleable-xs navbar-nav" id="CollapsingNavbar">
+ {% if page.primary_menu or page.header_form %}
+ <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+ <div class="collapse navbar-collapse" id="CollapsingNavbar">
{{ page.primary_menu }}
+ {% if page.header_form %}
+ <div class="form-inline navbar-form float-right">
+ {{ page.header_form }}
+ </div>
+ {% endif %}
</div>
{% endif %}
{% if sidebar_collapse %}
- <button class="navbar-toggler hidden-md-up" type="button" data-toggle="offcanvas" data-target=".sidebar-nav">
- ☰
- </button>
- {% endif %}
- {% if page.header_form %}
- <div class="form-inline navbar-form pull-right">
- {{ page.header_form }}
- </div>
+ <button class="navbar-toggler navbar-toggler-left" type="button" data-toggle="collapse" data-target="#CollapsingLeft" aria-controls="CollapsingLeft" aria-expanded="false" aria-label="Toggle navigation"></button>
{% endif %}
+ {% if container_navbar %}
</div>
+ {% endif %}
</nav>
{% endblock %}
</header>
diff --git a/templates/misc/status-messages.html.twig b/templates/misc/status-messages.html.twig
index d4bd6266239994982f5ccc796b47fe3738d9663e..61f006c3961da63acf1a795aff83cd3da854e880 100644
--- a/templates/misc/status-messages.html.twig
+++ b/templates/misc/status-messages.html.twig
@@ -30,8 +30,6 @@
set classes = [
'alert',
'alert-dismissible',
- 'fade',
- 'in',
type == 'status' ? 'alert-success',
type == 'warning' ? 'alert-warning',
type == 'error' ? 'alert-danger',
diff --git a/theme-settings.php b/theme-settings.php
index 0a14ee3870475f689603272038e53a986be30a0e..a617a7359b3b74caad309ee5df79069cd4d35c44 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -204,6 +204,22 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
'#collapsible' => TRUE,
'#collapsed' => TRUE,
);
+ $form['components']['navbar']['bootstrap_barrio_navbar_toggle'] = array(
+ '#type' => 'select',
+ '#title' => t('Navbar top toggle size'),
+ '#description' => t('Select size for navbar to collapse.'),
+ '#default_value' => theme_get_setting('bootstrap_barrio_navbar_toggle'),
+ '#options' => array(
+ 'navbar-toggleable-md' => t('Medium'),
+ 'navbar-toggleable-sm' => t('Small'),
+ ),
+ );
+ $form['components']['navbar']['bootstrap_barrio_navbar_container'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Navbar Width Container'),
+ '#description' => t('Check if Navbar width will be inside container or fluid width.'),
+ '#default_value' => theme_get_setting('bootstrap_barrio_navbar_container'),
+ );
$form['components']['navbar']['bootstrap_barrio_navbar_top_position'] = array(
'#type' => 'select',
'#title' => t('Navbar top position'),
@@ -211,7 +227,6 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
'#default_value' => theme_get_setting('bootstrap_barrio_navbar_top_position'),
'#options' => array(
'fixed-top' => t('Fixed Top'),
-// 'scroll-fixed-top' => t('Scroll Fixed Top'),
'fixed-bottom' => t('Fixed Bottom'),
),
'#empty_option' => t('Normal'),
@@ -223,7 +238,7 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
'#default_value' => theme_get_setting('bootstrap_barrio_navbar_top_color'),
'#options' => array(
'light' => t('Light'),
- 'dark' => t('Dark'),
+ 'inverse' => t('Inverse'),
),
'#empty_option' => t('Default'),
);
@@ -246,7 +261,6 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
'#default_value' => theme_get_setting('bootstrap_barrio_navbar_position'),
'#options' => array(
'fixed-top' => t('Fixed Top'),
-// 'scroll-fixed-top' => t('Scroll Fixed Top'),
'fixed-bottom' => t('Fixed Bottom'),
),
'#empty_option' => t('Normal'),
@@ -258,7 +272,7 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
'#default_value' => theme_get_setting('bootstrap_barrio_navbar_color'),
'#options' => array(
'light' => t('Light'),
- 'dark' => t('Dark'),
+ 'inverse' => t('Inverse'),
),
'#empty_option' => t('Default'),
);