Skip to content

Commit 5aa3818

Browse files
committed
[fix] Fixed shadows
1 parent dc70a5d commit 5aa3818

File tree

3 files changed

+43
-54
lines changed

3 files changed

+43
-54
lines changed

openwisp_utils/admin_theme/static/admin/css/openwisp.css

Lines changed: 36 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,16 @@ See https://code.djangoproject.com/ticket/33878 */
9191
/* Success/Positive */
9292
--ow-color-success: #498b26;
9393

94-
/* Gray Scale Spectrum */
94+
/* Foreground Scale Spectrum */
9595
--ow-color-black: #000;
96-
--ow-color-gray-darkest: #1b1818;
97-
--ow-color-gray-darker: #333;
98-
--ow-color-gray-dark: #777;
99-
--ow-color-gray-medium: #bbbbbb;
100-
--ow-color-gray-light: #efefef;
101-
--ow-color-gray-lighter: #f6f6f6;
102-
--ow-color-gray-lightest: #f9f9f9;
103-
--ow-color-gray-ghost: #fcfcfc;
96+
--ow-color-fg-darkest: #1b1818;
97+
--ow-color-fg-darker: #333;
98+
--ow-color-fg-dark: #777;
99+
--ow-color-fg-medium: #bbbbbb;
100+
--ow-color-fg-light: #efefef;
101+
--ow-color-fg-lighter: #f6f6f6;
102+
--ow-color-fg-lightest: #f9f9f9;
103+
--ow-color-fg-ghost: #fcfcfc;
104104
--ow-color-white: #fff;
105105

106106
/* Special Tones */
@@ -114,7 +114,7 @@ See https://code.djangoproject.com/ticket/33878 */
114114
--ow-color-login-bg: #f4f7f6;
115115
--ow-color-scrollbar-track: #f1f1f1;
116116

117-
/* Overlays (Black with opacity) */
117+
/* Overlays (Dark with opacity) */
118118
--ow-overlay-10: rgba(0, 0, 0, 0.1);
119119
--ow-overlay-5: rgba(0, 0, 0, 0.05);
120120
--ow-overlay-7: rgba(0, 0, 0, 0.07);
@@ -128,25 +128,20 @@ See https://code.djangoproject.com/ticket/33878 */
128128
--ow-overlay-gray-70: rgba(51, 51, 51, 0.7);
129129

130130
/* White Overlay */
131-
--ow-overlay-white-75: rgba(255, 255, 255, 0.75);
132-
133-
/* Shadow Values */
134-
--ow-shadow-26: #00000026;
135-
--ow-shadow-30: #00000030;
136-
--ow-shadow-40: #00000040;
131+
--ow-overlay-light-75: rgba(255, 255, 255, 0.75);
137132

138133
/* ========================================
139134
COMPONENT SEMANTIC VARIABLES (Tier 2)
140135
======================================== */
141136

142137
/* === LINKS === */
143-
--ow-link-color: var(--ow-color-gray-dark);
138+
--ow-link-color: var(--ow-color-fg-dark);
144139
--ow-link-hover: var(--ow-color-black);
145140
--ow-link-highlighted: var(--ow-color-primary);
146141
--ow-link-highlighted-hover: var(--ow-color-primary-dark);
147142

148143
/* === BUTTONS === */
149-
--ow-btn-default-bg: var(--ow-color-gray-darker);
144+
--ow-btn-default-bg: var(--ow-color-fg-darker);
150145
--ow-btn-default-text: var(--ow-color-white);
151146
--ow-btn-default-hover: var(--ow-overlay-gray-70);
152147

@@ -158,9 +153,9 @@ See https://code.djangoproject.com/ticket/33878 */
158153
--ow-btn-success-text: var(--ow-color-white);
159154

160155
/* === MENU/NAVIGATION === */
161-
--ow-menu-bg: var(--ow-color-gray-lightest);
156+
--ow-menu-bg: var(--ow-color-fg-ghost);
162157
--ow-menu-separator: var(--ow-overlay-7-5);
163-
--ow-menu-link-text: var(--ow-color-gray-dark);
158+
--ow-menu-link-text: var(--ow-color-fg-dark);
164159
--ow-menu-sublink-text: var(--ow-overlay-67-5);
165160
--ow-menu-link-hover-bg: var(--ow-color-highlight);
166161
--ow-menu-link-hover-text: var(--ow-color-primary);
@@ -175,17 +170,17 @@ See https://code.djangoproject.com/ticket/33878 */
175170
--ow-menu-toggle-icon: var(--ow-color-white);
176171
--ow-menu-toggle-hover: var(--ow-overlay-60);
177172
--ow-menu-backdrop: var(--ow-overlay-10);
178-
--ow-menu-tooltip-bg: var(--ow-color-gray-dark);
173+
--ow-menu-tooltip-bg: var(--ow-color-fg-dark);
179174
--ow-menu-tooltip-text: var(--ow-color-white);
180175
--ow-menu-backdrop: var(--ow-overlay-10);
181-
--ow-menu-tooltip-bg: var(--ow-color-gray-dark);
176+
--ow-menu-tooltip-bg: var(--ow-color-fg-dark);
182177
--ow-menu-tooltip-text: var(--ow-color-white);
183178

