From 8c754889791b82c7c7d5bd00718d003fd5b22813 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 2 Sep 2011 11:51:43 +0100
Subject: [PATCH] More changes to the CSS, and updating the bake templates and
 scaffolds.

---
 app/webroot/css/cake.generic.css              | 74 ++++++++++---------
 .../Console/Templates/default/views/index.ctp | 10 ++-
 lib/Cake/View/Scaffolds/index.ctp             |  8 +-
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/app/webroot/css/cake.generic.css b/app/webroot/css/cake.generic.css
index 6e69edb28..016c8d54e 100644
--- a/app/webroot/css/cake.generic.css
+++ b/app/webroot/css/cake.generic.css
@@ -258,7 +258,6 @@ fieldset {
 	padding: 16px 20px;
 }
 fieldset legend {
-	background:#fff;
 	color: #e32;
 	font-size: 160%;
 	font-weight: bold;
@@ -354,9 +353,7 @@ form .submit input[type=submit] {
 	padding: 8px 10px;
 }
 form .submit input[type=submit]:hover {
-	background: #4ca83d;
-	background-image: -webkit-linear-gradient(top, #62af56, #286E1E);
-	background-image: -moz-linear-gradient(top, #62af56, #286E1E);
+	background: #5BA150;
 }
 /* Form errors */
 form .error {
@@ -375,6 +372,12 @@ form .error-message {
 form .error,
 form .error-message {
 	color: #9E2424;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	-ms-box-shadow: none;
+	-o-box-shadow: none;
+	box-shadow: none;
+	text-shadow: none;
 }
 
 /** Notices and Errors **/
@@ -463,68 +466,73 @@ p.error em {
 }
 
 /**  Actions  **/
-div.actions ul {
+.actions ul {
 	margin: 0;
 	padding: 0;
 }
-div.actions li {
+.actions li {
 	margin:0 0 0.5em 0;
 	list-style-type: none;
 	white-space: nowrap;
 	padding: 0;
 }
-div.actions ul li a {
+.actions ul li a {
 	font-weight: normal;
 	display: block;
 	clear: both;
 }
-div.actions ul li a:hover {
-	text-decoration: underline;
-}
 
 /* Buttons and button links */
 input[type=submit],
-div.actions ul li a,
-td.actions a {
+.actions ul li a,
+.actions a {
 	font-weight:normal;
 	padding: 4px 8px;
-	background:#e6e49f;
-	background-image: -webkit-linear-gradient(top, #fefefe, #dedede);
-	background-image: -moz-linear-gradient(top, #fefefe, #dedede);
-	background-image: -ms-linear-gradient(top, #fefefe, #dedede);
-	background-image: -o-linear-gradient(top, #fefefe, #dedede);
-	background-image: linear-gradient(top, #fefefe, #dedede);
+	background: #dedede;
+	background-image: -webkit-linear-gradient(top, #fefefe, #dcdcdc);
+	background-image: -moz-linear-gradient(top, #fefefe, #dcdcdc);
+	background-image: -ms-linear-gradient(top, #fefefe, #dcdcdc);
+	background-image: -o-linear-gradient(top, #fefefe, #dcdcdc);
+	background-image: linear-gradient(top, #fefefe, #dcdcdc);
 	color:#333;
 	border:1px solid #bbb;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	text-decoration:none;
+	text-decoration: none;
 	text-shadow: #fff 0px 1px 0px;
 	min-width: 0;
-	-webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
-	-moz-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
-	box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
+	-webkit-user-select: none;
+	user-select: none;
 }
-input[type=submit]:hover,
-div.actions ul li a:hover,
-td.actions a:hover {
+.actions ul li a:hover,
+.actions a:hover {
+	background: #ededed;
+	border-color: #acacac;
+	text-decoration: none;
+}
+input[type=submit]:active,
+.actions ul li a:active,
+.actions a:active {
 	background: #fefefe;
 	background-image: -webkit-linear-gradient(top, #dfdfdf, #eee);
-	background-image: -moz-linear-gradient(left top, left bottom, #fafafa, #fefefe);
-	background-image: -ms-linear-gradient(left top, left bottom, #fafafa, #fefefe);
-	background-image: -o-linear-gradient(left top, left bottom, #fafafa, #fefefe);
-	background-image: linear-gradient(left top, left bottom, #fafafa, #fefefe);
+	background-image: -moz-linear-gradient(top, #dfdfdf, #eee);
+	background-image: -ms-linear-gradient(top, #dfdfdf, #eee);
+	background-image: -o-linear-gradient(top, #dfdfdf, #eee);
+	background-image: linear-gradient(top, #dfdfdf, #eee);
 	text-shadow: #eee 0px 1px 0px;
-	-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-	box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
+	-webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
+	box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
 	border-color: #aaa;
 	text-decoration: none;
 }
 
 /** Related **/
-div.related {
+.related {
 	clear: both;
 	display: block;
 }
diff --git a/lib/Cake/Console/Templates/default/views/index.ctp b/lib/Cake/Console/Templates/default/views/index.ctp
index fdaa5ae50..e78c383e9 100644
--- a/lib/Cake/Console/Templates/default/views/index.ctp
+++ b/lib/Cake/Console/Templates/default/views/index.ctp
@@ -65,9 +65,13 @@
 	</p>
 
 	<div class="paging">
-	<?php echo "\t<?php echo \$this->Paginator->prev('<< ' . __('previous'), array(), null, array('class'=>'disabled'));?>\n";?>
-	 | <?php echo "\t<?php echo \$this->Paginator->numbers();?>\n"?> |
-	<?php echo "\t<?php echo \$this->Paginator->next(__('next') . ' >>', array(), null, array('class' => 'disabled'));?>\n";?>
+	<?php
+		echo "<?php\n"; 
+		echo "\t\techo \$this->Paginator->prev('< ' . __('previous'), array(), null, array('class' => 'prev disabled'));\n";
+		echo "\t\techo \$this->Paginator->numbers(array('separator' => ''));\n";
+		echo "\t\techo \$this->Paginator->next(__('next') . ' >', array(), null, array('class' => 'next disabled'));\n";
+		echo "\t?>\n";
+	?>
 	</div>
 </div>
 <div class="actions">
diff --git a/lib/Cake/View/Scaffolds/index.ctp b/lib/Cake/View/Scaffolds/index.ctp
index c9c3a084e..d2559c6a4 100644
--- a/lib/Cake/View/Scaffolds/index.ctp
+++ b/lib/Cake/View/Scaffolds/index.ctp
@@ -67,9 +67,11 @@ endforeach;
 	));
 	?></p>
 	<div class="paging">
-	<?php echo $this->Paginator->prev('<< ' . __d('cake', 'previous'), array(), null, array('class' => 'disabled')); ?>
-	 | <?php echo $this->Paginator->numbers(); ?>
-	<?php echo $this->Paginator->next(__d('cake', 'next') .' >>', array(), null, array('class' => 'disabled')); ?>
+	<?php
+		echo $this->Paginator->prev('< ' . __d('cake', 'previous'), array(), null, array('class' => 'prev disabled'));
+		echo $this->Paginator->numbers(array('separator' => ''));
+		echo $this->Paginator->next(__d('cake', 'next') .' >', array(), null, array('class' => 'next disabled'));
+	?>
 	</div>
 </div>
 <div class="actions">