Skip to content

Commit

Permalink
rewrote about page and linked it from home page
Browse files Browse the repository at this point in the history
  • Loading branch information
docsmage committed Mar 25, 2017
1 parent 1af4ebc commit 58dbd6b
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 26 deletions.
8 changes: 3 additions & 5 deletions app/pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

</div>

<ui-view id="templatecontainer"></ui-view>
<ui-view class="templatecontainer"></ui-view>

<footer class="footer">

Expand All @@ -95,10 +95,8 @@

<a href="https://github.com/voiceofrae/RelaxIO" target="_blank"><svg class="footeritem" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><path d="M8 0C3.58 0 0 3.582 0 8c0 3.535 2.292 6.533 5.47 7.59.4.075.547-.172.547-.385 0-.19-.007-.693-.01-1.36-2.226.483-2.695-1.073-2.695-1.073-.364-.924-.89-1.17-.89-1.17-.725-.496.056-.486.056-.486.803.056 1.225.824 1.225.824.714 1.223 1.873.87 2.33.665.072-.517.278-.87.507-1.07-1.777-.2-3.644-.888-3.644-3.953 0-.873.31-1.587.823-2.147-.09-.202-.36-1.015.07-2.117 0 0 .67-.215 2.2.82.64-.178 1.32-.266 2-.27.68.004 1.36.092 2 .27 1.52-1.035 2.19-.82 2.19-.82.43 1.102.16 1.915.08 2.117.51.56.82 1.274.82 2.147 0 3.073-1.87 3.75-3.65 3.947.28.24.54.73.54 1.48 0 1.07-.01 1.93-.01 2.19 0 .21.14.46.55.38C13.71 14.53 16 11.53 16 8c0-4.418-3.582-8-8-8"/></svg></a>

<img src="/assets/images/navicons/about.png" alt="about">

<!-- <img id="relaxioinfooter" src="/assets/images/relaxio-header-small.png" alt="relaxiotitle"> -->

<a ui-sref="about"><img src="/assets/images/navicons/about.png" alt="about"></a>

</div>

</footer>
Expand Down
6 changes: 3 additions & 3 deletions app/styles/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
}

/*Container for all pages*/
#templatecontainer {
.templatecontainer {
margin: 0 auto;
position: absolute;
top: 260px; left: 0; bottom: 0; right: 0;
Expand Down Expand Up @@ -241,6 +241,6 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
#aboutpage {
margin: 0 auto;
text-align: center;
width: 70%;
font-size: 120%;
top: 220px;
font-size: 130%;
}
10 changes: 5 additions & 5 deletions app/templates/about.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div id="aboutpage"><h2>About</h2>
<div id="aboutpage">

<p>Relaxio is designed to allow users to create and store their own ambient mixes for reading, relaxing, and focusing. This app was developed as my capstone project in the Front-end Web Development course at <a href="http://bloc.io" target="_blank">Bloc.io.</a></p>

<p>All sound mp3s sourced via YouTube. Singing bowls mp3 available courtesy of the <a href="https://soundcloud.com/33bowls" target="_blank">33bowls monastery.</a> If you'd like to suggest new sounds that would improve your listening experience, please feel free to reach out via the contact info below.</p>
<p>Relaxio is designed to allow users to mix and match sounds for reading, relaxing, and focusing. All sound mp3s were sourced via YouTube. The singing bowls mp3 was made available courtesy of the <a href="https://soundcloud.com/33bowls" target="_blank">33bowls monastery.</a></p>
<p>To send feedback or suggest new sounds, feel free to reach out via <a href="https://twitter.com/voiceofrae" target="_blank">Twitter</a> or my <a href="http://renee-cs.com/" target="_blank">personal website.</a> You may also submit a pull request via <a href="https://github.com/voiceofrae/RelaxIO" target="_blank">Github.</a></p>

<p>Significant contributions to development were made by Matthew Maxwell, my Bloc mentor. Logo and icons designed by Gisele Schaaf.</p>
<p>Significant contributions to development were made by Matthew Maxwell, mentor at <a href="https://www.bloc.io/" target="_blank">Bloc.io</a>. All logos and icons were designed by Gisele Schaaf.</p>

