jinql
/
gentelella
mirror of https://github.com/ColorlibHQ/gentelella
1
0
Fork 0
Code Issues Releases Wiki Activity

Combined update. 

-
pull/776/head
AndreiCN 2018-09-06 17:07:21 +03:00
parent abae2bb9b9
commit b4c6cddde6
10 changed files with 163 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
build/css/custom.css
View File

@ -1,3 +1,94 @@
.daterangepicker .ranges li {
color: #73879C; }
.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
background: #536A7F;
border: 1px solid #536A7F;
color: #fff; }
.daterangepicker .input-mini {
background-color: #eee;
border: 1px solid #ccc;
box-shadow: none !important; }
.daterangepicker .input-mini.active {
border: 1px solid #ccc; }
.daterangepicker select.monthselect, .daterangepicker select.yearselect, .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
font-size: 12px;
padding: 1px;
height: auto;
margin: 0;
cursor: default;
height: 30px;
border: 1px solid #ADB2B5;
line-height: 30px;
border-radius: 0px !important; }
.daterangepicker select.monthselect {
margin-right: 2%; }
.daterangepicker td.in-range {
background: #E4E7EA;
color: #73879C; }
.daterangepicker td.active, .daterangepicker td.active:hover {
background-color: #536A7F;
color: #fff; }
.daterangepicker th.available:hover {
background: #eee;
color: #34495E; }
.daterangepicker:before, .daterangepicker:after {
content: none; }
.daterangepicker .calendar.single {
margin: 0 0 4px 0; }
.daterangepicker .calendar.single .calendar-table {
width: 224px;
padding: 0 0 4px 0 !important; }
.daterangepicker .calendar.single .calendar-table thead tr:first-child th {
padding: 8px 5px; }
.daterangepicker .calendar.single .calendar-table thead th {
border-radius: 0; }
.daterangepicker.picker_1 {
color: #fff;
background: #34495E; }
.daterangepicker.picker_1 .calendar-table {
background: #34495E; }
.daterangepicker.picker_1 .calendar-table thead tr {
background: #213345; }
.daterangepicker.picker_1 .calendar-table thead tr:first-child {
background: #1ABB9C; }
.daterangepicker.picker_1 .calendar-table td.off {
background: #34495E;
color: #999; }
.daterangepicker.picker_1 .calendar-table td.available:hover {
color: #34495E; }
.daterangepicker.picker_2 .calendar-table thead tr {
color: #1ABB9C; }
.daterangepicker.picker_2 .calendar-table thead tr:first-child {
color: #73879C; }
.daterangepicker.picker_3 .calendar-table thead tr:first-child {
color: #fff;
background: #1ABB9C; }
.daterangepicker.picker_4 .calendar-table thead tr:first-child {
color: #fff;
background: #34495E; }
.daterangepicker.picker_4 .calendar-table td, .daterangepicker.picker_4 .calendar-table td.off {
background: #ECF0F1;
border: 1px solid #fff;
border-radius: 0; }
.daterangepicker.picker_4 .calendar-table td.active {
background: #34495E; }
.calendar-exibit .show-calendar {
float: none;
display: block;
position: relative;
background-color: #fff;
border: 1px solid #ccc;
margin-bottom: 20px;
border: 1px solid rgba(0, 0, 0, 0.15);
overflow: hidden; }
.calendar-exibit .show-calendar .calendar {
margin: 0 0 4px 0; }
.calendar-exibit .show-calendar.picker_1 {
background: #34495E; }
.calendar-exibit .calendar-table {
padding: 0 0 4px 0; }
@charset "UTF-8";
.left_col {
background: #2A3F54; }
@ -187,7 +278,7 @@
@media (min-width: 480px) {
.nav_menu {
position: static; } }
.nav-md .container.body .col-md-3.left_col {
.nav-md .container-fluid.body .left_col {
min-height: 100%;
width: 230px;
padding: 0;
@ -3895,94 +3986,3 @@ ul.notifications {
.x_panel .dropdown-menu {
left: initial;
right: 0; } }
.daterangepicker .ranges li {
color: #73879C; }
.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
background: #536A7F;
border: 1px solid #536A7F;
color: #fff; }
.daterangepicker .input-mini {
background-color: #eee;
border: 1px solid #ccc;
box-shadow: none !important; }
.daterangepicker .input-mini.active {
border: 1px solid #ccc; }
.daterangepicker select.monthselect, .daterangepicker select.yearselect, .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect {
font-size: 12px;
padding: 1px;
height: auto;
margin: 0;
cursor: default;
height: 30px;
border: 1px solid #ADB2B5;
line-height: 30px;
border-radius: 0px !important; }
.daterangepicker select.monthselect {
margin-right: 2%; }
.daterangepicker td.in-range {
background: #E4E7EA;
color: #73879C; }
.daterangepicker td.active, .daterangepicker td.active:hover {
background-color: #536A7F;
color: #fff; }
.daterangepicker th.available:hover {
background: #eee;
color: #34495E; }
.daterangepicker:before, .daterangepicker:after {
content: none; }
.daterangepicker .calendar.single {
margin: 0 0 4px 0; }
.daterangepicker .calendar.single .calendar-table {
width: 224px;
padding: 0 0 4px 0 !important; }
.daterangepicker .calendar.single .calendar-table thead tr:first-child th {
padding: 8px 5px; }
.daterangepicker .calendar.single .calendar-table thead th {
border-radius: 0; }
.daterangepicker.picker_1 {
color: #fff;
background: #34495E; }
.daterangepicker.picker_1 .calendar-table {
background: #34495E; }
.daterangepicker.picker_1 .calendar-table thead tr {
background: #213345; }
.daterangepicker.picker_1 .calendar-table thead tr:first-child {
background: #1ABB9C; }
.daterangepicker.picker_1 .calendar-table td.off {
background: #34495E;
color: #999; }
.daterangepicker.picker_1 .calendar-table td.available:hover {
color: #34495E; }
.daterangepicker.picker_2 .calendar-table thead tr {
color: #1ABB9C; }
.daterangepicker.picker_2 .calendar-table thead tr:first-child {
color: #73879C; }
.daterangepicker.picker_3 .calendar-table thead tr:first-child {
color: #fff;
background: #1ABB9C; }
.daterangepicker.picker_4 .calendar-table thead tr:first-child {
color: #fff;
background: #34495E; }
.daterangepicker.picker_4 .calendar-table td, .daterangepicker.picker_4 .calendar-table td.off {
background: #ECF0F1;
border: 1px solid #fff;
border-radius: 0; }
.daterangepicker.picker_4 .calendar-table td.active {
background: #34495E; }
.calendar-exibit .show-calendar {
float: none;
display: block;
position: relative;
background-color: #fff;
border: 1px solid #ccc;
margin-bottom: 20px;
border: 1px solid rgba(0, 0, 0, 0.15);
overflow: hidden; }
.calendar-exibit .show-calendar .calendar {
margin: 0 0 4px 0; }
.calendar-exibit .show-calendar.picker_1 {
background: #34495E; }
.calendar-exibit .calendar-table {
padding: 0 0 4px 0; }

6
build/css/custom.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
build/js/custom.js
View File

@ -4260,7 +4260,7 @@ $(".bulk_action input").on("ifChecked", function() {
})
}), "undefined" != typeof NProgress && ($(document).ready(function() {
NProgress.start()
}), $(window).load(function() {
}), $(window).on('load', function() {
NProgress.done()
}));
var originalLeave = $.fn.popover.Constructor.prototype.leave;

4
production/calendar.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Gentelella Alela! | </title>
<title>Gentelella Alela!!! | </title>
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
@ -411,6 +411,8 @@
<!-- jQuery -->
<script src="../vendors/jquery/dist/jquery.min.js"></script>
<script src="../vendors/popper/popper.min.js"></script>
<!-- Bootstrap -->
<script src="../vendors/bootstrap/dist/js/bootstrap.min.js"></script>
<!-- FastClick -->

8
production/index.html
View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="images/favicon.ico" type="image/ico" />
<title>Gentelella Alela! | </title>
<title>Gentelella Alela!! | </title>
<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
@ -31,8 +31,8 @@
</head>
<body class="nav-md">
<div class="container body">
<div class="main_container">
<div class="container-fluid body">
<div class="main_container row">
<div class="col-md-3 left_col">
<div class="left_col">
<div class="navbar nav_title" style="border: 0;">
@ -1021,7 +1021,7 @@
<script src="../vendors/bootstrap-daterangepicker/daterangepicker.js"></script>
<!-- Custom Theme Scripts -->
<script src="../build/js/custom.min.js"></script>
<script src="../build/js/custom.js"></script>
</body>
</html>

2
src/scss/custom.scss
View File

@ -190,7 +190,7 @@
position: static;
}
}
.nav-md .container.body .col-md-3.left_col {
.nav-md .container-fluid.body .left_col {
min-height: 100%;
width: 230px;
padding: 0;

20
vendors/bootstrap/nuget/MyGet.ps1 vendored
View File

@ -1,8 +1,18 @@
# set env vars usually set by MyGet (enable for local testing)
#$env:SourcesPath = '..'
#$env:NuGet = "./nuget.exe" #https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
$nuget = $env:NuGet
#parse the version number out of package.json
$bsversion = ((Get-Content $env:SourcesPath\package.json) -join "`n" | ConvertFrom-Json).version
# parse the version number out of package.json
$bsversionParts = ((Get-Content $env:SourcesPath\package.json) -join "`n" | ConvertFrom-Json).version.split('-', 2) # split the version on the '-'
$bsversion = $bsversionParts[0]
#create packages
& $nuget pack "nuget\bootstrap.nuspec" -Verbosity detailed -NonInteractive -NoPackageAnalysis -BasePath $env:SourcesPath -Version $bsversion
& $nuget pack "nuget\bootstrap.less.nuspec" -Verbosity detailed -NonInteractive -NoPackageAnalysis -BasePath $env:SourcesPath -Version $bsversion
if ($bsversionParts.Length -gt 1)
{
$bsversion += '-' + $bsversionParts[1].replace('.', '').replace('-', '_') # strip out invalid chars from the PreRelease part
}
# create packages
& $nuget pack "$env:SourcesPath\nuget\bootstrap.nuspec" -Verbosity detailed -NonInteractive -NoPackageAnalysis -BasePath $env:SourcesPath -Version $bsversion
& $nuget pack "$env:SourcesPath\nuget\bootstrap.sass.nuspec" -Verbosity detailed -NonInteractive -NoPackageAnalysis -BasePath $env:SourcesPath -Version $bsversion

28
vendors/bootstrap/nuget/bootstrap.less.nuspec vendored
View File

@ -1,28 +0,0 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>bootstrap.less</id>
<version>3.3</version>
<title>Bootstrap Less</title>
<authors>Twitter, Inc.</authors>
<owners>bootstrap</owners>
<description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description>
<releaseNotes>http://blog.getbootstrap.com</releaseNotes>
<summary>Bootstrap framework in Less. Includes fonts and JavaScript</summary>
<language>en-us</language>
<projectUrl>http://getbootstrap.com</projectUrl>
<iconUrl>http://getbootstrap.com/apple-touch-icon.png</iconUrl>
<licenseUrl>https://github.com/twbs/bootstrap/blob/master/LICENSE</licenseUrl>
<copyright>Copyright 2015</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
<dependency id="jQuery" version="[1.9.1,3)" />
</dependencies>
<tags>css js less mobile-first responsive front-end framework web</tags>
</metadata>
<files>
<file src="less\**\*.less" target="content\Content\bootstrap" />
<file src="fonts\*.*" target="content\Content\fonts" />
<file src="dist\js\bootstrap*.js" target="content\Scripts" />
</files>
</package>

19
vendors/bootstrap/nuget/bootstrap.nuspec vendored
View File

@ -2,27 +2,28 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>bootstrap</id>
<version>3.3</version>
<version>4.1.0</version>
<title>Bootstrap CSS</title>
<authors>Twitter, Inc.</authors>
<authors>The Bootstrap Authors, Twitter Inc.</authors>
<owners>bootstrap</owners>
<description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description>
<releaseNotes>http://blog.getbootstrap.com</releaseNotes>
<releaseNotes>https://blog.getbootstrap.com/</releaseNotes>
<summary>Bootstrap framework in CSS. Includes fonts and JavaScript</summary>
<language>en-us</language>
<projectUrl>http://getbootstrap.com</projectUrl>
<iconUrl>http://getbootstrap.com/apple-touch-icon.png</iconUrl>
<projectUrl>https://getbootstrap.com/</projectUrl>
<iconUrl>https://getbootstrap.com/assets/img/favicons/apple-touch-icon.png</iconUrl>
<licenseUrl>https://github.com/twbs/bootstrap/blob/master/LICENSE</licenseUrl>
<copyright>Copyright 2015</copyright>
<copyright>Copyright 2017-2018</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
<dependency id="jQuery" version="[1.9.1,3)" />
<dependency id="jQuery" version="[3.0.0,4)" />
<dependency id="popper.js" version="[1.14.0,2)" />
</dependencies>
<tags>css js less mobile-first responsive front-end framework web</tags>
<tags>css mobile-first responsive front-end framework web</tags>
</metadata>
<files>
<file src="dist\css\*.*" target="content\Content" />
<file src="dist\fonts\*.*" target="content\fonts" />
<file src="dist\js\bootstrap*.js" target="content\Scripts" />
<file src="dist\js\bootstrap*.js.map" target="content\Scripts" />
</files>
</package>

29
vendors/bootstrap/nuget/bootstrap.sass.nuspec vendored Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>bootstrap.sass</id>
<version>4.1.0</version>
<title>Bootstrap Sass</title>
<authors>The Bootstrap Authors, Twitter Inc.</authors>
<owners>bootstrap</owners>
<description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description>
<releaseNotes>https://blog.getbootstrap.com/</releaseNotes>
<summary>Bootstrap framework in Sass. Includes fonts and JavaScript</summary>
<language>en-us</language>
<projectUrl>https://getbootstrap.com/</projectUrl>
<iconUrl>https://getbootstrap.com/assets/img/favicons/apple-touch-icon.png</iconUrl>
<licenseUrl>https://github.com/twbs/bootstrap/blob/master/LICENSE</licenseUrl>
<copyright>Copyright 2017-2018</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
<dependency id="jQuery" version="[3.0.0,4)" />
<dependency id="popper.js" version="[1.14.0,2)" />
</dependencies>
<tags>css sass mobile-first responsive front-end framework web</tags>
</metadata>
<files>
<file src="scss\**\*.scss" target="content\Content\bootstrap" />
<file src="dist\js\bootstrap*.js" target="content\Scripts" />
<file src="dist\js\bootstrap*.js.map" target="content\Scripts" />
</files>
</package>