How can i comfort my friend?

One of my really good friends granddad just died. I dont know how to comfort her. I feel so bad for her. The thing is, my friend is really mad at me at the moment. She's been mad at me since Thanksgiving, but i still consider her my best friend. I dont know what to do to help her, or if she even wants my help. I want us to be friends again, and i want to be there for her. Any ideas?