Switching up my workout

MPAssault91

I was previously working towards building muscle as my workout goal and now I am going to switch it to toning up. My question is what workouts are more effective, workouts like dips push ups sit up and pull ups + cardio or working out with weights + cardio. Also I was wondering if anyone could give me some diet tips and or websites I can go to to help me reach my goal.

Thanks