Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(typography): Add !default to variables #301

Merged
merged 1 commit into from
Feb 20, 2017
Merged

feat(typography): Add !default to variables #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/mdc-typography/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
$mdc-typography-font-family: Roboto, sans-serif;
$mdc-typography-font-family: Roboto, sans-serif !default;

$mdc-typography-font-weight-values: (
thin: 100,
Expand All @@ -22,7 +22,7 @@ $mdc-typography-font-weight-values: (
medium: 500,
bold: 700,
black: 900
);
) !default;

/* TODO(sgomes): Figure out what to do about desktop font sizes. */

Expand Down Expand Up @@ -106,4 +106,4 @@ $mdc-typography-styles: (
letter-spacing: .08em,
margin: -.5rem 0 1rem -.04em /* -8sp 0 16sp -.04em */
)
);
) !default;