Skip to content

Commit

Permalink
various dark mode adjustments
Browse files Browse the repository at this point in the history
and page corrections
  • Loading branch information
shdant113 committed Jul 28, 2019
1 parent ff97cde commit 8def95d
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 33 deletions.
10 changes: 5 additions & 5 deletions contactUsDirect.php
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ class GameResultData
<option value="other">Other</option>
</select></p>';

print '<p><font color="red">If you asked for a pause tell us for how long and why or your request will <strong>not</strong> be granted.</font></p>';
print '<p class="contact-us-desc">If you asked for a pause tell us for how long and why or your request will <strong>not</strong> be granted.</font></p>';
print '</div>';

print '<div id="ifOther" style="display:none">';
Expand All @@ -448,9 +448,9 @@ class GameResultData
print '</div>';

print '<div id="ifEmergency" style="display:none">';
print '<p> <font color="red">This is for personal emergencies only and will instantly pause all of your running games that you are not defeated in. The
print '<p class="contact-us-desc">This is for personal emergencies only and will instantly pause all of your running games that you are not defeated in. The
moderator team will give you 7 days to let us know when you expect to be back. If we do not hear back in 7 days we will look for a replacement. <br><br>
<strong>Vacations, business trips, or any other absence you know of ahead of time do not count as a personal emergency.</strong> This tool is intended for unexpected absences, such as a family emergency, widespread power outage, natural disaster, or other circumstance you cannot plan for. If you can plan for your pause ahead of time, it is not an emergency. You should inform others in your game in advance that you will need a pause, and if you cannot do so instead contact the moderators at' .Config::$modEMail;'.</font></br></br>
<u>Vacations, business trips, or any other absence you know of ahead of time do not count as a personal emergency.</u> This tool is intended for unexpected absences, such as a family emergency, widespread power outage, natural disaster, or other circumstance you cannot plan for. If you can plan for your pause ahead of time, it is not an emergency. You should inform others in your game in advance that you will need a pause, and if you cannot do so instead contact the moderators at' .Config::$modEMail;'.</font></br></br>
Abuse of the emergency pause will be punished with a 50% point dock and removal of your emergency pause privilege at minimum. <br><br>
Using your emergency pause will instantly pause the following games: ';

Expand All @@ -473,8 +473,8 @@ class GameResultData
</select></p>';
print '</div>';

