DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use button primary for higher contrast

Browse source
This commit is contained in:
snipe 2020-04-02 18:33:26 -07:00
parent 766c2b22cb
commit 21d8225696
17 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/build/all.js
View file

Binary file not shown.

BIN
public/js/build/vue.js
View file

Binary file not shown.

BIN
public/js/build/vue.js.map
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

8
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{ {
"/js/build/vue.js": "/js/build/vue.js?id=152f24a938f7b9bbe433", "/js/build/vue.js": "/js/build/vue.js?id=0f14185e42c7104f84ac",
"/css/AdminLTE.css": "/css/AdminLTE.css?id=56b8066cfbc70df10545", "/css/AdminLTE.css": "/css/AdminLTE.css?id=56b8066cfbc70df10545",
"/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405", "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
"/css/overrides.css": "/css/overrides.css?id=f4993c1ca8a18864253d", "/css/overrides.css": "/css/overrides.css?id=f4993c1ca8a18864253d",
@ -18,7 +18,7 @@
"/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4", "/css/skins/skin-blue-dark.css": "/css/skins/skin-blue-dark.css?id=d25c77d9c6f4cfe2efd4",
"/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860", "/css/skins/skin-orange-dark.css": "/css/skins/skin-orange-dark.css?id=abc219c1fed59cecb860",
"/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=d5d91824310f39239fc2", "/css/skins/skin-orange.css": "/css/skins/skin-orange.css?id=d5d91824310f39239fc2",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=208c6d7d7d1bcc23522d", "/js/build/vue.js.map": "/js/build/vue.js.map?id=2bff0b6aff67a75a8e8f",
"/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2", "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=5a2d6f3c59191ce716e2",
"/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16", "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
"/css/overrides.css.map": "/css/overrides.css.map?id=750ac6db3f6c3533777a", "/css/overrides.css.map": "/css/overrides.css.map?id=750ac6db3f6c3533777a",
@ -38,7 +38,7 @@
"/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29", "/css/skins/skin-orange-dark.css.map": "/css/skins/skin-orange-dark.css.map?id=68b998638217fd08ef29",
"/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=5cb51f4917038fd753ce", "/css/skins/skin-orange.css.map": "/css/skins/skin-orange.css.map?id=5cb51f4917038fd753ce",
"/css/dist/all.css": "/css/dist/all.css?id=9c6b075989db098ee828", "/css/dist/all.css": "/css/dist/all.css?id=9c6b075989db098ee828",
"/js/dist/all.js": "/js/dist/all.js?id=7fb467ed363987ba435f", "/js/dist/all.js": "/js/dist/all.js?id=cf5b3892cdfa09af2ca4",
"/css/build/all.css": "/css/build/all.css?id=9c6b075989db098ee828", "/css/build/all.css": "/css/build/all.css?id=9c6b075989db098ee828",
"/js/build/all.js": "/js/build/all.js?id=7fb467ed363987ba435f" "/js/build/all.js": "/js/build/all.js?id=cf5b3892cdfa09af2ca4"
} }

2
resources/assets/js/components/importer/importer-file.vue
View file

@ -76,7 +76,7 @@ tr {
</table> </table>
<br> <br>
<div class="col-md-8 col-md-offset-2 text-right"> <div class="col-md-8 col-md-offset-2 text-right">
<button type="button" class="btn btn-sm btn-default" @click="processDetail = false">Cancel</button> <button type="button" class="btn btn-sm btn-primary" @click="processDetail = false">Cancel</button>
<button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button> <button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button>
<br><br> <br><br>
</div> </div>

4
resources/assets/js/snipeit_modals.js
View file

@ -11,14 +11,14 @@
Create a Button looking like this: Create a Button looking like this:
<a href='{{ route('modal.user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-primary">New</a>
If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href' If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href'
data-toggle="modal" - required for Bootstrap Modals data-toggle="modal" - required for Bootstrap Modals
data-target="#createModal" - fixed ID for the modal, do not change data-target="#createModal" - fixed ID for the modal, do not change
data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library! data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library!
class="btn btn-sm btn-default" - makes it look button-ey, feel free to change :) class="btn btn-sm btn-primary" - makes it look button-ey, feel free to change :)
If you want to pass additional variables to the modal (In the Category Create one, for example, you can pass category_id), you can encode them as URL variables in the href If you want to pass additional variables to the modal (In the Category Create one, for example, you can pass category_id), you can encode them as URL variables in the href

2
resources/views/account/accept-asset.blade.php
View file

@ -72,7 +72,7 @@
<input type="hidden" name="signature_output" id="signature_output"> <input type="hidden" name="signature_output" id="signature_output">
</div> </div>
<div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-center"> <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-center">
<button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">Clear Signature</button> <button type="button" class="btn btn-sm btn-primary clear" data-action="clear" id="clear_button">Clear Signature</button>
</div> </div>
</div> </div>
</div> <!-- .col-md-12.text-center--> </div> <!-- .col-md-12.text-center-->

