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

Use System Fonts #409

Merged
merged 2 commits into from
Jan 20, 2016
Merged

Use System Fonts #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
565c20d
Use System Fonts
Jan 16, 2016
28e084f
Variablize the bold font weight
Jan 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/assets/stylesheets/administrate/base/_forms.scss
View file
Open in desktop
Expand Up @@ -6,14 +6,14 @@ fieldset {
}

legend {
font-weight: 600;
font-weight: $bold-font-weight;
margin-bottom: $small-spacing / 2;
padding: 0;
}

label {
display: block;
font-weight: 600;
font-weight: $bold-font-weight;
}

input,
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/administrate/base/_lists.scss
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ dl {
margin-bottom: $small-spacing;

dt {
font-weight: 600;
font-weight: $bold-font-weight;
margin-top: $small-spacing;
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/administrate/components/_buttons.scss
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
font-family: $base-font-family;
font-size: $base-font-size;
-webkit-font-smoothing: antialiased;
font-weight: 600;
font-weight: $bold-font-weight;
line-height: 1;
padding: $small-spacing $base-spacing;
text-decoration: none;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/administrate/components/_cells.scss
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@

.cell-label--asc,
.cell-label--desc {
font-weight: bold;
font-weight: $bold-font-weight;
}

.cell-label__sort-indicator {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/administrate/components/_pagination.scss
View file
Open in desktop
Expand Up @@ -12,6 +12,6 @@
}

.current {
font-weight: bold;
font-weight: $bold-font-weight;
}
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/administrate/components/_sidebar.scss
View file
Open in desktop
Expand Up @@ -18,5 +18,5 @@

.sidebar__link--active {
color: $blue;
font-weight: 900;
font-weight: $bold-font-weight;
}
8 changes: 5 additions & 3 deletions app/assets/stylesheets/administrate/library/_variables.scss
View file
Open in desktop
@@ -1,11 +1,13 @@
// Typography
$base-font-family: "Lato", $helvetica;
$base-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
"Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
sans-serif;
$heading-font-family: $base-font-family;

// Font Sizes
$base-font-size: 1em;

// Line height
$bold-font-weight: 600;

$base-line-height: 1.5;
$heading-line-height: 1.2;

Expand Down
1 change: 0 additions & 1 deletion app/views/layouts/administrate/application.html.erb
View file
Open in desktop
Expand Up @@ -19,7 +19,6 @@ By default, it renders:
<meta name="ROBOTS" content="NOODP" />
<meta name="viewport" content="initial-scale=1" />
<title><%= content_for(:title) %> | <%= Rails.application.class.parent_name.titlecase %></title>
<%= stylesheet_link_tag "//fonts.googleapis.com/css?family=Lato:300,400,900", media: "all" %>
<%= stylesheet_link_tag "administrate/application", media: "all" %>
<%= csrf_meta_tags %>
</head>
Expand Down