From 51633d3c113bcf988fe39631bd1dbd1402f42a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 4 Dec 2017 10:39:25 +0300 Subject: [PATCH] Upgraded to bootstrap 4 beta 2. --- .../AbpAspNetCoreMvcUiBootstrapModule.cs | 3 +- .../Shared/Components/AbpMenu/Default.cshtml | 7 +- ...olo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj | 16 - .../libs/bootstrap/css/bootstrap-grid.css | 1567 ++++ .../libs/bootstrap/css/bootstrap-grid.css.map | 1 + .../libs/bootstrap/css/bootstrap-grid.min.css | 7 + .../bootstrap/css/bootstrap-grid.min.css.map | 1 + .../libs/bootstrap/css/bootstrap-reboot.css | 342 + .../bootstrap/css/bootstrap-reboot.css.map | 1 + .../bootstrap/css/bootstrap-reboot.min.css | 8 + .../css/bootstrap-reboot.min.css.map | 1 + .../wwwroot/libs/bootstrap/css/bootstrap.css | 7496 +++++++---------- .../libs/bootstrap/css/bootstrap.css.map | 2 +- .../libs/bootstrap/css/bootstrap.min.css | 5 +- .../libs/bootstrap/css/bootstrap.min.css.map | 2 +- .../libs/bootstrap/js/bootstrap.bundle.js | 6287 ++++++++++++++ .../libs/bootstrap/js/bootstrap.bundle.js.map | 1 + .../libs/bootstrap/js/bootstrap.bundle.min.js | 7 + .../bootstrap/js/bootstrap.bundle.min.js.map | 1 + .../wwwroot/libs/bootstrap/js/bootstrap.js | 3407 ++++---- .../libs/bootstrap/js/bootstrap.js.map | 1 + .../libs/bootstrap/js/bootstrap.min.js | 12 +- .../libs/bootstrap/js/bootstrap.min.js.map | 1 + .../tether/css/tether-theme-arrows-dark.css | 134 - .../css/tether-theme-arrows-dark.min.css | 1 - .../libs/tether/css/tether-theme-arrows.css | 138 - .../tether/css/tether-theme-arrows.min.css | 1 - .../libs/tether/css/tether-theme-basic.css | 21 - .../tether/css/tether-theme-basic.min.css | 1 - .../wwwroot/libs/tether/css/tether.css | 8 - .../wwwroot/libs/tether/css/tether.min.css | 1 - .../wwwroot/libs/tether/js/tether.js | 1792 ---- .../wwwroot/libs/tether/js/tether.min.js | 1 - 33 files changed, 13377 insertions(+), 7897 deletions(-) create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/css/bootstrap-grid.css create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/css/bootstrap-grid.css.map create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/css/bootstrap-grid.min.css create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/css/bootstrap-grid.min.css.map create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/css/bootstrap-reboot.css create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/css/bootstrap-reboot.css.map create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/css/bootstrap-reboot.min.css create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/css/bootstrap-reboot.min.css.map create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap.bundle.js create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap.js.map create mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/bootstrap/js/bootstrap.min.js.map delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/css/tether-theme-arrows-dark.css delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/css/tether-theme-arrows-dark.min.css delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/css/tether-theme-arrows.css delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/css/tether-theme-arrows.min.css delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/css/tether-theme-basic.css delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/css/tether-theme-basic.min.css delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/css/tether.css delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/css/tether.min.css delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/js/tether.js delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/wwwroot/libs/tether/js/tether.min.js diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs index 92dae1bccf..4286b58039 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs @@ -28,8 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap options.ScriptBundles.Add("GlobalScripts", new[] { "/libs/jquery/jquery-3.1.1.min.js", - "/libs/tether/js/tether.min.js", - "/libs/bootstrap/js/bootstrap.min.js", + "/libs/bootstrap/js/bootstrap.bundle.min.js", "/libs/vue/vue.js", "/libs/abp/abp-jquery.js?_v" + DateTime.Now.Ticks }); diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml index 1835de738a..b3c2818362 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Views/Shared/Components/AbpMenu/Default.cshtml @@ -3,14 +3,13 @@ @using Volo.Abp.Ui.Navigation @model ApplicationMenu @inject ICurrentUser CurrentUser -