Skip to content

Commit 839b71a

Browse files
malice00malice00
authored
Merge pull request #138 from jenkinsci/colors
Rewrote part of color selecting
2 parents 274d397 + 060fa06 commit 839b71a

File tree

7 files changed

+607
-489
lines changed

7 files changed

+607
-489
lines changed

‎src/main/css/index.css‎

Lines changed: 84 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -24,70 +24,89 @@
2424

2525
.fc-toolbar {
2626
background: var(--table-background);
27-
height:2.6em;
27+
height: 2.6em;
2828
border-bottom: 1px solid #ddd;
29-
padding:3px;
30-
}
31-
32-
.fc-center {
33-
line-height:2.2em;
29+
padding: 3px;
3430
}
3531

3632
.fc-toolbar.fc-header-toolbar {
37-
margin-bottom:0px;
33+
margin-bottom: 0px;
3834
}
3935

4036
.fc-toolbar .fc-clear {
41-
clear:none;
37+
clear: none;
38+
}
39+
40+
.fc-center {
41+
line-height: 2.2em;
4242
}
4343

4444
.fc-view-container {
45-
padding:5px;
45+
padding: 5px;
4646
}
4747

4848
.fc-event-container a,
4949
.fc-event-container a:link,
5050
.fc-event-container a:active,
5151
.fc-event-container a:visited {
52-
color:black;
5352
text-decoration: none;
5453
}
5554

56-
.fc-event-container a.event-state-scheduled,
57-
.fc-event-container a.event-state-scheduled:link,
58-
.fc-event-container a.event-state-scheduled:active,
59-
.fc-event-container a.event-state-scheduled:visited {
60-
color: var(--text-color);
61-
}
62-
6355
.fc-event {
6456
background-color: #888888;
6557
border-color: #888888;
6658
}
6759

60+
.fc-event.event-selected {
61+
background:#aaa;
62+
}
63+
6864
.fc-event.event-result-success {
6965
background-color: var(--result-success-color);
7066
border-color: var(--result-success-color);
67+
color: var(--result-success-text-color);
68+
}
69+
70+
.fc-event.event-result-success.event-selected {
71+
background: var(--result-success-selected-color);
72+
color: var(--result-success-selected-text-color);
7173
}
7274

7375
.fc-event.event-result-failure {
7476
background-color: var(--result-failure-color);
75-
border-color:var(--result-failure-color);
77+
border-color: var(--result-failure-color);
78+
color: var(--result-failure-text-color);
79+
}
80+
81+
.fc-event.event-result-failure.event-selected {
82+
background: var(--result-failure-selected-color);
83+
color: var(--result-failure-selected-text-color);
7684
}
7785

7886
.fc-event.event-result-unstable {
79-
background-color: var(--warning-color);
80-
border-color: var(--warning-color);
87+
background-color: var(--result-unstable-color);
88+
border-color: var(--result-unstable-color);
89+
color: var(--result-unstable-text-color);
90+
}
91+
92+
.fc-event.event-result-unstable.event-selected {
93+
background: var(--result-unstable-selected-color);
94+
color: var(--result-unstable-selected-text-color);
8195
}
8296

8397
.fc-event.event-state-scheduled {
84-
background-color: var(--grey);
85-
border-color: var(--grey);
98+
background-color: var(--result-scheduled-color);
99+
border-color: var(--result-scheduled-text-color);
86100
border-style: dashed;
101+
color: var(--result-scheduled-text-color);
102+
}
103+
104+
.fc-event.event-state-scheduled.event-selected {
105+
background: var(--result-scheduled-selected-color);
106+
color: var(--result-scheduled-selected-text-color);
87107
}
88108

89109
.fc-event.event-state-running {
90-
border-color: white;
91110
border-style: dashed;
92111
animation: blink-animation 2s both ease-in-out infinite;
93112
}
@@ -98,42 +117,26 @@
98117
}
99118
}
100119

101-
.fc-event.event-selected {
102-
background:#aaa;
103-
}
104-
.fc-event.event-result-success.event-selected {
105-
background:var(--result-success-selected-color);
106-
}
107-
.fc-event.event-result-failure.event-selected {
108-
background:var(--result-failure-selected-color);
109-
}
110-
.fc-event.event-result-unstable.event-selected {
111-
background:var(--light-orange);
112-
}
113-
.fc-event.event-state-scheduled.event-selected {
114-
background:var(--light-grey);
115-
}
116-
117120
.fc-unthemed td.fc-today {
118-
background: var(--text-color-secondary);
121+
background: grey;
119122
}
120123

121124
.tippy-tooltip.jenkins-theme {
122-
background-color:var(--background);
125+
background-color: var(--background);
123126
border: 1px solid var(--card-border-color);
124127
color: var(--text-color);
125-
padding:0;
126-
font-size:100%;
127-
text-align:left;
128+
padding: 0;
129+
font-size: 100%;
130+
text-align: left;
128131
border-radius: 8px;
129132
}
130133

