v01.00.02

dnnconsulting · Oct 26, 2016 · 340524f · 340524f
1 parent 7267c80
commit 340524f
Show file tree

Hide file tree

Showing 23 changed files with 10,087 additions and 60 deletions.
diff --git a/404Skin.ascx b/404Skin.ascx
@@ -18,14 +18,12 @@
 <dnn:JQUERY ID="dnnjQuery" runat="server" jQueryHoverIntent="true" />
 
 <dnn:DnnCssInclude ID="DnnCssMaterialIcons" runat="server" FilePath="https://fonts.googleapis.com/icon?family=Material+Icons" />
-<dnn:DnnCssInclude ID="DnnCssFontawesome" runat="server" FilePath="assets/font-awesome-4.5.0/css/font-awesome.min.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssBootstrap" runat="server" FilePath="assets/bootstrap/3.3.6/css/bootstrap.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssSmartMenu" runat="server" FilePath="assets/css/jquery.smartmenus.bootstrap.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssFontawesome" runat="server" FilePath="assets/font-awesome-4.7.0/css/font-awesome.min.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssBootstrap" runat="server" FilePath="assets/bootstrap/3.3.7/css/bootstrap.min.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssSmartMenu" runat="server" FilePath="assets/css/jquery.smartmenus.bootstrap.min.css" PathNameAlias="SkinPath" />
 <dnn:DnnCssInclude ID="DnnCssMDesignBase" runat="server" FilePath="assets/MDB/3.3.3/css/mdb.min.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssApp" runat="server" FilePath="assets/css/app.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssInclude2" runat="server" FilePath="assets/css/dnnmdesign_overriders.css" PathNameAlias="SkinPath" />
-
-<dnn:DnnCssInclude ID="DnnCssInclude1" runat="server" FilePath="assets/css/prism.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssApp" runat="server" FilePath="assets/css/app.min.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssAppOverrides" runat="server" FilePath="assets/css/dnnmdesign_overriders.css" PathNameAlias="SkinPath" />
 
 <!-- Start : Header Section -->
 <header>
@@ -90,10 +88,8 @@
     </div>
   </div><!--// End : Search Modal -->
 
-<dnn:DnnJsInclude ID="DnnJsBootstrap" runat="server" FilePath="assets/bootstrap/3.3.6/js/bootstrap.min.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
+<dnn:DnnJsInclude ID="DnnJsBootstrap" runat="server" FilePath="assets/bootstrap/3.3.7/js/bootstrap.min.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
 <dnn:DnnJsInclude ID="DnnJsSmartMenu1" runat="server" FilePath="assets/js/jquery.smartmenus.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
 <dnn:DnnJsInclude ID="DnnJsSmartMenu2" runat="server" FilePath="assets/js/jquery.smartmenus.bootstrap.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
 <dnn:DnnJsInclude ID="DnnJsMDBase" runat="server" FilePath="assets/MDB/3.3.3/js/mdb.min.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
-<dnn:DnnJsInclude ID="DnnJsApp" runat="server" FilePath="assets/js/app.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
-
-<dnn:DnnJsInclude ID="DnnJsInclude1" runat="server" FilePath="assets/js/prism.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
+<dnn:DnnJsInclude ID="DnnJsApp" runat="server" FilePath="assets/js/app.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
diff --git a/404Skin.css b/404Skin.css
@@ -15,15 +15,16 @@
     box-sizing: content-box !important; /* Opera/IE 8+ */
 }
 
+/* Addition by Peter Schotman*/
+ul.dnnAdminTabNav li a { font-size: 14px; }
 
