From 839dd8cf94c38bb208fdee1a8ad54773bdcb8c02 Mon Sep 17 00:00:00 2001 From: smanylov Date: Thu, 16 Apr 2026 17:07:14 +0700 Subject: [PATCH] change match table styles and notification styles --- package.json | 2 +- src/app/styles/global-styles.scss | 35 +++++ src/app/styles/header.scss | 4 +- src/app/styles/variable.scss | 3 +- src/app/styles/violation-details.scss | 139 +++++++++--------- src/app/ui/file-page/file-page-note.tsx | 2 +- .../violation-table/case-complaint.tsx | 43 +++--- .../file-page/violation-table/case-legal.tsx | 43 +++--- .../file-page-violation-info-tabs.tsx | 4 +- .../file-page-violation-info.tsx | 81 +++++++--- .../file-page-violations-list.tsx | 5 +- src/app/ui/icons/icons.tsx | 18 +++ src/i18n/messages/en.json | 5 +- src/i18n/messages/ru.json | 9 +- 14 files changed, 247 insertions(+), 146 deletions(-) diff --git a/package.json b/package.json index 62d9b38..0c0ed87 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "no-copy-frontend", - "version": "0.89.0", + "version": "0.90.0", "private": true, "scripts": { "dev": "next dev -p 2999", diff --git a/src/app/styles/global-styles.scss b/src/app/styles/global-styles.scss index aa0330c..1873693 100644 --- a/src/app/styles/global-styles.scss +++ b/src/app/styles/global-styles.scss @@ -159,6 +159,41 @@ } } +.btn, +.btn-s, +.btn-m { + border: none; + cursor: pointer; + font-weight: 600; + transition: all 0.3s; + text-decoration: none; + display: inline-flex; + align-items: center; + justify-content: center; + + &:disabled { + opacity: 0.5; + } +} + +.btn { + padding: 12px 24px; + font-size: 14px; + border-radius: 10px; +} + +.btn-s { + padding: 6px 12px; + font-size: 12px; + border-radius: 6px; +} + +.btn-l { + padding: 16px 32px; + font-size: 16px; + border-radius: 12px; +} + .btn-primary { background: linear-gradient(135deg, v.$p-color, v.$s-color); color: v.$white; diff --git a/src/app/styles/header.scss b/src/app/styles/header.scss index d0c4e34..a032b1d 100644 --- a/src/app/styles/header.scss +++ b/src/app/styles/header.scss @@ -170,7 +170,7 @@ &-item { display: flex; - gap: 4px; + gap: 0px; padding: 10px 14px; border-bottom: 1px solid v.$b-color-1; transition: background-color 0.2s; @@ -216,6 +216,8 @@ cursor: pointer; height: max-content; color: v.$p-color; + align-self: start; + padding-top: 5px; svg { fill: v.$p-color; diff --git a/src/app/styles/variable.scss b/src/app/styles/variable.scss index 390cd9a..a7a8be8 100644 --- a/src/app/styles/variable.scss +++ b/src/app/styles/variable.scss @@ -28,8 +28,7 @@ $color-document: #a561e6; $status-new: #fab005; $status-showed: #5a6e8a; -/* $status-in-work: #3b82f6; */ -$status-in-work: #6366f1; +$status-in-work: #3b82f6; $authorized-use: #2ecc71; :root { diff --git a/src/app/styles/violation-details.scss b/src/app/styles/violation-details.scss index 69b5c75..0570556 100644 --- a/src/app/styles/violation-details.scss +++ b/src/app/styles/violation-details.scss @@ -141,26 +141,7 @@ } } - .btn-small { - padding: 6px 12px; - border-radius: 8px; - font-size: 12px; - font-weight: 600; - border: none; - cursor: pointer; - transition: all 0.3s ease; - text-decoration: none; - display: inline-block; - - &:disabled { - opacity: 0.6; - } - } - .btn-primary-small { - /* background: linear-gradient(135deg, #6366f1, #8b5cf6); - color: white; */ - border: 2px solid v.$status-in-work; color: v.$status-in-work; @@ -216,7 +197,7 @@ &.selected { opacity: 1; - border: 1px solid #6366f1; + border-color: #cbd5e1; background: linear-gradient(180deg, #ffffff 0%, #e6eaf3 100%); } } @@ -251,6 +232,7 @@ border-radius: 8px; position: relative; overflow: hidden; + box-shadow: 4px 4px 7px v.$bg-darkening; img { object-fit: contain; @@ -264,7 +246,7 @@ } .source-url { - color: v.$status-in-work; + color: #000; font-weight: 600; font-size: 14px; text-decoration: none; @@ -286,6 +268,22 @@ gap: 10px; flex-wrap: wrap; margin-top: auto; + + a { + font-weight: 600; + + &:hover { + text-decoration: underline; + } + } + + svg { + fill: #64748b; + + &:hover { + fill: #000; + } + } } } } @@ -330,23 +328,6 @@ } } - .btn-action { - flex: 1; - width: 100%; - padding: 12px 20px; - border-radius: 12px; - font-weight: 600; - border: none; - cursor: pointer; - transition: all 0.3s ease; - font-size: 14px; - max-width: 300px; - - &:disabled { - opacity: 0.5; - } - } - .btn-case { background: linear-gradient(135deg, #6366f1, #8b5cf6); color: white; @@ -358,10 +339,6 @@ } .btn-resolve { - /* background: linear-gradient(135deg, #10b981, #059669); */ - /* background: #10b981; - color: white; */ - padding: 12px 30px; white-space: nowrap; color: #10b981; border: 2px solid #10b981; @@ -410,7 +387,8 @@ } &-title { - border-bottom: 1px solid v.$border-color-1; + /* border-bottom: 1px solid v.$border-color-1; */ + font-size: 18px; justify-content: space-between; align-items: center; margin-bottom: 5px; @@ -432,6 +410,7 @@ background: #f5f5f5; border-radius: 8px; overflow: hidden; + box-shadow: 4px 4px 10px v.$bg-darkening; img { width: 100%; @@ -475,6 +454,7 @@ display: flex; flex-direction: column; justify-content: space-between; + padding-left: 16px; /* gap: 10px; */ } @@ -485,15 +465,31 @@ margin-right: 5px; } - a { - color: v.$p-color; + .source { + color: #000; word-break: break-all; font-weight: 500; + } + } + + &-icon { + svg { + display: inline; + width: 20px; + height: 20px; + margin-left: 3px; + fill: v.$text-s; + cursor: pointer; + padding-bottom: 4px; &:hover { - text-decoration: underline; + fill: #000; } } + + &.hiden { + display: none; + } } &-status { @@ -514,7 +510,7 @@ font-weight: 600; div { - color: v.$p-color; + color: #000; } } @@ -535,6 +531,8 @@ &-header { flex-shrink: 0; padding-bottom: 5px; + padding-right: 16px; + padding-left: 10px; border-bottom: 1px solid rgb(226, 232, 240); &-grid { @@ -580,6 +578,7 @@ .btn { min-width: 180px; + background: v.$status-showed; } } } @@ -644,6 +643,17 @@ background: v.$status-in-work; } + + &.action { + color: v.$status-showed; + border: 2px solid v.$status-showed; + } + + &.action.active { + color: v.$white; + border: 2px solid v.$status-showed; + background: v.$status-showed; + } } } @@ -737,17 +747,24 @@ &:first-child { font-weight: 700; - color: v.$p-color; + color: v.$status-in-work; .complaint-details-header { background-color: #fff; } } + + &:nth-child(even) { + background-color: v.$b-color-1; + } + + &:nth-child(odd) { + background-color: #fff; + } } &-header { - background-color: #f8f9fa; - background-color: v.$b-color-1; + /* background-color: v.$b-color-1; */ padding: 10px 16px; border-bottom: 1px solid #e9ecef; } @@ -756,19 +773,10 @@ color: #495057; font-size: 14px; font-weight: 500; - text-transform: uppercase; + /* text-transform: uppercase; */ letter-spacing: 0.5px; } - &-content { - padding: 12px 16px; - color: #212529; - font-size: 15px; - font-weight: 400; - line-height: 1.5; - background-color: #ffffff; - } - strong { font-weight: 600; color: #212529; @@ -796,10 +804,9 @@ .note-textarea { width: 100%; min-height: 80px; - padding: 12px; + padding: 10px 20px; border: 1px solid v.$border-color-1; border-radius: 8px; - font-size: 14px; font-family: inherit; resize: vertical; box-sizing: border-box; @@ -807,8 +814,7 @@ &:focus { outline: none; - border-color: #6366f1; - box-shadow: 0 0 0 3px rgba(99, 102, 241, 0.1); + box-shadow: 2px 2px 4px v.$shadow-1; } &-wrapper { @@ -829,7 +835,7 @@ border-radius: 8px; box-sizing: border-box; background: #f8fafc; - padding: 5px; + padding: 10px 20px; &::-webkit-outer-spin-button, &::-webkit-inner-spin-button { @@ -839,8 +845,7 @@ &:focus { outline: none; - border-color: #6366f1; - box-shadow: 0 0 0 3px rgba(99, 102, 241, 0.1); + box-shadow: 2px 2px 4px v.$shadow-1; } &::placeholder { diff --git a/src/app/ui/file-page/file-page-note.tsx b/src/app/ui/file-page/file-page-note.tsx index 45eefb8..9122035 100644 --- a/src/app/ui/file-page/file-page-note.tsx +++ b/src/app/ui/file-page/file-page-note.tsx @@ -14,7 +14,7 @@ export default function FilePageNote() {
-
diff --git a/src/app/ui/file-page/violation-table/case-complaint.tsx b/src/app/ui/file-page/violation-table/case-complaint.tsx index 1676042..e044ba7 100644 --- a/src/app/ui/file-page/violation-table/case-complaint.tsx +++ b/src/app/ui/file-page/violation-table/case-complaint.tsx @@ -86,10 +86,16 @@ export default function CaseComplaint({ selectedViolation, updateStatusHandler }
+