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

Merge pull request #2303 from REJack/v3-dev 

v3.0.0-rc.3 fixes
pull/2312/head
Raphael Jackstadt 2019-10-04 15:12:15 +02:00 committed by GitHub
parent 43786cdd8c c011e42b77
commit 85a1215dd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 84 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/npm/Publish.js
View File

@ -28,7 +28,11 @@ class Publish {
// Publish files
Plugins.forEach((module) => {
try {
fse.copySync(module.from, module.to)
if (fse.existsSync(module.from)) {
fse.copySync(module.from, module.to)
} else {
fse.copySync(module.from.replace('node_modules/', '../'), module.to)
}
if (this.options.verbose) {
console.log(`Copied ${module.from} to ${module.to}`)

5
build/scss/_cards.scss
View File

@ -108,10 +108,11 @@ html.maximized-card {
float: right;
margin-right: -$card-spacer-x / 2;
.input-group,
.nav,
.pagination {
margin-bottom: -$card-spacer-y / 2;
margin-top: -$card-spacer-y / 2;
margin-bottom: -$card-spacer-y / 2.5;
margin-top: -$card-spacer-y / 2.5;
}
[data-toggle='tooltip'] {

2
build/scss/_mixins.scss
View File

@ -513,7 +513,7 @@
// Accent Variant
@mixin accent-variant($name, $color) {
&.accent-#{$name} {
.accent-#{$name} {
$link-color: $color;
$link-hover-color: darken($color, 15%);
$pagination-active-bg: $color;

9
build/scss/_navs.scss
View File

@ -63,6 +63,15 @@
}
}
.navbar-no-expand {
flex-direction: row;
.nav-link {
padding-left: $navbar-nav-link-padding-x;
padding-right: $navbar-nav-link-padding-x;
}
}
// Color variants
@each $color, $value in $theme-colors {
@if $color == dark or $color == light {

6
docs/index.md
View File

@ -15,17 +15,17 @@ Visit the releases section on Github and download the [latest release](https://g
###### __Via NPM__
```bash
npm install admin-lte@3.0.0-beta.2 --save
npm install admin-lte@v3-latest --save
```
###### __Via Yarn__
```bash
yarn add admin-lte@3.0.0-beta.2
yarn add admin-lte@v3-latest
```
###### __Via Bower__
```bash
bower install admin-lte#3.0.0-beta.2
bower install admin-lte#v3-latest
```
> If bower asks which version of jQuery to use, choose version 3 or above.
{: .quote-info}

2
package.json
View File

@ -84,6 +84,7 @@
"filterizr": "^2.2.3",
"flag-icon-css": "^3.4.0",
"flot": "^3.2.9",
"fs-extra": "^5.0.0",
"icheck-bootstrap": "^3.0.1",
"inputmask": "^4.0.8",
"ion-rangeslider": "^2.3.0",
@ -120,7 +121,6 @@
"eslint": "^4.19.1",
"eslint-plugin-compat": "^2.7.0",
"extract-text-webpack-plugin": "^3.0.2",
"fs-extra": "^5.0.0",
"node-sass": "^4.12.0",
"node-sass-package-importer": "^5.3.2",
"nodemon": "^1.19.1",

6
pages/examples/invoice-print.html
View File

@ -18,7 +18,7 @@
<!-- Google Font: Source Sans Pro -->
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
</head>
<body onload="window.print();">
<body>
<div class="wrapper">
<!-- Main content -->
<section class="invoice">
@ -162,5 +162,9 @@
<!-- /.content -->
</div>
<!-- ./wrapper -->
<script type="text/javascript">
window.addEventListener("load", window.print());
</script>
</body>
</html>

108
pages/layout/top-nav.html
View File

@ -22,73 +22,77 @@ scratch. This page gets rid of all links and provides the needed markup only.
<div class="wrapper">
<!-- Navbar -->
<nav class="main-header navbar navbar-expand navbar-light navbar-white">
<nav class="main-header navbar navbar-expand-md navbar-light navbar-white">
<div class="container">
<a href="index3.html" class="navbar-brand">
<img src="../../dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
style="opacity: .8">
<span class="brand-text font-weight-light">AdminLTE 3</span>
</a>
<button class="navbar-toggler order-1" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<!-- Left navbar links -->
<ul class="navbar-nav">
<li class="nav-item">
</li>
<li class="nav-item d-none d-sm-inline-block">
<a href="index3.html" class="nav-link">Home</a>
</li>
<li class="nav-item d-none d-sm-inline-block">
<a href="#" class="nav-link">Contact</a>
</li>
<li class="nav-item dropdown">
<a id="dropdownSubMenu1" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle">Dropdown</a>
<ul aria-labelledby="dropdownSubMenu1" class="dropdown-menu border-0 shadow">
<li><a href="#" class="dropdown-item">Some action </a></li>
<li><a href="#" class="dropdown-item">Some other action</a></li>
<div class="collapse navbar-collapse order-3" id="navbarCollapse">
<!-- Left navbar links -->
<ul class="navbar-nav">
<li class="nav-item">
<a href="index3.html" class="nav-link">Home</a>
</li>
<li class="nav-item">
<a href="#" class="nav-link">Contact</a>
</li>
<li class="nav-item dropdown">
<a id="dropdownSubMenu1" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle">Dropdown</a>
<ul aria-labelledby="dropdownSubMenu1" class="dropdown-menu border-0 shadow">
<li><a href="#" class="dropdown-item">Some action </a></li>
<li><a href="#" class="dropdown-item">Some other action</a></li>
<li class="dropdown-divider"></li>
<li class="dropdown-divider"></li>
<!-- Level two dropdown-->
<li class="dropdown-submenu dropdown-hover">
<a id="dropdownSubMenu2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="dropdown-item dropdown-toggle">Hover for action</a>
<ul aria-labelledby="dropdownSubMenu2" class="dropdown-menu border-0 shadow">
<li>
<a tabindex="-1" href="#" class="dropdown-item">level 2</a>
</li>
<!-- Level two dropdown-->
<li class="dropdown-submenu dropdown-hover">
<a id="dropdownSubMenu2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="dropdown-item dropdown-toggle">Hover for action</a>
<ul aria-labelledby="dropdownSubMenu2" class="dropdown-menu border-0 shadow">
<li>
<a tabindex="-1" href="#" class="dropdown-item">level 2</a>
</li>
<!-- Level three dropdown-->
<li class="dropdown-submenu">
<a id="dropdownSubMenu3" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="dropdown-item dropdown-toggle">level 2</a>
<ul aria-labelledby="dropdownSubMenu3" class="dropdown-menu border-0 shadow">
<li><a href="#" class="dropdown-item">3rd level</a></li>
<li><a href="#" class="dropdown-item">3rd level</a></li>
</ul>
</li>
<!-- End Level three -->
<!-- Level three dropdown-->
<li class="dropdown-submenu">
<a id="dropdownSubMenu3" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="dropdown-item dropdown-toggle">level 2</a>
<ul aria-labelledby="dropdownSubMenu3" class="dropdown-menu border-0 shadow">
<li><a href="#" class="dropdown-item">3rd level</a></li>
<li><a href="#" class="dropdown-item">3rd level</a></li>
</ul>
</li>
<!-- End Level three -->
<li><a href="#" class="dropdown-item">level 2</a></li>
<li><a href="#" class="dropdown-item">level 2</a></li>
</ul>
</li>
<!-- End Level two -->
</ul>
</li>
</ul>
<li><a href="#" class="dropdown-item">level 2</a></li>
<li><a href="#" class="dropdown-item">level 2</a></li>
</ul>
</li>
<!-- End Level two -->
</ul>
</li>
</ul>
<!-- SEARCH FORM -->
<form class="form-inline ml-3">
<div class="input-group input-group-sm">
<input class="form-control form-control-navbar" type="search" placeholder="Search" aria-label="Search">
<div class="input-group-append">
<button class="btn btn-navbar" type="submit">
<i class="fas fa-search"></i>
</button>
<!-- SEARCH FORM -->
<form class="form-inline ml-0 ml-md-3">
<div class="input-group input-group-sm">
<input class="form-control form-control-navbar" type="search" placeholder="Search" aria-label="Search">
<div class="input-group-append">
<button class="btn btn-navbar" type="submit">
<i class="fas fa-search"></i>
</button>
</div>
</div>
</div>
</form>
</form>
</div>
<!-- Right navbar links -->
<ul class="navbar-nav ml-auto">
<ul class="order-1 order-md-3 navbar-nav navbar-no-expand ml-auto">
<!-- Messages Dropdown Menu -->
<li class="nav-item dropdown">
<a class="nav-link" data-toggle="dropdown" href="#">

2
pages/tables/simple.html
View File

@ -841,7 +841,7 @@
<h3 class="card-title">Simple Full Width Table</h3>
<div class="card-tools">
<ul class="pagination pagination-sm m-0 float-right">
<ul class="pagination pagination-sm float-right">
<li class="page-item"><a class="page-link" href="#">&laquo;</a></li>
<li class="page-item"><a class="page-link" href="#">1</a></li>
<li class="page-item"><a class="page-link" href="#">2</a></li>