snipe
|
97731cd7c8
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>
# Conflicts:
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/mix-manifest.json
|
2022-12-05 16:34:34 -08:00 |
|
Godfrey M
|
371a5bf4d6
|
changes the icon color with themes
|
2022-11-30 10:37:47 -08:00 |
|
snipe
|
c8baf4c6ad
|
Updated prod assets
Signed-off-by: snipe <[email protected]>
|
2022-10-12 16:25:43 -07:00 |
|
snipe
|
1377725a97
|
Dev assets
Signed-off-by: snipe <[email protected]>
|
2022-09-27 14:53:47 -07:00 |
|
snipe
|
a8a00f0a79
|
Updated prod JS assets
Signed-off-by: snipe <[email protected]>
|
2022-09-12 11:08:29 -07:00 |
|
snipe
|
ab60fa08df
|
Updated dev assets
Signed-off-by: snipe <[email protected]>
|
2022-08-24 16:38:11 -07:00 |
|
snipe
|
3a6c6d8466
|
Prod assets
Signed-off-by: snipe <[email protected]>
|
2022-07-07 14:40:39 -07:00 |
|
snipe
|
b98af0f50f
|
Upgrade font-awesome to v6
Signed-off-by: snipe <[email protected]>
|
2022-07-07 14:22:08 -07:00 |
|
snipe
|
3a8786fdb7
|
Updated assets for prod
Signed-off-by: snipe <[email protected]>
|
2022-06-23 18:27:31 -07:00 |
|
snipe
|
f4c346a57c
|
Small fixes to default blue skin
Signed-off-by: snipe <[email protected]>
|
2022-06-23 18:11:42 -07:00 |
|
snipe
|
a758e825ed
|
Dev assets
Signed-off-by: snipe <[email protected]>
|
2022-06-15 13:45:33 -07:00 |
|
snipe
|
7cd35a80b6
|
Updated assets for production
Signed-off-by: snipe <[email protected]>
|
2022-06-13 20:52:47 -07:00 |
|
snipe
|
eaecf8137a
|
Updated assets for develop
Signed-off-by: snipe <[email protected]>
|
2022-06-13 19:52:27 -07:00 |
|
snipe
|
61a6c83418
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>
# Conflicts:
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/mix-manifest.json
|
2022-05-18 17:21:32 -07:00 |
|
snipe
|
319eae7810
|
Recompiled dev assets
Signed-off-by: snipe <[email protected]>
|
2022-05-18 16:21:04 -07:00 |
|
snipe
|
4b21d9e7f4
|
Rebuild production assets
Signed-off-by: snipe <[email protected]>
|
2022-05-18 11:13:18 -07:00 |
|
snipe
|
3bf2328db2
|
Regenerated dev assets
Signed-off-by: snipe <[email protected]>
|
2022-05-18 11:11:34 -07:00 |
|
snipe
|
bf028adcc3
|
Updated production assets
Signed-off-by: snipe <[email protected]>
|
2022-05-17 19:33:50 -07:00 |
|
snipe
|
be5be7a8b9
|
Bumped packages
Signed-off-by: snipe <[email protected]>
|
2022-05-17 19:30:57 -07:00 |
|
snipe
|
13d81f0a0c
|
Updated prod assets
Signed-off-by: snipe <[email protected]>
|
2022-05-13 11:55:19 -07:00 |
|
Godfrey M
|
708dc08b4f
|
mixes color contrast on dropdown menu from navbar
on file
|
2022-03-03 09:27:52 -08:00 |
|
snipe
|
ee47a02792
|
Updated assets
Signed-off-by: snipe <[email protected]>
|
2022-01-21 12:33:49 -08:00 |
|
snipe
|
43c57c8461
|
Merge master into develop
Signed-off-by: snipe <[email protected]>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
|
2022-01-12 20:51:33 -08:00 |
|
snipe
|
8be6d10dbe
|
Fixed #10467 - Safari only font-awesome bug
Signed-off-by: snipe <[email protected]>
|
2021-12-24 12:30:34 -08:00 |
|
snipe
|
f4ef828332
|
Fixex js table export
Signed-off-by: snipe <[email protected]>
|
2021-12-24 11:17:36 -08:00 |
|
snipe
|
8738451685
|
Fixed font awesome caret
Signed-off-by: snipe <[email protected]>
|
2021-09-25 23:17:35 -07:00 |
|
snipe
|
8d1c3106b5
|
Building assets again
Signed-off-by: snipe <[email protected]>
|
2021-09-24 11:13:15 -07:00 |
|
snipe
|
12df310449
|
Updated assets
Signed-off-by: snipe <[email protected]>
|
2021-09-24 02:16:58 -07:00 |
|
snipe
|
60b8320b4b
|
Updated production assets
Signed-off-by: snipe <[email protected]>
|
2021-07-06 15:15:28 -07:00 |
|
snipe
|
11d9b1ba45
|
Updated assets
Signed-off-by: snipe <[email protected]>
|
2021-07-06 15:09:03 -07:00 |
|
Brady Wetherington
|
dce1dd41c8
|
Regenerate assets after repairing Vue integration
|
2021-06-28 16:38:05 -07:00 |
|
Godfrey M
|
f199098a59
|
undid the color change for links, darkened the back-sub-alt
|
2021-06-23 16:29:21 -07:00 |
|
snipe
|
67ac3631df
|
Production assets
Signed-off-by: snipe <[email protected]>
|
2021-05-04 22:05:26 -07:00 |
|
snipe
|
931e2df3bd
|
Updated production assets
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
|
2021-02-19 10:05:29 -08:00 |
|
Godfrey Martinez
|
8fb97da314
|
Color of asset selection in bulk checkout [ch15525] (#9145)
|
2021-02-17 12:56:26 -08:00 |
|
Godfrey Martinez
|
55a526a6b3
|
corrected background color for bulk checkout listable items in all da… (#8916)
* corrected background color for bulk checkout listable items in all dark schemas
* resubmitting
|
2020-12-15 12:37:22 -08:00 |
|
snipe
|
b433b49469
|
Ficing webpack, CSS and JS (*whew* that sucked)
Signed-off-by: snipe <[email protected]>
|
2020-04-27 22:41:33 -07:00 |
|
snipe
|
72a1616b3c
|
Removed wonky assets
Signed-off-by: snipe <[email protected]>
|
2020-04-27 21:02:42 -07:00 |
|
snipe
|
88d39b4287
|
Updated generated assets
Signed-off-by: snipe <[email protected]>
|
2020-04-23 22:46:41 -07:00 |
|
snipe
|
94e8343f63
|
Generated skins in css/dist/skins
Signed-off-by: snipe <[email protected]>
|
2020-04-22 07:13:09 -07:00 |
|