diff --git a/app/assets/stylesheets/badge_details.scss b/app/assets/stylesheets/badge_details.scss new file mode 100644 index 000000000..b3011a45a --- /dev/null +++ b/app/assets/stylesheets/badge_details.scss @@ -0,0 +1,11 @@ +.badge_details { + img { + width: 192px; + height: 192px; + object-fit: contain; + aspect-ratio: 1 / 1; + background-color: #fafafa; + border-radius: 8px; + border: 1px solid #f5f5f5; + } +} diff --git a/app/assets/stylesheets/badges.scss b/app/assets/stylesheets/badges.scss index ff423f433..8896d1478 100644 --- a/app/assets/stylesheets/badges.scss +++ b/app/assets/stylesheets/badges.scss @@ -1,27 +1,19 @@ .sticker-book { - display: flex; - justify-content: space-around; - flex-wrap: wrap; + .badge-container { + width: auto; + background-color: white; - a { - height: auto; - width: 45%; - margin-bottom: 45px; - } + .badge-image-conatiner { + width: auto; + display: flex; + aspect-ratio: 1 / 1; + background-color: #f5f5f5; - .badge-image { - max-width: 100%; - left: 0; - - &.unearned { - filter: opacity(20%) contrast(0); - } - } - - @media screen and (min-width: 650px) { - a { - min-height: 200px; - width: 200px; + .badge-image { + object-fit: contain; + width: 100%; + aspect-ratio: 1 / 1; + } } } } diff --git a/app/assets/stylesheets/crayons.scss b/app/assets/stylesheets/crayons.scss index cdf8c9065..59ec8cb24 100644 --- a/app/assets/stylesheets/crayons.scss +++ b/app/assets/stylesheets/crayons.scss @@ -46,3 +46,7 @@ @import 'components/drawer-navigation'; @import 'config/generator'; + +@import 'badge_details'; + +@import 'badges'; diff --git a/app/views/badges/_badge_detail.html.erb b/app/views/badges/_badge_detail.html.erb index 1056ed48b..7e9714198 100644 --- a/app/views/badges/_badge_detail.html.erb +++ b/app/views/badges/_badge_detail.html.erb @@ -1,6 +1,5 @@ -
+
<%= badge.title %> badge -
+ class="badge-container crayons-card media-card"> +
" + class="badge-image" src="<%= optimized_image_url(badge.badge_image_url, width: 192) %>" alt="<%= badge.title %> badge" title="<%= badge.title %>" diff --git a/app/views/users/_badges_area.html.erb b/app/views/users/_badges_area.html.erb index 174f50837..ee877d5da 100644 --- a/app/views/users/_badges_area.html.erb +++ b/app/views/users/_badges_area.html.erb @@ -12,7 +12,7 @@ <%= achievement.badge_title %>