Skip to content

Commit

Permalink
Merge pull request #461 from t3-innovation-network/fix-prettier
Browse files Browse the repository at this point in the history 
fixed js/scss formatting to follow prettier rules
  • Loading branch information
@shlag3n
shlag3n authored Feb 17, 2024
2 parents 1ee87b9 + a7a6f52 commit 5b585f4
Show file tree
Hide file tree
Showing 221 changed files with 2,578 additions and 3,415 deletions.
4 changes: 3 additions & 1 deletion .stylelintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
"stylelint-config-prettier",
"stylelint-config-standard-scss"
],
"plugins": ["stylelint-order"],
"rules": {
"declaration-block-trailing-semicolon": null,
"no-descending-specificity": null,
"selector-class-pattern": null
"selector-class-pattern": null,
"order/properties-alphabetical-order": true
}
}
28 changes: 14 additions & 14 deletions app/assets/stylesheets/application.scss
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
@import "colors";
@import 'colors';

/* General */

@font-face {
font-family: "Proxima Nova Condensed Light";
src: url("../fonts/proxima-light/Proxima Nova Condensed Light.otf");
font-family: 'Proxima Nova Condensed Light';
src: url('../fonts/proxima-light/Proxima Nova Condensed Light.otf');
}

body {
font-family: "Proxima Nova Condensed Light", sans-serif;
font-family: 'Proxima Nova Condensed Light', sans-serif;

&.waiting {
cursor: wait;
}
}

.subtitle {
font-weight: bold;
font-size: 18px;
font-weight: bold;
}

