Skip to content

Commit

Permalink
Merge branch 'release/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
mcwarman committed Sep 20, 2017
2 parents 6f2c6f3 + f4ef83e commit 1b52069
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 22 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
22 changes: 22 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The MIT License (MIT)

Original work Copyright (c) 2016 DashingCode
Modified work Copyright (c) 2017 Matthew Warman

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
56 changes: 35 additions & 21 deletions css/main.css
Original file line number Diff line number Diff line change
@@ -1,21 +1,35 @@
h1 {
font-family: "Open Sans", sans-serif;
font-size: 48px;
font-weight: normal;
margin: 10px;
text-align: center;
}
#navigation ul{
text-align: center;
list-style: none;
padding: 0;
}
#navigation ul li {
display: inline;
padding-left: 5px;
padding-right: 5px;
}

#navigation ul li a {
color: #000;
}
h1 {
font-family: "Open Sans", sans-serif;
font-size: 48px;
font-weight: normal;
margin: 10px;
text-align: center;
}
#navigation ul{
text-align: center;
list-style: none;
padding: 0;
}
#navigation ul li {
list-style: none;
display: inline-block;
border-radius: 100%;
border: 2px solid #000;
height:50px;
width: 50px;
margin: 8px;
}
#navigation ul li:hover {
color: #000;
text-decoration: none;
-webkit-transition: 500ms;
-moz-transition: 500ms;
transition: 500ms;
background-color: rgba(0, 0, 0, 0.25);
}
#navigation ul li a {
color: #000;
}
#navigation ul li a i {
padding: 9px;
}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1>Matthew Warman</h1>
<div id="navigation">
<ul>
<li>
<a href="https://github.com/mcwarman" aria-label="Link to GitHub profile"><i class="fa fa-github fa-3x" aria-hidden="true"></i></a>
<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>
</li>
</ul>
</div>
Expand Down

0 comments on commit 1b52069

Please sign in to comment.