Skip to content

Commit

Permalink
clean up formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
add2point71dots committed Mar 20, 2017
1 parent cd7a634 commit b29b516
Show file tree
Hide file tree
Showing 10 changed files with 188 additions and 179 deletions.
16 changes: 8 additions & 8 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="styles/font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="styles/styles.css">
<link rel="stylesheet" media="only screen and (min-width: 501px) and (max-width: 800px)" href="styles/styles-medium.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="styles/styles-small.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="styles/styles-small.css">
</head>
<body>
<header>
Expand All @@ -19,18 +19,18 @@ <h1 class="mobile-only"><a href="index.html">Addie Land - about</a></h1>
<li class="selected"><a href="about.html">about</a></li>
<li class="dropdown">
<a href="blog/index.html">blog</a>
<ul>
<li><a href="blog/blog1.html">blog entry 1</a></li>
<li><a href="blog/blog2.html">blog entry 2</a></li>
<li><a href="blog/blog3.html">blog entry 3</a></li>
</ul>
</li>
<ul>
<li><a href="blog/blog1.html">blog entry 1</a></li>
<li><a href="blog/blog2.html">blog entry 2</a></li>
<li><a href="blog/blog3.html">blog entry 3</a></li>
</ul>
</li>
</ul>
</nav>
</header>
<main class="indent clearfix">
<section id="about-content">
<img class="col1of2" src="images/addie-square.jpg">
<img class="col1of2" src="images/addie-square.jpg" alt="addie">
<article class="col2of2">
<h1 class="mobile-hidden">Addie Land - about</h1>
<hr class="mobile-hidden">
Expand Down
14 changes: 7 additions & 7 deletions blog/blog1.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../styles/font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="../styles/styles.css">
<link rel="stylesheet" media="only screen and (min-width: 501px) and (max-width: 800px)" href="../styles/styles-medium.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="../styles/styles-small.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="../styles/styles-small.css">
</head>
<body>
<header>
Expand All @@ -19,12 +19,12 @@ <h1 class="mobile-only"><a href="index.html">Addie Land - blog</a></h1>
<li><a href="../about.html">about</a></li>
<li class="dropdown selected">
<a href="index.html">blog</a>
<ul>
<li><a href="blog1.html">blog entry 1</a></li>
<li><a href="blog2.html">blog entry 2</a></li>
<li><a href="blog3.html">blog entry 3</a></li>
</ul>
</li>
<ul>
<li><a href="blog1.html">blog entry 1</a></li>
<li><a href="blog2.html">blog entry 2</a></li>
<li><a href="blog3.html">blog entry 3</a></li>
</ul>
</li>
</ul>
</nav>
</header>
Expand Down
16 changes: 8 additions & 8 deletions blog/blog2.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../styles/font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="../styles/styles.css">
<link rel="stylesheet" media="only screen and (min-width: 501px) and (max-width: 800px)" href="../styles/styles-medium.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="../styles/styles-small.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="../styles/styles-small.css">
</head>
<body>
<header>
Expand All @@ -19,12 +19,12 @@ <h1 class="mobile-only"><a href="index.html">Addie Land - blog</a></h1>
<li><a href="../about.html">about</a></li>
<li class="dropdown selected">
<a href="index.html">blog</a>
<ul>
<li><a href="blog1.html">blog entry 1</a></li>
<li><a href="blog2.html">blog entry 2</a></li>
<li><a href="blog3.html">blog entry 3</a></li>
</ul>
</li>
<ul>
<li><a href="blog1.html">blog entry 1</a></li>
<li><a href="blog2.html">blog entry 2</a></li>
<li><a href="blog3.html">blog entry 3</a></li>
</ul>
</li>
</ul>
</nav>
</header>
Expand All @@ -35,7 +35,7 @@ <h1><span class="mobile-hidden">Addie Land - </span><a href="index.html">blog</a
<article>
<img src="https://placeimg.com/200/200/nature" alt="placeholder image">
<p>
Nullam malesuada, leo vitae fringilla efficitur, libero ex fringilla leo, quis cursus neque ligula quis metus. Maecenas blandit tristique mi sit amet congue. Donec non consequat tellus. Cras risus dui, dapibus sed magna sit amet, sodales lobortis ante. Donec rhoncus congue augue, eu pharetra sem. Sed blandit purus magna, et maximus metus gravida in. Etiam at lacus ornare, tristique mauris id, finibus nulla. Sed convallis lacinia pharetra. Aliquam vel mollis ligula, nec mattis urna. Aliquam interdum blandit sem imperdiet tristique. Duis non viverra ipsum, at consequat arcu. Duis eu dolor a leo pharetra dictum vel sed est. Mauris et augue tempor, finibus purus vehicula, bibendum elit. Integer mollis felis sed hendrerit tempus. In dui tortor, condimentum a viverra ullamcorper, sagittis ac mi.
Nullam malesuada, leo vitae fringilla efficitur, libero ex fringilla leo, quis cursus neque ligula quis metus. Maecenas blandit tristique mi sit amet congue. Donec non consequat tellus. Cras risus dui, dapibus sed magna sit amet, sodales lobortis ante. Donec rhoncus congue augue, eu pharetra sem. Sed blandit purus magna, et maximus metus gravida in. Etiam at lacus ornare, tristique mauris id, finibus nulla. Sed convallis lacinia pharetra. Aliquam vel mollis ligula, nec mattis urna. Aliquam interdum blandit sem imperdiet tristique. Duis non viverra ipsum, at consequat arcu. Duis eu dolor a leo pharetra dictum vel sed est. Mauris et augue tempor, finibus purus vehicula, bibendum elit. Integer mollis felis sed hendrerit tempus. In dui tortor, condimentum a viverra ullamcorper, sagittis ac mi.
</p>
<p>
In dignissim nisi ac erat facilisis tristique sed eget tortor. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Suspendisse viverra neque et libero tempus, id rhoncus lacus maximus. Aliquam efficitur aliquam massa nec congue. Etiam neque massa, rutrum consequat tempus ac, elementum gravida turpis. Etiam ac risus a ante gravida finibus. Suspendisse metus ligula, dictum eget finibus id, aliquam ut sapien. Phasellus id ipsum a magna ultrices vulputate.
Expand Down
14 changes: 7 additions & 7 deletions blog/blog3.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../styles/font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="../styles/styles.css">
<link rel="stylesheet" media="only screen and (min-width: 501px) and (max-width: 800px)" href="../styles/styles-medium.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="../styles/styles-small.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="../styles/styles-small.css">
</head>
<body>
<header>
Expand All @@ -19,12 +19,12 @@ <h1 class="mobile-only"><a href="index.html">Addie Land - blog</a></h1>
<li><a href="../about.html">about</a></li>
<li class="dropdown selected">
<a href="index.html">blog</a>
<ul>
<li><a href="blog1.html">blog entry 1</a></li>
<li><a href="blog2.html">blog entry 2</a></li>
<li><a href="blog3.html">blog entry 3</a></li>
</ul>
</li>
<ul>
<li><a href="blog1.html">blog entry 1</a></li>
<li><a href="blog2.html">blog entry 2</a></li>
<li><a href="blog3.html">blog entry 3</a></li>
</ul>
</li>
</ul>
</nav>
</header>
Expand Down
14 changes: 7 additions & 7 deletions blog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../styles/font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="../styles/styles.css">
<link rel="stylesheet" media="only screen and (min-width: 501px) and (max-width: 800px)" href="../styles/styles-medium.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="../styles/styles-small.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="../styles/styles-small.css">
</head>
<body>
<header>
Expand All @@ -19,12 +19,12 @@ <h1 class="mobile-only"><a href="index.html">Addie Land - blog</a></h1>
<li><a href="../about.html">about</a></li>
<li class="dropdown selected">
<a href="index.html">blog</a>
<ul>
<li><a href="blog1.html">blog entry 1</a></li>
<li><a href="blog2.html">blog entry 2</a></li>
<li><a href="blog3.html">blog entry 3</a></li>
</ul>
</li>
<ul>
<li><a href="blog1.html">blog entry 1</a></li>
<li><a href="blog2.html">blog entry 2</a></li>
<li><a href="blog3.html">blog entry 3</a></li>
</ul>
</li>
</ul>
</nav>
</header>
Expand Down
14 changes: 7 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="styles/font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="styles/styles.css">
<link rel="stylesheet" media="only screen and (min-width: 501px) and (max-width: 800px)" href="styles/styles-medium.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="styles/styles-small.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="styles/styles-small.css">
</head>
<body>
<header>
Expand All @@ -19,12 +19,12 @@ <h1 class="mobile-only"><a href="index.html">Addie Land</a></h1>
<li><a href="about.html">about</a></li>
<li class="dropdown">
<a href="blog/index.html">blog</a>
<ul>
<li><a href="blog/blog1.html">blog entry 1</a></li>
<li><a href="blog/blog2.html">blog entry 2</a></li>
<li><a href="blog/blog3.html">blog entry 3</a></li>
</ul>
</li>
<ul>
<li><a href="blog/blog1.html">blog entry 1</a></li>
<li><a href="blog/blog2.html">blog entry 2</a></li>
<li><a href="blog/blog3.html">blog entry 3</a></li>
</ul>
</li>
</ul>
</nav>
</header>
Expand Down
14 changes: 7 additions & 7 deletions portfolio.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="styles/font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="styles/styles.css">
<link rel="stylesheet" media="only screen and (min-width: 501px) and (max-width: 800px)" href="styles/styles-medium.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="styles/styles-small.css">
<link rel="stylesheet" media="only screen and (min-width: 50px) and (max-width: 500px)" href="styles/styles-small.css">
</head>
<body>
<header>
Expand All @@ -19,12 +19,12 @@ <h1 class="mobile-only"><a href="index.html">Addie Land - portfolio</a></h1>
<li><a href="about.html">about</a></li>
<li class="dropdown">
<a href="blog/index.html">blog</a>
<ul>
<li><a href="blog/blog1.html">blog entry 1</a></li>
<li><a href="blog/blog2.html">blog entry 2</a></li>
<li><a href="blog/blog3.html">blog entry 3</a></li>
</ul>
</li>
<ul>
<li><a href="blog/blog1.html">blog entry 1</a></li>
<li><a href="blog/blog2.html">blog entry 2</a></li>
<li><a href="blog/blog3.html">blog entry 3</a></li>
</ul>
</li>
</ul>
</nav>
</header>
Expand Down
36 changes: 20 additions & 16 deletions styles/styles-medium.css
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
.col1of2 {
width: 35%;
margin: 2% 4%;
}

