Skip to content

Commit

Permalink
Merge branch 'master' into shortcuts
Browse files Browse the repository at this point in the history
  • Loading branch information
AngelFQC authored Jun 27, 2024
2 parents 09df6e1 + 423fc09 commit 9eafea0
Show file tree
Hide file tree
Showing 553 changed files with 22,624 additions and 8,180 deletions.
685 changes: 343 additions & 342 deletions .yarn/releases/yarn-4.1.1.cjs → .yarn/releases/yarn-4.3.0.cjs
100755 → 100644

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.1.1.cjs
yarnPath: .yarn/releases/yarn-4.3.0.cjs
146 changes: 132 additions & 14 deletions assets/css/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,6 @@
}

@layer utilities {
.custom-collapse {
display: none;
}
.custom-collapse.active {
display: block;
}
.collapse {
visibility: inherit !important;
}
.border-gray-300 {
--tw-border-opacity: 1;
border-color: rgba(156, 163, 175, var(--tw-border-opacity));
Expand Down Expand Up @@ -237,6 +228,10 @@
color: #666;
}

.card .stat-content {
padding: 10px;
}

// Alerts

.alert {
Expand Down Expand Up @@ -446,10 +441,6 @@
font-size: 12px;
}

.question_description img, .question_options img {
display: inherit !important;
}

.question_options .droppable {
padding: 5px;
text-align: center;
Expand Down Expand Up @@ -606,7 +597,9 @@ form .field {
}

.freeze + label,
.advmultiselect + label {
.advmultiselect + label,
textarea + label.settings-label
{
font-size: 13px;
@apply absolute top-0 left-0 text-support-3 text-caption px-1 bg-white text-primary;
}
Expand All @@ -626,6 +619,131 @@ form .field {
display: none;
}

.sub-item-indent {
padding-left: 20px;
}

.sub-item-indent.active {
background-color: #e0e0e0;
color: #333;
font-weight: bold;
}

.easy-donut {
display: flex;
flex-direction: column;
align-items: center;
}
.easy-donut .percent {
font-size: 1.25rem;
font-weight: bold;
}
.stat-widget-five {
display: flex;
align-items: center;
}
.stat-widget-five .fa, .stat-widget-five .mdi-icon {
margin-right: 1rem;
}

.toggle-password {
position: absolute !important;
top: 65% !important;
transform: translateY(-50%);
right: 0.75rem;
display: flex;
align-items: center;
cursor: pointer;
}

.toggle-password i {
font-size: 24px;
}

#legacy_content {
.exercise-overview {
padding: 30px 10px 60px;
}
.question-result {
padding-top: 30px;
}

.exercise-draggable-answer.full-width {
width: 100%;
}

.exercise-draggable-answer.list-inline {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}

.exercise-draggable-answer.vertical {
@apply flex flex-col w-full;
}

.exercise-draggable-answer.horizontal {
@apply flex flex-wrap;
}

.droppable-item {
@apply flex items-center justify-between p-4 mb-4 rounded-md;
}

.number {
@apply text-lg font-bold;
}

.droppable, .ui-droppable {
@apply border-2 border-dashed p-4 bg-white rounded-md min-h-[50px];
}

.question_options .question-answer__items--vertical .droppable {
width: 98%;
}

.ui-dragging {
@apply w-full flex items-center justify-center p-4 border-2 border-dashed;
}

.vertical .ui-draggable-dragging {
width: 80%;
}

.question-answer__items--vertical {
@apply flex flex-col w-full;
}

.question-answer__items--horizontal {
@apply flex flex-row flex-wrap;
}
}

.btn:hover {
cursor: pointer;
color: #fff;
}

.btn.btn--success.btn-large:hover {
background-color: #28a745;
}

.btn.btn--warning.question-validate-btn:hover {
background-color: #ffc107;
}

.btn.btn--info:hover {
background-color: #17a2b8;
}

.btn.btn--success:hover {
background-color: #28a745;
}

.btn.btn--danger:hover {
background-color: #dc3545;
}

//@import 'primevue-md-light-indigo/theme.css';
//@import '~primevue/resources/primevue.min.css';
//@import '~primeflex/primeflex.css';
Expand Down
59 changes: 59 additions & 0 deletions assets/css/legacy/frameReadyLoader.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@layer base {
:root {
--color-primary-base: 46 117 163;
--color-primary-gradient: 36 77 103;
--color-primary-button-text: 46 117 163;
--color-primary-button-alternative-text: 255 255 255;

--color-secondary-base: 243 126 47;
--color-secondary-gradient: 224 100 16;
--color-secondary-button-text: 255 255 255;

--color-tertiary-base: 51 51 51;
--color-tertiary-gradient: 0 0 0;
--color-tertiary-button-text: 255 255 255;

--color-success-base: 119 170 12;
--color-success-gradient: 83 127 0;
--color-success-button-text: 255 255 255;

--color-info-base: 13 123 253;
--color-info-gradient: 0 84 211;
--color-info-button-text: 255 255 255;

--color-warning-base: 245 206 1;
--color-warning-gradient: 186 152 0;
--color-warning-button-text: 0 0 0;

--color-danger-base: 223 59 59;
--color-danger-gradient: 180 0 21;
--color-danger-button-text: 255 255 255;

--color-form-base: 46 117 163;
}
}

@import "../scss/settings/typography";

@import "../scss/libs/mediaelementjs/styles";

body {
@apply prose max-w-none space-y-4
prose-h1:text-h1
prose-h2:text-h2
prose-h3:text-h3
prose-h4:text-h4
prose-h5:text-h5
prose-h6:text-h6
prose-img:inline-block prose-img:my-2
prose-a:text-info
;

> * {
@apply my-0;
}
}
Loading

0 comments on commit 9eafea0

Please sign in to comment.