Prop D received 63 percent of the votes Tuesday, which is more than the simple majority needed to become law. Prop D also establishes additional limits on the locations and hours of pot shops.
Voters were asked to consider a total of three different proposals regulating medical marijuana shops in the city.
Ordinance E would have also capped the number of clinics at 135 but without new taxes. Supporters abandoned that measure, choosing to back Prop D instead. It lost 65 to 35 percent.
Ordinance F wouldn't have limited the number of clinics, but would have put in place stringent controls, such as audits and testing for pesticides and toxins. But it also failed to get the votes, going down 60 percent to 40 percent.