Skip to content

Commit a321ad9

Browse files
committed
Handle select2 stuff
1 parent 4dff662 commit a321ad9

File tree

10 files changed

+127
-77
lines changed

10 files changed

+127
-77
lines changed

public/css/build/app.css

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/app.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/overrides.css

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/build/overrides.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/dist/all.css

Lines changed: 0 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/mix-manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"/js/dist/all.js": "/js/dist/all.js?id=1c72002abd039fabdc1f3a9d9da62df4",
3-
"/css/build/overrides.css": "/css/build/overrides.css?id=9bf11543c8712aed043dccb5f56fc7c8",
4-
"/css/build/app.css": "/css/build/app.css?id=1d7fade97abff2bf94974932db8fc8f3",
3+
"/css/build/overrides.css": "/css/build/overrides.css?id=d23a6aaa17b789304c8822ea940a0ee9",
4+
"/css/build/app.css": "/css/build/app.css?id=b58cc5dc5a0b3264f9c674a42f8f204f",
55
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=ee0ed88465dd878588ed044eefb67723",
6-
"/css/dist/all.css": "/css/dist/all.css?id=c68f90cb606cfa9c89e96b4a1375abde",
6+
"/css/dist/all.css": "/css/dist/all.css?id=3df38c2f640006ddb15da6e71f9a74eb",
77
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
88
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
99
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

resources/assets/less/overrides.less

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,6 @@ body {
500500
}
501501

502502
.select2-selection--multiple {
503-
border-color: #d2d6de !important;
504503
overflow-y: auto;
505504
}
506505

@@ -1012,7 +1011,6 @@ input[type="checkbox"]::before {
10121011
transform: scale(0);
10131012
transition: 120ms transform ease-in-out;
10141013
box-shadow: inset 1em 1em rgb(211, 211, 211);
1015-
10161014
content: "";
10171015
width: 1em;
10181016
height: 1em;
@@ -1080,7 +1078,6 @@ input[type="radio"]::before {
10801078
border-radius: 50%;
10811079
transform: scale(0);
10821080
transition: 120ms transform ease-in-out;
1083-
box-shadow: inset 1em 1em #428bca;
10841081
}
10851082

10861083
input[type="radio"]:checked::before {
@@ -1247,37 +1244,27 @@ input[name="columnsSearch"] {
12471244
}
12481245

12491246
.callout.callout-legend {
1250-
background-color: #f4f4f4;
1251-
border-left: 5px solid #959495;
12521247
padding: 15px 30px 15px 15px;
12531248
font-size: 100%;
12541249
border-radius: 0px;
12551250
}
12561251

12571252
.callout.callout-legend h4 {
1258-
color: #333;
12591253
font-size: 16px;
12601254
font-weight: bold;
12611255
margin-top: 5px;
12621256
margin-bottom: 0px;
12631257
}
12641258

12651259
.callout.callout-legend a {
1266-
color: #333333;
12671260
text-decoration: none;
12681261
cursor: pointer;
12691262
}
12701263

12711264
p.callout-subtext {
1272-
color:#333;
12731265
margin-top: 5px;
12741266
}
12751267

1276-
p.callout-subtext a:hover, p.callout-subtext a:visited, p.callout-subtext a:link {
1277-
color: #31708f;
1278-
text-decoration: none;
1279-
}
1280-
12811268
/**
12821269
This just hides the padding on the right side of the mark tag for a less weird visual experience
12831270
*/

resources/views/blade/redirect_submit_options.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</select>
2828
@endif
2929

30-
<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' : '') !!}>
30+
<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' : '') !!}>
3131
<x-icon type="checkmark" />
3232
{{ $button_label }}
3333
</button>

0 commit comments

Comments
 (0)