District, with fits and starts, inches toward teacher equity