184179
/* === CALENDAR/DATE PICKER === */
185180
--ow-calendar-header-bg: var(--ow-color-primary);
186181
--ow-calendar-header-text: var(--ow-color-white);
187-
--ow-calendar-bg: var(--ow-color-gray-light);
188-
--ow-calendar-nav-bg: var(--ow-overlay-white-75);
182+
--ow-calendar-bg: var(--ow-color-fg-light);
183+
--ow-calendar-nav-bg: var(--ow-overlay-light-75);
189184
--ow-calendar-nav-hover: var(--ow-color-white);
190185
--ow-calendar-selected-bg: var(--ow-color-highlight);
191186
--ow-calendar-selected-text: var(--ow-color-primary);
@@ -202,15 +197,15 @@ See https://code.djangoproject.com/ticket/33878 */
202197
--ow-paginator-showall-hover: var(--ow-color-primary-dark);
203198

204199
/* === ACCOUNT MENU === */
205-
--ow-account-text: var(--ow-color-gray-dark);
200+
--ow-account-text: var(--ow-color-fg-dark);
206201
--ow-account-hover: var(--ow-color-primary);
207-
--ow-account-icon: var(--ow-color-gray-dark);
202+
--ow-account-icon: var(--ow-color-fg-dark);
208203
--ow-account-icon-hover: var(--ow-color-primary);
209204
--ow-account-menu-bg: var(--ow-color-white);
210-
--ow-account-menu-separator: var(--ow-color-gray-lighter);
205+
--ow-account-menu-separator: var(--ow-color-fg-lighter);
211206

212207
/* === FORMS === */
213-
--ow-form-label: var(--ow-color-gray-darkest);
208+
--ow-form-label: var(--ow-color-fg-darkest);
214209
--ow-form-help-text: var(--ow-overlay-45);
215210
--ow-form-readonly-border: var(--ow-overlay-5);
216211
--ow-form-readonly-bg: var(--ow-overlay-7);
@@ -220,41 +215,35 @@ See https://code.djangoproject.com/ticket/33878 */
220215
/* === BREADCRUMBS === */
221216
--ow-breadcrumb-bg: var(--ow-color-white);
222217
--ow-breadcrumb-text: var(--ow-color-breadcrumb-text);
223-
--ow-breadcrumb-border: var(--ow-color-gray-lighter);
218+
--ow-breadcrumb-border: var(--ow-color-fg-lighter);
224219

225220
/* === MODULES/SECTIONS === */
226-
--ow-module-bg: var(--ow-color-gray-lightest);
227-
--ow-module-text: var(--ow-color-gray-darker);
221+
--ow-module-bg: var(--ow-color-fg-lightest);
222+
--ow-module-text: var(--ow-color-fg-darker);
228223

229224
/* === OVERLAYS & MODALS === */
230-
--ow-overlay-bg: var(--ow-overlay-white-75);
225+
--ow-overlay-bg: var(--ow-overlay-light-75);
231226
--ow-loading-spinner-bg: var(--ow-overlay-90);
232227
--ow-selector-chosen-bg: var(--ow-overlay-60);
233228

234229
/* === SCROLLBAR === */
235-
--ow-scrollbar-thumb: var(--ow-color-gray-dark);
236-
--ow-scrollbar-thumb-hover: var(--ow-color-gray-darker);
230+
--ow-scrollbar-thumb: var(--ow-color-fg-dark);
231+
--ow-scrollbar-thumb-hover: var(--ow-color-fg-darker);
237232
--ow-scrollbar-track: var(--ow-color-scrollbar-track);
238233

239-
/* === SHADOWS === */
240-
--ow-shadow-light: var(--ow-shadow-26);
241-
--ow-shadow-medium: var(--ow-shadow-30);
242-
--ow-shadow-dark: var(--ow-shadow-40);
243-
244234
/* === LOGIN PAGE === */
245235
--ow-login-bg: var(--ow-color-login-bg);
246236
--ow-login-shadow: var(--ow-color-login-bg);
247237

