Bootstrap 4

.gitignore

@@ -26,6 +26,8 @@
 /node_modules
 /assets/css
 
+node_modules
+
 # Backup entities generated with doctrine:generate:entities command
 **/Entity/*~
 criticalmass.iml

assets/js/CriticalMass.js

@@ -1,6 +1,7 @@
 var CriticalMass = CriticalMass || {};
 
 CriticalMass.loadModule = function (name, context, options, callback) {
+    console.log(name);
     require([name], function (Module) {
         var module = new Module(context, options);
 
@@ -13,6 +14,9 @@ CriticalMass.loadModule = function (name, context, options, callback) {
 require.config({
     baseUrl: '/js/',
     shim: {
+        'bootstrap.bundle': {
+            deps: ['jquery']
+        },
         'leaflet-sleep': {
             deps: ['leaflet'],
             exports: 'L.Map.Sleep'
@@ -47,4 +51,4 @@ require.config({
             exports: 'Bloodhound'
         }
     }
-});
+});

assets/js/modules/CookieNotice.js

@@ -11,6 +11,7 @@ define(['cookie.notice'], function () {
             'noticeBgColor': '#000',
             'noticeTextColor': '#fff',
             'linkColor':'#fff',
+            'fontSize': '1em',
             'buttonLocales': {
                 'de': 'Einverstanden'
             },

assets/js/modules/map/Map.js

@@ -1,5 +1,5 @@
 //define(['leaflet', 'CityMarker', 'LocationMarker', 'L.Control.Locate', 'Leaflet.Sleep'], function () {
-define(['leaflet', 'CityMarker', 'LocationMarker'], function () {
+define(['jquery', 'leaflet', 'CityMarker', 'LocationMarker'], function ($, L) {
     Map = function (mapId, settings) {
         this._mapId = mapId;
 

assets/js/modules/modal/CloseModalButton.js

@@ -6,7 +6,7 @@ define([], function () {
     CloseModalButton.prototype._html = null;
 
     CloseModalButton.prototype.render = function () {
-        this._html = '<button type="button" class="btn btn-default" data-dismiss="modal">Schließen</button>';
+        this._html = '<button type="button" class="btn btn-secondary-outline" data-dismiss="modal">Schließen</button>';
 
         this._$button = $(this._html);
 

assets/js/modules/modal/Modal.js

@@ -96,10 +96,12 @@ define([], function () {
             '  <div class="modal-dialog modal-' + this._size + '">',
             '    <div class="modal-content">',
             '      <div class="modal-header">',
-            '        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>',
-            '        <h4 class="modal-title">',
+            '        <h5 class="modal-title">',
             '          ' + this._modalTitle,
-            '        </h4>',
+            '        </h5>',
+            '        <button type="button" class="close" data-dismiss="modal" aria-label="Close">',
+            '          <span aria-hidden="true">&times;</span>',
+            '        </button>',
             '      </div>',
             '      <div class="modal-body">',
             '        ' + this._modalBody,

assets/js/modules/page/TrackListPage.js

@@ -26,7 +26,7 @@ define(['AutoMap', 'Modal', 'ModalButton', 'CloseModalButton'], function () {
         var deleteButton = new ModalButton();
         deleteButton.setCaption('Löschen');
         deleteButton.setIcon('cross');
-        deleteButton.setClass('btn-success');
+        deleteButton.setClass('btn-primary');
         deleteButton.setHref(Routing.generate('caldera_criticalmass_track_delete', {trackId: trackId}));
 
         var closeButton = new CloseModalButton;

assets/scss/criticalmass.scss

@@ -1,6 +1,7 @@
-@import "../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap.scss";
+@import "../../node_modules/bootstrap/scss/bootstrap.scss";
 @import "criticalmass/criticalmass";
-@import "criticalmass/frontpage3";
+@import "criticalmass/bikeright4";
+@import "criticalmass/frontpage4";
 
 .form-control.datepicker {
   padding: 0.5rem 0.75rem !important;
@@ -10,11 +11,6 @@
   text-align: left !important;
 }
 
-.breadcrumb > li + li:before {
-  content: "/\00a0";
-  color: $breadcrumb-color;
-}
-
 input[type="file"] {
   display: inline !important;
 }

assets/scss/criticalmass/_frontpage4.scss

@@ -0,0 +1,37 @@
+.carousel {
+  margin-left: -15px;
+  margin-right: -15px;
+  text-align: center;
+
+  .carousel-item {
+    .carousel-caption {
+      text-shadow: 0.5px 1px 2px rgba(0, 0, 0, 0.9);
+    }
+  }
+}
+
+.navbar-wrapper {
+  .navbar {
+    margin-bottom: 0;
+  }
+}
+
+@media (max-width: 920px) {
+  .navbar-wrapper {
+    .container {
+      width: 100%;
+      padding-left: 0;
+      padding-right: 0;
+    }
+  }
+}
+
+@media (min-width: 920px) {
+  .navbar-wrapper {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    margin-top: 20px;
+  }
+}