Skip to content

Commit 154a8c8

Browse files
LukeTowersHitArrowLegendbennothommo
authored
Update Winter's branding colors (#93)
Co-authored-by: HitArrowLegend <[email protected]> Co-authored-by: Ben Thomson <[email protected]>
1 parent 05d2a84 commit 154a8c8

File tree

67 files changed

+253
-251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+253
-251
lines changed

‎modules/backend/assets/css/winter.css

+70-71
Large diffs are not rendered by default.

‎modules/backend/assets/images/dashboard-icon.svg

+5-5
Loading

‎modules/backend/assets/images/media-icon.svg

+7-7
Loading

‎modules/backend/assets/images/tab-shape.svg

+4-4
Loading

‎modules/backend/assets/less/core/variables.less

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@color-border: #cccccc;
1818
@color-border-light: #e1e1e1;
1919

20-
@color-mainmenu: #000000;
20+
@color-mainmenu: #151515;
2121
@color-mainmenu-inactive: rgba(255,255,255,.6);
2222
@color-mainmenu-active: #ffffff;
2323
@color-mainmenu-active-bg: #262626;
@@ -93,10 +93,10 @@
9393
@color-filelist-hero-active-bg: @highlight-active-bg;
9494
@color-filelist-hero-active-text: @highlight-active-text;
9595

96-
@color-fancy-master-tabs-bg: #d35400;
96+
@color-fancy-master-tabs-bg: @brand-secondary-darker;
9797
@color-fancy-master-tabs-active-text: #ffffff;
9898
@color-fancy-master-tabs-inactive-text: rgba(255, 255, 255, .35);
99-
@color-fancy-master-panel-bg: #d35400;
99+
@color-fancy-master-panel-bg: @brand-secondary-darker;
100100

101101
@color-fancy-secondary-tabs-bg: #475354;
102102
@color-fancy-secondary-tabs-active-text: #ffffff;
@@ -111,9 +111,9 @@
111111
@color-fancy-form-tabless-fields-bg: @brand-secondary;
112112
@color-fancy-form-label: rgba(255, 255, 255, .5);
113113
@color-fancy-form-text: #ffffff;
114-
@color-fancy-form-text-selection: #d35400;
114+
@color-fancy-form-text-selection: @brand-secondary-darker;
115115
@color-fancy-form-placeholder: rgba(255, 255, 255, .5);
116-
@color-fancy-form-inactive-tab: #b9530f;
116+
@color-fancy-form-inactive-tab: #2c9cb9;
117117

118118
@color-sortable-caret: #999999;
119119
@color-sortable-active: @brand-secondary;
@@ -150,4 +150,4 @@
150150
// --------------------------------------------------
151151

152152
@menu-breakpoint-min: 770px;
153-
@menu-breakpoint-max: (@menu-breakpoint-min - 1);
153+
@menu-breakpoint-max: (@menu-breakpoint-min - 1);

‎modules/backend/assets/less/layout/fancylayout.less

-4
Original file line numberDiff line numberDiff line change
@@ -437,10 +437,6 @@ body.fancy-layout .master-tabs.control-tabs,
437437
}
438438
}
439439

440-
.tab-collapse-icon.primary {
441-
color: #808c8d;
442-
}
443-
444440
&.primary-collapsed {
445441
.tab-collapse-icon.primary {
446442
color: white;

‎modules/backend/assets/less/layout/sidepanel.less

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
}
4242

4343
.sidepanel-content-header {
44-
background: #d35400;
44+
background: @brand-secondary-darker;
4545
color: white;
4646
font-size: 15px;
4747
padding: 12px 20px 13px;
4848
position: relative;
4949

5050
&:after {
51-
.triangle(down, 15px, 8px, #d35400);
51+
.triangle(down, 15px, 8px, @brand-secondary-darker);
5252
position: absolute;
5353
left: 14px;
5454
bottom: -8px;
@@ -94,4 +94,4 @@ body.display-side-panel {
9494
#layout-side-panel .fix-button {
9595
display: none;
9696
}
97-
}
97+
}

‎modules/backend/behaviors/importexportcontroller/assets/less/import.less

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282

8383
&.is-required {
8484
.column-icon {
85-
color: #ab2a1c;
85+
color: @brand-danger;
8686
}
8787
}
8888
}
@@ -141,7 +141,7 @@
141141
top: -1px;
142142
left: -3px;
143143
&:hover {
144-
background: #ab2a1c;
144+
background: @brand-danger;
145145
}
146146
}
147147
}
@@ -198,4 +198,4 @@
198198
}
199199
}
200200

201-
}
201+
}

‎modules/backend/formwidgets/ColorPicker.php

+16-16
Original file line numberDiff line numberDiff line change
@@ -155,52 +155,52 @@ protected function getAvailableColors()
155155
'color' => '#16a085',
156156
],
157157
[
158-
'color' => '#2ecc71',
158+
'color' => '#6cc551',
159159
],
160160
[
161-
'color' => '#27ae60',
161+
'color' => '#52a838',
162162
],
163163
[
164-
'color' => '#3498db',
164+
'color' => '#b1dbef',
165165
],
166166
[
167-
'color' => '#2980b9',
167+
'color' => '#88c9e7',
168168
],
169169
[
170-
'color' => '#9b59b6',
170+
'color' => '#2da7c7',
171171
],
172172
[
173-
'color' => '#8e44ad',
173+
'color' => '#227f96',
174174
],
175175
[
176-
'color' => '#34495e',
176+
'color' => '#b281c5',
177177
],
178178
[
179-
'color' => '#2b3e50',
179+
'color' => '#7b4e8e',
180180
],
181181
[
182-
'color' => '#f1c40f',
182+
'color' => '#103141',
183183
],
184184
[
185-
'color' => '#f39c12',
185+
'color' => '#081821',
186186
],
187187
[
188-
'color' => '#e67e22',
188+
'color' => '#f8e095',
189189
],
190190
[
191-
'color' => '#d35400',
191+
'color' => '#dcb22d',
192192
],
193193
[
194-
'color' => '#e74c3c',
194+
'color' => '#de8754',
195195
],
196196
[
197-
'color' => '#c0392b',
197+
'color' => '#d66829',
198198
],
199199
[
200-
'color' => '#ecf0f1',
200+
'color' => '#b33f32',
201201
],
202202
[
203-
'color' => '#bdc3c7',
203+
'color' => '#ab2a1c',
204204
],
205205
[
206206
'color' => '#95a5a6',

‎modules/backend/formwidgets/fileupload/assets/css/fileupload.css

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)