Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/frontend/.stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
'use strict';

module.exports = {
plugins: ['stylelint-scales'],
extends: ['stylelint-config-recommended-scss'],
rules: {
'property-disallowed-list': ['font-size', 'line-height'],
'font-weight-notation': 'numeric',
'scales/font-weights': [200, 400, 600],
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}

.no-cohorts {
font-weight: bold;
font-weight: 600;
margin-left: 0.5rem;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
.file-is-loading {
display: flex;
@include m.font-size("xxxl");
font-weight: bold;
font-weight: 600;
justify-content: center;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

.confirm-message {
color: var(--red);
font-weight: bold;
font-weight: 600;
padding: 1rem 10%;
text-align: center;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

tfoot {
td:nth-last-child(1) {
font-weight: bold;
font-weight: 600;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}

.inline-label {
font-weight: bold;
font-weight: 600;
margin-right: 0.5rem;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
color: var(--black);
display: flex;
@include cm.font-size("smallest");
font-weight: 100;
font-weight: 200;
justify-content: center;
margin: 0.25rem;
padding: 0.25rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
.if-active {
color: var(--light-blue);
justify-self: end;
font-weight: bold;
font-weight: 600;
}

&.active {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
background-color: var(--lightest-grey);
border-radius: 4px;
cursor: pointer;
font-weight: bold;
font-weight: 600;
padding: 0.2rem 0.4rem 0.2rem 0.6rem;
vertical-align: middle;

Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/styles/components/my-profile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
width: 100%;

h2 {
font-weight: bold;
font-weight: 600;
margin: 0;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@

li {
.active {
font-weight: bold;
font-weight: 600;
}

li {
font-weight: bold;
font-weight: 600;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

.domain-title {
color: var(--green);
font-weight: bold;
font-weight: 600;
}
}
}
Expand All @@ -34,14 +34,14 @@
padding-left: 0.5rem;

.selected {
font-weight: bold;
font-weight: 600;
}
}
}
}

.no-cohorts {
color: var(--dark-yellow);
font-weight: bold;
font-weight: 600;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}
button {
@include cm.ilios-button-reset;
font-weight: bold;
font-weight: 600;
}

ul {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
}

.term-title {
font-weight: bold;
font-weight: 600;
}

.term-details {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

.school-competencies-list {
.headers {
font-weight: bold;
font-weight: 600;
}
.grid-row {
display: grid;
Expand Down Expand Up @@ -82,7 +82,7 @@
.confirm-message {
color: var(--light-red);
grid-column: 1 / -1;
font-weight: bold;
font-weight: 600;
text-align: center;
margin-bottom: 1rem;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
padding: 1rem;

h4 {
font-weight: bold;
font-weight: 600;
margin-bottom: 1rem;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@include m.detail-container-content;

label {
font-weight: bold;
font-weight: 600;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
padding: 1rem;

h4 {
font-weight: bold;
font-weight: 600;
margin-bottom: 1rem;
width: 100%;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
border-radius: 0.2rem;
color: var(--black);
@include cm.font-size("small");
font-weight: normal;
font-weight: 400;
margin-left: 0.8rem;
padding: 0.25em;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
.more-permissions-notice {
color: var(--black);
font-style: italic;
font-weight: bold;
font-weight: 600;
text-align: center;
}
}
2 changes: 1 addition & 1 deletion packages/frontend/app/styles/layout/_noscript.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ noscript {
border: 2px dashed var(--orange);
color: var(--black);
@include m.font-size("xxl");
font-weight: bold;
font-weight: 600;
margin: 2rem;
padding: 2rem;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/styles/mixins/header-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
border: 1px solid var(--super-light-grey);
border-radius: 0;
color: var(--black);
font-weight: normal;
font-weight: 400;
padding: 0.25rem;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
}

tfoot td {
font-weight: bold;
font-weight: 600;
}
}
1 change: 1 addition & 0 deletions packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"stylelint": "^16.20.0",
"stylelint-config-recommended-scss": "^15.0.0",
"stylelint-config-standard": "^36.0.1",
"stylelint-scales": "^5.0.0",
"stylelint-scss": "^6.11.0",
"terser-webpack-plugin": "^5.3.14",
"testem-failure-only-reporter": "^1.0.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/ilios-common/.stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
'use strict';

module.exports = {
plugins: ['stylelint-scales'],
extends: ['stylelint-config-recommended-scss'],
rules: {
'property-disallowed-list': ['font-size', 'line-height'],
'font-weight-notation': 'numeric',
'scales/font-weights': [200, 400, 600],
},
};
5 changes: 3 additions & 2 deletions packages/ilios-common/addon/components/single-event.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,9 @@ export default class SingleEvent extends Component {
</div>
{{/if}}
{{#if @event.sessionDescription}}
{{this.sessionDescription}}
<br />
<div class="single-event-session-description">
{{this.sessionDescription}}
</div>
{{/if}}
</div>
<div class="single-event-learningmaterial-list" data-test-session-materials>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ p {
}
}

strong,
b {
font-weight: 600;
}

.add,
.yes {
color: var(--green);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
border: 1px solid var(--white);
border-radius: 0.2rem;
color: var(--black);
font-weight: normal;
font-weight: 400;
padding: 0.25rem 0.5rem;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

.competency-title {
color: var(--green);
font-weight: bold;
font-weight: 600;
}
}
}
Expand All @@ -40,14 +40,14 @@
padding-left: 0.5rem;

.selected {
font-weight: bold;
font-weight: 600;
}
}
}
}

.no-cohorts {
color: var(--dark-orange);
font-weight: bold;
font-weight: 600;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
.included {
.title {
display: block;
font-weight: bold;
font-weight: 600;
margin-bottom: 0.5rem;
}

Expand All @@ -60,7 +60,7 @@

.title {
display: block;
font-weight: bold;
font-weight: 600;
margin-bottom: 0.5em;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
.ilios-calendar-event-time {
display: block;
@include m.font-size("small");
font-weight: bold;
font-weight: 600;
padding-bottom: 0.5em;
}

.ilios-calendar-event-location {
display: inline;
font-weight: bold;
font-weight: 600;
}

&.ilm {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
@include m.ilios-tag-list;

.term-title {
font-weight: bold;
font-weight: 600;
}

.term-details {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

h2 {
@include m.ilios-heading-h3;
font-weight: normal;
font-weight: 400;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

.title {
@include m.font-size("medium");
font-weight: bold;
font-weight: 600;
margin-top: 0;
padding-left: 1rem;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
@include m.ilios-heading;
color: var(--black);
@include m.font-size("base");
font-weight: bold;
font-weight: 600;
}

.mesh-manager {
Expand Down
Loading