Skip to content
This repository has been archived by the owner on Mar 7, 2018. It is now read-only.

Commit

Permalink
Updates fontawesome to 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
David Underwood committed Aug 21, 2013
1 parent 9496b31 commit 3af326d
Show file tree
Hide file tree
Showing 6 changed files with 1,874 additions and 552 deletions.
Binary file modified templates/project/assets/fonts/fontawesome-webfont.eot
Binary file not shown.
640 changes: 392 additions & 248 deletions templates/project/assets/fonts/fontawesome-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/project/assets/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file modified templates/project/assets/fonts/fontawesome-webfont.woff
Binary file not shown.
50 changes: 26 additions & 24 deletions templates/project/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,41 +35,41 @@ $text-danger-color: #fff;
// ----------------------------------------------------------------------------
// Base styles
// ----------------------------------------------------------------------------
html {
font-size: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
html {
font-size: 100%;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}

body {
margin: 0;
body {
margin: 0;
background-color: $background-color;
font-size: 20px;
color: $text-color;
font-family: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
}

b, strong {
font-weight: bold;
b, strong {
font-weight: bold;
}

a {
text-decoration: none;
color: inherit;
}

img {
border: 0;
-ms-interpolation-mode: bicubic;
vertical-align: middle;
img {
border: 0;
-ms-interpolation-mode: bicubic;
vertical-align: middle;
}

img, object {
max-width: 100%;
img, object {
max-width: 100%;
}

iframe {
max-width: 100%;
iframe {
max-width: 100%;
}

table {
Expand All @@ -82,16 +82,16 @@ td {
vertical-align: middle;
}

ul, ol {
padding: 0;
margin: 0;
ul, ol {
padding: 0;
margin: 0;
}

h1, h2, h3, h4, h5, p {
h1, h2, h3, h4, h5, p {
padding: 0;
margin: 0;
margin: 0;
}
h1 {
h1 {
margin-bottom: 12px;
text-align: center;
font-size: 30px;
Expand Down Expand Up @@ -124,6 +124,8 @@ h3 {
top: 0;
opacity: 0.1;
font-size: 275px;
text-align: center;
margin-top: 82px;
}

.list-nostyle {
Expand Down Expand Up @@ -152,7 +154,7 @@ h3 {
background-color: $background-warning-color-1;
@include animation(status-warning-background, 2s, ease, infinite);

.icon-warning-sign {
.icon-warning-sign {
display: inline-block;
}

Expand All @@ -166,7 +168,7 @@ h3 {
background-color: $background-danger-color-1;
@include animation(status-danger-background, 2s, ease, infinite);

.icon-warning-sign {
.icon-warning-sign {
display: inline-block;
}

Expand Down
Loading

0 comments on commit 3af326d

Please sign in to comment.