-/* Make the Control bar more mobile friendly */
+/* Make the Control bar more mobile friendly 
 .ControlContainer {
     position: relative;
     width: 727px;
     height: 53px;
     margin: 0px auto;
-}
-
+}*/
 
 .paneOutline {
     margin: 5px 0;

diff --git a/Admin.ascx b/Admin.ascx
@@ -18,14 +18,12 @@
 <dnn:JQUERY ID="dnnjQuery" runat="server" jQueryHoverIntent="true" />
 
 <dnn:DnnCssInclude ID="DnnCssMaterialIcons" runat="server" FilePath="https://fonts.googleapis.com/icon?family=Material+Icons" />
-<dnn:DnnCssInclude ID="DnnCssFontawesome" runat="server" FilePath="assets/font-awesome-4.5.0/css/font-awesome.min.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssBootstrap" runat="server" FilePath="assets/bootstrap/3.3.6/css/bootstrap.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssSmartMenu" runat="server" FilePath="assets/css/jquery.smartmenus.bootstrap.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssFontawesome" runat="server" FilePath="assets/font-awesome-4.7.0/css/font-awesome.min.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssBootstrap" runat="server" FilePath="assets/bootstrap/3.3.7/css/bootstrap.min.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssSmartMenu" runat="server" FilePath="assets/css/jquery.smartmenus.bootstrap.min.css" PathNameAlias="SkinPath" />
 <dnn:DnnCssInclude ID="DnnCssMDesignBase" runat="server" FilePath="assets/MDB/3.3.3/css/mdb.min.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssApp" runat="server" FilePath="assets/css/app.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssInclude2" runat="server" FilePath="assets/css/dnnmdesign_overriders.css" PathNameAlias="SkinPath" />
-
-<dnn:DnnCssInclude ID="DnnCssInclude1" runat="server" FilePath="assets/css/prism.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssApp" runat="server" FilePath="assets/css/app.min.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssAppOverrides" runat="server" FilePath="assets/css/dnnmdesign_overriders.css" PathNameAlias="SkinPath" />
 
 <!-- Start : Header Section -->
 <header>
@@ -87,10 +85,8 @@
     </div>
   </div><!--// End : Search Modal -->
 
-<dnn:DnnJsInclude ID="DnnJsBootstrap" runat="server" FilePath="assets/bootstrap/3.3.6/js/bootstrap.min.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
+<dnn:DnnJsInclude ID="DnnJsBootstrap" runat="server" FilePath="assets/bootstrap/3.3.7/js/bootstrap.min.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
 <dnn:DnnJsInclude ID="DnnJsSmartMenu1" runat="server" FilePath="assets/js/jquery.smartmenus.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
 <dnn:DnnJsInclude ID="DnnJsSmartMenu2" runat="server" FilePath="assets/js/jquery.smartmenus.bootstrap.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
 <dnn:DnnJsInclude ID="DnnJsMDBase" runat="server" FilePath="assets/MDB/3.3.3/js/mdb.min.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
-<dnn:DnnJsInclude ID="DnnJsApp" runat="server" FilePath="assets/js/app.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
-
-<dnn:DnnJsInclude ID="DnnJsInclude1" runat="server" FilePath="assets/js/prism.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
+<dnn:DnnJsInclude ID="DnnJsApp" runat="server" FilePath="assets/js/app.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
diff --git a/Admin.css b/Admin.css
@@ -15,15 +15,16 @@
     box-sizing: content-box !important; /* Opera/IE 8+ */
 }
 
+/* Addition by Peter Schotman*/
+ul.dnnAdminTabNav li a { font-size: 14px; }
 
