Was the post-war era (1945-1961) one of conformity, change, or both?

Conformity on an individual scale as you said because of the conservative values and McCarthyism. On a national scale however, America was truly becoming a super power, we also saw the civil rights movement and other cultural changes.