Skip to content

Commit

Permalink
Fixed some styles on the last step of the installation process. (joom…
Browse files Browse the repository at this point in the history
…la#51)

Co-authored-by: Todor <todor@funfex.com>
  • Loading branch information
2 people authored and wilsonge committed Jan 15, 2021
1 parent ef6df7f commit 8041ca9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
6 changes: 5 additions & 1 deletion installation/template/scss/template.scss
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ caption {
caption-side: top;
}

.badge-warning {
.bg-warning {
color: #292b2c;
}

Expand All @@ -232,3 +232,7 @@ caption {
background-color: $white;
box-shadow: 0 0 1px 1px rgba(0, 0, 0, .25);
}

.table > :not(:last-child) > :last-child > * {
border-bottom-color: $table-border-color;
}
13 changes: 4 additions & 9 deletions installation/tmpl/remove/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,24 +158,19 @@ class="j-install-step-form flex-column mt-5 border rounded d-none"
<?php echo $setting->label; ?>
</td>
<td>
<span class="badge badge-success disabled">
<span class="badge bg-success disabled">
<?php echo Text::_($setting->recommended ? 'JON' : 'JOFF'); ?>
</span>
</td>
<td>
<span class="badge badge-<?php echo ($setting->state === $setting->recommended) ? 'success' : 'warning'; ?>">
<span class="badge bg-<?php echo ($setting->state === $setting->recommended) ? 'success' : 'warning'; ?>">
<?php echo Text::_($setting->state ? 'JON' : 'JOFF'); ?>
</span>
</td>
</tr>
<?php endif; ?>
<?php endforeach; ?>
</tbody>
<tfoot>
<tr>
<td colspan="3"></td>
</tr>
</tfoot>
</table>

<?php endif; ?>
Expand Down Expand Up @@ -254,9 +249,9 @@ class="btn btn-primary"
<td class="text-center">
<?php // Display a Note if language pack version is not equal to Joomla version ?>
<?php if (substr($language->version, 0, 3) != $version::MAJOR_VERSION . '.' . $version::MINOR_VERSION || substr($language->version, 0, 5) != $currentShortVersion) : ?>
<span class="badge badge-warning hasTooltip" title="<?php echo Text::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>"><?php echo $language->version; ?></span>
<span class="badge bg-warning hasTooltip" title="<?php echo Text::_('JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM'); ?>"><?php echo $language->version; ?></span>
<?php else : ?>
<span class="badge badge-success"><?php echo $language->version; ?></span>
<span class="badge bg-success"><?php echo $language->version; ?></span>
<?php endif; ?>
</td>
</tr>
Expand Down

0 comments on commit 8041ca9

Please sign in to comment.