.small-text {
Expand Down Expand Up @@ -65,11 +65,11 @@ a:hover {
}

.fully-centered {
position: absolute;
transform: translate(-50%, -50%);
left: 50%;
margin: 0;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}

.desm-col-header {
Expand Down Expand Up @@ -186,13 +186,13 @@ a:hover {
}

.comment-dot {
position: relative;
left: -10px;
position: relative;
}

.rounded-divider {
border-top: 2px solid #bbb;
border-radius: 5px;
border-top: 2px solid #bbb;
}

.desm-rounded {
Expand Down Expand Up @@ -226,7 +226,7 @@ a:hover {
}

.fit-content-height {
min-height: "fit-content";
min-height: 'fit-content';
}

.centered-width {
Expand All @@ -238,13 +238,13 @@ a:hover {
/* Scrollbar */

.has-scrollbar {
overflow-y: scroll;
max-height: 45vw;
overflow-y: scroll;
}

.scrollbar::-webkit-scrollbar {
width: 6px;
background-color: $background-color-dark;
width: 6px;
}

.scrollbar::-webkit-scrollbar-thumb {
Expand All @@ -267,9 +267,9 @@ a:hover {
}

.box-title {
max-height: 40px;
overflow: hidden;
text-overflow: ellipsis;
max-height: 40px;
}

.border-top-dashboard-highlight {
Expand Down
143 changes: 71 additions & 72 deletions app/assets/stylesheets/customradio.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,121 +3,120 @@
@import 'colors';

.desm-radio div {
clear: both;
overflow: hidden;
clear: both;
overflow: hidden;
}

.desm-check-container-sm{
height: 5rem;
.desm-check-container-sm {
height: 5rem;
}

.desm-radio label {
width: 100%;
border-radius: 3px;
border: 1px solid $primary-color-highlight;
font-weight: normal;
border: 1px solid $primary-color-highlight;
border-radius: 3px;
font-weight: normal;
width: 100%;
}

.desm-radio input[type="radio"]:empty,
.desm-radio input[type="checkbox"]:empty {
left: -9999px;
position: absolute;
.desm-radio input[type='radio']:empty,
.desm-radio input[type='checkbox']:empty {
left: -9999px;
position: absolute;
}

.desm-radio input[type="radio"]:empty~label,
.desm-radio input[type="checkbox"]:empty~label {
position: relative;
line-height: 2.5em;
text-indent: 3.25em;
cursor: pointer;
user-select: none;
.desm-radio input[type='radio']:empty ~ label,
.desm-radio input[type='checkbox']:empty ~ label {
cursor: pointer;
line-height: 2.5em;
position: relative;
text-indent: 3.25em;
user-select: none;
}

.desm-radio input[type="radio"]:empty~label::before,
.desm-radio input[type="checkbox"]:empty~label::before {
position: absolute;
display: block;
top: 0;
bottom: 0;
left: 0;
content: '';
width: 2.5em;
background: $primary-color-highlight;
;
border-radius: 3px 0 0 3px;
.desm-radio input[type='radio']:empty ~ label::before,
.desm-radio input[type='checkbox']:empty ~ label::before {
background: $primary-color-highlight;
border-radius: 3px 0 0 3px;
bottom: 0;
content: '';
display: block;
left: 0;
position: absolute;
top: 0;
width: 2.5em;
}

.desm-radio > .has-spine input[type="radio"]:empty~label::before,
.desm-radio > .has-spine input[type="checkbox"]:empty~label::before {
background: green !important;
.desm-radio > .has-spine input[type='radio']:empty ~ label::before,
.desm-radio > .has-spine input[type='checkbox']:empty ~ label::before {
background: green !important;
}

.desm-radio input[type="radio"]:hover:not(:checked)~label,
.desm-radio input[type="checkbox"]:hover:not(:checked)~label {
color: $on-primary-light;
.desm-radio input[type='radio']:hover:not(:checked) ~ label,
.desm-radio input[type='checkbox']:hover:not(:checked) ~ label {
color: $on-primary-light;
}

.desm-radio input[type="radio"]:hover:not(:checked)~label::before,
.desm-radio input[type="checkbox"]:hover:not(:checked)~label::before {
content: '✓';
color: $foreground-color;
font-weight: bolder;
text-indent: .9em;
.desm-radio input[type='radio']:hover:not(:checked) ~ label::before,
.desm-radio input[type='checkbox']:hover:not(:checked) ~ label::before {
color: $foreground-color;
content: '✓';
font-weight: bolder;
text-indent: 0.9em;
}

.desm-radio input[type="radio"]:checked~label,
.desm-radio input[type="checkbox"]:checked~label {
color: #777;
.desm-radio input[type='radio']:checked ~ label,
.desm-radio input[type='checkbox']:checked ~ label {
color: #777;
}

.desm-radio input[type="radio"]:checked~label::before,
.desm-radio input[type="checkbox"]:checked~label::before {
content: '✓';
background-color: #ccc;
color: #333;
font-weight: bolder;
text-indent: .9em;
.desm-radio input[type='radio']:checked ~ label::before,
.desm-radio input[type='checkbox']:checked ~ label::before {
background-color: #ccc;
color: #333;
content: '✓';
font-weight: bolder;
text-indent: 0.9em;
}

.desm-radio input[type="radio"]:focus~label::before,
.desm-radio input[type="checkbox"]:focus~label::before {
box-shadow: 0 0 0 3px #999;
.desm-radio input[type='radio']:focus ~ label::before,
.desm-radio input[type='checkbox']:focus ~ label::before {
box-shadow: 0 0 0 3px #999;
}

.desm-radio-default input[type="radio"]:checked~label::before,
.desm-radio-default input[type="checkbox"]:checked~label::before {
color: #333;
background-color: #ccc;
.desm-radio-default input[type='radio']:checked ~ label::before,
.desm-radio-default input[type='checkbox']:checked ~ label::before {
background-color: #ccc;
color: #333;
}

.desm-radio-primary {
position: relative;
position: relative;
}

.desm-radio-primary input[type="radio"]:checked~label::before,
.desm-radio-primary input[type="checkbox"]:checked~label::before {
color: #fff;
background-color: $on-primary;
.desm-radio-primary input[type='radio']:checked ~ label::before,
.desm-radio-primary input[type='checkbox']:checked ~ label::before {
background-color: $on-primary;
color: #fff;
}

/* CUSTOM CONTROLS */

.desm-custom-control-input:focus~.custom-control-label::before {
.desm-custom-control-input:focus ~ .custom-control-label::before {
border-color: $primary-color !important;
box-shadow: 0 0 0 0.2rem $primary-color-light !important;
opacity: 0.5;
box-shadow: 0 0 0 0.2rem $primary-color-light !important;
opacity: 0.5;
}

.desm-custom-control-input:checked~.custom-control-label::before {
border-color: $primary-color !important;
.desm-custom-control-input:checked ~ .custom-control-label::before {
background-color: $primary-color !important;
border-color: $primary-color !important;
}

.desm-custom-control-input:focus:not(:checked)~.custom-control-label::before {
.desm-custom-control-input:focus:not(:checked) ~ .custom-control-label::before {
border-color: $on-primary-light !important;
}

.desm-custom-control-input:not(:disabled):active~.custom-control-label::before {
.desm-custom-control-input:not(:disabled):active ~ .custom-control-label::before {
background-color: $primary-color-highlight !important;
border-color: $primary-color-highlight !important;
}
16 changes: 8 additions & 8 deletions app/assets/stylesheets/drag-n-drop.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@

/* Drag and Drop Classes */

.dnd-active{
.dnd-active {
border: solid 3px $primary-color !important;
color: $primary-color;
font-weight: bold;
}

.domain-drag-box{
.domain-drag-box {
min-height: 3.5vw;
text-align: center;
}

.mapping-term-drag-box{
.mapping-term-drag-box {
height: calc(1.5em + 1.8rem + 2px);
text-align: center;
}

.draggable{
.draggable {
cursor: move;
}

.not-draggable{
.not-draggable {
cursor: not-allowed;
}

.is-dragging{
.is-dragging {
opacity: 0.4;
}

.terms-progress{
.terms-progress {
height: 0.5rem !important;
margin-top: 10px;
}

.term-selected {
border-color: $primary-color !important;
border-width: 1px !important;
}
}
12 changes: 6 additions & 6 deletions app/assets/stylesheets/forms.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
}

.domain-option {
padding-top: 0.2vw;
padding-bottom: 0.2vw;
padding-top: 0.2vw;
}

.form-group {
Expand All @@ -28,18 +28,18 @@
z-index: 5;

&:focus {
box-shadow: 0 0 0 .3rem rgb(0 123 255 / 50%) !important;
box-shadow: 0 0 0 0.3rem rgb(0 123 255 / 50%) !important;
}
}

.react-codemirror2{
.react-codemirror2 {
height: 100%;
max-height: 27rem;

::-webkit-scrollbar {
background-color: $primary-color-highlight;
height: 6px;
width: 6px;
background-color: $primary-color-highlight;
}

/* Handle */
Expand All @@ -59,11 +59,11 @@
}
}

.CodeMirror{
.CodeMirror {
height: 100% !important;
}

.custom-select:focus{
.custom-select:focus {
border-color: $primary-color !important;
box-shadow: 0 0 0 0.2rem $background-color-dark !important;
}
Loading

0 comments on commit 5b585f4

Please sign in to comment.