Skip to content

Commit

Permalink
Upgrade Bootstrap to 4.6 #196
Browse files Browse the repository at this point in the history
  • Loading branch information
roman-yagodin committed Jun 15, 2021
1 parent dc590b8 commit 5837df7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://github.com/browserslist/browserslist#readme
# From https://github.com/twbs/bootstrap/blob/v4.4.1/.browserslistrc
# From https://github.com/twbs/bootstrap/blob/v4.6.0/.browserslistrc

>= 1%
last 1 major version
Expand Down
27 changes: 3 additions & 24 deletions R7.Epsilon/Skins/SkinObjects/Includes.ascx.cs
Original file line number Diff line number Diff line change
@@ -1,25 +1,4 @@
//
// File: Includes.ascx.cs
// Project: R7.Epsilon
//
// Author: Roman M. Yagodin <[email protected]>
//
// Copyright (c) 2015-2020 Roman M. Yagodin, R7.Labs
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

using System;
using System;
using DotNetNuke.Web.Client;
using DotNetNuke.Web.Client.ClientResourceManagement;
using DotNetNuke.Framework.JavaScriptLibraries;
Expand All @@ -33,7 +12,7 @@ public class Includes: EpsilonSkinObjectBase
// TODO: Move to OnInit?
protected override void OnLoad (EventArgs e)
{
ClientResourceManager.RegisterStyleSheet (Page, Const.SKIN_PATH + "css/bootstrap.min.css", (int) FileOrder.Css.SkinCss, "DnnPageHeaderProvider", "bootstrap", "4.3.1");
ClientResourceManager.RegisterStyleSheet (Page, Const.SKIN_PATH + "css/bootstrap.min.css", (int) FileOrder.Css.SkinCss, "DnnPageHeaderProvider", "bootstrap", "4.6.0");

var fontAwesome = JavaScriptLibraryHelper.GetHighestVersionLibrary ("FontAwesome");
if (fontAwesome != null) {
Expand All @@ -48,7 +27,7 @@ protected override void OnLoad (EventArgs e)
Page, "css/blueimp-gallery.min.css", (int) FileOrder.Css.SkinCss, "DnnPageHeaderProvider", "blueimp-gallery");
}

ClientResourceManager.RegisterScript (Page, Const.SKIN_PATH + "js/bootstrap.bundle.min.js", (int) FileOrder.Js.DefaultPriority, "DnnFormBottomProvider", "bootstrap", "4.3.1");
ClientResourceManager.RegisterScript (Page, Const.SKIN_PATH + "js/bootstrap.bundle.min.js", (int) FileOrder.Js.DefaultPriority, "DnnFormBottomProvider", "bootstrap", "4.6.0");

ClientResourceManager.RegisterScript (Page, Const.SKIN_PATH + "js/skin.min.js", (int) FileOrder.Js.DefaultPriority, "DnnFormBottomProvider", "skin", "0.0.0");

Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"@babel/core": "^7.11.1",
"@babel/preset-env": "^7.11.0",
"babel-loader": "^8.0.6",
"bootstrap": "^4.5.2",
"bootstrap": "^4.6.0",
"brand-colors": "^2.1.1",
"browserslist-useragent-regexp": "^2.1.1",
"clipboard": "^2.0.4",
Expand Down

0 comments on commit 5837df7

Please sign in to comment.