ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle select2 stuff

Browse Source
This commit is contained in:
snipe
2025-11-28 14:13:19 +00:00
parent 4dff66253c
commit a321ad9dbe
10 changed files with 127 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/css/build/app.css
View File

@@ -842,7 +842,6 @@ body {
color: white !important;
}
.select2-selection--multiple {
border-color: #d2d6de !important;
overflow-y: auto;
}
.select2-selection__choice {
@@ -1355,7 +1354,6 @@ input[type="radio"]::before {
border-radius: 50%;
transform: scale(0);
transition: 120ms transform ease-in-out;
box-shadow: inset 1em 1em #428bca;
}
input[type="radio"]:checked::before {
transform: scale(1);
@@ -1486,34 +1484,23 @@ input[name="columnsSearch"] {
width: 120px;
}
.callout.callout-legend {
background-color: #f4f4f4;
border-left: 5px solid #959495;
padding: 15px 30px 15px 15px;
font-size: 100%;
border-radius: 0px;
}
.callout.callout-legend h4 {
color: #333;
font-size: 16px;
font-weight: bold;
margin-top: 5px;
margin-bottom: 0px;
}
.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}
p.callout-subtext {
color: #333;
margin-top: 5px;
}
p.callout-subtext a:hover,
p.callout-subtext a:visited,
p.callout-subtext a:link {
color: #31708f;
text-decoration: none;
}
/**
This just hides the padding on the right side of the mark tag for a less weird visual experience
*/

2
public/css/build/app.css.map
View File

File diff suppressed because one or more lines are too long

13
public/css/build/overrides.css
View File

@@ -466,7 +466,6 @@ body {
color: white !important;
}
.select2-selection--multiple {
border-color: #d2d6de !important;
overflow-y: auto;
}
.select2-selection__choice {
@@ -979,7 +978,6 @@ input[type="radio"]::before {
border-radius: 50%;
transform: scale(0);
transition: 120ms transform ease-in-out;
box-shadow: inset 1em 1em #428bca;
}
input[type="radio"]:checked::before {
transform: scale(1);
@@ -1110,34 +1108,23 @@ input[name="columnsSearch"] {
width: 120px;
}
.callout.callout-legend {
background-color: #f4f4f4;
border-left: 5px solid #959495;
padding: 15px 30px 15px 15px;
font-size: 100%;
border-radius: 0px;
}
.callout.callout-legend h4 {
color: #333;
font-size: 16px;
font-weight: bold;
margin-top: 5px;
margin-bottom: 0px;
}
.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}
p.callout-subtext {
color: #333;
margin-top: 5px;
}
p.callout-subtext a:hover,
p.callout-subtext a:visited,
p.callout-subtext a:link {
color: #31708f;
text-decoration: none;
}
/**
This just hides the padding on the right side of the mark tag for a less weird visual experience
*/

2
public/css/build/overrides.css.map
View File

File diff suppressed because one or more lines are too long

26
public/css/dist/all.css vendored
View File

@@ -22178,7 +22178,6 @@ body {
color: white !important;
}
.select2-selection--multiple {
border-color: #d2d6de !important;
overflow-y: auto;
}
.select2-selection__choice {
@@ -22691,7 +22690,6 @@ input[type="radio"]::before {
border-radius: 50%;
transform: scale(0);
transition: 120ms transform ease-in-out;
box-shadow: inset 1em 1em #428bca;
}
input[type="radio"]:checked::before {
transform: scale(1);
@@ -22822,34 +22820,23 @@ input[name="columnsSearch"] {
width: 120px;
}
.callout.callout-legend {
background-color: #f4f4f4;
border-left: 5px solid #959495;
padding: 15px 30px 15px 15px;
font-size: 100%;
border-radius: 0px;
}
.callout.callout-legend h4 {
color: #333;
font-size: 16px;
font-weight: bold;
margin-top: 5px;
margin-bottom: 0px;
}
.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}
p.callout-subtext {
color: #333;
margin-top: 5px;
}
p.callout-subtext a:hover,
p.callout-subtext a:visited,
p.callout-subtext a:link {
color: #31708f;
text-decoration: none;
}
/**
This just hides the padding on the right side of the mark tag for a less weird visual experience
*/
@@ -23868,7 +23855,6 @@ body {
color: white !important;
}
.select2-selection--multiple {
border-color: #d2d6de !important;
overflow-y: auto;
}
.select2-selection__choice {
@@ -24381,7 +24367,6 @@ input[type="radio"]::before {
border-radius: 50%;
transform: scale(0);
transition: 120ms transform ease-in-out;
box-shadow: inset 1em 1em #428bca;
}
input[type="radio"]:checked::before {
transform: scale(1);
@@ -24512,34 +24497,23 @@ input[name="columnsSearch"] {
width: 120px;
}
.callout.callout-legend {
background-color: #f4f4f4;
border-left: 5px solid #959495;
padding: 15px 30px 15px 15px;
font-size: 100%;
border-radius: 0px;
}
.callout.callout-legend h4 {
color: #333;
font-size: 16px;
font-weight: bold;
margin-top: 5px;
margin-bottom: 0px;
}
.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}
p.callout-subtext {
color: #333;
margin-top: 5px;
}
p.callout-subtext a:hover,
p.callout-subtext a:visited,
p.callout-subtext a:link {
color: #31708f;
text-decoration: none;
}
/**
This just hides the padding on the right side of the mark tag for a less weird visual experience
*/

6
public/mix-manifest.json
View File

@@ -1,9 +1,9 @@
{
"/js/dist/all.js": "/js/dist/all.js?id=1c72002abd039fabdc1f3a9d9da62df4",
"/css/build/overrides.css": "/css/build/overrides.css?id=9bf11543c8712aed043dccb5f56fc7c8",
"/css/build/app.css": "/css/build/app.css?id=1d7fade97abff2bf94974932db8fc8f3",
"/css/build/overrides.css": "/css/build/overrides.css?id=d23a6aaa17b789304c8822ea940a0ee9",
"/css/build/app.css": "/css/build/app.css?id=b58cc5dc5a0b3264f9c674a42f8f204f",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=ee0ed88465dd878588ed044eefb67723",
"/css/dist/all.css": "/css/dist/all.css?id=c68f90cb606cfa9c89e96b4a1375abde",
"/css/dist/all.css": "/css/dist/all.css?id=3df38c2f640006ddb15da6e71f9a74eb",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

13
resources/assets/less/overrides.less
View File

@@ -500,7 +500,6 @@ body {
}
.select2-selection--multiple {
border-color: #d2d6de !important;
overflow-y: auto;
}
@@ -1012,7 +1011,6 @@ input[type="checkbox"]::before {
transform: scale(0);
transition: 120ms transform ease-in-out;
box-shadow: inset 1em 1em rgb(211, 211, 211);
content: "";
width: 1em;
height: 1em;
@@ -1080,7 +1078,6 @@ input[type="radio"]::before {
border-radius: 50%;
transform: scale(0);
transition: 120ms transform ease-in-out;
box-shadow: inset 1em 1em #428bca;
}
input[type="radio"]:checked::before {
@@ -1247,15 +1244,12 @@ input[name="columnsSearch"] {
}
.callout.callout-legend {
background-color: #f4f4f4;
border-left: 5px solid #959495;
padding: 15px 30px 15px 15px;
font-size: 100%;
border-radius: 0px;
}
.callout.callout-legend h4 {
color: #333;
font-size: 16px;
font-weight: bold;
margin-top: 5px;
@@ -1263,21 +1257,14 @@ input[name="columnsSearch"] {
}
.callout.callout-legend a {
color: #333333;
text-decoration: none;
cursor: pointer;
}
p.callout-subtext {
color:#333;
margin-top: 5px;
}
p.callout-subtext a:hover, p.callout-subtext a:visited, p.callout-subtext a:link {
color: #31708f;
text-decoration: none;
}
/**
This just hides the padding on the right side of the mark tag for a less weird visual experience
*/

2
resources/views/blade/redirect_submit_options.blade.php
View File

@@ -27,7 +27,7 @@
</select>
@endif
<button type="submit" id="{{ $id }}" class="btn btn-primary pull-right{{ ($disabled_select ? ' disabled' : '') }}" style="margin-left:5px; border-radius: 3px;"{!! ($disabled_select ? ' data-tooltip="true" title="'.trans('admin/hardware/general.edit').'" disabled' : '') !!}>
<button type="submit" id="{{ $id }}" class="btn btn-success pull-right{{ ($disabled_select ? ' disabled' : '') }}" style="margin-left:5px; border-radius: 3px;"{!! ($disabled_select ? ' data-tooltip="true" title="'.trans('admin/hardware/general.edit').'" disabled' : '') !!}>
<x-icon type="checkmark" />
{{ $button_label }}
</button>

125
resources/views/layouts/default.blade.php
View File

@@ -49,6 +49,7 @@
}
[data-theme="light"] {
color-scheme: light;
--box-bg: #ffffff;
--box-header-bottom-border-color: #f4f4f4;
--box-header-bottom-border: 1px solid var(--box-header-bottom-border-color);
@@ -65,16 +66,18 @@
--table-border-row-top: 1px solid #ecf0f5;
--table-stripe-bg-alt: rgba(211, 211, 211, 0.25);
--table-stripe-bg: #ffffff;
--text-blue: #d6d6d6;
--text-blue: var(--text-legend-help);
--text-danger: #a94442;
--text-help: #605e5e;
--text-info: #31708f;
--text-legend-help: var(--text-help);
--text-success: #039516;
--text-warning: #da9113;
}
[data-theme="dark"] {
color-scheme: dark;
--box-bg: #3d4144;
--box-header-bottom-border-color: #605e5e;
--box-header-bottom-border: 1px solid var(--box-header-bottom-border-color);
@@ -91,15 +94,85 @@
--table-border-row: 1px solid #656464;
--table-stripe-bg-alt: #323131;
--table-stripe-bg: #494747;
--text-blue: #d6d6d6;
--text-blue: var(--text-legend-help);
--text-danger: #dd4b39;
--text-help: #a6a4a4;
--text-info: #2baae6;
--text-legend-help: #d6d6d6;
--text-success: #4ced61;
--text-warning: #f3a51f;
}
.dropdown-wrapper,
.input-group-addon,
.js-data-ajax,
.option,
.select2 .select2-container .select2-container--default,
.select2,
.select2-choice,
.select2-container,
.select2-container--above,
.select2-container--below,
.select2-container--default,
.select2-container--focus,
.select2-hidden-accessible,
.select2-results__option,
.select2-search input,
.select2-search--dropdown,
.select2-search__field,
.select2-selection .select2-selection--single,
.select2-selection,
.select2-selection,
.select2-selection--single,
.select2-selection--single,
input[type="text"],
option[selected],
select,
select::selection,
textarea
{
background-color: var(--table-stripe-bg-alt) !important;
color: var(--color-fg) !important;
}
.select2-results__option[aria-selected=true] /** this handles the selected option */
{
background-color: hsl(from var(--main-theme-color) h s calc(l - 5)) !important;
color: var(--color-fg) !important;
}
/**
Highlight the select2 on hover
*/
.select2-results__option--highlighted[aria-selected=false] {
background-color: hsl(from var(--main-theme-color) h s calc(l + 20)) !important;
color: var(--color-fg) !important;
}
.select2-selection__choice,
.select2-container--default .select2-selection--multiple .select2-selection__choice
{
background-color: var(--main-theme-color) !important;
border-color: hsl(from var(--main-theme-color) h s calc(l - 15)) !important;
}
.select2-selection__choice__remove {
color: white !important;
}
.select2-container--default .select2-selection--multiple .select2-selection__choice
{
background-color: hsl(from var(--main-theme-color) h s calc(l - 5)) !important;
color: var(--color-fg) !important;
overflow-y: auto;
}
.select2-selection__choice {
border-radius: 0px !important;
}
.search-highlight {
background-color: var(--search-highlight);
}
@@ -150,11 +223,13 @@
color: var(--color-bg);
}
.footer-links a:link,
.text-blue {
color: var(--text-blue) !important;
}
a,
a:link,
a:visited
{
@@ -399,13 +474,41 @@
.btn-primary,
.btn-primary:hover,
.btn-primary:active,
.btn-primary.hover {
.btn-primary:active:hover,
.btn-primary:active:focus,
.btn-primary a,
.btn-primary a:link,
.btn-primary a:hover,
label.btn-primary:hover
{
background-color: hsl(from var(--main-theme-color) h s calc(l - 5));
border-color: hsl(from var(--main-theme-color) h s calc(l - 15));
color: white;
}
.btn-default,
.btn-default:hover,
.btn-default:active,
.btn-default:active:hover,
.btn-default:active:focus,
label.btn-default:hover,
.btn-default.hover {
background-color: hsl(from var(--main-theme-color) h s calc(l - 5));
border-color: hsl(from var(--main-theme-color) h s calc(l - 15));
color: var(--color-fg) !important;
}
.btn-default.active,
.btn-default.active:hover,
.btn-default.active:focus
{
background-color: hsl(from var(--main-theme-color) h s calc(l - 10));
border-color: hsl(from var(--main-theme-color) h s calc(l - 15));
color: var(--color-fg) !important;
}
.navbar-nav > .notifications-menu > .dropdown-menu > li.header,
@@ -514,7 +617,9 @@
color: var(--text-help);
}
.alert-msg {
.alert-msg,
.has-error
{
color: var(--text-danger);
}
@@ -570,10 +675,20 @@
}
.callout.callout-legend h4 {
.callout-legend h4 a,
.callout-legend h4 a:hover
{
color: var(--color-fg);
}
p.callout-subtext, p.callout-subtext a:hover, p.callout-subtext a:visited, p.callout-subtext a:link {
color: var(--text-legend-help) !important;
text-decoration: none;
}
legend {
border-bottom: 1px solid var(--callout-left-border);
}

2
resources/views/layouts/edit-form.blade.php
View File

@@ -45,7 +45,7 @@
</div>
@if (isset($topSubmit) && ($topSubmit=='true'))
<div class="col-md-3 text-right" style="padding-right: 10px;">
<button type="submit" class="btn btn-primary pull-right" name="submit">
<button type="submit" class="btn btn-success pull-right" name="submit">
<x-icon type="checkmark" />
{{ trans('general.save') }}
</button>