<div id="contacticons">
<a href="http://github.com/voiceofrae/RelaxIO" target="_blank" class="contacticon"><span class="icon-github icon"></span></a>
Expand Down
8 changes: 3 additions & 5 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

</div>

<ui-view id="templatecontainer"></ui-view>
<ui-view class="templatecontainer"></ui-view>

<footer class="footer">

Expand All @@ -95,10 +95,8 @@

<a href="https://github.com/voiceofrae/RelaxIO" target="_blank"><svg class="footeritem" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><path d="M8 0C3.58 0 0 3.582 0 8c0 3.535 2.292 6.533 5.47 7.59.4.075.547-.172.547-.385 0-.19-.007-.693-.01-1.36-2.226.483-2.695-1.073-2.695-1.073-.364-.924-.89-1.17-.89-1.17-.725-.496.056-.486.056-.486.803.056 1.225.824 1.225.824.714 1.223 1.873.87 2.33.665.072-.517.278-.87.507-1.07-1.777-.2-3.644-.888-3.644-3.953 0-.873.31-1.587.823-2.147-.09-.202-.36-1.015.07-2.117 0 0 .67-.215 2.2.82.64-.178 1.32-.266 2-.27.68.004 1.36.092 2 .27 1.52-1.035 2.19-.82 2.19-.82.43 1.102.16 1.915.08 2.117.51.56.82 1.274.82 2.147 0 3.073-1.87 3.75-3.65 3.947.28.24.54.73.54 1.48 0 1.07-.01 1.93-.01 2.19 0 .21.14.46.55.38C13.71 14.53 16 11.53 16 8c0-4.418-3.582-8-8-8"/></svg></a>

<img src="/assets/images/navicons/about.png" alt="about">

<!-- <img id="relaxioinfooter" src="/assets/images/relaxio-header-small.png" alt="relaxiotitle"> -->

<a ui-sref="about"><img src="/assets/images/navicons/about.png" alt="about"></a>

</div>

</footer>
Expand Down
6 changes: 3 additions & 3 deletions dist/styles/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
}

/*Container for all pages*/
#templatecontainer {
.templatecontainer {
margin: 0 auto;
position: absolute;
top: 260px; left: 0; bottom: 0; right: 0;
Expand Down Expand Up @@ -241,6 +241,6 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
#aboutpage {
margin: 0 auto;
text-align: center;
width: 70%;
font-size: 120%;
top: 220px;
font-size: 130%;
}
10 changes: 5 additions & 5 deletions dist/templates/about.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div id="aboutpage"><h2>About</h2>
<div id="aboutpage">

<p>Relaxio is designed to allow users to create and store their own ambient mixes for reading, relaxing, and focusing. This app was developed as my capstone project in the Front-end Web Development course at <a href="http://bloc.io" target="_blank">Bloc.io.</a></p>

<p>All sound mp3s sourced via YouTube. Singing bowls mp3 available courtesy of the <a href="https://soundcloud.com/33bowls" target="_blank">33bowls monastery.</a> If you'd like to suggest new sounds that would improve your listening experience, please feel free to reach out via the contact info below.</p>
<p>Relaxio is designed to allow users to mix and match sounds for reading, relaxing, and focusing. All sound mp3s were sourced via YouTube. The singing bowls mp3 was made available courtesy of the <a href="https://soundcloud.com/33bowls" target="_blank">33bowls monastery.</a></p>
<p>To send feedback or suggest new sounds, feel free to reach out via <a href="https://twitter.com/voiceofrae" target="_blank">Twitter</a> or my <a href="http://renee-cs.com/" target="_blank">personal website.</a> You may also submit a pull request via <a href="https://github.com/voiceofrae/RelaxIO" target="_blank">Github.</a></p>

<p>Significant contributions to development were made by Matthew Maxwell, my Bloc mentor. Logo and icons designed by Gisele Schaaf.</p>
<p>Significant contributions to development were made by Matthew Maxwell, mentor at <a href="https://www.bloc.io/" target="_blank">Bloc.io</a>. All logos and icons were designed by Gisele Schaaf.</p>

<div id="contacticons">
<a href="http://github.com/voiceofrae/RelaxIO" target="_blank" class="contacticon"><span class="icon-github icon"></span></a>
Expand Down

0 comments on commit 58dbd6b

Please sign in to comment.