Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[4.0] Articles frontend associations badges changed to buttons and more #32992

Merged
merged 6 commits into from
Apr 14, 2021
Merged

[4.0] Articles frontend associations badges changed to buttons and more #32992

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2df403
[4.0] Articles frontend associations badges changed to buttons and more
infograf768 Apr 4, 2021
63e08b2
cs
infograf768 Apr 4, 2021
104ad07
overriding btn-secondary and btn-sm instead of creating btn-badge
infograf768 Apr 6, 2021
e43ec8a
some corrections and format
infograf768 Apr 6, 2021
0660dd2
oops
infograf768 Apr 6, 2021
bff5a71
Update templates/cassiopeia/scss/vendor/bootstrap/_buttons.scss
infograf768 Apr 8, 2021
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
Prev Previous commit
Next Next commit
some corrections and format
  • Loading branch information
@infograf768
infograf768 committed Apr 6, 2021
commit e43ec8a38fade714a18e144b76c4b0090ebc46a1
4 changes: 2 additions & 2 deletions components/com_content/tmpl/category/default_articles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
<?php else : ?>
<?php $class = 'btn btn-secondary btn-sm btn-' . strtolower($association['language']->lang_code); ?>
<a class="<?php echo $class; ?>" title="<?php echo $association['language']->title_native; ?>" href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->lang_code; ?>
<span class="sr-only"><?php echo $association['language']->title_native; ?></span>
<span class="visually-hidden"><?php echo $association['language']->title_native; ?></span>
</a>
<?php endif; ?>
<?php endforeach; ?>
Expand All @@ -216,7 +216,7 @@
<?php else : ?>
<?php $class = 'btn btn-secondary btn-sm btn-' . strtolower($association['language']->lang_code); ?>
<a class="<?php echo $class; ?>" title="<?php echo $association['language']->title_native; ?>" href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->lang_code; ?>
<span class="sr-only"><?php echo $association['language']->title_native; ?></span>
<span class="visually-hidden"><?php echo $association['language']->title_native; ?></span>
</a>
<?php endif; ?>
<?php endforeach; ?>
Expand Down
2 changes: 1 addition & 1 deletion layouts/joomla/content/info_block/associations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<?php else : ?>
<?php $class = 'btn btn-secondary btn-sm btn-' . strtolower($association['language']->lang_code); ?>
<a class="<?php echo $class; ?>" title="<?php echo $association['language']->title_native; ?>" href="<?php echo Route::_($association['item']); ?>"><?php echo $association['language']->lang_code; ?>
<span class="sr-only"><?php echo $association['language']->title_native; ?></span>
<span class="visually-hidden"><?php echo $association['language']->title_native; ?></span>
</a>
<?php endif; ?>
<?php endforeach; ?>
Expand Down
34 changes: 19 additions & 15 deletions templates/cassiopeia/scss/vendor/bootstrap/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,29 @@
}
}

.article-info .association .btn-secondary,
.cat-list-association .btn-secondary, {
font-weight: 700;
color: $white;
background-color: $gray-600;
border-color: $gray-400;

&:hover,
&:focus {
.article-info .association,
.cat-list-association {
.btn-secondary {
font-weight: 700;
color: $white;
background-color: $gray-800;
background-color: $gray-600;
border-color: $gray-400;

&:hover,
&:focus {
color: $white;
background-color: $gray-800;
}
}
}

.article-info .association .btn-sm, .btn-group-sm > .btn,
.cat-list-association .btn-sm, .btn-group-sm > .btn {
padding: 0 .25rem;
font-size: .8rem;
border-radius: .2rem;
.article-info .association,
.cat-list-association {
btn-sm {
padding: 0 .25rem;
font-size: .8rem;
border-radius: .2rem;
}
}

@include media-breakpoint-down(md) {
Expand Down