diff --git a/Customers/Customers.master b/Customers/Customers.master index fd380e0..187ca17 100644 --- a/Customers/Customers.master +++ b/Customers/Customers.master @@ -116,12 +116,7 @@ $("#myModal").modal("show"); }); }); - - - - - - + - + + + + + + + + diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 6476b04..5344122 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -44,45 +44,31 @@ } g-3 { width: 100%; - } + } + + .modal-dialog .modal-content .modal-footer{ + width:1200px; + } + } @media (max-width: 349.98px) { body { width: 349.98px; } - h1 { color: #043381; font-size: 22px; } - h2 { color: #043381; font-size: 28px; } - #tableSearch { width: 53%; border: 1px solid grey; } - - #conovertab { - margin-left: -38px; - width: 416px; - } - } - @media(min-width: 558.98px){ - .modal-content { - position: relative; - display: flex; - flex-direction: column; - pointer-events: auto; - background-color: #fff; - background-clip: padding-box; - border: 1px solid rgba(0,0,0,.2); - border-radius: .3rem; - outline: 0 - } + #conovertab{ + margin-left:-38px;width:416px; } } diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index 966ecb9..0a188b9 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -503,10 +503,10 @@ Partial Class CustomsAviso Catch ex As FormatException MsgBox("Diese Daten können nicht validiert werden", MsgBoxStyle.Critical) End Try - Else - regexval_txt_LKWNr_M.ForeColor = Drawing.Color.Red - regexval_txt_LKWNr_M.ErrorMessage = "Das LKW Kennzeichen ist nicht richtig formatiert." End If + Else + regexval_txt_LKWNr_M.ForeColor = Drawing.Color.Red + regexval_txt_LKWNr_M.ErrorMessage = "Das LKW Kennzeichen ist nicht richtig formatiert." End If If rbt_Alle.Checked = True Then pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb index 7ecc7ce..b368471 100644 --- a/Customers/Invoices.aspx.vb +++ b/Customers/Invoices.aspx.vb @@ -476,7 +476,8 @@ Partial Class Customers_Default3 tr.Cells.Add(tbl_Cell_Info) initcells(tr, tbl_Cell_Index, tbl_Cell_ReNr, tbl_Cell_LKWs, tbl_Cell_Auftragsdat, tbl_Cell_KundAuftrNr, tbl_Cell_Absender, tbl_Cell_Empfaenger, tbl_Cell_Info, tbl_HeaderCellIndex, tbl_HeaderCell_ReNr, tbl_HeaderCell_LKWNr, tbl_HeaderCell_Auftragsdatum, tbl_HeaderCell_KundenAuftrNummer, tbl_HeaderCell_Absender, tbl_HeaderCell_Empfaenger, tbl_HeaderCell_Info) - + normaltable.ViewStateMode = ViewStateMode.Enabled + Page.ViewStateMode = ViewStateMode.Enabled normaltable.Rows.Add(tr) i += 1 diff --git a/css/Customers/MasterpageCustomers.css b/css/Customers/MasterpageCustomers.css index c1132d6..4d5f5d9 100644 --- a/css/Customers/MasterpageCustomers.css +++ b/css/Customers/MasterpageCustomers.css @@ -352,9 +352,9 @@ ContentPlaceHolder1 { } .modal-content { - width: 900px; + width: 600px; display: block; - + overflow-x: hidden; } .modal-header { @@ -364,7 +364,7 @@ ContentPlaceHolder1 { } .modal-footer { - width: 900px; + width: 600px; } #exampleModalLabel { font-size: 12px; @@ -451,7 +451,7 @@ ContentPlaceHolder1 { } .modal-content { width: 900px; - + display: block; } .modal-dialog{ width:900px; diff --git a/css/navbarsidebar.css b/css/navbarsidebar.css index 3a8a563..804ba8f 100644 --- a/css/navbarsidebar.css +++ b/css/navbarsidebar.css @@ -2898,7 +2898,7 @@ a[data-toggle="collapse"] { left: 0; z-index: 1060; display: none; - + width: 100%; height: 100%; overflow-x: hidden; overflow-y: auto; diff --git a/css/navbarsidebar2.css b/css/navbarsidebar2.css index 1cda81b..0dd2915 100644 --- a/css/navbarsidebar2.css +++ b/css/navbarsidebar2.css @@ -2922,13 +2922,13 @@ a[data-toggle="collapse"] { word-wrap: break-word } - .modal { position: fixed; top: 0; left: 0; z-index: 1060; - display: none; + display: none; + width: 100%; height: 100%; overflow-x: hidden; overflow-y: auto; @@ -2937,7 +2937,7 @@ a[data-toggle="collapse"] { .modal-dialog { position: relative; - + width: auto; margin: .5rem; pointer-events: none } @@ -2982,15 +2982,15 @@ a[data-toggle="collapse"] { .modal-content { position: relative; - display: -moz-box; + display: flex; flex-direction: column; - width: 900pwx; + width: 100%; pointer-events: auto; background-color: #fff; background-clip: padding-box; border: 1px solid rgba(0,0,0,.2); border-radius: .3rem; - outline: 0; + outline: 0 } .modal-backdrop { @@ -3056,7 +3056,7 @@ a[data-toggle="collapse"] { @media (min-width:576px) { .modal-dialog { - width: 500px; + width: 1200px; margin: 1.75rem auto } @@ -3245,7 +3245,6 @@ a[data-toggle="collapse"] { } } - .tooltip { position: absolute; z-index: 1080; diff --git a/json1.json b/json1.json deleted file mode 100644 index 0db3279..0000000 --- a/json1.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/vwd.webinfo b/vwd.webinfo index 0f8c31b..a290a9d 100644 --- a/vwd.webinfo +++ b/vwd.webinfo @@ -5,8 +5,4 @@ - - - - \ No newline at end of file