Skip to content

Commit 7a708ea

Browse files
committed
Refactor
1 parent 2bfa601 commit 7a708ea

10 files changed

+84
-67
lines changed

Diff for: css/media.css

-35
This file was deleted.

Diff for: css/style.css

+71-24
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
html, body, {
1+
html, body {
22
height: 100%;
33
}
44

55
body {
66
margin: 0;
77
color: #FFF;
8-
font: normal 16px/1.2 "Roboto", Helvetica, Arial, sans-serif;
8+
font-family: 'Source Sans Pro', sans-serif;
99
text-align: center;
1010
text-shadow: 1px 1px #000;
1111
background: #111 url('../images/mountains.jpg') no-repeat center center fixed;
@@ -19,6 +19,52 @@ body {
1919
padding: 175px 20px 15px;
2020
}
2121

22+
h3 {
23+
margin: 0;
24+
font-weight: 600;
25+
font-size: 10vw;
26+
display: block;
27+
}
28+
29+
h3::selection {
30+
background: black;
31+
}
32+
33+
.text-area {
34+
display: block;
35+
}
36+
37+
h4 {
38+
margin: 0;
39+
font-weight: 400;
40+
font-size: 4vw;
41+
display: block;
42+
padding-top: 20px;
43+
}
44+
45+
h4>span::selection {
46+
background: black;
47+
}
48+
49+
.highlight {
50+
background: linear-gradient(180deg,rgba(255,255,255,0) 65%, #000000 0%)
51+
}
52+
53+
.text-area-lower {
54+
bottom: 0;
55+
left: 0;
56+
position: fixed;
57+
right: 0;
58+
display: flex;
59+
justify-content: center;
60+
padding-bottom: 10px;;
61+
}
62+
63+
.image {
64+
width: 9vw;
65+
max-width: 85px;
66+
}
67+
2268
.fade-in {
2369
opacity: 0;
2470
-webkit-animation: fadeIn ease-in 1;
@@ -38,8 +84,29 @@ body {
3884
animation-delay: 0.5s;
3985
}
4086

41-
h3::selection {
42-
background: black;
87+
.text-subtitle {
88+
-webkit-animation-delay: 0.7s;
89+
-moz-animation-delay: 0.7s;
90+
animation-delay: 0.7s;
91+
}
92+
93+
@media (max-width: 650px) {
94+
html {
95+
height: 100%;
96+
}
97+
h3{
98+
font-size: 20vw;
99+
}
100+
h4{
101+
font-size: 8vw;
102+
}
103+
.container {
104+
padding-top: 25%;
105+
}
106+
.image {
107+
width: 15vw;
108+
max-width: 85px;
109+
}
43110
}
44111

45112
@-webkit-keyframes fadeIn {
@@ -74,23 +141,3 @@ h3::selection {
74141
-webkit-transform: translateY(20px);
75142
}
76143
}
77-
78-
h3 {
79-
font-family: "Roboto Slab", Helvetica, Arial, sans-serif;
80-
margin: 0;
81-
font-weight: 400;
82-
font-size: 8em;
83-
display: block;
84-
}
85-
86-
.github-icon {
87-
position: fixed;
88-
bottom: 15px;
89-
left: 15px;
90-
}
91-
92-
.laylow-icon {
93-
position: fixed;
94-
bottom: 15px;
95-
right: 15px;
96-
}

Diff for: images/GitHub-Mark-32px.png

-881 Bytes
Binary file not shown.

Diff for: images/GitHub-Mark-64px.png

-2.56 KB
Binary file not shown.

Diff for: images/GitHub-Mark-Light-64px.png

-2.28 KB
Binary file not shown.

Diff for: images/Laylow-32px.png

-378 KB
Binary file not shown.

Diff for: images/Laylow-64px.png

-380 KB
Binary file not shown.

Diff for: images/mountains.jpg

-1.06 KB
Loading

Diff for: index.html

+11-6
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

1212
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
1313
<link rel="stylesheet" href="css/style.css">
14-
<link rel="stylesheet" href="css/media.css">
15-
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Slab|Roboto">
14+
<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600&display=swap" rel="stylesheet">
1615

1716
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.9/angular.min.js" data-require="angular.js@*"
1817
data-semver="1.3.9"></script>
@@ -31,10 +30,16 @@ <h3>{{greeting}}</h3>
3130
</div>
3231
</div>
3332

34-
<div>
35-
<a class="github-icon" href="https://github.com/amarinelli"><img src="images/GitHub-Mark-Light-64px.png" height="64"
36-
width="64" alt="GitHub Icon" /></a>
37-
<a class="laylow-icon" href="https://laylow.beer"><img src="images/Laylow-64px.png" height="64" width="64" alt="Laylow Icon" /></a>
33+
<div class="text-area">
34+
<div class="fade-in text-subtitle">
35+
<h4><span class="highlight">Adam Marinelli</span></h4>
36+
</div>
37+
</div>
38+
39+
<div class="text-area-lower">
40+
<a class="noSelect" rel="noopener" href="https://laylow.beer" target="_blank">
41+
<img class="image" src="https://laylow.beer/img/logo-192x192.png"></img>
42+
</a>
3843
</div>
3944

4045
</body>

Diff for: js/main.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(function(angular) {
1+
(function (angular) {
22

33
// The module code
44
angular
@@ -8,7 +8,7 @@
88
// The controller code
99
function MainController($scope, $http) {
1010

11-
$scope.greeting = "Hello ...";
11+
$scope.greeting = "Hello";
1212

1313
}
1414

0 commit comments

Comments
 (0)