Skip to content

Commit 4b27014

Browse files
labkey-martyplabkey-martyp
committed
.scss cleanup
1 parent ac560e7 commit 4b27014

8 files changed

Lines changed: 47 additions & 233 deletions

File tree

‎ehr/package-lock.json‎

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

‎ehr/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dependencies": {
1818
"@labkey/api": "1.45.0",
1919
"@labkey/components": "7.13.1",
20-
"@labkey/ehr": "0.0.4-fb-ehr-hist-id-search.12"
20+
"@labkey/ehr": "0.0.4-fb-ehr-hist-id-search.13"
2121
},
2222
"devDependencies": {
2323
"@labkey/build": "8.7.0",

‎labkey-ui-ehr/package-lock.json‎

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

‎labkey-ui-ehr/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@labkey/ehr",
3-
"version": "0.0.4-fb-ehr-hist-id-search.12",
3+
"version": "0.0.4-fb-ehr-hist-id-search.13",
44
"description": "Components, models, actions, and utility functions for LabKey EHR applications and pages",
55
"sideEffects": false,
66
"files": [

‎labkey-ui-ehr/src/theme/OtherReportWrapper.scss‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
/**
2-
* OtherReportWrapper Styles
3-
* Styling for the OtherReportWrapper component
4-
*/
5-
61
.other-report-wrapper {
7-
min-height: 50px;
2+
&__target {
3+
min-height: 50px;
4+
}
85
}

‎labkey-ui-ehr/src/theme/ParticipantReports.scss‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
/**
2-
* ParticipantReports Styles
3-
* Styling for the main ParticipantReports container
4-
*/
5-
61
.participant-reports {
7-
.filter-not-supported-error {
2+
&__filter-error {
83
margin-top: 16px;
94
margin-bottom: 16px;
105
padding: 12px;

‎labkey-ui-ehr/src/theme/SearchByIdPanel.scss‎

Lines changed: 13 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
/**
2-
* SearchByIdPanel Styles
3-
* Styling for the Animal ID search panel with filter modes
4-
*/
5-
61
.search-by-id-panel {
72
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
83
max-width: 900px;
@@ -15,149 +10,13 @@
1510
margin-bottom: 20px;
1611
}
1712

18-
// ID Search Section - conditionally displayed in ID Search mode
19-
.id-search-section {
20-
background-color: #f8f9fa;
21-
padding: 16px;
22-
border-radius: 8px;
23-
margin-bottom: 20px;
24-
25-
label {
26-
display: block;
27-
margin-bottom: 8px;
28-
font-weight: 500;
29-
color: #333;
30-
}
31-
32-
.animal-id-input {
33-
width: 100%;
34-
min-height: 80px;
35-
padding: 10px;
36-
font-size: 14px;
37-
font-family: monospace;
38-
border: 1px solid #ccc;
39-
border-radius: 4px;
40-
resize: vertical;
41-
box-sizing: border-box;
42-
margin-bottom: 12px;
43-
44-
&:focus {
45-
outline: none;
46-
border-color: #0066cc;
47-
box-shadow: 0 0 0 3px rgba(0, 102, 204, 0.1);
48-
}
49-
}
50-
51-
.validation-error {
52-
padding: 10px;
53-
margin-bottom: 12px;
54-
background-color: #ffebee;
55-
border: 1px solid #f5c6cb;
56-
border-radius: 4px;
57-
color: #721c24;
58-
font-size: 14px;
59-
}
60-
61-
.update-report-button {
62-
padding: 10px 20px;
63-
background-color: #0066cc;
64-
color: white;
65-
border: none;
66-
border-radius: 4px;
67-
cursor: pointer;
68-
font-size: 14px;
69-
font-weight: 500;
70-
transition: background-color 0.2s;
71-
72-
&:hover:not(:disabled) {
73-
background-color: #0052a3;
74-
}
75-
76-
&:disabled {
77-
background-color: #ccc;
78-
cursor: not-allowed;
79-
}
80-
}
81-
}
82-
83-
// Filter Mode Section - always displayed
84-
.filter-mode-section {
85-
background-color: #f8f9fa;
86-
padding: 16px;
87-
border-radius: 8px;
88-
margin-bottom: 20px;
89-
90-
> label {
91-
display: block;
92-
margin-bottom: 10px;
93-
font-weight: 500;
94-
color: #333;
95-
}
96-
97-
.filter-toggle-buttons {
98-
display: flex;
99-
gap: 8px;
100-
flex-wrap: wrap;
101-
102-
button {
103-
padding: 10px 20px;
104-
background-color: #6c757d;
105-
color: white;
106-
border: none;
107-
border-radius: 4px;
108-
cursor: pointer;
109-
font-size: 14px;
110-
transition: background-color 0.2s;
111-
112-
&:hover:not(:disabled) {
113-
background-color: #5a6268;
114-
}
115-
116-
&.active {
117-
background-color: #28a745;
118-
119-
&:hover {
120-
background-color: #218838;
121-
}
122-
}
123-
124-
&:disabled {
125-
background-color: #ccc;
126-
cursor: not-allowed;
127-
opacity: 0.6;
128-
}
129-
}
130-
}
131-
}
132-
133-
// Error message for unsupported filters
134-
.error-message {
135-
padding: 10px;
136-
margin-bottom: 12px;
137-
background-color: #fff3cd;
138-
border: 1px solid #ffeeba;
139-
border-radius: 4px;
140-
color: #856404;
141-
font-size: 14px;
142-
}
143-
14413
// URL Params mode (read-only)
14514
&--url-params {
14615
background-color: #f8f9fa;
14716
padding: 16px;
14817
border-radius: 8px;
14918
margin-bottom: 20px;
15019

151-
.read-only-summary {
152-
margin-bottom: 12px;
153-
font-size: 14px;
154-
color: #333;
155-
padding: 10px;
156-
background-color: #e3f2fd;
157-
border: 1px solid #90caf9;
158-
border-radius: 4px;
159-
}
160-
16120
button {
16221
padding: 10px 20px;
16322
background-color: #0066cc;
@@ -175,7 +34,6 @@
17534
}
17635
}
17736

178-
// Additional inline styles
17937
&__label {
18038
display: block;
18139
margin-bottom: 8px;
@@ -210,15 +68,15 @@
21068
flex-wrap: wrap;
21169
}
21270

213-
.search-button {
71+
&__search-button {
21472
padding: 10px 20px;
21573
color: white;
21674
border: none;
21775
border-radius: 4px;
21876
font-size: 14px;
21977
font-weight: 500;
22078

221-
&.active {
79+
&--active {
22280
background-color: #0066cc;
22381
cursor: pointer;
22482

@@ -227,7 +85,7 @@
22785
}
22886
}
22987

230-
&.inactive {
88+
&--inactive {
23189
background-color: #6c757d;
23290
cursor: pointer;
23391
}
@@ -238,41 +96,35 @@
23896
}
23997
}
24098

241-
.filter-button {
99+
&__filter-button {
242100
padding: 10px 20px;
243101
color: white;
244102
border: none;
245103
border-radius: 4px;
246104
cursor: pointer;
247105
font-size: 14px;
248106

249-
&.all-animals {
250-
&.active {
251-
background-color: #28a745;
107+
&--active {
108+
background-color: #28a745;
252109

253-
&:hover {
254-
background-color: #218838;
255-
}
110+
&:hover {
111+
background-color: #218838;
256112
}
113+
}
257114

258-
&.inactive {
259-
background-color: #6c757d;
260-
}
115+
&--inactive {
116+
background-color: #6c757d;
261117
}
262118

263-
&.alive-at-center {
264-
&.active {
119+
&--alive-at-center {
120+
&.search-by-id-panel__filter-button--active {
265121
background-color: #17a2b8;
266122

267123
&:hover {
268124
background-color: #138496;
269125
}
270126
}
271127

272-
&.inactive {
273-
background-color: #6c757d;
274-
}
275-
276128
&:disabled {
277129
background-color: #ccc;
278130
cursor: not-allowed;

0 commit comments

Comments
 (0)