Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b726e59
Update uwave.css
UWBSE Mar 1, 2019
2172cd6
Update uwave.css
UWBSE Mar 1, 2019
77a7901
Update uwave.css
UWBSE Mar 1, 2019
3eadcd6
Update uwave.css
UWBSE Mar 1, 2019
4ab681f
Update uwave.css
UWBSE Mar 1, 2019
56b6b98
Update uwave.css
UWBSE Mar 1, 2019
83419dc
Purple and Gold Color Changes #1
ryanhenrie Mar 2, 2019
1c6efa7
Update uwave.css
UWBSE Mar 15, 2019
fb5b13d
Update uwave.css
UWBSE Mar 15, 2019
555612e
Trying to make a couple things gold
ryanhenrie Mar 19, 2019
4eb58cb
more gold??
ryanhenrie Mar 19, 2019
696f80b
Hopefully gold text in nav
ryanhenrie Mar 19, 2019
f41ada0
Add files via upload
ryanhenrie Apr 26, 2019
81d10f1
Tried to make the swoosh gold
ryanhenrie Apr 26, 2019
b537112
Change "UWAVE" in the top right from red to gold
ryanhenrie Apr 26, 2019
9406c07
Asset had to be refitted, was floating away
ryanhenrie Apr 26, 2019
00675da
Refit UWAVE-textonly
ryanhenrie Apr 26, 2019
336de4e
Refit the gold swoosh
ryanhenrie Apr 26, 2019
77b3659
Misnamed the first Swoosh file
ryanhenrie Apr 26, 2019
f0c6a53
Fixed reference to correct swoosh in the code
ryanhenrie Apr 26, 2019
9019634
Trying to change swoosh to gold
ryanhenrie Apr 26, 2019
fdb0718
Tried changing text to white
ryanhenrie Apr 26, 2019
43e27ca
Trying to change general text color
ryanhenrie Apr 26, 2019
8f0ec0a
Tried to un-purple some URLs
ryanhenrie Apr 26, 2019
d72045d
Text Colors Again
ryanhenrie Apr 26, 2019
3d3227c
Trying to swap favicon color, step1
ryanhenrie Apr 27, 2019
9790a8c
Replacing favicon w/ gold
ryanhenrie Apr 27, 2019
ac24bec
weird icon, reuploading
ryanhenrie Apr 27, 2019
e743aea
Gold favicon
ryanhenrie Apr 27, 2019
f293fd3
Hard to see as purple on white (Chrome default?)
ryanhenrie Apr 27, 2019
65e6d49
Favicon gold with purple box
ryanhenrie Apr 27, 2019
6150415
Removed 'Sign our Petition'
ryanhenrie Apr 27, 2019
1324c21
Re:Comment out the Petition URL
ryanhenrie Apr 27, 2019
9f99cf2
Re:Re:Fix the Petition Thing
ryanhenrie Apr 27, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions assets/css/uwave.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
a,
a:focus,
a:hover {
color: #fff;
/* color: #fff;
Attemping to change the URL colors to gold*/
color: #b7a57a;
text-decoration: underline;
}

