Revert "fix the version upgrade to work both on Chrome and FF"

This reverts commit c675120.
greenido · Sep 27, 2012 · e471142 · e471142
1 parent 3bb84e9
commit e471142
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 362 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/html5-logo_250.png b/html5-logo_250.png
diff --git a/main.html b/main.html
@@ -3,11 +3,8 @@
   <head>
     <meta charset=utf-8 />
     <title>ToDo List - WebSQL To IndexedDB Live Example</title>
-    <meta name="description" content="WebSQL To IndexedDB Live Example - last updated: May 2012">
-    <meta name="author" content="Ido Green">
   </head>
   <style>
-<<<<<<< HEAD
 /* TODO - C'mon... move it to a css file
 Containers
 ----------------------------------------------------------------------------------------------------*/
@@ -16,163 +13,144 @@
 	margin-left: 4%;
 	margin-right: 4%;
 }
-=======
 
-    /*
-      Variable Grid System (Fluid Version).
-      Learn more ~ http://www.spry-soft.com/grids/
-      Based on 960 Grid System - http://960.gs/ & 960 Fluid - http://www.designinfluences.com/
-    
-      Licensed under GPL and MIT.
-    */
-
-
-    /* Containers
-    ----------------------------------------------------------------------------------------------------*/
-    .container_3 {
-      width: 92%;
-      margin-left: 4%;
-      margin-right: 4%;
-    }
->>>>>>> fix the version upgrade to work both on Chrome and FF
-
-    /* Grid >> Global
-    ----------------------------------------------------------------------------------------------------*/
-
-    .grid_1,
-    .grid_2,
-    .grid_3 {
-      display:inline;
-      float: left;
-      position: relative;
-      margin-left: 1%;
-      margin-right: 1%;
-    }
+/* Grid >> Global
+----------------------------------------------------------------------------------------------------*/
 
-    /* Grid >> Children (Alpha ~ First, Omega ~ Last)
-    ----------------------------------------------------------------------------------------------------*/
+.grid_1,
+.grid_2,
+.grid_3 {
+	display:inline;
+	float: left;
+	position: relative;
+	margin-left: 1%;
+	margin-right: 1%;
+}
 
-    .alpha {
-      margin-left: 0;
-    }
+/* Grid >> Children (Alpha ~ First, Omega ~ Last)
+----------------------------------------------------------------------------------------------------*/
 
-    .omega {
-      margin-right: 0;
-    }
+.alpha {
+	margin-left: 0;
+}
 
-    /* Grid >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
+.omega {
+	margin-right: 0;
+}
 
+/* Grid >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .grid_1 {
-      width:31.333%;
-    }
 
-    .container_3 .grid_2 {
-      width:64.667%;
-    }
+.container_3 .grid_1 {
+	width:31.333%;
+}
 
-    .container_3 .grid_3 {
-      width:98.0%;
-    }
+.container_3 .grid_2 {
+	width:64.667%;
+}
 
+.container_3 .grid_3 {
+	width:98.0%;
+}
 
 
-    /* Prefix Extra Space >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
 
+/* Prefix Extra Space >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .prefix_1 {
-      padding-left:33.333%;
-    }
 
-    .container_3 .prefix_2 {
-      padding-left:66.667%;
-    }
+.container_3 .prefix_1 {
+	padding-left:33.333%;
+}
 
+.container_3 .prefix_2 {
+	padding-left:66.667%;
+}
 
 
-    /* Suffix Extra Space >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
 
+/* Suffix Extra Space >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .suffix_1 {
-      padding-right:33.333%;
-    }
 
-    .container_3 .suffix_2 {
-      padding-right:66.667%;
-    }
+.container_3 .suffix_1 {
+	padding-right:33.333%;
+}
 
+.container_3 .suffix_2 {
+	padding-right:66.667%;
+}
 
 
-    /* Push Space >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
 
+/* Push Space >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .push_1 {
-      left:33.333%;
-    }
 
-    .container_3 .push_2 {
-      left:66.667%;
-    }
+.container_3 .push_1 {
+	left:33.333%;
+}
 
+.container_3 .push_2 {
+	left:66.667%;
+}
 
 
-    /* Pull Space >> 3 Columns
-    ----------------------------------------------------------------------------------------------------*/
 
+/* Pull Space >> 3 Columns
+----------------------------------------------------------------------------------------------------*/
 
-    .container_3 .pull_1 {
-      left:-33.333%;
-    }
 
-    .container_3 .pull_2 {
-      left:-66.667%;
-    }
+.container_3 .pull_1 {
+	left:-33.333%;
+}
 
+.container_3 .pull_2 {
+	left:-66.667%;
+}
 
 
 
-    /* Clear Floated Elements
-    ----------------------------------------------------------------------------------------------------*/
 
-    /* http://sonspring.com/journal/clearing-floats */
+/* Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
 
-    .clear {
-      clear: both;
-      display: block;
-      overflow: hidden;
-      visibility: hidden;
-      width: 0;
-      height: 0;
-    }
+/* http://sonspring.com/journal/clearing-floats */
 
-    /* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
+.clear {
+	clear: both;
+	display: block;
+	overflow: hidden;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
 
-    .clearfix:after {
-      clear: both;
-      content: ' ';
-      display: block;
-      font-size: 0;
-      line-height: 0;
-      visibility: hidden;
-      width: 0;
-      height: 0;
-    }
+/* http://perishablepress.com/press/2008/02/05/lessons-learned-concerning-the-clearfix-css-hack */
+
+.clearfix:after {
+	clear: both;
+	content: ' ';
+	display: block;
+	font-size: 0;
+	line-height: 0;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
 
-    .clearfix {
-      display: inline-block;
-    }
+.clearfix {
+	display: inline-block;
+}
 
-    * html .clearfix {
-      height: 1%;
-    }
+* html .clearfix {
+	height: 1%;
+}
 
-    .clearfix {
-      display: block;
-    }
+.clearfix {
+	display: block;
+}
   </style>
   <body>
 

diff --git a/notes.html b/notes.html