* Prevent options from jumping when selected due to border being added/removed based on active option. Instead, always have a border on the option but set its color when active
* Use gray instead of white border in order to match background so that it isn't visible while unselected. Add margin-bottom back
* Make sure the locked option style remains unchanged
- Nest .locked in .customize-options .option to get specificity
- Override border, border-radius, and margin-top for .locked
- Set the override values to what would be applied without other style changes
26bde1f766