2
resources/views/partials/forms/edit/category-select.blade.php
View file

@ -18,7 +18,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Category::class) @can('create', \App\Models\Category::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.category',['category_type' => isset($category_type) ? $category_type : 'assets' ]) }}' data-toggle="modal" data-target="#createModal" data-select='category_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.category',['category_type' => isset($category_type) ? $category_type : 'assets' ]) }}' data-toggle="modal" data-target="#createModal" data-select='category_select_id' class="btn btn-sm btn-primary">New</a>
@endif @endif
@endcan @endcan
</div> </div>

2
resources/views/partials/forms/edit/location-select.blade.php
View file

@ -17,7 +17,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Location::class) @can('create', \App\Models\Location::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-primary">New</a>
@endif @endif
@endcan @endcan
</div> </div>

2
resources/views/partials/forms/edit/manufacturer-select.blade.php
View file

@ -19,7 +19,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Manufacturer::class) @can('create', \App\Models\Manufacturer::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.manufacturer') }}' data-toggle="modal" data-target="#createModal" data-select='manufacturer_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.manufacturer') }}' data-toggle="modal" data-target="#createModal" data-select='manufacturer_select_id' class="btn btn-sm btn-primary">New</a>
@endif @endif
@endcan @endcan
</div> </div>

2
resources/views/partials/forms/edit/model-select.blade.php
View file

@ -18,7 +18,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\AssetModel::class) @can('create', \App\Models\AssetModel::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.model') }}' data-toggle="modal" data-target="#createModal" data-select='model_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.model') }}' data-toggle="modal" data-target="#createModal" data-select='model_select_id' class="btn btn-sm btn-primary">New</a>
<span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"> <span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;">
<i class="fa fa-spinner fa-spin" aria-hidden="true"></i> <i class="fa fa-spinner fa-spin" aria-hidden="true"></i>
</span> </span>

2
resources/views/partials/forms/edit/status.blade.php
View file

@ -8,7 +8,7 @@
<div class="col-md-2 col-sm-2 text-left"> <div class="col-md-2 col-sm-2 text-left">
@can('create', \App\Models\Statuslabel::class) @can('create', \App\Models\Statuslabel::class)
<a href='{{ route('modal.statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-primary">New</a>
@endcan @endcan
<span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> </span> <span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> </span>

2
resources/views/partials/forms/edit/supplier-select.blade.php
View file

@ -17,7 +17,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Supplier::class) @can('create', \App\Models\Supplier::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.supplier') }}' data-toggle="modal" data-target="#createModal" data-select='supplier_select' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.supplier') }}' data-toggle="modal" data-target="#createModal" data-select='supplier_select' class="btn btn-sm btn-primary">New</a>
@endif @endif
@endcan @endcan
</div> </div>

2
resources/views/partials/forms/edit/supplier.blade.php
View file

@ -6,6 +6,6 @@
{!! $errors->first('supplier_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('supplier_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
<a href='{{ route('modal.supplier') }}' data-toggle="modal" data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.supplier') }}' data-toggle="modal" data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id' class="btn btn-sm btn-primary">New</a>
</div> </div>
</div> </div>

2
resources/views/partials/forms/edit/user-select.blade.php
View file

@ -17,7 +17,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\User::class) @can('create', \App\Models\User::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_user_select' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_user_select' class="btn btn-sm btn-primary">New</a>
@endif @endif
@endcan @endcan
</div> </div>

6
resources/views/users/view.blade.php
View file

@ -287,19 +287,19 @@
<div class="col-md-2"> <div class="col-md-2">
@can('update', $user) @can('update', $user)
<div class="col-md-12"> <div class="col-md-12">
<a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-default hidden-print">{{ trans('admin/users/general.edit') }}</a> <a href="{{ route('users.edit', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.edit') }}</a>
</div> </div>
@endcan @endcan
@can('create', $user) @can('create', $user)
<div class="col-md-12" style="padding-top: 5px;"> <div class="col-md-12" style="padding-top: 5px;">
<a href="{{ route('clone/user', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-default hidden-print">{{ trans('admin/users/general.clone') }}</a> <a href="{{ route('clone/user', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.clone') }}</a>
</div> </div>
@endcan @endcan
@can('view', $user) @can('view', $user)
<div class="col-md-12" style="padding-top: 5px;"> <div class="col-md-12" style="padding-top: 5px;">
<a href="{{ route('users.print', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-default hidden-print" target="_blank" rel="noopener">{{ trans('admin/users/general.print_assigned') }}</a> <a href="{{ route('users.print', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print" target="_blank" rel="noopener">{{ trans('admin/users/general.print_assigned') }}</a>
</div> </div>
@endcan @endcan