Skip to content

Commit 923c954

Browse files
authored
Merge pull request #3061 from codecrafters-io/feat/language-dropdown-enhance-button-layout-2
feat(language-dropdown): enhance button layout and logo display
2 parents 2b83c5f + 6b4144f commit 923c954

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

app/components/language-dropdown-link.hbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
</div>
1212
<div>
1313
{{#if @isSelected}}
14-
{{svg-jar "check-circle" class="w-4 fill-current text-teal-500"}}
14+
{{svg-jar "check-circle" class="w-5 fill-current text-teal-500"}}
1515
{{else if (and @isRequested (not @isSelected))}}
16-
{{svg-jar "exclamation" class="w-4 fill-current text-yellow-500"}}
16+
{{svg-jar "exclamation" class="w-5 fill-current text-yellow-500"}}
1717
{{else}}
18-
<img src={{@language.grayLogoUrl}} alt={{@language.name}} class="w-4 h-4 block group-hover:hidden" />
19-
<img src={{@language.tealLogoUrl}} alt={{@language.name}} class="w-4 h-4 hidden group-hover:block" />
18+
<img src={{@language.grayLogoUrl}} alt={{@language.name}} class="w-5 h-5 opacity-50 block group-hover:hidden" />
19+
<img src={{@language.tealLogoUrl}} alt={{@language.name}} class="w-5 h-5 hidden group-hover:block" />
2020
{{/if}}
2121
</div>
2222
</div>

app/components/language-dropdown.hbs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,19 @@
33
<dd.Trigger>
44
<button
55
type="button"
6-
class="inline-flex justify-center w-full rounded-md border border-gray-300 dark:border-white/10
6+
class="group inline-flex justify-center items-center w-full gap-x-1 rounded-md border border-gray-300 dark:border-white/10
77
{{if dd.isOpen 'bg-gray-50 dark:bg-gray-800' 'bg-white dark:bg-gray-900'}}
8-
shadow-xs px-4 py-2 text-sm font-medium text-gray-800 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800 focus:outline-hidden"
8+
shadow-xs py-2
9+
{{if @selectedLanguage 'pl-2 pr-3' 'px-3'}}
10+
text-sm font-medium text-gray-800 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800 focus:outline-hidden"
911
data-test-language-dropdown-trigger
1012
>
11-
<span class="mr-1" data-test-current-language-name>
13+
{{#if @selectedLanguage}}
14+
<img src={{@selectedLanguage.grayLogoUrl}} alt={{@selectedLanguage.name}} class="w-6 h-6 block group-hover:hidden mr-0.5" />
15+
<img src={{@selectedLanguage.tealLogoUrl}} alt={{@selectedLanguage.name}} class="w-6 h-6 hidden group-hover:block mr-0.5" />
16+
{{/if}}
17+
18+
<span data-test-current-language-name>
1219
{{#if this.isAllLanguagesOptionSelected}}
1320
All Languages
1421
{{else}}

0 commit comments

Comments
 (0)