Skip to content
This repository was archived by the owner on Jan 11, 2020. It is now read-only.

Card content goes out of card fixes #370 #373

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Card content goes out of card fixes #370 #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b5fb9e1
Add hover effect to footer icon fixes #344
anupm12 Feb 2, 2019
20ee52d
Changed the hover effect also added it to the participant card
anupm12 Feb 2, 2019
fce6f5f
Merge branch 'master' into master
anupm12 Feb 3, 2019
acd9da3
Changed transition time and transition scale
anupm12 Feb 3, 2019
8189be3
Changed transition time and transition scale
anupm12 Feb 3, 2019
50fc389
Merge remote-tracking branch 'upstream/master'
anupm12 Feb 3, 2019
15ded72
Merge remote-tracking branch 'upstream/master'
anupm12 Feb 4, 2019
b2808ec
Merge remote-tracking branch 'upstream/master'
anupm12 Feb 4, 2019
9601cdb
Merge remote-tracking branch 'upstream/master'
anupm12 Feb 5, 2019
06c379b
Merge remote-tracking branch 'upstream/master'
anupm12 Feb 6, 2019
5043cb0
Fixed card content going out of card
anupm12 Feb 6, 2019
38e3d0d
Merge branch 'master' into card-text
anupm12 Feb 11, 2019
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
5 changes: 3 additions & 2 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ html,body
}

.participant-card {
max-height: 325px;
min-height: 325px;
/* max-height: 100%; */
min-height: 400px;
width: 100% !important;
min-width: 180px;
box-shadow: 0 3px 6px 0 rgba(0,0,0,0.12);
Expand Down Expand Up @@ -509,6 +509,7 @@ input:checked + .slider:before {
.card-college{
font-size:14px;
font-weight: 600;
vertical-align: baseline;
}

.card-name{
Expand Down
2 changes: 1 addition & 1 deletion js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ $(document).ready(function() {
"<h4 class='card-title card-name'>" +
participant.name +
"</h4>" +
"<p class='card-text card-college'>" +
"<p class='card-text card-college' style='height: 100% !important'>" +
participant.college +
"</p>" +
"</div>"+
Expand Down