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

Commit 3af326d

Browse files
author
David Underwood
committed
Updates fontawesome to 3.2.1
1 parent 9496b31 commit 3af326d

File tree

6 files changed

+1874
-552
lines changed

6 files changed

+1874
-552
lines changed
Binary file not shown.

templates/project/assets/fonts/fontawesome-webfont.svg

Lines changed: 392 additions & 248 deletions
Loading
Binary file not shown.
Binary file not shown.

templates/project/assets/stylesheets/application.scss

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,41 @@ $text-danger-color: #fff;
3535
// ----------------------------------------------------------------------------
3636
// Base styles
3737
// ----------------------------------------------------------------------------
38-
html {
39-
font-size: 100%;
40-
-webkit-text-size-adjust: 100%;
41-
-ms-text-size-adjust: 100%;
38+
html {
39+
font-size: 100%;
40+
-webkit-text-size-adjust: 100%;
41+
-ms-text-size-adjust: 100%;
4242
}
4343

44-
body {
45-
margin: 0;
44+
body {
45+
margin: 0;
4646
background-color: $background-color;
4747
font-size: 20px;
4848
color: $text-color;
4949
font-family: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
5050
}
5151

52-
b, strong {
53-
font-weight: bold;
52+
b, strong {
53+
font-weight: bold;
5454
}
5555

5656
a {
5757
text-decoration: none;
5858
color: inherit;
5959
}
6060

61-
img {
62-
border: 0;
63-
-ms-interpolation-mode: bicubic;
64-
vertical-align: middle;
61+
img {
62+
border: 0;
63+
-ms-interpolation-mode: bicubic;
64+
vertical-align: middle;
6565
}
6666

67-
img, object {
68-
max-width: 100%;
67+
img, object {
68+
max-width: 100%;
6969
}
7070

71-
iframe {
72-
max-width: 100%;
71+
iframe {
72+
max-width: 100%;
7373
}
7474

7575
table {
@@ -82,16 +82,16 @@ td {
8282
vertical-align: middle;
8383
}
8484

85-
ul, ol {
86-
padding: 0;
87-
margin: 0;
85+
ul, ol {
86+
padding: 0;
87+
margin: 0;
8888
}
8989

90-
h1, h2, h3, h4, h5, p {
90+
h1, h2, h3, h4, h5, p {
9191
padding: 0;
92-
margin: 0;
92+
margin: 0;
9393
}
94-
h1 {
94+
h1 {
9595
margin-bottom: 12px;
9696
text-align: center;
9797
font-size: 30px;
@@ -124,6 +124,8 @@ h3 {
124124
top: 0;
125125
opacity: 0.1;
126126
font-size: 275px;
127+
text-align: center;
128+
margin-top: 82px;
127129
}
128130

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

155-
.icon-warning-sign {
157+
.icon-warning-sign {
156158
display: inline-block;
157159
}
158160

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

169-
.icon-warning-sign {
171+
.icon-warning-sign {
170172
display: inline-block;
171173
}
172174

0 commit comments

Comments
 (0)