Merge branch 'awards-scrolling' into 'master'

Make awards list scrollable [fixes #37]

Closes #37

See merge request gridtracker.org/gridtracker!19
merge-requests/31/head
Paul Traina 2020-11-07 22:59:41 +00:00
commit f4ba4a366f
2 zmienionych plików z 7 dodań i 1 usunięć

Wyświetl plik

@ -111,7 +111,7 @@
</div>
<div id="SecondaryRosterControls">
<div id="AwardTrackerControls" class="controlItem" style="border: none; overflow: auto; overflow-x: hidden">
<div id="AwardTrackerControls" class="controlItem">
<div id="AwardWantedList"></div>
<div class="button" onclick="openAwardPopup()">Add Awards</div>

Wyświetl plik

@ -139,6 +139,12 @@ body.roster {
margin-right: 4px;
}
#AwardWantedList {
overflow: auto;
overflow-x: hidden;
max-height: 142px;
}
#RosterControls.normal #ShowFewerControlsLink { display: none; }
#RosterControls.normal #ShowMoreControlsLink { display: block; }
#RosterControls.normal #SecondaryRosterControls { display: none; }