Expand All @@ -15,8 +17,11 @@ a:hover {
.btn-play:hover,
.btn-play:focus {
text-shadow: none; /* Prevent inheritence from `body` */
background-color: #333;
/* background-color: #333;
color: #ccc;
Attemping to change play button bg to purple and color gold*/
background-color: #4b2e83;
color: #b7a57a;
border: 0;
}

Expand All @@ -28,10 +33,13 @@ a:hover {
html,
body {
height: 100%;
background-color: #333;
/* background-color: #333;*/
background-color: #4b2e83;
}
body {
color: #ffffff;
/* color: #4b2e83;
trying to change text color to gold */
color: #b7a57a;
text-align: center;
text-shadow: 0 1px 3px rgba(0,0,0,.5);
}
Expand Down Expand Up @@ -73,7 +81,9 @@ body {
padding-left: 0;
font-size: 16px;
font-weight: bold;
color: #cc1f2e;
/* color: #4b2e83;
Trying to make URLs on top gold */
color: #b7a57a;
border-bottom: 2px solid transparent;
text-decoration: none;
}
Expand All @@ -85,7 +95,9 @@ body {
.masthead-nav > .active > a,
.masthead-nav > .active > a:hover,
.masthead-nav > .active > a:focus {
color: #cc1f2e;
/* color: #4b2e83;
Trying to make URLs on top gold */
color: #b7a57a;
border-bottom-color: #fff;
}

Expand All @@ -108,8 +120,11 @@ body {
*/

.mastfoot {
color: #999; /* IE8 proofing */
/*color: #999; /* IE8 proofing *
color: rgba(255,255,255,.5);
Trying to make shit gold again */
color: #b7a57a; /* IE8 proofing */
color: rgba(183, 165, 122,.5);
}


Expand Down Expand Up @@ -149,15 +164,18 @@ body {
.red:hover,
.red:active,
.red:visited {
color: #cc1f2e;
color: #b7a57a; /* Tried to make the click-able link text (such as "Business" under About) not be purple anymore */
}

.content {
min-height: calc(100%-60px);
padding-top: 30px;
padding-bottom: 100px;
height: 100%;
color: #ccc;
/* color: #ccc;
gold?? */
color: #b7a57a;
/*Tried just commenting this color. I believe it was making most text purple, but we changed it to #fff to try white, it didn't work. */
text-align: left;
}

Expand All @@ -181,8 +199,11 @@ body {

.externalplayer {
font-size: 8pt;
color: #999;
/*color: #999;
color: rgba(255,255,255,.7);
Trying to make shit gold again */
color: #b7a57a;
color: rgba(183, 165, 122,.7);
}

#donationFAQs li {
Expand All @@ -198,8 +219,8 @@ address {
.btn-red:hover,
.btn-red:active {
color: #ddd;
background-color: #aa1f2e;
border-color: #aa1f2e;
background-color: #4b2e83;
border-color: #4b2e83;
}

.jumbotron {
Expand Down
Binary file added assets/img/Swish-315x151.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/Swish_256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/UWAVE+Swish-315x151.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/UWAVE+Swish.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/UWAVE-textonly-121x30.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/UWAVE-textonly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified favicon.ico
Binary file not shown.
10 changes: 6 additions & 4 deletions foot.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<div class="mastfoot">
<div class="mastfoot">
<div class="inner">
<p><a href="http://uwave.fm/petition" target="_blank" class="red">Sign our petition to help UWave Radio get on the air.</a></p>
<!-- <p><a href="http://uwave.fm/petition" target="_blank" class="red">Sign our petition to help UWave Radio get on the air.</a></p>
Trying to get rid of the old "Sign our Petition" footer -->
<noscript><b class="red">This site works best with Javascript enabled</b></noscript>
<p>This site copyright &copy; 2018 UWave Radio. Some rights reserved. <a href="https://creativecommons.org/licenses/by-nc-sa/3.0/us/" target="_blank">CC BY NC SA</a>. What we play may be licensed differently.</p>
<p>This site copyright &copy; 2019 UWave Radio. Some rights reserved. <a href="https://creativecommons.org/licenses/by-nc-sa/3.0/us/" target="_blank">CC BY NC SA</a>. What we play may be licensed differently.</p>
</div>
</div>
</div>

<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="assets/js/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
Expand Down
2 changes: 1 addition & 1 deletion head.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<div class="inner">
<span class="col-md-3">
<ul class="nav masthead-nav">
<li><a href="." class="navlink"><img src="assets/img/uwave.png" alt="UWave" /></a></li>
<li><a href="." class="navlink"><img src="assets/img/UWAVE-textonly-121x30.png" alt="UWave" /></a></li>
</ul>
</span>
<span class="col-md-6">
Expand Down
4 changes: 2 additions & 2 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<p class="lead">
<?php if($settings->online) {?>
<a href="/external" class="btn btn-lg btn-play">
<img src="assets/img/swoosh.png" alt="UWave swoosh shape"><br />
<img src="assets/img/Swish-315x151.png" alt="UWave swoosh shape"><br />
<i class="playpause glyphicon glyphicon-play-circle"></i> <span class="playtext">Tune in</span>
</a><br />
<?php } else {
echo "<img src=\"assets/img/swoosh.png\" alt=\"UWave swoosh shape\"><br /><br /><b>";
echo "<img src=\"assets/img/Swish-315x151.png\" alt=\"UWave swoosh shape\"><br /><br /><b>";
if(array_key_exists("reason", $settings)) {
echo $settings->reason;
} else {
Expand Down
2 changes: 1 addition & 1 deletion live.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="inner cover">
<p class="lead">
<a href="/external" class="btn btn-lg btn-play">
<img src="assets/img/swoosh.png"><br />
<img src="assets/img/Swish-315x151.png"><br />
<i class="playpause glyphicon glyphicon-play-circle"></i> <span class="playtext">Tune in</span>
</a><br />
<span class="metadata"></span>
Expand Down