Skip to content

Commit 1b52069

Browse files
committed
Merge branch 'release/1.1.1'
2 parents 6f2c6f3 + f4ef83e commit 1b52069

File tree

4 files changed

+59
-22
lines changed

4 files changed

+59
-22
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The MIT License (MIT)
2+
3+
Original work Copyright (c) 2016 DashingCode
4+
Modified work Copyright (c) 2017 Matthew Warman
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.

css/main.css

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
1-
h1 {
2-
font-family: "Open Sans", sans-serif;
3-
font-size: 48px;
4-
font-weight: normal;
5-
margin: 10px;
6-
text-align: center;
7-
}
8-
#navigation ul{
9-
text-align: center;
10-
list-style: none;
11-
padding: 0;
12-
}
13-
#navigation ul li {
14-
display: inline;
15-
padding-left: 5px;
16-
padding-right: 5px;
17-
}
18-
19-
#navigation ul li a {
20-
color: #000;
21-
}
1+
h1 {
2+
font-family: "Open Sans", sans-serif;
3+
font-size: 48px;
4+
font-weight: normal;
5+
margin: 10px;
6+
text-align: center;
7+
}
8+
#navigation ul{
9+
text-align: center;
10+
list-style: none;
11+
padding: 0;
12+
}
13+
#navigation ul li {
14+
list-style: none;
15+
display: inline-block;
16+
border-radius: 100%;
17+
border: 2px solid #000;
18+
height:50px;
19+
width: 50px;
20+
margin: 8px;
21+
}
22+
#navigation ul li:hover {
23+
color: #000;
24+
text-decoration: none;
25+
-webkit-transition: 500ms;
26+
-moz-transition: 500ms;
27+
transition: 500ms;
28+
background-color: rgba(0, 0, 0, 0.25);
29+
}
30+
#navigation ul li a {
31+
color: #000;
32+
}
33+
#navigation ul li a i {
34+
padding: 9px;
35+
}

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h1>Matthew Warman</h1>
2929
<div id="navigation">
3030
<ul>
3131
<li>
32-
<a href="https://github.com/mcwarman" aria-label="Link to GitHub profile"><i class="fa fa-github fa-3x" aria-hidden="true"></i></a>
32+
<a href="https://github.com/mcwarman" aria-label="Link to my GitHub profile"><i class="fa fa-github fa-2x" aria-hidden="true" title="GitHub"></i></a>
3333
</li>
3434
</ul>
3535
</div>

0 commit comments

Comments
 (0)