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: filter bar style correction #222

Merged
merged 4 commits into from
Mar 29, 2023
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Atualizações


## [Versão 3.9.18]
- Estilo das caixas de filtros corrigidos


## [Versão 3.9.17]
- Agora na tela de login o "Lembra-me" agora é "Mantenha-me conectado"

Expand All @@ -13,7 +17,6 @@
- Agora o campo de nome civil fica oculto e é exibido um checkbox com "Esse é um nome social?" relacionando com o campo "Nome de Apresentação"



## [Versão 3.9.13]
- Relatório de Cardápios Especiais
- Aba Saúde adicionada no formulário de aluno
Expand Down
2 changes: 1 addition & 1 deletion config.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
defined('YII_DEBUG') or define('YII_DEBUG', true);
// defined('YII_DEBUG') or define('YII_DEBUG', false);

define("TAG_VERSION", '3.9.17');
define("TAG_VERSION", '3.9.18');


define("YII_VERSION", Yii::getVersion());
Expand Down
2 changes: 1 addition & 1 deletion sass/css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions sass/scss/_filter_bar.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.filter-bar {
display: flex;
align-items: center;
background: #fafafa;
border: 1px solid #e5e5e5;
// background: #fafafa;
// border: 1px solid #e5e5e5;
height: auto;
margin-bottom: 20px;
padding: 0 10px;
Expand Down
17 changes: 15 additions & 2 deletions themes/default/css/template.css
Original file line number Diff line number Diff line change
Expand Up @@ -1623,11 +1623,24 @@ li.highlight.profile
}

.filter-bar {
background: #fafafa;
border: 1px solid #e5e5e5;
/* background: #fafafa;
border: 1px solid #e5e5e5; */
height: 44px;
margin-bottom: 20px;
padding: 0 10px;
align-items: flex-end !important;
}

.filter-bar > div {
display: grid;
}

.filter-bar .t-button-primary {
margin: 0 !important;
}

.filter-bar .no-disciplines-guide {
display: inline-block;
}

.filter-bar div {
Expand Down
5 changes: 4 additions & 1 deletion themes/default/views/classes/classContents.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@
</select>
</div>

</div>

<div>

<?php echo CHtml::label(yii::t('default', 'Month') . " *", 'month', array('class' => 'control-label required', 'style' => 'width: 53px;')); ?>

Expand All @@ -116,7 +119,7 @@
?>

</div>
<div class="disciplines-container">
<div class="disciplines-container" style="display: none;">
<?php echo CHtml::label(yii::t('default', 'Discipline') . " *", 'disciplines', array('class' => 'control-label required', 'style' => 'width: 85px;')); ?>
<?php
echo CHtml::dropDownList('disciplines', '', array(), array(
Expand Down
2 changes: 1 addition & 1 deletion themes/default/views/classes/frequency.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
?>
</div>
<!-- diciplina -->
<div class="disciplines-container">
<div class="disciplines-container" style="display: none;">
<?php echo CHtml::label(yii::t('default', 'Discipline') . " *", 'disciplines', array('class' => 'control-label required','style' => 'width: 88px;')); ?>
<?php
echo CHtml::dropDownList('disciplines', '', array(), array(
Expand Down
2 changes: 1 addition & 1 deletion themes/default/views/enrollment/grades.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class='t-button-primary hidden-print no-show'><?php echo Yii::t('default', 'Sav
));
?>
</div>
<div class="no-disciplines-guide">Algumas Disciplinas não aparecem na tabela? <span class="no-disciplines-link">Saiba mais</span>.</div>
<div class="no-disciplines-guide" style="display: none;">Algumas Disciplinas não aparecem na tabela? <span class="no-disciplines-link">Saiba mais</span>.</div>
</div>
<br>
<div class="alert-no-students alert alert-warning">Não há estudantes cadastrados na turma.</div>
Expand Down