print ' <p>Please give us any additional details
<textarea name="additionalInfo" class = "contactUs" rows="5"></textarea></p>';
print ' <p class="contact-us-desc">Please give us any additional details below.</p>
<textarea name="additionalInfo" class = "contactUs" rows="5"></textarea>';
print '<p><input type="submit" class = "green-Submit" name="submit"/></p>';
print '</form>';
}
Expand Down
37 changes: 26 additions & 11 deletions css/darkMode/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -429,13 +429,13 @@ a {
text-decoration:underline;
}
a:link {
color: rgba(255, 255, 255, 0.8)
color: rgba(175, 255, 175, 0.8)
}
a:visited {
color: rgba(255, 255, 255, 0.8)
color: rgba(175, 255, 175, 0.8)
}
a:active {
color: rgba(255, 255, 255, 0.8)
color: rgba(175, 255, 175, 0.8)
}
a:hover {
color: #009902 ! important;
Expand Down Expand Up @@ -484,6 +484,7 @@ a.light {
#header-welcome a {
font-weight:normal !important;
text-decoration:none !important;
color: rgba(255, 255, 255, 0.8);
}

#header-goto {
Expand Down Expand Up @@ -596,7 +597,7 @@ a.light {
background-color: #0b6a0b;
font-size: 0;
height: 5px;
border-top: 1px solid #000;
border-top: 1px solid #0b6a0b;
border-bottom: 1px solid #000;
margin-bottom:5px;
}
Expand Down Expand Up @@ -1106,12 +1107,13 @@ select option {

/* Modal Content */
.modal-content {
background-color: #fefefe;
background-color: #5e6368;
color: rgba(255, 255, 255, 0.8);
margin: auto;
padding: 10px;
border: 1px solid #888;
width: 80%;
max-width: 760px;
width: 80%;
max-width: 760px;
}

/* The Close Button */
Expand Down Expand Up @@ -1259,8 +1261,8 @@ select option {
padding: 6px;
}

.datc tr:nth-child(even){background-color: #f2f2f2; word-break: break-word;}
.datc tr:nth-child(odd){background-color: #ffffff; word-break: break-word;}
.datc tr:nth-child(even){background-color: #555; word-break: break-word;}
.datc tr:nth-child(odd){background-color: #777; word-break: break-word;}

.datc th {
padding-top: 12px;
Expand Down Expand Up @@ -1464,6 +1466,11 @@ input[type=submit].contactUs {
input[type=submit].contactUs:hover {
background-color: #45a049;
}

.contact-us-desc {
color: rgb(255, 153, 153);
font-weight: 900;
}
/* End of section for contactUsDirect page styling */

/* Section for intro page */
Expand Down Expand Up @@ -1587,7 +1594,7 @@ input[type=text].settings, input[type=password].settings, textarea.settings, sel
}

.credits-title {
background-color: #4CAF50;
background-color: #006c00;
color: white;
padding: 10px;
border: none;
Expand All @@ -1602,7 +1609,7 @@ input[type=text].settings, input[type=password].settings, textarea.settings, sel
border-radius: 7px;
padding: 10px;
overflow: hidden;
background-color: #f1f1f1;
background-color: #555;
font-size: 14px;
margin: 0 0 15px 0 !important;
}
Expand Down Expand Up @@ -1936,6 +1943,14 @@ form.safeForm {
background-color: #5f6368;
}

.orderDropDown {
background-color: #757b81 !important;
}

.hof-self {
color: #ff7272 !important
}

/* end of dark mode corrections */


Expand Down
4 changes: 4 additions & 0 deletions css/desktopOnly/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,10 @@ input[type=submit].gameCreate:hover {
color: white;
min-width:70px;
}

.hof-self {
color: red;
}
/* End of section for Hall of Fame styling */

/* Section for donations page styling */
Expand Down
9 changes: 9 additions & 0 deletions css/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,10 @@ input[type=submit].gameCreate:hover {
color: white;
min-width:70px;
}

.hof-self {
color: red;
}
/* End of section for Hall of Fame styling */

/* Section for donations page styling */
Expand Down Expand Up @@ -1448,6 +1452,11 @@ input[type=submit].contactUs {
input[type=submit].contactUs:hover {
background-color: #45a049;
}

.contact-us-desc {
color: red;
font-weight: 900;
}
/* End of section for contactUsDirect page styling */

/* Section for intro page */
Expand Down
14 changes: 12 additions & 2 deletions detailedSearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -685,13 +685,23 @@ class GameResultData
if ($seeBronze=='checked') { print '<th class= "advancedSearch">IsBronze</th>'; }

print "</tr>";

global $User;
foreach ($UsersData as $values)
{
print '<TR><TD class= "advancedSearch"><a href="profile.php?userID='.$values->userID.'">'.$values->userID.'</a>';

// Print the mod or banned icons if the user is one or the other.
if ($values->mod) { print ' <img src="images/icons/mod.png" title="Moderator/Admin" />'; }
if ($values->mod)
{
if ($User->getTheme() == 'No')
{
print ' <img src="images/icons/mod.png" title="Moderator/Admin" />';
}
else
{
print ' <img src="images/icons/mod3.png" title="Moderator/Admin" />';
}
}
if ($values->banned) { print ' <img src="images/icons/cross.png"title="Banned" />'; }

// Only show the highest level of donator status held by a user.
Expand Down
3 changes: 1 addition & 2 deletions forum.php
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,7 @@
<strong><em>'.libTime::text($message['timeSent']).'</em></strong>'.$muteLink.'<br />
'.$User->likeMessageToggleLink($message['id'],$message['fromUserID']).libHTML::likeCount($message['likeCount']).
'</div>';



print '<div class="message-subject">';

print libHTML::forumMessage($message['id'],$message['latestReplySent']);
Expand Down
8 changes: 4 additions & 4 deletions halloffame.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<td class="hof"> '.number_format($points).' '.libHTML::points().' - #'.$i.' </td>';
if ($User->username == $username)
{
print '<td class="hof"><a href="profile.php?userID='.$id.'" style="color:red;">'.$username.'</a></td> ';
print '<td class="hof"><a class="hof-self" href="profile.php?userID='.$id.'">'.$username.'</a></td> ';
$showMe = 0;
}
else
Expand All @@ -85,7 +85,7 @@
</tr>';
print ' <tr class="hof">
<td class="hof"> '.number_format($User->points).' '.libHTML::points().' - <a name="me"></a>#'.$position.' </td>
<td class="hof" style="color:red;"><strong><em>'.$User->username.'</em></strong></td>
<td class="hof hof-self"><strong><em>'.$User->username.'</em></strong></td>
</tr>';
}

Expand Down Expand Up @@ -127,7 +127,7 @@
<td class="hof"> '.number_format($points).' '.libHTML::points().' - #'.$i.' </td>';
if ($User->username == $username)
{
print '<td class="hof"><a href="profile.php?userID='.$id.'" style="color:red;">'.$username.'</a></td> ';
print '<td class="hof"><a class="hof-self" href="profile.php?userID='.$id.'">'.$username.'</a></td> ';
$showMe = 0;
}
else
Expand All @@ -145,7 +145,7 @@
</tr>';
print ' <tr class="hof">
<td class="hof"> '.number_format($User->points).' '.libHTML::points().' - <a name="me"></a>#'.$position.' </td>
<td class="hof" style="color:red;"><strong><em>'.$User->username.'</em></strong></td>
<td class="hof hof-self"><strong><em>'.$User->username.'</em></strong></td>
</tr>';
}

Expand Down
Binary file removed images/icons/mod-darkmode.jpg
Binary file not shown.
Binary file added images/icons/mod3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
1 change: 0 additions & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,6 @@ static function forumNew() {
{
$buf .= '<div class="homeForumPost homeForumPostAlt'.libHTML::alternate().' userID'.$post['userID'].'">
<div class="homeForumPostTime">'.libTime::text($post['timeSent']).' '.$post['iconMessage'].'</div>
<a href="profile.php?userID='.$post['userID'].'" class="light">'.$post['username'].'</a>
'.' ('.$post['points'].libHTML::points().
Expand Down
10 changes: 8 additions & 2 deletions locales/English/credits.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
'If you like webDiplomacy, you can purchase the board game! <br />
<a href="http://www.wizards.com/default.asp?x=ah/prod/diplomacy">Available for Purchase from Avalon Hill</a>'
),
array(
'Managing the <a href="https://discord.gg/f2ram4w">webDiplomacy Discord Server</a>',
'<a href="http://webdiplomacy.net/profile.php?userID=100862">Aurelin</a><br />
<a href="http://webdiplomacy.net/profile.php?userID=41379">captainmeme</a><br />'
),
array(
'Co-owners of webDiplomacy',
'<a href="http://kestas.kuliukas.com/">Kestas Kuliukas</a>, original creator of webDiplomacy<br />
Expand All @@ -55,8 +60,9 @@
array(
'The webDiplomacy Developers',
'<a href="profile.php?userID=15658">jmo1121109</a>, current lead developer<br />
<a href="profile.php?userID=10">kestasjk</a></br>
<a href="profile.php?userID=59641">Squigs44</a>'
<a href="profile.php?userID=10">kestasjk</a><br />
<a href="profile.php?userID=59641">Squigs44</a><br />
<a href="profile.php?userID=38739">bo_sox48</a>'
),
array(
'Lifetime Site Contributors',
Expand Down
2 changes: 1 addition & 1 deletion objects/basic/set.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function icon() {
}
else
{
return '<img src="'.l_s('images/icons/webdip-darkmode-tick-faded.png').'" alt="'.l_t('Completed').'" title="'.l_t('Orders completed, but not ready for next turn').'" /> ';
return '<img src="'.l_s('images/icons/tick_faded_dark.png').'" alt="'.l_t('Completed').'" title="'.l_t('Orders completed, but not ready for next turn').'" /> ';
}

}
Expand Down
4 changes: 2 additions & 2 deletions objects/user.php
Original file line number Diff line number Diff line change
Expand Up @@ -593,13 +593,13 @@ static function typeIcon($type) {

if( strstr($type,'Moderator') )
{
if ($User->getTheme() == 'No')
if ($User->getTheme() == 'No' || $User->getTheme() == null)
{
$buf .= ' <img src="'.l_s('images/icons/mod.png').'" alt="'.l_t('Mod').'" title="'.l_t('Moderator/Admin').'" />';
}
else
{
$buf .= ' <img src="'.l_s('images/icons/mod-darkmode.jpg').'" alt="'.l_t('Mod').'" title="'.l_t('Moderator/Admin').'" style="height: 12px; width: 12px; border-radius: 6px;" />';
$buf .= ' <img src="'.l_s('images/icons/mod3.png').'" alt="'.l_t('Mod').'" title="'.l_t('Moderator/Admin').'" />';
}
}

Expand Down
6 changes: 3 additions & 3 deletions variants/Classic/resources/darkMode/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Occupation bars and country text colors need to be defined here.
color: rgba(255, 255, 255, 0.8) ! important;
}
.variantClassic .country1 {
color: rgb(226, 165, 212) ! important;
color: rgb(243, 198, 232) ! important;
}
.variantClassic .country2 {
color: rgb(117, 165, 255) ! important;
Expand All @@ -24,7 +24,7 @@ Occupation bars and country text colors need to be defined here.
color: rgb(50, 168, 109) ! important;
}
.variantClassic .country4 {
color: rgb(216, 122, 0) ! important;
color: rgb(202, 172, 133) ! important;
}
.variantClassic .country5 {
color: rgb(232, 107, 107) ! important;
Expand All @@ -33,7 +33,7 @@ Occupation bars and country text colors need to be defined here.
color: rgb(212, 214, 79) ! important;
}
.variantClassic .country7 {
color: rgb(173, 108, 196) ! important;
color: rgb(213, 156, 234) ! important;
}

.variantClassic .occupationBar1 {
Expand Down

0 comments on commit 8def95d

Please sign in to comment.