|
663 | 663 | <div class="notification is-info" id="messages_infos_div" > |
664 | 664 | <button class="delete"></button> |
665 | 665 | <#list infos as info > |
666 | | - <span class="icon"><i class="fa fa-info-circle"></i> ${info.message} <br> |
| 666 | + <span class="icon"><i class="fa fa-info-circle"></i></span> ${info.message} <br> |
667 | 667 | </#list> |
668 | 668 | </div> |
669 | 669 | </#if> |
670 | 670 | </#if> |
671 | 671 | <#if warnings??> |
672 | 672 | <#if warnings?size > 0 > |
673 | 673 | <div class="${warnings_class}" id="messages_warnings_div" > |
674 | | - <a class="close" data-dismiss="alert" href="#">x</a> |
| 674 | + <a class="delete" data-dismiss="alert" href="#">x</a> |
675 | 675 | <#list warnings as warning > |
676 | | - <span class="icon"><i class="fa fa-info-circle"></i> ${warning.message} <br> |
| 676 | + <span class="icon"><i class="fa fa-info-circle"></i></span> ${warning.message} <br> |
677 | 677 | </#list> |
678 | 678 | </div> |
679 | 679 | </#if> |
@@ -976,7 +976,7 @@ <h2 class="title"> |
976 | 976 | <#-- BUTTON --> |
977 | 977 | <#-- bootstrap 3 : size: is-small/is-medium/is-large --> |
978 | 978 | <#-- upcoming bootstrap 4 : size: is-medium for small buttons/empty for medium buttons/is-large for large buttons --> |
979 | | -<#-- color: is-default[bootstrap4 : btn-secondary]/is-primary/is-success/is-warning/is-danger/btn-info/bg-purple/bg-blue/bg-navy/bg-teal/bg-maroon/bg-black/bg-gray/bg-olive/bg-lime/bg-orange/bg-fuchsia --> |
| 979 | +<#-- color: default : secondary]/primary/success/warning/danger/info --> |
980 | 980 | <#-- color (upcoming bootstrap 4): btn-outline-default/btn-outline-primary/btn-outline-success/btn-outline-warning/btn-outline-danger/btn-outline-info/ --> |
981 | 981 | <#-- style: btn-block/btn-flat/close/navbar-toggle/collapsed... --> |
982 | 982 | <#-- type: button/submit/reset --> |
@@ -1092,7 +1092,7 @@ <h2 class="title"> |
1092 | 1092 |
|
1093 | 1093 | <#macro modalHeader titleLevel='h4' modalTitle='' id='' params=''> |
1094 | 1094 | <div class="modal-header"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>> |
1095 | | - <button type="button" class="close" data-dismiss="modal" aria-label="Close"> |
| 1095 | + <button type="button" class="delete" data-dismiss="modal" aria-label="Close"> |
1096 | 1096 | <span aria-hidden="true">×</span> |
1097 | 1097 | </button> |
1098 | 1098 | <${titleLevel} class="modal-title">${modalTitle}</${titleLevel}> |
@@ -1128,11 +1128,12 @@ <h2 class="title"> |
1128 | 1128 | </#macro> |
1129 | 1129 |
|
1130 | 1130 | <#-- ALERT --> |
1131 | | -<#-- classes: alert-success/alert-info/alert-warning/alert-danger + alert-dismissible --> |
1132 | | -<#macro alert class='' titleLevel='h3' title='' iconTitle='' dismissible=false id='' params=''> |
1133 | | -<div class="alert alert-${class}"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>> |
| 1131 | +<#-- class: --> |
| 1132 | +<#-- color: success/info/warning/danger --> |
| 1133 | +<#macro alert class='' color='' titleLevel='h3' title='' iconTitle='' dismissible=false id='' params=''> |
| 1134 | +<div class="notification ${class} <#if color!=''> is-${color}</#if>"<#if id!=''> id="${id}"</#if><#if params!=''> ${params}</#if>> |
1134 | 1135 | <#if dismissible> |
1135 | | - <@button color='' size='' style='close' params='data-dismiss="alert" aria-hidden="true"'>×</@button> |
| 1136 | + <@button color='' size='' style='close' class='delete' params='data-dismiss="alert" aria-hidden="true"'>×</@button> |
1136 | 1137 | </#if> |
1137 | 1138 | <#if title!=''> |
1138 | 1139 | <${titleLevel}> |
@@ -1371,9 +1372,9 @@ <h3> |
1371 | 1372 | <span id="zone4" class="hidden-sm hidden-md"> ${dashboard_zone_4}<i class="caret"></i></span> |
1372 | 1373 | </a> |
1373 | 1374 | <#if userMenuItems?has_content> |
1374 | | - <ul class="dropdown-menu" role="menu" aria-labelledby="dLabelUserHeader"> |
| 1375 | + <ul class="navbar-dropdown" role="menu" aria-labelledby="dLabelUserHeader"> |
1375 | 1376 | <#list userMenuItems as item> |
1376 | | - <li class="dropdown-item ${item.itemClass?html}">${item.content}</li> |
| 1377 | + <a class="navbar-item ${item.itemClass?html}">${item.content}</a> |
1377 | 1378 | </#list> |
1378 | 1379 | </ul> |
1379 | 1380 | </#if> |
|
0 commit comments