Skip to content

Commit

Permalink
Strip trailing whitespace.
Browse files Browse the repository at this point in the history
My editor kept doing this automatically, and it doesn't hurt anything.
  • Loading branch information
audreytoskin committed Sep 6, 2017
1 parent d46266b commit ac352b8
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 38 deletions.
38 changes: 19 additions & 19 deletions app/styles/style.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
html, body {
height: 100%;
html, body {
height: 100%;
min-height: 100%;
width: 100%;
width: 100%;
margin: 0 auto;
}

#background {
background-color: #7FB7EA;
}

#navbackground {
#navbackground {
height: 25%;
min-height: 220px;
background-image: url("/assets/images/background/blue_circles.jpg");
Expand All @@ -18,7 +18,7 @@ background-color: #7FB7EA;
background-color: deepskyblue;
}

.topnav {
.topnav {
max-width: 450px;
margin: 0 auto;
padding-top: 50px;
Expand Down Expand Up @@ -69,7 +69,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
#masterplaypauseandvolume { margin: 0 auto; float: none; }
#masterplaypause { margin-bottom: 10px; }
#mastervolume { margin: 0 auto; margin-bottom: 5px;}
#smallrelaxio {display: block; margin: 0 auto; text-align: center; padding: 15px;}
#smallrelaxio {display: block; margin: 0 auto; text-align: center; padding: 15px;}
.headerimg { display: none; height: 0px; width: 0px; }
.column.fourth { width: 50%; }
}
Expand Down Expand Up @@ -114,8 +114,8 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
border-radius: 50%;
width: 100px;
height: 100px;
margin: 0 auto;
margin: 0 auto;

box-shadow: 0px 0px 20px 8px #fff,
0px 0px 5px 5px #fff inset;
}
Expand All @@ -125,7 +125,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
height: 100px;
width: 100px;
background-image: url("/assets/images/Play-Icon.png");
margin: 0 auto;
margin: 0 auto;
}

/* Pause button */
Expand Down Expand Up @@ -158,11 +158,11 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
}

#thunderstorm {
background-image: url("/assets/images/soundicons/Storm.png");
background-image: url("/assets/images/soundicons/Storm.png");
}

#birdsong {
background-image: url("/assets/images/soundicons/Singing-Birds.png");
background-image: url("/assets/images/soundicons/Singing-Birds.png");
}

#om {
Expand Down Expand Up @@ -203,15 +203,15 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
cursor: pointer;
background-color: #434343;
}

.seek-bar .fill {
background: #333;
width: 100%;
height: 0.35rem;
}

.seek-bar .thumb {
background-color: #434343;
background-color: #434343;
position: absolute;
height: 1.2rem;
width: 1.2rem;
Expand All @@ -223,7 +223,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
margin-top: -0.60rem;
border-radius: 50%;
cursor: pointer;
/*
/*
transition: width 120ms ease-in-out;
height 120ms ease-in-out,
margin 120ms ease-in-out,
Expand All @@ -233,10 +233,10 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
*/
;
}

/*
.seek-bar:hover .thumb {
background-color: #434343;
background-color: #434343;
width: 1.2rem;
height: 1.2rem;
margin: -0.7rem;
Expand All @@ -259,7 +259,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
margin: 0 auto;
max-width: 200px;
padding-top: 30px;
padding-bottom: 30px;
padding-bottom: 30px;
}

/* Styles and placement for each individual icon */
Expand All @@ -278,4 +278,4 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
font-size: 180%;
margin-top: 60px;
text-align: center;
}
}
38 changes: 19 additions & 19 deletions dist/styles/style.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
html, body {
height: 100%;
html, body {
height: 100%;
min-height: 100%;
width: 100%;
width: 100%;
margin: 0 auto;
}

#background {
background-color: #7FB7EA;
}

#navbackground {
#navbackground {
height: 25%;
min-height: 220px;
background-image: url("/assets/images/background/blue_circles.jpg");
Expand All @@ -18,7 +18,7 @@ background-color: #7FB7EA;
background-color: deepskyblue;
}

.topnav {
.topnav {
max-width: 450px;
margin: 0 auto;
padding-top: 50px;
Expand Down Expand Up @@ -69,7 +69,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
#masterplaypauseandvolume { margin: 0 auto; float: none; }
#masterplaypause { margin-bottom: 10px; }
#mastervolume { margin: 0 auto; margin-bottom: 5px;}
#smallrelaxio {display: block; margin: 0 auto; text-align: center; padding: 15px;}
#smallrelaxio {display: block; margin: 0 auto; text-align: center; padding: 15px;}
.headerimg { display: none; height: 0px; width: 0px; }
.column.fourth { width: 50%; }
}
Expand Down Expand Up @@ -114,8 +114,8 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
border-radius: 50%;
width: 100px;
height: 100px;
margin: 0 auto;
margin: 0 auto;

box-shadow: 0px 0px 20px 8px #fff,
0px 0px 5px 5px #fff inset;
}
Expand All @@ -125,7 +125,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
height: 100px;
width: 100px;
background-image: url("/assets/images/Play-Icon.png");
margin: 0 auto;
margin: 0 auto;
}

/* Pause button */
Expand Down Expand Up @@ -158,11 +158,11 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
}

#thunderstorm {
background-image: url("/assets/images/soundicons/Storm.png");
background-image: url("/assets/images/soundicons/Storm.png");
}

#birdsong {
background-image: url("/assets/images/soundicons/Singing-Birds.png");
background-image: url("/assets/images/soundicons/Singing-Birds.png");
}

#om {
Expand Down Expand Up @@ -203,15 +203,15 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
cursor: pointer;
background-color: #434343;
}

.seek-bar .fill {
background: #333;
width: 100%;
height: 0.35rem;
}

.seek-bar .thumb {
background-color: #434343;
background-color: #434343;
position: absolute;
height: 1.2rem;
width: 1.2rem;
Expand All @@ -223,7 +223,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
margin-top: -0.60rem;
border-radius: 50%;
cursor: pointer;
/*
/*
transition: width 120ms ease-in-out;
height 120ms ease-in-out,
margin 120ms ease-in-out,
Expand All @@ -233,10 +233,10 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
*/
;
}

/*
.seek-bar:hover .thumb {
background-color: #434343;
background-color: #434343;
width: 1.2rem;
height: 1.2rem;
margin: -0.7rem;
Expand All @@ -259,7 +259,7 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
margin: 0 auto;
max-width: 200px;
padding-top: 30px;
padding-bottom: 30px;
padding-bottom: 30px;
}

/* Styles and placement for each individual icon */
Expand All @@ -278,4 +278,4 @@ src: url('/assets/fonts/fontello/font/fontello.ttf') format('truetype');
font-size: 180%;
margin-top: 60px;
text-align: center;
}
}

0 comments on commit ac352b8

Please sign in to comment.