Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix/small fixes #247

Merged
merged 4 commits into from
Apr 12, 2023
Merged

Fix/small fixes #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab37cca
feito alterações escola,aulas ministradas, Administração
Tori-IPTI Apr 10, 2023
2b0ba63
alteração no tamanho do input em Estrutura de Unidades e Avaliações
Tori-IPTI Apr 11, 2023
b56e5ba
div-input-structure-units
Tori-IPTI Apr 11, 2023
25bf1ec
alterado chamada da imagens dos cards
Tori-IPTI Apr 11, 2023
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
10 changes: 0 additions & 10 deletions sass/css/components/reports.css
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions sass/css/components/reports.map
View file
Open in desktop

This file was deleted.

1,724 changes: 1,723 additions & 1 deletion sass/css/main.css
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions sass/css/main.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion sass/css/reports.css
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions sass/css/reports.map
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion sass/scss/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
color: $colorsBaseInkNormal;

&:hover,
&--active {
&--active, &:focus {
color: $colorsBaseInkNormal;
background-color: $colorsBaseCloudLightHover;
}
Expand Down
2 changes: 0 additions & 2 deletions sass/scss/_grades.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


t-grades{

}
0 sass/scss/reports.scss → sass/scss/_reports.scss
View file
Open in desktop
File renamed without changes.
7 changes: 6 additions & 1 deletion themes/default/css/template2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,12 +714,17 @@ li[instructor]:hover {
margin: 7px 26px 0px 0px;
}
.div-input-structure-units{
margin-right: 7px;
margin-right: 14px;
}
.label-input-structure-units{
margin-right: 10px;
}


.widget > .widget-head {
background: #ffffff;

}
#menu-integrations ul {
width: 100%;
}
27 changes: 14 additions & 13 deletions themes/default/views/admin/_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
$cs->registerScriptFile($baseUrl . '/js/admin/form/validations.js', CClientScript::POS_END);
$cs->registerScriptFile($baseUrl . '/js/admin/form/_initialization.js', CClientScript::POS_END);
$cs->registerCssFile($themeUrl . '/css/template2.css');
$cs->registerCssFile($baseUrl . 'sass/css/main.css');

$form = $this->beginWidget('CActiveForm', array(
'id' => 'users-createUser-form',
Expand Down Expand Up @@ -42,8 +43,8 @@

<div class="tag-inner">
<div class="widget widget-tabs border-bottom-none">
<?php echo $form->errorSummary($model); ?>
<?php echo $form->errorSummary($model); ?>

<div class="widget-head">
<ul class="tab-classroom">
<li id="tab-classroom" class="active">
Expand Down Expand Up @@ -89,19 +90,19 @@
</div>
</div>
<div class="separator"></div>
<div class="span6" >
<div class="span6">
<div class="control-group">
<div class="controls">
<?php echo CHtml::label(Yii::t('default', 'Schools'), 'schools', array('class' => 'control-label')); ?>
</div>
<div class="controls">
<?php echo CHtml::dropDownList('schools',$userSchools,CHtml::listData(SchoolIdentification::model()->findAll('situation=1 order by name'), 'inep_id', 'name'),array('multiple'=>'multiple', 'class'=>'select-search-on')); ?>
<?php echo CHtml::dropDownList('schools', $userSchools, CHtml::listData(SchoolIdentification::model()->findAll('situation=1 order by name'), 'inep_id', 'name'), array('multiple' => 'multiple', 'class' => 'select-search-on t-multiselect control-input multiselect')); ?>
</div>
</div>
<div class="control-group">
<div class="controls">
<?php echo CHtml::activeCheckbox($model,'active') ?>
<?php echo CHtml::label( Yii::t('default','Active'), 'active', array('class' => 'control-label', 'id' => 'active-label')); ?>
<?php echo CHtml::activeCheckbox($model, 'active') ?>
<?php echo CHtml::label(Yii::t('default', 'Active'), 'active', array('class' => 'control-label', 'id' => 'active-label')); ?>
</div>
</div>
</div>
Expand Down Expand Up @@ -131,7 +132,7 @@
<!-- <span style="margin: 0;" class="btn-action single glyphicons circle_question_mark" data-toggle="tooltip" data-placement="top" data-original-title="<?php echo Yii::t('help', 'Min length') . "6"; ?>"><i></i></span> -->
<?php echo $form->error($model, 'password'); ?>
</div>
</div>
</div>
</div>
</div>
</div>
Expand All @@ -147,11 +148,11 @@
</script>

<style>
#active-label {
width: 40px !important;
}
#active-label {
width: 40px !important;
}

input[type="checkbox"] {
height: 30px !important;
}
input[type="checkbox"] {
height: 30px !important;
}
</style>
Loading