Skip to content

Commit de7eedc

Browse files
committed
Modifications to _global-styles.scss for diacritic problem test
1 parent 4227c0f commit de7eedc

File tree

1 file changed

+59
-132
lines changed

1 file changed

+59
-132
lines changed

src/themes/montreal/styles/_global-styles.scss

Lines changed: 59 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
// Import the custom fonts
2-
// @import 'https://fonts.googleapis.com/css2?family=Figtree:wght@400;600&display=swap';
3-
// @import 'https://fonts.googleapis.com/css2?family=Lora:wght@400;600&display=swap';
4-
@import '../assets/fonts/figtree/fig-tree';
5-
@import '../assets/fonts/lora/lora-font';
1+
@charset "UTF-8";
62

7-
// Configure Bootstrap to use these fonts
8-
$font-family-sans-serif: 'Noto Sans', 'Figtree', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
9-
$font-family-serif: 'Lora', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
10-
11-
// Assign the fonts to specific Bootstrap components or SCSS variables
12-
$headings-font-family: $font-family-sans-serif;
13-
$h4-font-family: $font-family-serif;
14-
$body-font-family: $font-family-sans-serif;
3+
// Import the custom fonts avec support des caractères français
4+
@import 'https://fonts.googleapis.com/css2?family=Figtree:wght@400;600&subset=latin,latin-ext&display=swap';
5+
@import 'https://fonts.googleapis.com/css2?family=Lora:wght@400;600&subset=latin,latin-ext&display=swap';
156

7+
// Configure Bootstrap to use these fonts
8+
$font-family-sans-serif: 'Figtree', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
9+
$font-family-serif: 'Lora', Georgia, 'Times New Roman', Times, serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
1610
/* -------------------------------------------------------
1711
Importation des styles globaux
1812
---------------------------------------------------------- */
@@ -27,6 +21,7 @@ $body-font-family: $font-family-sans-serif;
2721
/* -------------------------------------------------------
2822
Styles theme UdeM
2923
---------------------------------------------------------- */
24+
3025
.logo-udem{
3126
vertical-align: bottom;
3227
border-style: none;
@@ -36,9 +31,14 @@ $body-font-family: $font-family-sans-serif;
3631
font-weight: 600;
3732
font-size: 28px;
3833
color:$gray-800;
39-
font-family: Lora;
34+
font-family: $font-family-serif;
35+
}
36+
37+
ds-system-wide-alert-banner {
38+
display: none;
4039
}
4140

41+
4242
.facet-filter, .setting-option {
4343
background-color: var(--bs-light);
4444
border-radius: var(--bs-border-radius);
@@ -50,7 +50,7 @@ $body-font-family: $font-family-sans-serif;
5050

5151
h4 {
5252
font-size: 1.25rem!important;
53-
font-family: Lora;
53+
font-family: $font-family-serif;
5454
}
5555
}
5656

@@ -61,12 +61,12 @@ $body-font-family: $font-family-sans-serif;
6161

6262
h1, h2, h3, h5, h6 {
6363
font-weight: 600;
64-
font-family: Figtree;
64+
font-family: $font-family-sans-serif;
6565
color: $greensecondary;
6666
}
6767

6868
h4 {
69-
font-family: Lora;
69+
font-family: $font-family-serif;
7070
}
7171

