Skip to content

Commit a85eabb

Browse files
auroreallibemmoqui
authored andcommitted
Bientôt la fin ...
1 parent 421fc69 commit a85eabb

File tree

4 files changed

+119
-162
lines changed
  • formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets
  • scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/styleSheets
  • suggestionBox/suggestionBox-war/src/main/webapp/suggestionBox/jsp/styleSheets
  • survey/survey-war/src/main/webapp/survey/jsp/styleSheets

4 files changed

+119
-162
lines changed

formsOnline/formsOnline-war/src/main/webapp/formsOnline/jsp/styleSheets/formsOnline.css

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@
7171
.my-formsOnline-title {
7272
padding: 0;
7373
margin: 2em 0 0.5em;
74-
font-size:1.3em;
75-
font-weight:normal;
74+
font-size:var(--font-size-titre);
75+
font-weight:var(--font-weight-titre);
76+
color: var(--color-titre);
7677
line-height: 90%;
7778
}
7879

@@ -89,11 +90,13 @@
8990
}
9091
.formsOnline-waitMyAction-title strong {
9192
color:var(--color-titre-avec-deux-couleurs);
93+
font-size: 90%;
94+
font-weight:normal;
9295
}
9396

9497
.my-formsOnline-title strong{
9598
display: block;
96-
font-size: 1em;
99+
font-size: 90%;
97100
font-weight:normal;
98101
color:var(--color-titre-avec-deux-couleurs);
99102
}
@@ -115,13 +118,13 @@
115118
#my-formsOnline-validate .my-formsOnline-title strong {
116119
color:var(--color-flashy-principale);
117120
display:inline;
118-
font-size:1em;
121+
font-size:90%;
119122
}
120123

121124
#my-formsOnline-refused .my-formsOnline-title strong {
122125
color:var(--color-titre-avec-deux-couleurs);
123126
display:inline;
124-
font-size:1em;
127+
font-size:90%;
125128
}
126129

127130
#all-formsOnline .secteur-container li a:hover,
@@ -146,12 +149,12 @@
146149
}
147150

148151
.my-formsOnline-title {
149-
font-size:1.17em;
152+
font-size:var(--font-size-titre);
150153
line-height: 1em;
151154
}
152155

153156
.my-formsOnline-title strong {
154-
font-size:1.11em;
157+
font-size:90%;
155158
}
156159

157160
.formsOnline .principalContent .inlineMessage {
@@ -261,7 +264,8 @@
261264
}
262265

263266
#all-formsOnline .form-title {
264-
font-size:1.3em;
267+
font-size:var(--font-size-titre);
268+
font-weight:var(--font-weight-titre);
265269
}
266270

267271
#all-formsOnline .form-description,

scheduleEvent/scheduleEvent-war/src/main/webapp/scheduleevent/jsp/styleSheets/scheduleevent.css

Lines changed: 40 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
* along with this program. If not, see <https://www.gnu.org/licenses/>.
2323
*/
2424

25-
img {
26-
border: 0px:
27-
}
28-
2925
#datepicker {
3026
float:left;
3127
margin:0 1em 1em 0;
@@ -67,21 +63,21 @@ td.txtlibform {
6763
}
6864

6965
#selected_hour table td{
70-
padding:3px;
66+
padding:0.25em;
7167
border-bottom:1px solid #FFF;
7268
border-right:1px solid #FFF;
7369
text-align:center;
7470
}
7571

7672
#selected_hour thead td{
7773
font-weight:bold;
78-
padding:3px 10px;
74+
padding:0.25em 0.5em;
7975
}
8076

8177
.selected_date li a {
82-
position:absolute;
83-
top:6px;
84-
right:3px;
78+
position: absolute;
79+
top: calc( 50% - 8px );
80+
right: 0.5em;
8581
}
8682