.col2of2 {
display: block;
float: none;
width: auto;
margin: 0;
}

h1 {
font-size: 1.75em;
}

/*** main nav ***/
header nav {
width: 100%;
}
Expand All @@ -34,6 +19,25 @@ header nav li a {
border: dashed #ffa249 1px;
}

/*** sub nav ***/
.dropdown:hover ul {
display: none;
}

/*** structural classes ***/
.col1of2 {
width: 35%;
margin: 2% 4%;
}

.col2of2 {
display: block;
float: none;
width: auto;
margin: 0;
}

/*** non-structural elements ***/
h1 {
font-size: 1.75em;
}
54 changes: 28 additions & 26 deletions styles/styles-small.css
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
p {
padding-bottom: 5px;
}

.col1of2, .col2of2 {
display: block;
float: none;
margin: auto;
width: 100%;
}

.col2of2 {
margin-top: 10px;
}

/*** header ***/
header h1 {
text-align: center;
}
Expand All @@ -38,19 +24,18 @@ header nav li a {
border: dashed #ffa249 1px;
}

/*** sub nav ***/
.dropdown:hover ul {
display: none;
}

/*** main ***/
main {
margin-top: 0;
padding-top: 3%;
}

img.col1of2 {
width: 60%;
}

/*** footer ***/
footer {
text-align: center;
}
Expand All @@ -59,13 +44,20 @@ footer li + li {
margin-left: 7%;
}

/*** responsive classes ***/
.mobile-hidden {
display: none;
/*** structural classes ***/
.col1of2, .col2of2 {
display: block;
float: none;
margin: auto;
width: 100%;
}

h1.mobile-only, hr.mobile-only {
display: block;
img.col1of2 {
width: 60%;
}

.col2of2 {
margin-top: 10px;
}

.blurbs img {
Expand All @@ -85,6 +77,16 @@ h1.mobile-only, hr.mobile-only {
margin: 10px 0;
}

#blog-entry-content h1 {
background-image: url('../images/inflicted.png');
/*** non-structural elements ***/
p {
padding-bottom: 5px;
}

/*** responsive classes ***/
.mobile-hidden {
display: none;
}

h1.mobile-only, hr.mobile-only {
display: block;
}
Loading

0 comments on commit b29b516

Please sign in to comment.