131134
.tippy-tooltip.jenkins-theme .parameterBlock {
132-
padding-top:10px;
135+
padding-top: 10px;
133136
}
134137

135138
.tippy-tooltip.jenkins-theme .parameters {
136-
padding-left:10px;
139+
padding-left: 10px;
137140
}
138141

139142
.tippy-tooltip.jenkins-theme .tooltip-head {
@@ -148,8 +151,8 @@
148151

149152
.tippy-tooltip.jenkins-theme .tooltip-head .tooltip-close {
150153
float: right;
151-
margin-right:3px;
152-
margin-left:5px;
154+
margin-right: 3px;
155+
margin-left: 5px;
153156
cursor: pointer;
154157
}
155158

@@ -158,81 +161,77 @@
158161
}
159162

160163
.tippy-tooltip.jenkins-theme .tooltip-body {
161-
padding:10px;
164+
padding: 10px;
162165
}
163166

164167
.tippy-tooltip.jenkins-theme .tooltip-middle {
165-
display:flex;
168+
display: flex;
166169
gap: 5px;
167170
align-items: top;
168171
}
169172

170-
171173
.tippy-tooltip.jenkins-theme .tooltip-left {
172-
padding-right:10px;
173-
min-width:200px;
174+
padding-right: 10px;
175+
min-width: 200px;
174176
}
175177

176178
.tippy-tooltip.jenkins-theme .tooltip-right {
177-
padding-left:10px;
178-
border-left:1px solid var(--text-color-secondary);
179-
min-width:200px;
179+
padding-left: 10px;
180+
border-left: 1px solid var(--text-color-secondary);
181+
min-width: 200px;
180182
}
181183

182184
.tippy-tooltip.jenkins-theme .tooltip-right ul a {
183-
display:inline-block;
184-
min-width:3em;
185+
display: inline-block;
186+
min-width: 3em;
185187
}
186188

187189
.tippy-tooltip.jenkins-theme .tooltip-bottom {
188-
border-top:1px solid var(--text-color-secondary);
189-
margin-top:20px;
190-
padding-top:10px;
190+
border-top: 1px solid var(--text-color-secondary);
191+
margin-top: 20px;
192+
padding-top: 10px;
191193
}
192194

193195
.tippy-tooltip.jenkins-theme .tooltip-bottom .previous {
194-
float:left;
196+
float: left;
195197
}
196198

197199
.tippy-tooltip.jenkins-theme .tooltip-bottom .previous i:after {
198200
content:"\25C0";
199-
font-size:80%;
200-
font-style:normal;
201-
margin-right:2px;
201+
font-size: 80%;
202+
font-style: normal;
203+
margin-right: 2px;
202204
}
203205

204206
.tippy-tooltip.jenkins-theme .tooltip-bottom .next {
205-
float:right;
207+
float: right;
206208
}
207209

208210
.tippy-tooltip.jenkins-theme .tooltip-bottom .next i:after {
209211
content:"\25B6";
210-
font-size:80%;
211-
font-style:normal;
212-
margin-left:2px;
212+
font-size: 80%;
213+
font-style: normal;
214+
margin-left: 2px;
213215
}
214216

215217
.tippy-tooltip.jenkins-theme .tooltip-body .time {
216-
color:var(--text-color-secondary);
217-
text-decoration:none;
218+
color: var(--text-color-secondary);
219+
text-decoration: none;
218220
}
219221

220222
.tippy-tooltip.jenkins-theme .tooltip-body .time:hover {
221-
color:var(--text-color-secondary);
222-
text-decoration:underline;
223+
color: var(--text-color-secondary);
224+
text-decoration: underline;
223225
}
224226

225227
.tippy-tooltip.jenkins-theme .tooltip-body .nextBuild {
226-
color:var(--text-color-secondary);
227-
}
228-
229-
.tippy-tooltip.jenkins-theme .tooltip-body ul {
230-
margin:0px;
231-
padding:0px;
232-
list-style-type:none;
228+
color: var(--text-color-secondary);
233229
}
234230

235231
.tippy-tooltip.jenkins-theme .tooltip-body ul {
232+
margin: 0px;
233+
padding: 0px;
234+
list-style-type: none;
236235
}
237236

238237
.tippy-popper[x-placement^=top] .tippy-tooltip.jenkins-theme .tippy-arrow {
@@ -248,21 +247,21 @@
248247
}
249248

250249
.calendar-view-config-default {
251-
font-size:90%;
250+
font-size: 90%;
252251
color: var(--text-color-secondary);
253252
}
254253

255254
.calendar-view-config-label {
256-
vertical-align:middle;
257-
padding:0px 10px 20px 10px;
255+
vertical-align: middle;
256+
padding: 0px 10px 20px 10px;
258257
}
259258

260259
.calendar-view-config-label.first-label {
261-
padding-left:0px;
260+
padding-left: 0px;
262261
}
263262

264263
.calendar-view-config-input {
265-
width:30%;
264+
width: 30%;
266265
}
267266

268267
.calendar-view-config-container {

0 commit comments

Comments
 (0)