Skip to content

Commit

Permalink
Version 2.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tc-imba committed Oct 16, 2017
1 parent 47acc7a commit d56b799
Show file tree
Hide file tree
Showing 1,469 changed files with 35,712 additions and 11,425 deletions.
21 changes: 15 additions & 6 deletions ASPNET_Core_1_0_Full_Project/ASPNET_Core_1_0/wwwroot/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
*
* INSPINIA - Responsive Admin Theme
* version 2.7
* version 2.7.1
*
*/
h1,
Expand Down Expand Up @@ -531,7 +531,7 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
background: #fff;
color: #1ab394;
}
.top-navigation .nav > li.active {
.top-navigation .navbar .nav > li.active {
background: #fff;
border: none;
}
Expand Down Expand Up @@ -1070,11 +1070,14 @@ button.dim:active:before {
background-color: #d1dade;
color: #5e5e5e;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 10px;
font-weight: 600;
padding: 3px 8px;
text-shadow: none;
}
.nav .label,
.ibox .label {
font-size: 10px;
}
.badge {
background-color: #d1dade;
color: #5e5e5e;
Expand Down Expand Up @@ -1891,7 +1894,6 @@ div.dt-button-info {
padding: 6px 12px;
transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%;
font-size: 14px;
}
.form-control:focus,
.single-line:focus {
Expand Down Expand Up @@ -3461,6 +3463,10 @@ body.tour-open .animated {
.sidebar-container .sidebar-message {
padding: 15px 20px;
}
.sidebar-container .sidebar-message .media-body {
display: block;
width: auto;
}
.sidebar-container .sidebar-message .message-avatar {
height: 38px;
width: 38px;
Expand Down Expand Up @@ -8398,6 +8404,9 @@ body.md-skin {
color: #1ab394;
background: #ffffff;
}
.md-skin.fixed-nav #side-menu {
background-color: #fff;
}
.md-skin.fixed-nav #wrapper.top-navigation #page-wrapper {
margin-top: 0;
}
Expand Down Expand Up @@ -8428,7 +8437,7 @@ body.md-skin {
#page-wrapper {
position: inherit;
margin: 0 0 0 220px;
min-height: 1200px;
min-height: 100vh;
}
.navbar-static-side {
z-index: 2001;
Expand All @@ -8445,7 +8454,7 @@ body.md-skin {
#page-wrapper {
position: inherit;
margin: 0 0 0 0;
min-height: 1000px;
min-height: 100vh;
}
.body-small .navbar-static-side {
display: none;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*
* INSPINIA - Responsive Admin Theme
* version 2.7
* version 2.7.1
*
*/

Expand Down Expand Up @@ -97,7 +97,8 @@ $(document).ready(function () {
});

// Minimalize menu
$('.navbar-minimalize').on('click', function () {
$('.navbar-minimalize').on('click', function (event) {
event.preventDefault();
$("body").toggleClass("mini-navbar");
SmoothlyMenu();

Expand All @@ -116,13 +117,13 @@ $(document).ready(function () {
$(".sidebar-panel").css("min-height", heightWithoutNavbar + "px");

var navbarHeight = $('nav.navbar-default').height();
var wrapperHeigh = $('#page-wrapper').height();
var wrapperHeight = $('#page-wrapper').height();

if (navbarHeight > wrapperHeigh) {
if (navbarHeight > wrapperHeight) {
$('#page-wrapper').css("min-height", navbarHeight + "px");
}

if (navbarHeight < wrapperHeigh) {
if (navbarHeight < wrapperHeight) {
$('#page-wrapper').css("min-height", $(window).height() + "px");
}

Expand Down Expand Up @@ -287,5 +288,3 @@ function WinMove() {
})
.disableSelection();
}


21 changes: 15 additions & 6 deletions ASPNET_Core_1_0_Seed_Project/ASPNET_Core_1_0/wwwroot/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
*
* INSPINIA - Responsive Admin Theme
* version 2.7
* version 2.7.1
*
*/
h1,
Expand Down Expand Up @@ -531,7 +531,7 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
background: #fff;
color: #1ab394;
}
.top-navigation .nav > li.active {
.top-navigation .navbar .nav > li.active {
background: #fff;
border: none;
}
Expand Down Expand Up @@ -1070,11 +1070,14 @@ button.dim:active:before {
background-color: #d1dade;
color: #5e5e5e;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 10px;
font-weight: 600;
padding: 3px 8px;
text-shadow: none;
}
.nav .label,
.ibox .label {
font-size: 10px;
}
.badge {
background-color: #d1dade;
color: #5e5e5e;
Expand Down Expand Up @@ -1891,7 +1894,6 @@ div.dt-button-info {
padding: 6px 12px;
transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%;
font-size: 14px;
}
.form-control:focus,
.single-line:focus {
Expand Down Expand Up @@ -3461,6 +3463,10 @@ body.tour-open .animated {
.sidebar-container .sidebar-message {
padding: 15px 20px;
}
.sidebar-container .sidebar-message .media-body {
display: block;
width: auto;
}
.sidebar-container .sidebar-message .message-avatar {
height: 38px;
width: 38px;
Expand Down Expand Up @@ -8398,6 +8404,9 @@ body.md-skin {
color: #1ab394;
background: #ffffff;
}
.md-skin.fixed-nav #side-menu {
background-color: #fff;
}
.md-skin.fixed-nav #wrapper.top-navigation #page-wrapper {
margin-top: 0;
}
Expand Down Expand Up @@ -8428,7 +8437,7 @@ body.md-skin {
#page-wrapper {
position: inherit;
margin: 0 0 0 220px;
min-height: 1200px;
min-height: 100vh;
}
.navbar-static-side {
z-index: 2001;
Expand All @@ -8445,7 +8454,7 @@ body.md-skin {
#page-wrapper {
position: inherit;
margin: 0 0 0 0;
min-height: 1000px;
min-height: 100vh;
}
.body-small .navbar-static-side {
display: none;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*
* INSPINIA - Responsive Admin Theme
* version 2.7
* version 2.7.1
*
*/

Expand Down Expand Up @@ -97,7 +97,8 @@ $(document).ready(function () {
});

// Minimalize menu
$('.navbar-minimalize').on('click', function () {
$('.navbar-minimalize').on('click', function (event) {
event.preventDefault();
$("body").toggleClass("mini-navbar");
SmoothlyMenu();

Expand Down Expand Up @@ -287,5 +288,3 @@ function WinMove() {
})
.disableSelection();
}


Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ $('#fixedsidebar').click(function () {
localStorage.setItem("fixedsidebar", 'on');
}
} else {
$('.sidebar-collapse').slimscroll({ destroy: true });
$('.sidebar-collapse').slimScroll({ destroy: true });
$('.sidebar-collapse').attr('style', '');
$("body").removeClass('fixed-sidebar');

Expand Down Expand Up @@ -223,4 +223,4 @@ if (localStorageSupport) {
if (fixedfooter == 'on') {
$('#fixedfooter').prop('checked', 'checked')
}
}
}
21 changes: 15 additions & 6 deletions ASPNET_MVC5_Full_Version/Inspinia_MVC5/Content/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/*
*
* INSPINIA - Responsive Admin Theme
* version 2.7
* version 2.7.1
*
*/
h1,
Expand Down Expand Up @@ -531,7 +531,7 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
background: #fff;
color: #1ab394;
}
.top-navigation .nav > li.active {
.top-navigation .navbar .nav > li.active {
background: #fff;
border: none;
}
Expand Down Expand Up @@ -1070,11 +1070,14 @@ button.dim:active:before {
background-color: #d1dade;
color: #5e5e5e;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 10px;
font-weight: 600;
padding: 3px 8px;
text-shadow: none;
}
.nav .label,
.ibox .label {
font-size: 10px;
}
.badge {
background-color: #d1dade;
color: #5e5e5e;
Expand Down Expand Up @@ -1891,7 +1894,6 @@ div.dt-button-info {
padding: 6px 12px;
transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%;
font-size: 14px;
}
.form-control:focus,
.single-line:focus {
Expand Down Expand Up @@ -3461,6 +3463,10 @@ body.tour-open .animated {
.sidebar-container .sidebar-message {
padding: 15px 20px;
}
.sidebar-container .sidebar-message .media-body {
display: block;
width: auto;
}
.sidebar-container .sidebar-message .message-avatar {
height: 38px;
width: 38px;
Expand Down Expand Up @@ -8398,6 +8404,9 @@ body.md-skin {
color: #1ab394;
background: #ffffff;
}
.md-skin.fixed-nav #side-menu {
background-color: #fff;
}
.md-skin.fixed-nav #wrapper.top-navigation #page-wrapper {
margin-top: 0;
}
Expand Down Expand Up @@ -8428,7 +8437,7 @@ body.md-skin {
#page-wrapper {
position: inherit;
margin: 0 0 0 220px;
min-height: 1200px;
min-height: 100vh;
}
.navbar-static-side {
z-index: 2001;
Expand All @@ -8445,7 +8454,7 @@ body.md-skin {
#page-wrapper {
position: inherit;
margin: 0 0 0 0;
min-height: 1000px;
min-height: 100vh;
}
.body-small .navbar-static-side {
display: none;
Expand Down
13 changes: 6 additions & 7 deletions ASPNET_MVC5_Full_Version/Inspinia_MVC5/Scripts/app/inspinia.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
*
* INSPINIA - Responsive Admin Theme
* version 2.7
* version 2.7.1
*
*/

Expand Down Expand Up @@ -97,7 +97,8 @@ $(document).ready(function () {
});

// Minimalize menu
$('.navbar-minimalize').on('click', function () {
$('.navbar-minimalize').on('click', function (event) {
event.preventDefault();
$("body").toggleClass("mini-navbar");
SmoothlyMenu();

Expand All @@ -115,13 +116,13 @@ $(document).ready(function () {
$(".sidebar-panel").css("min-height", heightWithoutNavbar + "px");

var navbarHeight = $('nav.navbar-default').height();
var wrapperHeigh = $('#page-wrapper').height();
var wrapperHeight = $('#page-wrapper').height();

if (navbarHeight > wrapperHeigh) {
if (navbarHeight > wrapperHeight) {
$('#page-wrapper').css("min-height", navbarHeight + "px");
}

if (navbarHeight < wrapperHeigh) {
if (navbarHeight < wrapperHeight) {
$('#page-wrapper').css("min-height", $(window).height() + "px");
}

Expand Down Expand Up @@ -286,5 +287,3 @@ function WinMove() {
})
.disableSelection();
}


Loading

0 comments on commit d56b799

Please sign in to comment.