-/* Make the Control bar more mobile friendly */
+/* Make the Control bar more mobile friendly 
 .ControlContainer {
     position: relative;
     width: 727px;
     height: 53px;
     margin: 0px auto;
-}
-
+}*/
 
 .paneOutline {
     margin: 5px 0;

diff --git a/DnnMDesign.dnn b/DnnMDesign.dnn
@@ -1,8 +1,8 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DnnC.Skins.DnnMDesign" type="Skin" version="01.00.01">
+    <package name="DnnC.Skins.DnnMDesign" type="Skin" version="01.00.02">
       <friendlyName>DnnMDesign</friendlyName>
-      <description>A responsive DNN skin using Bootstrap v3.3.6 and Material Design for Bootstrap. Requires installation via the Host/Extensions page.</description>
+      <description>A responsive DNN skin using Bootstrap v3.3.7 and Material Design for Bootstrap. Requires installation via the Host/Extensions page.</description>
       <owner>
         <name>Geoff Barlow</name>
         <organization>DnnConsulting.nl</organization>

diff --git a/Home.ascx b/Home.ascx
@@ -18,12 +18,12 @@
 <dnn:JQUERY ID="dnnjQuery" runat="server" jQueryHoverIntent="true" />
 
 <dnn:DnnCssInclude ID="DnnCssMaterialIcons" runat="server" FilePath="https://fonts.googleapis.com/icon?family=Material+Icons" />
-<dnn:DnnCssInclude ID="DnnCssFontawesome" runat="server" FilePath="assets/font-awesome-4.5.0/css/font-awesome.min.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssBootstrap" runat="server" FilePath="assets/bootstrap/3.3.6/css/bootstrap.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssSmartMenu" runat="server" FilePath="assets/css/jquery.smartmenus.bootstrap.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssFontawesome" runat="server" FilePath="assets/font-awesome-4.7.0/css/font-awesome.min.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssBootstrap" runat="server" FilePath="assets/bootstrap/3.3.7/css/bootstrap.min.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssSmartMenu" runat="server" FilePath="assets/css/jquery.smartmenus.bootstrap.min.css" PathNameAlias="SkinPath" />
 <dnn:DnnCssInclude ID="DnnCssMDesignBase" runat="server" FilePath="assets/MDB/3.3.3/css/mdb.min.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssApp" runat="server" FilePath="assets/css/app.css" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude ID="DnnCssInclude2" runat="server" FilePath="assets/css/dnnmdesign_overriders.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssApp" runat="server" FilePath="assets/css/app.min.css" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude ID="DnnCssAppOverrides" runat="server" FilePath="assets/css/dnnmdesign_overriders.css" PathNameAlias="SkinPath" />
 
 <!-- ./ Wrapper -->
 <div class="home-wrapper">
@@ -62,11 +62,6 @@
      </div>
 </div><!--// End : Content Pane : full width -->
 
-
-
-
-
-
 <!-- Start : Content Areas -->
 <section>
     <!--#include file = "includes/_content-panes.ascx" -->
@@ -100,7 +95,7 @@
 
 </div><!-- ./ Wrapper -->
 
-<dnn:DnnJsInclude ID="DnnJsBootstrap" runat="server" FilePath="assets/bootstrap/3.3.6/js/bootstrap.min.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
+<dnn:DnnJsInclude ID="DnnJsBootstrap" runat="server" FilePath="assets/bootstrap/3.3.7/js/bootstrap.min.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
 <dnn:DnnJsInclude ID="DnnJsSmartMenu1" runat="server" FilePath="assets/js/jquery.smartmenus.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
 <dnn:DnnJsInclude ID="DnnJsSmartMenu2" runat="server" FilePath="assets/js/jquery.smartmenus.bootstrap.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />
 <dnn:DnnJsInclude ID="DnnJsMDBase" runat="server" FilePath="assets/MDB/3.3.3/js/mdb.min.js" PathNameAlias="SkinPath" ForceProvider="DnnFormBottomProvider" />

diff --git a/Home.css b/Home.css
@@ -15,15 +15,16 @@
     box-sizing: content-box !important; /* Opera/IE 8+ */
 }
 
+/* Addition by Peter Schotman*/
+ul.dnnAdminTabNav li a { font-size: 14px; }
 
-/* Make the Control bar more mobile friendly */
+/* Make the Control bar more mobile friendly 
 .ControlContainer {
     position: relative;
     width: 727px;
     height: 53px;
     margin: 0px auto;
-}
-
+}*/
 
 .paneOutline {
     margin: 5px 0;

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -5,6 +5,17 @@
 	<a href=http://www.dnnconsulting.nl>http://www.dnnconsulting.nl</a><br />
 <hr/>
 	<h3>About the DnnMDesign Theme</h3>
+	<h4>Version 01.00.02</h4><br />	
+	<h5>Add functionality and fixes</h5>
+	<ul>
+		<li>Updated Bootstrap to version 3.3.7</li>
+		<li>Updated Fontawesome to version 4.5.0</li>
+		<li>Added minified css and amended the links in the skins</li>
+		<li>Merged optimized images (Ernst Peter Tamminga, pull request)</li>
+		<li>Removed the css that resizes the controlbar, causes problems</li>
+		<li>Variuos other small changes</li>
+	</ul>
+
 	<h4>Version 01.00.01</h4><br />	
 	<h5>Add functionality and fixes</h5>
 	<ul>