8783
.selected_date h3 {
@@ -93,8 +89,6 @@ td.txtlibform {
9389

9490
.buttonBar {
9591
clear:both;
96-
text-align:center;
97-
width:400px;
9892
}
9993

10094
.scheduleEvent p.txtnav {
@@ -109,17 +103,17 @@ td.txtlibform {
109103

110104
.questionResults td.hideDay,.questionResults td.hideTime {
111105
background-color:inherit;
112-
border:1px solid #FFFFFF;
106+
border:1px solid transparent;
113107
}
114108

115109
#dateTable, #contributorsInfos {
116-
margin:10px;
117-
width:98%;
110+
margin:1em 0;
111+
width:100%;
118112
}
119113

120114
#contributorsInfos h3 {
121115
padding:0;
122-
margin:10px 0 0 7px;
116+
margin:1em 0 0 0;
123117
}
124118

125119
#contributorsInfos ul {
@@ -132,65 +126,54 @@ td.txtlibform {
132126
padding-left:100px;
133127
line-height:20px;
134128
}
135-
129+
136130
.btnAction {
137-
background-image: none;
138-
background-color:#FFD5AF;
139-
border:1px solid #F1790F;
140-
border-radius:8px;
141-
-moz-border-radius: 8px;
142-
-webkit-border-radius: 8px;
143-
padding:8px 10px;
144-
color:#444444;
145-
font-weight:bold;
146-
line-height:120%;
131+
background:var(--bgColor-btn-secondaire);
132+
border:1px solid var(--border-color-btn-secondaire);
133+
border-radius:var(--radius-btn-secondaire);
134+
padding:0.25em 0.5em;
135+
color:var(--color-text-btn-secondaire);
147136
margin-top:4px;
148137
display:inline-block;
149138
}
150-
139+
.btnAction[href*='setUsers']:before {
140+
content:'';
141+
display: inline-block;
142+
width: 1.5em;
143+
height: 1.5em;
144+
vertical-align: top;
145+
margin-right:0.5em;
146+
background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath fill='%23000' d='M9 14c1.381 0 2.631-.56 3.536-1.465C13.44 11.631 14 10.381 14 9s-.56-2.631-1.464-3.535C11.631 4.56 10.381 4 9 4s-2.631.56-3.536 1.465C4.56 6.369 4 7.619 4 9s.56 2.631 1.464 3.535A5 5 0 0 0 9 14m0 7c3.518 0 6-1 6-2c0-2-2.354-4-6-4c-3.75 0-6 2-6 4c0 1 2.25 2 6 2m12-9h-2v-2a1 1 0 1 0-2 0v2h-2a1 1 0 1 0 0 2h2v2a1 1 0 1 0 2 0v-2h2a1 1 0 1 0 0-2'/%3E%3C/svg%3E");
147+
}
151148
.btnAction:hover {
152-
background-color:#F1790F;
153-
color:#FFF;
149+
background:var(--bgColor-btn-secondaire-hover);
154150
}
155151

156152
.inactif {
157153
color:#999999;
158154
}
159155

160-
.buttonBar {
161-
margin-top:30px;
162-
text-align:center;
163-
width:100%;
164-
}
165-
166-
.buttonBar table {
167-
margin:0 auto;
156+
#dateTable {
157+
background-color:var(--bgColor-bloc-fond-clair);
158+
padding:0.5em;
168159
}
169160

170-
.buttonBar table table{
171-
margin:inherit;
172-
}
173-
174-
/* copie css survey */
175-
176161
.questionResults th, .questionResults td, .questionResults tr {
177-
padding:5px 0;
178-
font-size:12px;
162+
padding:0.5em 0;
179163
}
180164
.questionResults thead td.day, .questionResults thead td.titreCouleur {
181165
text-align:center;
182166
}
183167

184168
.questionResults td.titreLigne, #contributorsInfos h3{
185-
color:#444;
186-
font-size:11px;
187-
font-weight:bold;
169+
font-size:1em;
170+
font-weight:700;
188171
width:128px;
189172
}
190173

191174
.questionResults .questionResults-top th {
192175
background-color:#E4E4E4;
193-
border:#CCC 1px solid;
176+
border:1px solid #CCC ;
194177
width:150px;
195178
}
196179

@@ -201,29 +184,25 @@ td.txtlibform {
201184
}
202185

203186
.questionResults .questionResults-Oui {
204-
background-color:#D5FAC5;
205-
border:1px solid #7CCC24;
187+
background-color:var(--bgColor-color-im-ok);
188+
border:1px solid var(--border-color-im-ok);
206189
text-align:center;
207-
font-size:12px;
208-
line-height: 27px;
190+
line-height: 2em;
209191
}
210192

211193
.questionResults .questionResults-Non {
212-
background-color:#FECBCB;
213-
border:1px solid #FF928F;
194+
background-color:var(--bgColor-color-im-nok);
195+
border:1px solid var(--border-color-im-nok);
214196
text-align:center;
215-
font-size:12px;
216-
line-height: 27px;
197+
line-height: 2em;
217198
}
218199

219200
.questionResults .displayUserName,
220201
.questionResults .displayUserName a,
221202
.questionResults .questionResults-NC,
222203
.questionResults .questionResults-NC a {
223204
background-color: #E4E4E4;
224-
font-size: 11px;
225-
font-weight: 100;
226-
line-height: 29px;
205+
line-height: 2em;
227206
margin-right: 5px;
228207
padding-left: 10px;
229208
white-space:nowrap;
@@ -244,5 +223,5 @@ td.txtlibform {
244223
}
245224

246225
tr.resultVote td.participation {
247-
text-align:center;;
226+
text-align:center;
248227
}

0 commit comments

Comments
 (0)