Compare commits

...

4 Commits

Author SHA1 Message Date
Angel Fernando Quiroz Campos 6165deae1b
Vendor: Remove optimize-css-assets-webpack-plugin 9 months ago
Angel Fernando Quiroz Campos b508679ceb
Exercise: Disable submit buttons while recorded audio is saving - refs BT#22293 9 months ago
Angel Fernando Quiroz Campos a83db96aec
Use Display::toolbarButton instead of HTML code 9 months ago
Angel Fernando Quiroz Campos fb2cf66e78
Display: Fix styles for icons, buttons and forms 9 months ago
  1. 29
      assets/css/scss/atoms/_buttons.scss
  2. 4
      assets/css/scss/molecules/_course_tool.scss
  3. 6
      assets/css/scss/molecules/_empty_state.scss
  4. 2
      assets/css/scss/molecules/_toolbar.scss
  5. 1
      package.json
  6. 10
      public/main/admin/course_list.php
  7. 4
      public/main/inc/lib/formvalidator/FormValidator.class.php
  8. 6
      public/main/inc/lib/javascript/record_audio/record_audio.js

@ -1,6 +1,9 @@
.btn {
@apply cursor-default font-semibold gap-2 inline-flex justify-center px-6 py-2 rounded-md transition flex-none;
font-size: 16px;
@apply cursor-default font-semibold gap-2 inline-flex justify-center px-6 py-2 rounded-md transition flex-none text-base;
.mdi {
@apply text-base;
}
&--primary {
@apply bg-primary text-white;
@ -231,8 +234,6 @@ $border-color_12: #9333EA;
@include filled-style('primary', 'support-4');
@apply cursor-pointer font-semibold gap-2 inline-flex justify-center items-center px-4 py-2 rounded-md transition;
font-size: 16px;
&:focus {
@apply outline-none;
}
@ -259,16 +260,28 @@ $border-color_12: #9333EA;
&.p-button-sm {
@apply px-2 py-1;
font-size: 13px;
.p-button-icon,
.p-button-label {
font-size: 13px;
}
}
&.p-button-lg {
@apply px-8 py-4;
font-size: 18px;
.p-button-icon,
.p-button-label {
font-size: 18px;
}
}
.p-button-icon {
@apply text-base;
}
.p-button-label {
@apply align-middle font-semibold;
@apply align-middle font-semibold text-base;
}
&.p-button-icon-only {
@ -289,7 +302,7 @@ $border-color_12: #9333EA;
@apply bg-gray-10;
.p-button-label {
text-decoration: underline;
@apply underline;
}
}
}

@ -13,13 +13,9 @@
&__icon {
@apply text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient leading-none;
&,
&.mdi {
font-size: 52px;
}
&::before {
}
}
&__title {

@ -7,7 +7,11 @@
}
&__icon {
@apply mb-4 text-9xl text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient w-32 h-32;
@apply mb-4 text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient w-32 h-32;
&.mdi {
font-size: 8rem;
}
}
&__summary {

@ -3,7 +3,7 @@
&-group-left,
&-group-right {
@apply flex flex-row flex-wrap gap-2;
@apply flex flex-row flex-wrap gap-2 items-center;
}
&-separator {

@ -77,7 +77,6 @@
"moment": "^2.30.1",
"multiselect-two-sides": "^2.5.7",
"mxgraph": "^4.2.2",
"optimize-css-assets-webpack-plugin": "^6.0.1",
"path": "^0.12.7",
"pinia": "^2.3.0",
"pretty-bytes": "^5.6.0",

@ -12,6 +12,7 @@ declare(strict_types=1);
use Chamilo\CoreBundle\Component\Utils\ActionIcon;
use Chamilo\CoreBundle\Component\Utils\StateIcon;
use Chamilo\CoreBundle\Component\Utils\ToolIcon;
use Chamilo\CoreBundle\Framework\Container;
$cidReset = true;
@ -416,9 +417,12 @@ if (isset($_GET['search']) && 'advanced' === $_GET['search']) {
['id' => 'course-search-keyword', 'aria-label' => get_lang('Search courses')]
);
$form->addButtonSearch(get_lang('Search courses'));
$advanced = '<a class="btn btn--plain" href="'.api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced">
<em class="pi pi-search"></em> '.
get_lang('Advanced search').'</a>';
$advanced = Display::toolbarButton(
get_lang('Advanced search'),
Container::getRouter()->generate('legacy_main', ['name' => 'admin/course_list.php', 'search' => 'advanced']),
ActionIcon::SEARCH,
'plain'
);
// Create a filter by session
$sessionFilter = new FormValidator(

@ -50,10 +50,8 @@ class FormValidator extends HTML_QuickForm
switch ($layout) {
case self::LAYOUT_BOX_SEARCH:
$attributes['class'] = 'form--search';
break;
case self::LAYOUT_INLINE:
$attributes['class'] = 'flex flex-row gap-3 ';
$attributes['class'] = 'flex flex-row gap-3 items-center ';
break;
case self::LAYOUT_BOX:
$attributes['class'] = 'ch flex gap-1 ';

@ -87,6 +87,8 @@ window.RecordAudio = (function () {
if (btnSave) {
btnSave.prop('disabled', true).text(btnSave.data('loadingtext'));
}
$('.exercise_save_now_button button, .exercise_actions button').prop('disabled', true);
}
}).done(function (response) {
$(response.message).insertAfter($(rtcInfo.blockId).find('.well'));
@ -97,6 +99,8 @@ window.RecordAudio = (function () {
btnStop.prop('disabled', true).addClass('hidden');
btnPause.prop('disabled', true).addClass('hidden');
btnStart.prop('disabled', false).removeClass('hidden');
$('.exercise_save_now_button button, .exercise_actions button').prop('disabled', false);
});
}
@ -127,7 +131,7 @@ window.RecordAudio = (function () {
alert(error);
}
if(!!(navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia)) {
if(navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia) {
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
navigator.getUserMedia(mediaConstraints, successCallback, errorCallback);
return;

Loading…
Cancel
Save