From b5da178b79f1b9240a17809964c3b6cd468f8b23 Mon Sep 17 00:00:00 2001
From: Robbie Antenesse <gamedev@alamantus.com>
Date: Tue, 7 Jun 2016 20:31:52 -0600
Subject: [PATCH] Subdued the colors a bit.

---
 css/lexiconga.css | 32 ++++++++++++++++----------------
 css/styles.css    |  8 +++++---
 index.php         |  6 +++---
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/css/lexiconga.css b/css/lexiconga.css
index 37c3df9..53fc86e 100644
--- a/css/lexiconga.css
+++ b/css/lexiconga.css
@@ -1,11 +1,11 @@
 body {
-	background: #ecf0f1;
+	background: #f2c057;
 }
 
 header {
 	height: 50px;
 	width: 100%;
-	background: #8e44ad;
+	background: #607aac;
 	margin-bottom: 10px;
 	border: none;
 	-webkit-box-shadow: 3px 3px 10px -1px rgba(0,0,0,0.75);
@@ -31,7 +31,7 @@ td, th {
 
 a {
 	text-decoration: none;
-	color: #2980b9;
+	color: #2d4262;
 	font-weight: bold;
 }
 
@@ -46,7 +46,6 @@ a {
 }
 
 #aboutButton {
-	background: #f1c40f;
 }
 
 #loginoutArea {
@@ -90,7 +89,7 @@ and (max-device-width : 480px) {
 }
 
 #wordEntryForm {
-	background: #e74c3c;
+	background: #ba5536;
 	-webkit-box-shadow: 5px 5px 7px 0px rgba(0,0,0,0.75);
 	-moz-box-shadow: 5px 5px 7px 0px rgba(0,0,0,0.75);
 	box-shadow: 5px 5px 7px 0px rgba(0,0,0,0.75);
@@ -98,19 +97,19 @@ and (max-device-width : 480px) {
 }
 
 input, textarea, select, option {
-	background: #ecf0f1;
+	background: #ffeb94;
 }
 
 #announcementArea {
-    background: #2ecc71;
+    background: #a2c523;
 }
 
 #notificationArea {
-    background:#c0c088;
+    background: #86ac41;
 }
 
 #dictionaryContainer {
-	background: #e67e22;
+	background: #cb6318;
 	padding: 15px;
 	border: none;
 	-webkit-box-shadow: 5px 5px 7px 0px rgba(0,0,0,0.75);
@@ -118,8 +117,8 @@ input, textarea, select, option {
 	box-shadow: 5px 5px 7px 0px rgba(0,0,0,0.75);
 }
 
-#dictionaryDescription, #settingsOptions, #infoPage, #loadAfterDeletePage, #accountSettingsPage, #fullScreenTextboxPage {
-	background: #bdc3c7;
+#settingsOptions, #infoPage, #loadAfterDeletePage, #accountSettingsPage, #fullScreenTextboxPage {
+	background: #c9a66b;
 }
 
 .management {
@@ -133,14 +132,15 @@ input, textarea, select, option {
 
 #dictionaryDescription {
 	width: 90%;
+	background: #f4cc70;
 }
 
 #loginLink, #logoutLink, #descriptionToggle, #searchFilterToggle, #settingsButton, .deleteCancelButton, .deleteConfirmButton, #settingsScreenCloseButton, #infoScreenCloseButton, .clickable, button {
-	background: #f1c40f;
+	background: #fbcd4b;
 }
 
 entry {
-	background: #bdc3c7;
+	background: #f4cc70;
 	border: none;
 	-webkit-box-shadow: 3px 3px 10px -1px rgba(0,0,0,0.75);
 	-moz-box-shadow: 3px 3px 10px -1px rgba(0,0,0,0.75);
@@ -148,15 +148,15 @@ entry {
 }
 
 .editButton {
-	background: #2ecc71;
+	background: #86ac41;
 }
 
 .deleteButton {
-	background: #e74c3c;
+	background: #ba5536;
 }
 
 footer {
-	background: #e67e22;
+	background: #cb6318;
 	border: none;
 	-webkit-box-shadow: 0px -3px 7px -1px rgba(0,0,0,0.75);
 	-moz-box-shadow: 0px -3px 7px -1px rgba(0,0,0,0.75);
diff --git a/css/styles.css b/css/styles.css
index 94a1f05..f5e59da 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -83,7 +83,9 @@ label span.checkboxlabel {
 
 input, textarea {
     display: block;
-    padding-left: 5px;
+    padding: 2px 0 2px 5px;
+    border: none;
+    margin: 2px 0;
 }
 
 input[type=checkbox] {
@@ -162,7 +164,7 @@ input[type=checkbox] {
     max-height: 400px;
     overflow-y: auto;
     padding: 15px;
-    border: 1px solid #cacaca;
+    border: none;
     margin: 10px;
 }
 
@@ -170,7 +172,7 @@ input[type=checkbox] {
     display: inline;
     font-weight: bold;
     font-size: 13px;
-    padding: 4px;
+    padding: 5px;
     border: none;
     background: #dddddd;
 }
diff --git a/index.php b/index.php
index 464bd46..247d310 100644
--- a/index.php
+++ b/index.php
@@ -309,12 +309,12 @@ if ($is_viewing) {
                     <input type="hidden" id="accountSettingsPreviousEmailField" name="previousemail" value="<?php echo $user_email; ?>" />
                 </label>
                 <div id="accountSettingsEmailChangeWarning" style="display:none;font-weight:bold;color:#dd5500;font-size:11px;margin-bottom:10px;">If you change your email address, please note that you will no longer be able to log in with your old email address, <?php echo $user_email; ?>.<br>Change it back unless you are completely sure that you want to change your email address!</div>
-                <label><span>Public Name <span class="clickable" onclick="ExplainPublicName()" style="font-size:11px;vertical-align:top;background:#e0c19c;padding:4px 7px;">?</span></span>
+                <label><span>Public Name <span class="clickable inline-button" onclick="ExplainPublicName()">?</span></span>
                     <input type="text" id="accountSettingsPublicNameField" name="publicname" value="<?php echo Get_Public_Name_By_Id($current_user); ?>" />
                 </label>
                 <label style="display:inline;"><b>Allow Emails</b>
 			        <input type="checkbox" id="createAccountAllowEmailsField" name="allowemails" checked="checked" />
-			    </label> <span class="clickable" onclick="ExplainAllowEmails()" style="font-size:11px;vertical-align:top;background:#e0c19c;padding:4px 7px;">?</span>
+			    </label> <span class="clickable inline-button" onclick="ExplainAllowEmails()">?</span>
                 <div id="accountSettingsError" style="font-weight:bold;color:red;"></div>
                 <button type="submit" id="accountSettingsSubmitButton" onclick="ValidateAccountSettings(); return false;">Save Settings</button>
                 <br><br>
@@ -338,7 +338,7 @@ if ($is_viewing) {
                     <select id="loadAfterDelete" onchange="ChangeDictionary(this);document.getElementById('loadAfterDeleteScreen').style.display = 'none';"></select>
                 </label>
                 <p>Or</p>
-                <label><button type="button" onclick="CreateNewDictionary();document.getElementById('loadAfterDeleteScreen').style.display = 'none';" style="cursor:pointer;">Create a New Dictionary</button></label>
+                <label><button type="button" onclick="CreateNewDictionary();document.getElementById('loadAfterDeleteScreen').style.display = 'none';">Create a New Dictionary</button></label>
             </div>
         </div>
     </div>