mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-09 23:24:06 -08:00
Merge remote-tracking branch 'origin/develop'
# Conflicts: # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/mix-manifest.json
This commit is contained in:
snipe
commit
77ec64aded
|
|
@ -2128,6 +2128,15 @@
|
|||
"contributions": [
|
||||
"code"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "joelpittet",
|
||||
"name": "Joel Pittet",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/70129?v=4",
|
||||
"profile": "https://pittet.ca",
|
||||
"contributions": [
|
||||
"code"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
 [](https://crowdin.com/project/snipe-it) [](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [](https://hub.docker.com/r/snipe/snipe-it/) [](https://twitter.com/snipeitapp) [](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
|
||||
[](#contributors)
|
||||
[](#contributors)
|
||||
|
||||
## Snipe-IT - Open Source Asset Management System
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
|
|||
| [<img src="https://avatars0.githubusercontent.com/u/1255375?v=4" width="110px;"/><br /><sub>Peter Upfold</sub>](https://peter.upfold.org.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterUpfold "Code") | [<img src="https://avatars2.githubusercontent.com/u/961717?v=4" width="110px;"/><br /><sub>Jared Biel</sub>](https://github.com/jbiel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbiel "Code") | [<img src="https://avatars1.githubusercontent.com/u/1733625?v=4" width="110px;"/><br /><sub>Dampfklon</sub>](https://github.com/dampfklon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dampfklon "Code") | [<img src="https://avatars2.githubusercontent.com/u/52973156?v=4" width="110px;"/><br /><sub>Charles Hamilton</sub>](https://communityclosing.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chamilton-ccn "Code") | [<img src="https://avatars.githubusercontent.com/u/551789?v=4" width="110px;"/><br /><sub>Giuseppe Iannello</sub>](https://github.com/giannello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=giannello "Code") | [<img src="https://avatars.githubusercontent.com/u/3691490?v=4" width="110px;"/><br /><sub>Peter Dave Hello</sub>](https://www.peterdavehello.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterDaveHello "Code") | [<img src="https://avatars.githubusercontent.com/u/6106332?v=4" width="110px;"/><br /><sub>sigmoidal</sub>](https://github.com/sigmoidal)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sigmoidal "Code") |
|
||||
| [<img src="https://avatars.githubusercontent.com/u/2082554?v=4" width="110px;"/><br /><sub>Vincent Lainé</sub>](https://github.com/phenixdotnet)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phenixdotnet "Code") | [<img src="https://avatars.githubusercontent.com/u/1943040?v=4" width="110px;"/><br /><sub>Lucas Pleß</sub>](http://www.lucas-pless.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derlucas "Code") | [<img src="https://avatars.githubusercontent.com/u/472804?v=4" width="110px;"/><br /><sub>Ian Littman</sub>](http://twitter.com/iansltx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=iansltx "Code") | [<img src="https://avatars.githubusercontent.com/u/3519029?v=4" width="110px;"/><br /><sub>João Paulo</sub>](https://github.com/PauloLuna)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PauloLuna "Code") | [<img src="https://avatars.githubusercontent.com/u/70443365?v=4" width="110px;"/><br /><sub>ThoBur</sub>](https://github.com/ThoBur)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ThoBur "Code") | [<img src="https://avatars.githubusercontent.com/u/1972329?v=4" width="110px;"/><br /><sub>Alexander Chibrikin</sub>](http://phpprofi.ru/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alek13 "Code") | [<img src="https://avatars.githubusercontent.com/u/438332?v=4" width="110px;"/><br /><sub>Anthony Winstanley</sub>](https://github.com/winstan)<br />[💻](https://github.com/snipe/snipe-it/commits?author=winstan "Code") |
|
||||
| [<img src="https://avatars.githubusercontent.com/u/3075214?v=4" width="110px;"/><br /><sub>Folke</sub>](https://github.com/fashberg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fashberg "Code") | [<img src="https://avatars.githubusercontent.com/u/1351571?v=4" width="110px;"/><br /><sub>Bennett Blodinger</sub>](https://github.com/benwa)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benwa "Code") | [<img src="https://avatars.githubusercontent.com/u/2974631?v=4" width="110px;"/><br /><sub>NMC</sub>](https://nmc.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ncareau "Code") | [<img src="https://avatars.githubusercontent.com/u/52182449?v=4" width="110px;"/><br /><sub>andres-baller</sub>](https://github.com/andres-baller)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andres-baller "Code") | [<img src="https://avatars.githubusercontent.com/u/67109348?v=4" width="110px;"/><br /><sub>sean-borg</sub>](https://github.com/sean-borg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sean-borg "Code") | [<img src="https://avatars.githubusercontent.com/u/32170051?v=4" width="110px;"/><br /><sub>EDVLeer</sub>](https://github.com/EDVLeer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=EDVLeer "Code") | [<img src="https://avatars.githubusercontent.com/u/23075196?v=4" width="110px;"/><br /><sub>Kurokat</sub>](https://github.com/Kurokat)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Kurokat "Code") |
|
||||
| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") |
|
||||
| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") |
|
||||
<!-- ALL-CONTRIBUTORS-LIST:END -->
|
||||
|
||||
This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ class LocationsController extends Controller
|
|||
|
||||
|
||||
|
||||
$offset = (($locations) && (request('offset') > $locations->count())) ? 0 : request('offset', 0);
|
||||
$offset = (($locations) && (request('offset') > $locations->count())) ? $locations->count() : request('offset', 0);
|
||||
|
||||
// Check to make sure the limit is not higher than the max allowed
|
||||
((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results');
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ class BulkUsersController extends Controller
|
|||
}
|
||||
|
||||
$users = User::whereIn('id', $user_raw_array)->get();
|
||||
$assets = Asset::whereIn('assigned_to', $user_raw_array)->get();
|
||||
$assets = Asset::whereIn('assigned_to', $user_raw_array)->where('assigned_type', 'App\Models\User')->get();
|
||||
$accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get();
|
||||
$licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get();
|
||||
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ class AssetModelPresenter extends Presenter
|
|||
"sortable" => false,
|
||||
"switchable" => false,
|
||||
"title" => trans('table.actions'),
|
||||
"formatter" => "licensesActionsFormatter",
|
||||
"formatter" => "modelsActionsFormatter",
|
||||
];
|
||||
|
||||
|
||||
|
|
|
|||
BIN
public/css/dist/skins/skin-black-dark.css
vendored
BIN
public/css/dist/skins/skin-black-dark.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-black-dark.min.css
vendored
BIN
public/css/dist/skins/skin-black-dark.min.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-blue-dark.css
vendored
BIN
public/css/dist/skins/skin-blue-dark.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-blue-dark.min.css
vendored
BIN
public/css/dist/skins/skin-blue-dark.min.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-green-dark.css
vendored
BIN
public/css/dist/skins/skin-green-dark.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-green-dark.min.css
vendored
BIN
public/css/dist/skins/skin-green-dark.min.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-orange-dark.css
vendored
BIN
public/css/dist/skins/skin-orange-dark.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-orange-dark.min.css
vendored
BIN
public/css/dist/skins/skin-orange-dark.min.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-purple-dark.css
vendored
BIN
public/css/dist/skins/skin-purple-dark.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-purple-dark.min.css
vendored
BIN
public/css/dist/skins/skin-purple-dark.min.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-red-dark.css
vendored
BIN
public/css/dist/skins/skin-red-dark.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-red-dark.min.css
vendored
BIN
public/css/dist/skins/skin-red-dark.min.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-yellow-dark.css
vendored
BIN
public/css/dist/skins/skin-yellow-dark.css
vendored
Binary file not shown.
BIN
public/css/dist/skins/skin-yellow-dark.min.css
vendored
BIN
public/css/dist/skins/skin-yellow-dark.min.css
vendored
Binary file not shown.
BIN
public/js/dist/all.js
vendored
BIN
public/js/dist/all.js
vendored
Binary file not shown.
BIN
public/js/dist/bootstrap-table.js
vendored
BIN
public/js/dist/bootstrap-table.js
vendored
Binary file not shown.
|
|
@ -1,38 +1,21 @@
|
|||
{
|
||||
"/js/build/app.js": "/js/build/app.js?id=dbeda4a18809e6247c2a",
|
||||
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341",
|
||||
"/css/build/app.css": "/css/build/app.css?id=032fd8c3fce99c7fd862",
|
||||
"/css/build/overrides.css": "/css/build/overrides.css?id=0b4aefd7ef0c117ef23a",
|
||||
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=2a741dd5409582c0af89",
|
||||
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=817384969ed226028416",
|
||||
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=d7996d850e8bcdc4e167",
|
||||
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=eee1d10b6d7db576428e",
|
||||
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=3b3c544f99a912a4a27b",
|
||||
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=39250963ef83dac17f77",
|
||||
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=1a1ebcc437f2de698c27",
|
||||
"/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=9b0d44d6e3a9cf46fa02",
|
||||
"/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=b8be296ada5cbc4563fa",
|
||||
"/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=3acc03e5a20757aa08ca",
|
||||
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=67a30cff63473dade0e3",
|
||||
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=46311efe6c78ad08a7ce",
|
||||
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=1473bf8494b4c962eb44",
|
||||
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=b41e38b304805136e81f",
|
||||
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=39eb843599c275696aed",
|
||||
"/css/dist/all.css": "/css/dist/all.css?id=199fdf677ce0dce6cef8",
|
||||
"/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
|
||||
"/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
|
||||
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=3b3c544f99a912a4a27b",
|
||||
"/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=1a1ebcc437f2de698c27",
|
||||
"/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=1473bf8494b4c962eb44",
|
||||
"/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=46311efe6c78ad08a7ce",
|
||||
"/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=9b0d44d6e3a9cf46fa02",
|
||||
"/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=3acc03e5a20757aa08ca",
|
||||
"/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=b41e38b304805136e81f",
|
||||
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=d7996d850e8bcdc4e167",
|
||||
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
|
||||
"/css/build/signature-pad.min.css": "/css/build/signature-pad.min.css?id=d41d8cd98f00b204e980",
|
||||
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=1e77fde04b3f42432581",
|
||||
"/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
|
||||
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=58d95c93430f2ae33392",
|
||||
"/js/dist/all.js": "/js/dist/all.js?id=0efed60df4636f215a73"
|
||||
"/js/build/app.js": "/js/build/app.js",
|
||||
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css",
|
||||
"/css/build/app.css": "/css/build/app.css",
|
||||
"/css/build/overrides.css": "/css/build/overrides.css",
|
||||
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css",
|
||||
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css",
|
||||
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css",
|
||||
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css",
|
||||
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css",
|
||||
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css",
|
||||
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css",
|
||||
"/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css",
|
||||
"/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css",
|
||||
"/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css",
|
||||
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css",
|
||||
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css",
|
||||
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css",
|
||||
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css",
|
||||
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,13 +108,14 @@ a {
|
|||
--background: #222;
|
||||
--back-main: #333;
|
||||
--back-sub: #444;
|
||||
--back-sub-alt: #dfd9d8;
|
||||
--button-default: darken(@black, 15%);
|
||||
--button-primary: darken(@black, 25%);
|
||||
--button-hover: darken(@black, 30%);
|
||||
--header: @black; /* Use same as Header picker */
|
||||
--text-main: #BBB;
|
||||
--text-sub: #9b9b9b;
|
||||
--link: lighten(@black, 30%); /* Use same as Header picker, lighten by 70% */
|
||||
--link: #AAA; /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: lighten(@black, 40%); /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: lighten(@black, 45%); /* Use same as Header picker, lighten by 70% */
|
||||
--nav-link: #FFF; /* Use same as Header picker */
|
||||
|
|
@ -164,7 +165,20 @@ a:hover {
|
|||
color: var(--nav-link) !important;
|
||||
}
|
||||
}
|
||||
a:link.btn-default{
|
||||
color: var(--nav-link);
|
||||
}
|
||||
/* Trying to figure out a way of having links different shades based on what row they are on (even/odd).
|
||||
a unique challenge for this dark mode skin.
|
||||
Probably writing the specificity for this incorrectly. --Godfrey Martinez 02/04/21
|
||||
|
||||
.table-striped>tbody>tr:nth-of-type(even)>a:link{
|
||||
color:#000d07;
|
||||
}
|
||||
.table-striped>tbody>tr:nth-of-type(odd)>a:link{
|
||||
color:#bfbfbf;
|
||||
|
||||
}*/
|
||||
|
||||
#accessoriesTable>tbody>tr>td>nobr>a>i.fa {
|
||||
color: var(--text-main);
|
||||
|
|
@ -189,20 +203,20 @@ body {
|
|||
}
|
||||
.btn-default{
|
||||
background-color: var(--button-default);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
|
||||
.btn-default dropdown-toggle {
|
||||
background-color: var(--button-default);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
|
||||
.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
|
||||
background-color: var(--button-hover);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.btn-primary, .btn-primary.hover, .btn-primary:active, .text-black {
|
||||
color: var(--text-main)!important;
|
||||
color: var(--nav-link)!important;
|
||||
}
|
||||
.btn-primary:hover {
|
||||
background-color: var(--button-primary);
|
||||
|
|
@ -334,6 +348,11 @@ input[type=text], input[type=search] {
|
|||
}
|
||||
.table-striped>tbody>tr:nth-of-type(odd) {
|
||||
background-color: var(--back-sub);
|
||||
color: var(--text-main);
|
||||
}
|
||||
.table-striped>tbody>tr:nth-of-type(even){
|
||||
background-color: var(--back-sub-alt);
|
||||
color: var(--header);
|
||||
}
|
||||
#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
|
||||
color: var(--text-main);
|
||||
|
|
|
|||
|
|
@ -108,15 +108,16 @@ a {
|
|||
--background: #222;
|
||||
--back-main: #333;
|
||||
--back-sub: #444;
|
||||
--back-sub-alt: #dfd9d8;
|
||||
--button-default: darken(@blue, 15%);
|
||||
--button-primary: darken(@blue, 25%);
|
||||
--button-hover: darken(@blue, 30%);
|
||||
--header: @blue; /* Use same as Header picker */
|
||||
--text-main: #BBB;
|
||||
--text-sub: #9b9b9b;
|
||||
--link: lighten(@blue, 30%); /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: lighten(@blue, 40%); /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: lighten(@blue, 45%); /* Use same as Header picker, lighten by 70% */
|
||||
--link: #1978D4; /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: #3c8dbc ; /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: #4B77BE; /* Use same as Header picker, lighten by 70% */
|
||||
--nav-link: #FFF; /* Use same as Header picker */
|
||||
--light-link: #fff; /* Use same as Header picker */
|
||||
}
|
||||
|
|
@ -239,6 +240,9 @@ body {
|
|||
background-color: var(--back-main);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.fixed-table-body thead th .th-inner{
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.form-control {
|
||||
background-color: var(--back-main);
|
||||
color: var(--text-main);
|
||||
|
|
@ -335,6 +339,10 @@ input[type=text], input[type=search] {
|
|||
.table-striped>tbody>tr:nth-of-type(odd) {
|
||||
background-color: var(--back-sub);
|
||||
}
|
||||
.table-striped>tbody>tr:nth-of-type(even){
|
||||
background-color: var(--back-sub-alt);
|
||||
color: var(--header);
|
||||
}
|
||||
#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
|
||||
color: var(--text-main);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,15 +108,16 @@ a {
|
|||
--background: #222;
|
||||
--back-main: #333;
|
||||
--back-sub: #444;
|
||||
--back-sub-alt: #dfd9d8;
|
||||
--button-default: darken(@green, 15%);
|
||||
--button-primary: darken(@green, 25%);
|
||||
--button-hover: darken(@green, 30%);
|
||||
--header: @green; /* Use same as Header picker */
|
||||
--text-main: #BBB;
|
||||
--text-sub: #9b9b9b;
|
||||
--link: lighten(@green, 30%); /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: lighten(@green, 40%); /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: lighten(@green, 45%); /* Use same as Header picker, lighten by 70% */
|
||||
--link: #28A228; /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: #5D995D; /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: #00AA00; /* Use same as Header picker, lighten by 70% */
|
||||
--nav-link: #FFF; /* Use same as Header picker */
|
||||
--light-link: #fff; /* Use same as Header picker */
|
||||
}
|
||||
|
|
@ -239,6 +240,9 @@ body {
|
|||
background-color: var(--back-main);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.fixed-table-body thead th .th-inner{
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.form-control {
|
||||
background-color: var(--back-main);
|
||||
color: var(--text-main);
|
||||
|
|
@ -335,6 +339,10 @@ input[type=text], input[type=search] {
|
|||
.table-striped>tbody>tr:nth-of-type(odd) {
|
||||
background-color: var(--back-sub);
|
||||
}
|
||||
.table-striped>tbody>tr:nth-of-type(even){
|
||||
background-color: var(--back-sub-alt);
|
||||
color: var(--header);
|
||||
}
|
||||
#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
|
||||
color: var(--text-main);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,15 +108,16 @@ a {
|
|||
--background: #222;
|
||||
--back-main: #333;
|
||||
--back-sub: #444;
|
||||
--back-sub-alt: #dfd9d8;
|
||||
--button-default: darken(@orange, 15%);
|
||||
--button-primary: darken(@orange, 25%);
|
||||
--button-hover: darken(@orange, 30%);
|
||||
--header: @orange; /* Use same as Header picker */
|
||||
--text-main: #BBB;
|
||||
--text-sub: #9b9b9b;
|
||||
--link: lighten(@orange, 30%); /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: lighten(@orange, 40%); /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: lighten(@orange, 45%); /* Use same as Header picker, lighten by 70% */
|
||||
--link: #D43900; /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: #D46A43; /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: #FF4500; /* Use same as Header picker, lighten by 70% */
|
||||
--nav-link: #FFF; /* Use same as Header picker */
|
||||
--light-link: #fff; /* Use same as Header picker */
|
||||
}
|
||||
|
|
@ -189,20 +190,22 @@ body {
|
|||
}
|
||||
.btn-default{
|
||||
background-color: var(--button-default);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
a:link.btn-default{
|
||||
color: var(--nav-link);
|
||||
}
|
||||
|
||||
.btn-default dropdown-toggle {
|
||||
background-color: var(--button-default);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
|
||||
.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
|
||||
background-color: var(--button-hover);
|
||||
color: var(--link);
|
||||
color: var(--background);
|
||||
}
|
||||
.btn-primary, .btn-primary.hover, .btn-primary:active, .text-orange {
|
||||
color: var(--text-main)!important;
|
||||
color: var(--nav-link)!important;
|
||||
}
|
||||
.btn-primary:hover {
|
||||
background-color: var(--button-primary);
|
||||
|
|
@ -239,6 +242,9 @@ body {
|
|||
background-color: var(--back-main);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.fixed-table-body thead th .th-inner{
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.form-control {
|
||||
background-color: var(--back-main);
|
||||
color: var(--text-main);
|
||||
|
|
@ -335,6 +341,10 @@ input[type=text], input[type=search] {
|
|||
.table-striped>tbody>tr:nth-of-type(odd) {
|
||||
background-color: var(--back-sub);
|
||||
}
|
||||
.table-striped>tbody>tr:nth-of-type(even){
|
||||
background-color: var(--back-sub-alt);
|
||||
color: var(--header);
|
||||
}
|
||||
#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
|
||||
color: var(--text-main);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,15 +108,16 @@ a {
|
|||
--background: #222;
|
||||
--back-main: #333;
|
||||
--back-sub: #444;
|
||||
--back-sub-alt: #dfd9d8;
|
||||
--button-default: darken(@purple, 15%);
|
||||
--button-primary: darken(@purple, 25%);
|
||||
--button-hover: darken(@purple, 30%);
|
||||
--header: @purple; /* Use same as Header picker */
|
||||
--text-main: #BBB;
|
||||
--text-sub: #9b9b9b;
|
||||
--link: lighten(@purple, 30%); /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: lighten(@purple, 40%); /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: lighten(@purple, 45%); /* Use same as Header picker, lighten by 70% */
|
||||
--link: #9370DB; /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: #B93CF6; /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: #BF55EC; /* Use same as Header picker, lighten by 70% */
|
||||
--nav-link: #FFF; /* Use same as Header picker */
|
||||
--light-link: #fff; /* Use same as Header picker */
|
||||
}
|
||||
|
|
@ -165,7 +166,9 @@ a:hover {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
a:link.btn-default{
|
||||
color: var(--nav-link);
|
||||
}
|
||||
#accessoriesTable>tbody>tr>td>nobr>a>i.fa {
|
||||
color: var(--text-main);
|
||||
}
|
||||
|
|
@ -189,20 +192,20 @@ body {
|
|||
}
|
||||
.btn-default{
|
||||
background-color: var(--button-default);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
|
||||
.btn-default dropdown-toggle {
|
||||
background-color: var(--button-default);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
|
||||
.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
|
||||
background-color: var(--button-hover);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.btn-primary, .btn-primary.hover, .btn-primary:active, .text-purple {
|
||||
color: var(--text-main)!important;
|
||||
color: var(--nav-link)!important;
|
||||
}
|
||||
.btn-primary:hover {
|
||||
background-color: var(--button-primary);
|
||||
|
|
@ -239,6 +242,9 @@ body {
|
|||
background-color: var(--back-main);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.fixed-table-body thead th .th-inner{
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.form-control {
|
||||
background-color: var(--back-main);
|
||||
color: var(--text-main);
|
||||
|
|
@ -335,6 +341,10 @@ input[type=text], input[type=search] {
|
|||
.table-striped>tbody>tr:nth-of-type(odd) {
|
||||
background-color: var(--back-sub);
|
||||
}
|
||||
.table-striped>tbody>tr:nth-of-type(even){
|
||||
background-color: var(--back-sub-alt);
|
||||
color: var(--header);
|
||||
}
|
||||
#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
|
||||
color: var(--text-main);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,15 +108,17 @@ a {
|
|||
--background: #222;
|
||||
--back-main: #333;
|
||||
--back-sub: #444;
|
||||
--back-sub-alt: #dfd9d8;
|
||||
--button-default: darken(@red, 15%);
|
||||
--button-primary: darken(@red, 25%);
|
||||
--button-hover: darken(@red, 30%);
|
||||
--header: @red; /* Use same as Header picker */
|
||||
--text-main: #BBB;
|
||||
--text-alt: #222;
|
||||
--text-sub: #9b9b9b;
|
||||
--link: lighten(@red, 30%); /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: lighten(@red, 40%); /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: lighten(@red, 45%); /* Use same as Header picker, lighten by 70% */
|
||||
--link: #e00000; /* Use same as Header picker, lighten by 70% */
|
||||
--visited-link: #D24D57; /* Use same as Header picker, lighten by 70% */
|
||||
--hover-link: #D24D57; /* Use same as Header picker, lighten by 70% */
|
||||
--nav-link: #FFF; /* Use same as Header picker */
|
||||
--light-link: #fff; /* Use same as Header picker */
|
||||
}
|
||||
|
|
@ -188,7 +190,7 @@ body {
|
|||
color: var(--header);
|
||||
}
|
||||
.btn-default{
|
||||
background-color: var(--button-default);
|
||||
background-color: var(--back-sub);
|
||||
color: var(--link);
|
||||
}
|
||||
|
||||
|
|
@ -239,6 +241,9 @@ body {
|
|||
background-color: var(--back-main);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.fixed-table-body thead th .th-inner{
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.form-control {
|
||||
background-color: var(--back-main);
|
||||
color: var(--text-main);
|
||||
|
|
@ -335,6 +340,10 @@ input[type=text], input[type=search] {
|
|||
.table-striped>tbody>tr:nth-of-type(odd) {
|
||||
background-color: var(--back-sub);
|
||||
}
|
||||
.table-striped>tbody>tr:nth-of-type(even){
|
||||
background-color: var(--back-sub-alt);
|
||||
color: var(--text-alt);
|
||||
}
|
||||
#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
|
||||
color: var(--text-main);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,6 +108,7 @@ a {
|
|||
--background: #222;
|
||||
--back-main: #333;
|
||||
--back-sub: #444;
|
||||
--back-sub-alt: #dfd9d8;
|
||||
--button-default: darken(@yellow, 15%);
|
||||
--button-primary: darken(@yellow, 25%);
|
||||
--button-hover: darken(@yellow, 30%);
|
||||
|
|
@ -152,7 +153,9 @@ a:visited {
|
|||
a:hover {
|
||||
color: var(--hover-link);
|
||||
}
|
||||
|
||||
a:link.btn-default{
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.btn-primary.hover {
|
||||
color: var(--nav-link);
|
||||
}
|
||||
|
|
@ -194,19 +197,19 @@ body {
|
|||
|
||||
.btn-default dropdown-toggle {
|
||||
background-color: var(--button-default);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
|
||||
.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
|
||||
background-color: var(--button-hover);
|
||||
color: var(--link);
|
||||
color: var(--nav-link);
|
||||
}
|
||||
.btn-primary, .btn-primary.hover, .btn-primary:active, .text-yellow {
|
||||
color: var(--text-main)!important;
|
||||
color: var(--nav-link)!important;
|
||||
}
|
||||
.btn-primary:hover {
|
||||
background-color: var(--button-primary);
|
||||
color: var(--link)!important;
|
||||
color: var(--nav-link)!important;
|
||||
}
|
||||
#componentsTable>tbody>tr>td>nobr>a>i.fa {
|
||||
color: var(--text-main);
|
||||
|
|
@ -335,6 +338,10 @@ input[type=text], input[type=search] {
|
|||
.table-striped>tbody>tr:nth-of-type(odd) {
|
||||
background-color: var(--back-sub);
|
||||
}
|
||||
.table-striped>tbody>tr:nth-of-type(even){
|
||||
background-color: var(--back-sub-alt);
|
||||
color: var(--header);
|
||||
}
|
||||
#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
|
||||
color: var(--text-main);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
|
||||
<link rel="stylesheet" href="{{ mix('css/build/signature-pad.min.css') }}">
|
||||
|
||||
<link rel="stylesheet" href="{{ url(mix('css/build/signature-pad.min.css')) }}">
|
||||
|
||||
<style>
|
||||
.form-horizontal .control-label, .form-horizontal .radio, .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline {
|
||||
|
|
|
|||
|
|
@ -160,11 +160,12 @@
|
|||
|
||||
// Add some overrides for any funny urls we have
|
||||
var dest = destination;
|
||||
var dpolymorphicItemFormatterest = '';
|
||||
if (destination=='fieldsets') {
|
||||
var dpolymorphicItemFormatterest = 'fields/fieldsets';
|
||||
var dpolymorphicItemFormatterest = 'fields/';
|
||||
}
|
||||
|
||||
return '<nobr><a href="{{ url('/') }}/' + dest + '/' + value.id + '"> ' + value.name + '</a></span>';
|
||||
return '<nobr><a href="{{ url('/') }}/' + dpolymorphicItemFormatterest + dest + '/' + value.id + '"> ' + value.name + '</a></span>';
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<title>{{ config('app.name') }} - Authorization</title>
|
||||
|
||||
|
||||
{{-- stylesheets --}}
|
||||
<link rel="stylesheet" href="{{ mix('css/all.css') }}">
|
||||
<link rel="stylesheet" href="{{ url(mix('css/all.css')) }}">
|
||||
<style>
|
||||
.passport-authorize .container {
|
||||
margin-top: 30px;
|
||||
|
|
|
|||
Loading…
Reference in a new issue