Commit 8ac165c0 authored by Thomas Park's avatar Thomas Park
Browse files

Merge pull request #525 from jgillich/gh-pages

superhero: use default font-weight, closes #522
parents 66c63541 ddbd4173
......@@ -3,7 +3,6 @@
// -----------------------------------------------------
$web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700" !default;
@import url($web-font-path);
// Navbar =====================================================================
......@@ -34,8 +33,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700" !defa
.btn {
font-weight: 300;
&-default {
&:hover {
background-color: darken($btn-default-bg, 3%);
......@@ -50,10 +47,6 @@ $web-font-path: "https://fonts.googleapis.com/css?family=Lato:300,400,700" !defa
// Typography =================================================================
body {
font-weight: 300;
}
.text-primary,
.text-primary:hover {
color: $brand-primary;
......@@ -91,7 +84,6 @@ body {
> li > a {
font-size: 12px;
font-weight: 300;
}
}
......@@ -144,7 +136,6 @@ label,
.checkbox label,
.help-block {
font-size: 12px;
font-weight: 300;
}
.input-addon,
......@@ -254,10 +245,6 @@ label,
// Indicators =================================================================
.label {
font-weight: 300;
}
.alert {
color: #fff;
......
......@@ -67,7 +67,7 @@ $line-height-computed: floor(($font-size-base * $line-height-base)) !default;
//** By default, this inherits from the `<body>`.
$headings-font-family: inherit !default;
$headings-font-weight: 300 !default;
$headings-font-weight: 400 !default;
$headings-line-height: 1.1 !default;
$headings-color: inherit !default;
......
......@@ -1189,7 +1189,7 @@ h6,
.h5,
.h6 {
font-family: inherit;
font-weight: 300;
font-weight: 400;
line-height: 1.1;
color: inherit;
}
......@@ -6805,9 +6805,6 @@ button.close {
background-color: #fff;
color: #df691a;
}
.btn {
font-weight: 300;
}
.btn-default:hover {
background-color: #485563;
}
......@@ -6815,9 +6812,6 @@ button.close {
.btn-xs {
font-size: 12px;
}
body {
font-weight: 300;
}
.text-primary,
.text-primary:hover {
color: #df691a;
......@@ -6849,7 +6843,6 @@ body {
}
.dropdown-menu > li > a {
font-size: 12px;
font-weight: 300;
}
.btn-group.open .dropdown-toggle {
-webkit-box-shadow: none;
......@@ -6898,7 +6891,6 @@ label,
.checkbox label,
.help-block {
font-size: 12px;
font-weight: 300;
}
.input-addon,
.input-group-addon {
......@@ -6976,9 +6968,6 @@ label,
.pager a {
color: #ebebeb;
}
.label {
font-weight: 300;
}
.alert {
color: #fff;
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -37,8 +37,6 @@
.btn {
font-weight: 300;
&-default {
&:hover {
background-color: darken(@btn-default-bg, 3%);
......@@ -53,10 +51,6 @@
// Typography =================================================================
body {
font-weight: 300;
}
.text-primary,
.text-primary:hover {
color: @brand-primary;
......@@ -94,7 +88,6 @@ body {
> li > a {
font-size: 12px;
font-weight: 300;
}
}
......@@ -147,7 +140,6 @@ label,
.checkbox label,
.help-block {
font-size: 12px;
font-weight: 300;
}
.input-addon,
......@@ -257,10 +249,6 @@ label,
// Indicators =================================================================
.label {
font-weight: 300;
}
.alert {
color: #fff;
......
......@@ -66,7 +66,7 @@
//** By default, this inherits from the `<body>`.
@headings-font-family: inherit;
@headings-font-weight: 300;
@headings-font-weight: 400;
@headings-line-height: 1.1;
@headings-color: inherit;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment