From f28cf0e5daa2d2bcf686e5770a46994bee18a18a Mon Sep 17 00:00:00 2001
From: ozhozh <ozhozh@12232710-3e20-11de-b438-597f59cd7555>
Date: Sat, 6 Nov 2010 21:03:40 +0000
Subject: [PATCH] Color palette unification. Now trying to stick to
 http://www.colourlovers.com/palette/1347019/YOURLS everywhere.

git-svn-id: http://yourls.googlecode.com/svn/trunk@522 12232710-3e20-11de-b438-597f59cd7555
---
 css/infos.css                | 23 +++++++++++++----------
 css/share.css                |  4 ++--
 css/style.css                | 36 ++++++++++++++++++------------------
 css/tablesorter.css          |  6 +++---
 includes/functions-infos.php |  4 ++--
 js/infos.js                  |  2 +-
 yourls-infos.php             |  4 ++--
 7 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/css/infos.css b/css/infos.css
index 638f906..746719c 100644
--- a/css/infos.css
+++ b/css/infos.css
@@ -1,3 +1,7 @@
+h3 span.label {
+	width:100px;
+	display:inline-block;
+}
 
 ul.toggle_display {
 	display:none;
@@ -13,9 +17,8 @@ ul.toggle_display li {
 	margin-right: 10px;
 }
 #tabs ul#headers {
-	border-bottom:1px solid #ccc;
+	border-bottom:1px solid #E3F3FF;
 	padding:12px 5px 3px 5px;
-	zmargin-right:200px;
 	float:left;
 }
 .wrap_unfloat {
@@ -24,19 +27,19 @@ ul.toggle_display li {
 
 #tabs ul#headers li a {
 	color:#595441;
-	border:1px solid #ccc;
+	border:1px solid #C7E7FF;
 	-moz-border-radius-topleft:10px;
 	-moz-border-radius-topright:10px;
 	-webkit-border-top-left-radius:10px;
 	-webkit-border-top-right-radius:10px;
 	border-radius:10px;
 	padding:10px 5px 5px 15px;
-	background:#dde;
+	background:#E3F3FF;
 }
 
 #tabs ul#headers li a:hover {
 	text-decoration:none;
-	background:#eef;
+	background:#88C0EB;
 }
 
 #tabs ul#headers li a.selected {
@@ -55,17 +58,17 @@ ul.toggle_display li {
 	-webkit-border-top-right-radius:10px;
 	border-radius:10px;
 	padding:3px 10px;
-	background:#FFE3BB;
+	background:#E3F3FF;
 }
 #stats_lines li a:hover {
 	text-decoration:none;
-	background:#FF9B06;
+	background:#C7E7FF;
 }
 #stats_lines li a.selected {
-	background:#FFC26B;
+	background:#88C0EB;
 }
 #stats_lines li a.selected:hover {
-	background:#FFC26B;
+	background:#88C0EB;
 }
 .tab {
 	padding:10px;
@@ -97,7 +100,7 @@ ul.no_bullet li {
 	margin:0;
 }
 #historical_clicks li:hover {
-	background:#FFB545 !important;
+	background:#C7E7FF !important;
 }
 #historical_clicks span.historical_link {
 	min-width:130px;
diff --git a/css/share.css b/css/share.css
index 84b6461..73bf6b4 100644
--- a/css/share.css
+++ b/css/share.css
@@ -10,7 +10,7 @@ div.share {
 	-moz-border-radius:5px;
 	-webkit-border-radius:5px;
 	border-radius:5px;
-	border:2px solid #8DBDD8;
+	border:2px solid #88c0eb;
 	background:#fff;
 	margin-right:1em;
 	padding:0 1em;
@@ -38,7 +38,7 @@ div.share {
 }
 #charcount {
 	padding-left:5px;
-	color:#8DBDD8;
+	color:#88c0eb;
 }
 #charcount.negative {
 	color:red;
diff --git a/css/style.css b/css/style.css
index bee8e41..021dd20 100644
--- a/css/style.css
+++ b/css/style.css
@@ -2,7 +2,7 @@ body {
 	font-family: Verdana, Arial;
 	font-size: 12px;
 	color: #595441;
-	background:#E3F3FF;
+	background:#e3f3ff;
 	text-align:center;
 	margin-top:0px;
 	padding-top:10px;
@@ -14,10 +14,10 @@ body {
 	background:white;
 	text-align:left;
 	padding:5px 20px 10px 20px;
-	border-left:3px solid #5FA3C6;
-	border-right:3px solid #5FA3C6;
-	border-bottom:3px solid #5FA3C6;
-	border-top:3px solid #5FA3C6;
+	border-left:3px solid #2a85b3;
+	border-right:3px solid #2a85b3;
+	border-bottom:3px solid #2a85b3;
+	border-top:3px solid #2a85b3;
 	-moz-border-radius:20px;
 	-webkit-border-radius:20px;
 	border-radius:20px;
@@ -27,7 +27,7 @@ div, p, td {
 	font-size: 12px;
 }
 a, a:link, a:active, a:visited {
-	color: #2A85B3;
+	color: #2a85b3;
 	text-decoration: none;
 }
 a:hover {
@@ -35,9 +35,9 @@ a:hover {
 }
 h1 {height:50px;margin:0;float:right;width:500px;}
 h1 a {text-align:right;font-size:20px;float:right;}
-h1 a, h1 a:link, h1 a:active, h1 a:visited {color:#2A85B3}
+h1 a, h1 a:link, h1 a:active, h1 a:visited {color:#2a85b3}
 h1 a:hover{text-decoration:none;}
-h1 a:hover span{text-decoration:underline;color:#8dbdd8}
+h1 a:hover span{text-decoration:underline;color:#88c0eb}
 
 ul#admin_menu {
 	min-height:100px;
@@ -73,7 +73,7 @@ Input.text, select, textarea {
 	font-size: 10px;
 	color: #595441;
 	background-color: #FFFFFF;
-	border: 1px solid #8dbdd8;
+	border: 1px solid #88c0eb;
 	margin:1px;
 }
 input.button {
@@ -82,15 +82,15 @@ input.button {
 	color: #595441;
 	font-weight: bold;
 	background-color: #FFFFFF;
-	border: 1px solid #8dbdd8;
+	border: 1px solid #88c0eb;
 	cursor:pointer;
 }
 input.primary {
-	border:2px solid #aaccaa;
+	border:2px solid #2A85B3;
 	background:#fafafe;
 }
 input.text:focus, textarea:focus {
-	border:2px solid #AACCAA;
+	border:2px solid #2A85B3;
 	margin:0px;
 }
 tr.edit-row  td {
@@ -104,7 +104,7 @@ tr.edit-row  td {
 	clear:both;
 }
 #new_url div {
-	background:#D9EAF3;
+	background:#C7E7FF;
 	padding:4px;
 }
 #new_url_form {
@@ -112,7 +112,7 @@ tr.edit-row  td {
 }
 #new_url #feedback {
 	background:#ff8;
-	color:#8DBDD8;
+	color:#88c0eb;
 	width:50%;
 	margin:0px 25%;
 	padding:2px;
@@ -139,7 +139,7 @@ td.actions .button {
 	color: #595441;
 	font-weight: bold;
 	background-color: #FFFFFF;
-	border: 1px solid #8dbdd8;
+	border: 1px solid #88c0eb;
 	-moz-border-radius:3px;
 	-webkit-border-radius:3px;
 	border-radius:3px;
@@ -231,7 +231,7 @@ td.actions .button_stats {
 	padding:0 2px;
 }
 a.bookmarklet {
-	border:2px solid #2A85B3;
+	border:2px solid #2a85b3;
 	-moz-border-radius:3px;
 	-webkit-border-radius:3px;
 	border-radius:3px;
@@ -257,7 +257,7 @@ a.bookmarklet:hover {
 	-moz-border-radius:10px;
 	-webkit-border-radius:10px;
 	border-radius:10px;
-	border:2px solid #2A85B3;
+	border:2px solid #2a85b3;
 	-moz-border-radius-bottomleft:30px;
 	-moz-border-radius-bottomright:30px;
 	-webkit-border-bottom-left-radius:25px;
@@ -271,7 +271,7 @@ a.bookmarklet:hover {
 }
 
 .notice {
-	border:1px solid #5FA3C6;
+	border:1px solid #2a85b3;
 	background: #F3FAFD;
 	-moz-border-radius:6px;
 	-webkit-border-radius:6px;
diff --git a/css/tablesorter.css b/css/tablesorter.css
index ea53092..ee1d3bf 100644
--- a/css/tablesorter.css
+++ b/css/tablesorter.css
@@ -8,13 +8,13 @@ table.tblSorter {
 	text-align: left;
 }
 table.tblSorter thead tr th, table.tblSorter tfoot tr th, table.tblSorter th.header {
-	background-color: #D9EAF3;
+	background-color: #C7E7FF;
 	border: 1px solid #FFF;
 	font-size: 8pt;
 	padding: 4px;
 }
 table.tblSorter tfoot tr th {
-	background-color: #D9EAF3;
+	background-color: #E3F3FF;
 }
 table.tblSorter thead tr .header {
 	background-image: url('../images/bg.gif');
@@ -42,7 +42,7 @@ table.tblSorter thead tr .headerSortDown {
 	background-image: url('../images/asc.gif');
 }
 table.tblSorter thead tr .headerSortDown, table.tblSorter thead tr .headerSortUp {
-	background-color: #8dbdd8;
+	background-color: #88c0eb;
 }
 table.tblSorter tfoot tr {
 	background-color: #BCD9E8;
diff --git a/includes/functions-infos.php b/includes/functions-infos.php
index 94c35bc..c1fe7bd 100644
--- a/includes/functions-infos.php
+++ b/includes/functions-infos.php
@@ -147,8 +147,8 @@ function yourls_stats_line( $values, $legend1_list, $legend2_list ) {
 		'chxt'=> 'x,x,y',
 		'chd' => 't:'.( join(',' ,  $values ) ),
 		'chds' => '0,'.$max,
-		'chm' => 'B,E3F3FF,0,0,0|o,5FA3C6,0,-1,6|o,FFFFFF,0,-1,4',
-		'chco' => '5FA3C6',
+		'chm' => 'B,E3F3FF,0,0,0|o,2a85b3,0,-1,6|o,FFFFFF,0,-1,4',
+		'chco' => '2a85b3',
 		'chxl'=> '0:|'. $legend1 .'|1:|'. $legend2 .'|2:|'. $label_clicks
 	);
 	$line_src = 'http://chart.apis.google.com/chart?' . http_build_query( $line );
diff --git a/js/infos.js b/js/infos.js
index f30e5a3..4bf3ded 100644
--- a/js/infos.js
+++ b/js/infos.js
@@ -26,7 +26,7 @@ $(document).ready(function(){
 	$('#stats_lines li a:first').click();
 	
 	// Prettify list
-	$('#historical_clicks li:odd').css('background', '#FFE3BB');
+	$('#historical_clicks li:odd').css('background', '#E3F3FF');
 	
 	// Toggle detail lists
 	$('a.details').click(function(){
diff --git a/yourls-infos.php b/yourls-infos.php
index a0a8a15..bd4eabd 100644
--- a/yourls-infos.php
+++ b/yourls-infos.php
@@ -176,7 +176,7 @@
 
 <h2 id="informations"><?php echo $title; ?></h2>
 
-<h3>Short URL: <img src="<?php echo YOURLS_SITE; ?>/images/favicon.gif"/>
+<h3><span class="label">Short URL:</span> <img src="<?php echo YOURLS_SITE; ?>/images/favicon.gif"/>
 <?php if( $aggregate ) {
 	$i = 0;
 	foreach( $keyword_list as $k ) {
@@ -194,7 +194,7 @@
 	if( count( $keyword_list ) > 1 )
 		echo ' <a href="'. yourls_link($keyword).'+all" title="Aggregate stats for duplicate short URLs"><img src="' . YOURLS_SITE . '/images/chart_bar_add.png" border="0" /></a>';
 } ?></h3>
-<h3 id="longurl">Long URL: <img class="fix_images" src="<?php echo yourls_get_favicon_url( $longurl );?>" /> <?php yourls_html_link( $longurl, yourls_trim_long_string( $longurl ), 'longurl' ); ?></h3>
+<h3 id="longurl"><span class="label">Long URL:</span> <img class="fix_images" src="<?php echo yourls_get_favicon_url( $longurl );?>" /> <?php yourls_html_link( $longurl, yourls_trim_long_string( $longurl ), 'longurl' ); ?></h3>
 
 <div id="tabs">
 	<div class="wrap_unfloat">
-- 
2.45.0