Skip to content

Commit f95318e

Browse files
committed
Merge branch 'release/1.2.0'
2 parents 1b52069 + 6048c90 commit f95318e

File tree

6 files changed

+71
-8
lines changed

6 files changed

+71
-8
lines changed

Diff for: LICENSE

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
The MIT License (MIT)
1+
MIT License
22

3-
Original work Copyright (c) 2016 DashingCode
4-
Modified work Copyright (c) 2017 Matthew Warman
3+
Copyright (c) 2017 Matthew Warman
54

65
Permission is hereby granted, free of charge, to any person obtaining a copy
76
of this software and associated documentation files (the "Software"), to deal

Diff for: README.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# mcwarman.github.io [![Tag](https://img.shields.io/github/tag/mcwarman/mcwarman.github.io.svg)](https://github.com/mcwarman/mcwarman.github.io/tags) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
2+
3+
## License
4+
5+
This site includes third party open source components, which has its own license:
6+
* [DashingCode/front-cover](https://github.com/dashingcode/front-cover) - [DashingCode-LICENSE.txt](etc/DashingCode-LICENSE.txt).
7+
8+
Background images:
9+
* [Old workshop!](https://www.flickr.com/photos/adriano-1973/12663229044/in/photolist-ki1mPf-ar7fme-ar78tZ-ar9M37-zRcVpa-7Uizd8-ar7kmF-ar79ug-ozpsiq-c12bp7-edXdKh-bzmLiA-fm4NXA-oq2qM8-pXiroQ-rbuoFw-8Pzhk7-8PznyJ-7Ya7E6-o5yUju-8fStup-o5p92g-juLGNi-nyqHw2-oMC3cJ-py7hEo-FhFVo3-m2xG6B-m2x5Pe-bminP9-p7a6Hn-a7SwxG-p1prat-og5WXJ-pCwyEr-qiBEjc-m2vLek-p1njvW-ogUc6x-8EjaWH-prc1vz-e7nkL8-jRWJE6-bgEUwT-oo1EPS-9voDrj-aXYsCc-maAKrn-b5aing-r9PTes) by [Adriano BIDOLI](https://www.flickr.com/photos/adriano-1973/) is licensed under [CC BY-NC-CD 2.0](https://creativecommons.org/licenses/by-nc-nd/2.0/)

Diff for: css/main.css

+36-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,41 @@
1-
h1 {
1+
html {
2+
background: url(../images/background.jpg) no-repeat center center fixed;
3+
-webkit-background-size: cover;
4+
-moz-background-size: cover;
5+
-o-background-size: cover;
6+
background-size: cover;
7+
}
8+
body {
29
font-family: "Open Sans", sans-serif;
10+
color: #FFF;
11+
position: absolute;
12+
top: 0;
13+
bottom: 0;
14+
right: 0;
15+
left: 0;
16+
margin: 0;
17+
}
18+
19+
h1 {
320
font-size: 48px;
421
font-weight: normal;
522
margin: 10px;
23+
}
24+
#content {
25+
position: absolute;
626
text-align: center;
27+
background-color: rgba(0, 0, 0, 0.4);
28+
top: 0;
29+
bottom: 0;
30+
right: 0;
31+
left: 0;
32+
margin: 0;
33+
}
34+
#avatar img {
35+
height: 180px;
36+
border-radius: 100%;
37+
border: 3px solid white;
38+
margin-top:10px;
739
}
840
#navigation ul{
941
text-align: center;
@@ -14,21 +46,21 @@ h1 {
1446
list-style: none;
1547
display: inline-block;
1648
border-radius: 100%;
17-
border: 2px solid #000;
49+
border: 1px solid #FFF;
1850
height:50px;
1951
width: 50px;
2052
margin: 8px;
2153
}
2254
#navigation ul li:hover {
23-
color: #000;
55+
color: #FFF;
2456
text-decoration: none;
2557
-webkit-transition: 500ms;
2658
-moz-transition: 500ms;
2759
transition: 500ms;
2860
background-color: rgba(0, 0, 0, 0.25);
2961
}
3062
#navigation ul li a {
31-
color: #000;
63+
color: #FFF;
3264
}
3365
#navigation ul li a i {
3466
padding: 9px;

Diff for: etc/DashingCode-LICENSE.txt

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

Diff for: images/background.jpg

76.2 KB
Loading

Diff for: index.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
<title>Matthew Warman - warman.io</title>
2020
</head>
2121
<body>
22-
<div>
22+
<div id="content">
23+
<div id="avatar"><img src="https://avatars2.githubusercontent.com/u/7236500"/></div>
2324
<h1>Matthew Warman</h1>
25+
<h3>Technical Swiss Army Knife</h3>
2426
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
2527
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
2628
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>

0 commit comments

Comments
 (0)