248238
/* === MISC === */
249239
--ow-toggle-btn-bg: var(--ow-color-white);
250240
--ow-toggle-btn-hover-bg: var(--darkened-bg);
251-
--ow-toggle-btn-shadow: var(--ow-shadow-40);
252-
--ow-option-container-bg: var(--ow-color-gray-light);
253-
--ow-option-container-text: var(--ow-color-gray-darker);
241+
--ow-option-container-bg: var(--ow-color-fg-light);
242+
--ow-option-container-text: var(--ow-color-fg-darker);
254243
--ow-option-hover-bg: var(--ow-color-primary);
255244
--ow-option-hover-text: var(--ow-color-white);
256245
--ow-hamburger-bg: var(--ow-color-white);
257-
--ow-hamburger-hover: var(--ow-color-gray-light);
246+
--ow-hamburger-hover: var(--ow-color-fg-light);
258247
--ow-selector-chosen-text: var(--ow-color-white);
259248
--ow-stacked-inline-helptext-bg: #ffe5e5;
260249
}
@@ -681,7 +670,7 @@ span.datetimeshortcuts .clock-icon:hover {
681670
display: flex;
682671
justify-content: center;
683672
align-items: center;
684-
box-shadow: 0px 1px 2px var(--ow-toggle-btn-shadow);
673+
box-shadow: 0px 1px 2px #00000040;
685674
border-radius: 4px;
686675
background: var(--ow-toggle-btn-bg);
687676
cursor: pointer;
@@ -1130,7 +1119,7 @@ div#toolbar #searchbar {
11301119
z-index: 999;
11311120
background-color: var(--ow-option-container-bg);
11321121
border-radius: 8px;
1133-
box-shadow: var(--ow-shadow-medium);
1122+
box-shadow: 0px 1px 3px #00000040;
11341123
color: var(--ow-option-container-text);
11351124
font-weight: normal;
11361125
}
@@ -1343,7 +1332,7 @@ div#container.no-auth,
13431332
#menu {
13441333
position: fixed;
13451334
background: var(--ow-menu-bg);
1346-
box-shadow: var(--ow-shadow-medium);
1335+
box-shadow: 0 1px 4px -1px #00000026;
13471336
top: 0;
13481337
left: 0;
13491338
}
@@ -1427,7 +1416,7 @@ a.menu-item,
14271416
height: 1.25rem;
14281417
width: 1.25rem;
14291418
margin-left: 1.25rem;
1430-
background: var(--ow-color-gray-medium);
1419+
background: var(--ow-color-fg-medium);
14311420
transition: transform 0.3s;
14321421
}
14331422
.mg-heading {

openwisp_utils/admin_theme/static/admin/css/ow-auto-filter.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
min-width: 222px !important;
4242
}
4343
.auto-filter .select2-selection {
44-
border: 1px solid var(--ow-color-gray-dark) !important;
44+
border: 1px solid var(--ow-color-fg-dark) !important;
4545
border-radius: 0.2rem !important;
4646
padding: 0.4rem 1.25rem 0.3125rem 1rem;
4747
}
@@ -74,7 +74,7 @@
7474
max-height: 18.75rem;
7575
min-width: 100%;
7676
border: none !important;
77-
box-shadow: var(--ow-shadow-dark);
77+
box-shadow: 0px 1px 4px #00000040;
7878
overflow-y: auto;
7979
}
8080
.auto-filter-choices .select2-results ul {
@@ -84,7 +84,7 @@
8484
.auto-filter-choices .select2-results li {
8585
margin: 0;
8686
list-style-type: none;
87-
color: var(--ow-color-gray-dark);
87+
color: var(--ow-color-fg-dark);
8888
font-size: 14px;
8989
border-radius: 4px;
9090
font-weight: 500;

openwisp_utils/admin_theme/static/admin/css/ow-filters.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ow-changelist-filter {
1515
padding: 1.25rem 2.5rem;
1616
background-color: var(--body-bg);
17-
border-bottom: 2px solid var(--ow-color-gray-lighter);
17+
border-bottom: 2px solid var(--ow-color-fg-lighter);
1818
display: flex;
1919
flex-direction: column-reverse;
2020
}
@@ -90,7 +90,7 @@
9090
max-height: 18.75rem;
9191
min-width: 100%;
9292
transition: all 0.3s ease;
93-
box-shadow: var(--ow-shadow-dark);
93+
box-shadow: 0px 1px 4px #00000040;
9494
pointer-events: none;
9595
display: none;
9696
overflow-y: auto;
@@ -105,7 +105,7 @@
105105
padding: 0px;
106106
}
107107
.filter-title {
108-
border: 1px solid var(--ow-color-gray-dark);
108+
border: 1px solid var(--ow-color-fg-dark);
109109
border-radius: 0.2rem;
110110
padding: 0.4rem 1.25rem 0.3125rem 1rem;
111111
cursor: pointer;
@@ -223,7 +223,7 @@
223223
}
224224
.left-arrow:hover,
225225
.right-arrow:hover {
226-
background-color: var(--ow-color-gray-lightest);
226+
background-color: var(--ow-color-fg-lightest);
227227
}
228228
.left-arrow.down,
229229
.right-arrow.down {

0 commit comments

Comments
 (0)