From 1cd6a615bb47a33794e4a4f690c87a348ab752d7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 26 Dec 2009 10:07:33 -0800
Subject: For some reason this wasn't a clean merge, probably because of line
 endings.

---
 system/views/kohana_profiler_table.css | 104 ++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 52 deletions(-)

(limited to 'system')

diff --git a/system/views/kohana_profiler_table.css b/system/views/kohana_profiler_table.css
index 6e7601c9..41a1c9a3 100644
--- a/system/views/kohana_profiler_table.css
+++ b/system/views/kohana_profiler_table.css
@@ -1,53 +1,53 @@
-#kohana-profiler .kp-table
-{
-	font-size: 1.0em;
-	color: #4D6171;
-	width: 100%;
-	border-collapse: collapse;
-	border-top: 1px solid #E5EFF8;
-	border-right: 1px solid #E5EFF8;
-	border-left: 1px solid #E5EFF8;
-	margin-bottom: 10px;
-}
-#kohana-profiler .kp-table td
-{
-	background-color: #FFFFFF;
-	border-bottom: 1px solid #E5EFF8;
-	padding: 3px;
-	vertical-align: top;
-}
-#kohana-profiler .kp-table .kp-title td
-{
-	font-weight: bold;
-	background-color: inherit;
-}
-#kohana-profiler .kp-table .kp-altrow td
-{
-	background-color: #F7FBFF;
-}
-#kohana-profiler .kp-table .kp-totalrow td
-{
-	background-color: #FAFAFA;
-	border-top: 1px solid #D2DCE5;
-	font-weight: bold;
-}
-#kohana-profiler .kp-table .kp-column
-{
-	width: 100px;
-	border-left: 1px solid #E5EFF8;
-	text-align: center;
-}
-#kohana-profiler .kp-table .kp-data, #kohana-profiler .kp-table .kp-name
-{
-	background-color: #FAFAFB;
-	vertical-align: top;
-}
-#kohana-profiler .kp-table .kp-name
-{
-	width: 200px;
-	border-right: 1px solid #E5EFF8;
-}
-#kohana-profiler .kp-table .kp-altrow .kp-data, #kohana-profiler .kp-table .kp-altrow .kp-name
-{
-	background-color: #F6F8FB;
+#kohana-profiler .kp-table
+{
+	font-size: 1.0em;
+	color: #4D6171;
+	width: 100%;
+	border-collapse: collapse;
+	border-top: 1px solid #E5EFF8;
+	border-right: 1px solid #E5EFF8;
+	border-left: 1px solid #E5EFF8;
+	margin-bottom: 10px;
+}
+#kohana-profiler .kp-table td
+{
+	background-color: #FFFFFF;
+	border-bottom: 1px solid #E5EFF8;
+	padding: 3px;
+	vertical-align: top;
+}
+#kohana-profiler .kp-table .kp-title td
+{
+	font-weight: bold;
+	background-color: inherit;
+}
+#kohana-profiler .kp-table .kp-altrow td
+{
+	background-color: #F7FBFF;
+}
+#kohana-profiler .kp-table .kp-totalrow td
+{
+	background-color: #FAFAFA;
+	border-top: 1px solid #D2DCE5;
+	font-weight: bold;
+}
+#kohana-profiler .kp-table .kp-column
+{
+	width: 100px;
+	border-left: 1px solid #E5EFF8;
+	text-align: center;
+}
+#kohana-profiler .kp-table .kp-data, #kohana-profiler .kp-table .kp-name
+{
+	background-color: #FAFAFB;
+	vertical-align: top;
+}
+#kohana-profiler .kp-table .kp-name
+{
+	width: 200px;
+	border-right: 1px solid #E5EFF8;
+}
+#kohana-profiler .kp-table .kp-altrow .kp-data, #kohana-profiler .kp-table .kp-altrow .kp-name
+{
+	background-color: #F6F8FB;
 }
\ No newline at end of file
-- 
cgit v1.2.3