7272
h2{
@@ -105,7 +105,7 @@ nav#admin-sidebar a {
105105
Styles pour les paragraphes et le texte
106106
---------------------------------------------------------- */
107107
p, span, a {
108-
font-family: Figtree;
108+
font-family: $font-family-sans-serif;
109109
}
110110

111111
.dont-break-out {
@@ -133,12 +133,27 @@ p, span, a {
133133

134134
.bg-papyrus-menu {
135135
background: #EEF4F7;
136+
z-index: 10;
136137
}
137138

138139
.nav-udem a {
139140
margin-right: 20px !important;
140141
}
141142

143+
ds-file-download-link a.dont-break-out {
144+
color: #0057AC;
145+
font-weight: bold;
146+
text-decoration: underline;
147+
}
148+
149+
ds-file-download-link a.dont-break-out:hover {
150+
color: #00407F;
151+
text-decoration: underline!important;
152+
}
153+
154+
155+
156+
142157
/* -------------------------------------------------------
143158
Pied de page
144159
---------------------------------------------------------- */
@@ -149,7 +164,7 @@ p, span, a {
149164

150165
h5 {
151166
margin-bottom: 20px;
152-
font-family: Figtree;
167+
font-family: $font-family-sans-serif;
153168
}
154169

155170
ul {
@@ -209,35 +224,35 @@ p, span, a {
209224

210225
.text-bib {
211226
color: #FFF;
212-
font-family: Figtree;
227+
font-family: $font-family-sans-serif;
213228
font-size: 24px;
214229
font-weight: 600;
215230
line-height: 150%;
216231
}
217232
}
218233

234+
219235
/* -------------------------------------------------------
220236
Section des espaces
221237
---------------------------------------------------------- */
222238
.espaces-section {
223239
background-color: $green;
224-
color: #FFFFFF;
225240
margin-top: -16px;
226241
border-top: 10px solid $green;
227242

228243
.section-title {
229-
font-family: Figtree, sans-serif;
244+
font-family: $font-family-sans-serif;
230245
font-size: 2.5rem;
231246
font-style: normal;
232247
font-weight: 550;
233248
color: #FFFFFF;
234249
}
235250

236251
.section-description {
237-
font-family: Figtree, sans-serif;
252+
font-family: $font-family-sans-serif;
238253
font-size: 1rem;
239254
line-height: 1.5;
240-
text-align: start;
255+
text-align: start;
241256
color: #d9dbdb!important;
242257

243258
span {
@@ -255,10 +270,6 @@ p, span, a {
255270
}
256271
}
257272

258-
.main-image img {
259-
border-radius: 16px;
260-
}
261-
262273
.secondary-image {
263274
top: 80%;
264275
left: 45%;
@@ -268,25 +279,9 @@ p, span, a {
268279
z-index: 2;
269280
background: $green!important;
270281
}
271-
272-
.img-radius-bib {
273-
border-radius: 12px!important;
274-
}
275-
}
276282

277-
.bib-home {
278-
border-color: $gray-100!important;
279-
background-color:white!important;
280-
color: $green!important;
281-
}
282-
283-
.bib-home:hover {
284-
border-color: white!important;
285-
background-color:transparent!important;
286-
color: white!important;
287283
}
288284

289-
290285
/* -------------------------------------------------------
291286
Couleurs de fond personnalisées
292287
---------------------------------------------------------- */
@@ -318,6 +313,7 @@ p, span, a {
318313
// -------------------------------------------------------
319314
// Button Styles
320315
// -------------------------------------------------------
316+
321317
.btn {
322318
border-radius: 60px;
323319
}
@@ -326,11 +322,24 @@ p, span, a {
326322
background-color: #262525;
327323
}
328324

325+
329326
.cm-btn-success{
330327
background-color: $green!important;
331328
color: $extralightgreen!important;
332329
}
333330

331+
.bib-home {
332+
border-color: $gray-100!important;
333+
background-color:white!important;
334+
color: $green!important;
335+
}
336+
337+
.bib-home:hover {
338+
border-color: white!important;
339+
background-color:transparent!important;
340+
color: white!important;
341+
}
342+
334343
.navbar-nav .dropdown-menu {
335344
background: $white !important;
336345
}
@@ -339,101 +348,19 @@ p, span, a {
339348
padding: 10px;
340349
}
341350

351+
.img-radius-bib {
352+
border-radius: 12px!important;
353+
}
354+
342355
/* Définir une hauteur minimale pour le contenu principal afin d'éviter que le footer ne remonte trop haut*/
343356
#main-content {
344-
min-height: 80vh !important;
357+
min-height: 80vh!important;
345358
}
346359

347-
/* organize logo with menu on small screens */
348360
@media (max-width: 600px) {
361+
/* Organisation du logo avec le menu sur petits écrans */
349362
.navbar-right-bib {
350363
margin-top: 5rem!important;
351364
padding-bottom: 2.5rem!important;
352365
}
353366
}
354-
// -------------------------------------------------------
355-
// Submission Form Styling - Added by Scholaris Team
356-
// -------------------------------------------------------
357-
.submission-form-hint {
358-
padding: 2px;
359-
border: 1px solid lightcoral;
360-
border-image: none;
361-
background-color: seashell;
362-
}
363-
364-
.submission-form-hint-title {
365-
margin-right: 0.3em;
366-
margin-left: 0.3em;
367-
font-family: monospace;
368-
border: 1pt darkkhaki solid;
369-
}
370-
371-
// Submission form spacing
372-
ds-dynamic-form-control-container[class*="col-sm"] {
373-
margin-bottom: 25px;
374-
}
375-
376-
ds-dynamic-form-control-container[class*="col-sm"] ds-dynamic-form-control-container[class*="col-sm"] {
377-
margin-bottom: unset !important;
378-
}
379-
380-
.form-group {
381-
margin-bottom: 35px;
382-
ds-dynamic-form-control-container[class*="col-sm"] {
383-
margin-bottom: unset !important;
384-
}
385-
}
386-
387-
ds-dynamic-form-control-container[class*="d-none"],
388-
ds-dynamic-form-control-container[hidden] {
389-
margin-bottom: unset !important;
390-
}
391-
392-
@media (min-width: 992px) {
393-
.modal-dialog:has(ds-create-item-parent-selector),
394-
.modal-dialog:has(ds-create-collection-parent-selector),
395-
.modal-dialog:has(ds-create-community-parent-selector),
396-
.modal-dialog:has(ds-edit-collection-selector),
397-
.modal-dialog:has(ds-edit-item-selector),
398-
.modal-dialog:has(ds-edit-community-selector) {
399-
max-width: 800px;
400-
}
401-
}
402-
403-
// -------------------------------------------------------
404-
// Expand the Pop-up Collection Box on the Search Results
405-
// Search Results Page - Added by Scholaris Team
406-
// Example URL: http://localhost:4000/search?query=TEST&spc.page=1
407-
// -------------------------------------------------------
408-
@media (min-width: 1024px) {
409-
.modal-content:has(ds-scope-selector-modal[_nghost-dspace-angular-c77]){
410-
width: 150%;
411-
}
412-
}
413-
414-
// UdeM Addition For Description Changes
415-
p.section-description a {
416-
color: #3fc5c9!important;
417-
}
418-
419-
p.section-description a:hover {
420-
color: #ffffff!important;
421-
}
422-
423-
ds-file-download-link a.dont-break-out
424-
{
425-
color: #0057AC;
426-
font-weight: bold;
427-
text-decoration: underline;
428-
}
429-
430-
ds-file-download-link a.dont-break-out:hover {
431-
color: #00407F;
432-
text-decoration: underline!important;
433-
}
434-
435-
ds-item-page-full-file-section {
436-
.file-section {
437-
word-break: break-all;
438-
}
439-
}

0 commit comments

Comments
 (0)