Permalink
Browse files

Fixing merge conflicts from 17b39e1 in master branch.

  • Loading branch information...
1 parent 17b39e1 commit 760381cc8c4671272a68aec5389d09c5d6c6424a @justinhough committed Jul 24, 2013
Showing with 3 additions and 492 deletions.
  1. +0 −31 example/about.html
  2. +0 −47 example/documentation.html
  3. +0 −32 example/fluid.html
  4. +0 −33 example/grid.html
  5. +0 −13 index.html
  6. +2 −314 js/centurion.js
  7. +1 −8 js/modernizr-2.6.2-custom-min.js
  8. +0 −14 semantic.html
View
@@ -2,21 +2,6 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<<<<<<< HEAD
- <title>Centurion Framework</title>
- <meta name="description" content="Centurion Framework">
- <meta name="author" content="">
-
- <meta name="viewport" content="width=device-width, initial-scale=1" />
-
- <link rel="shortcut icon" href="images/favicon.jpg" />
- <link rel="apple-touch-icon" href="images/apple-touch-icon.png" />
- <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png" />
- <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png" />
-
- <link rel="stylesheet" href="../css/reset.css" />
- <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
-=======
<title>About | Centurion Framework</title>
<meta name="description" content="Centurion Framework">
@@ -30,38 +15,22 @@
<link rel="apple-touch-icon" sizes="114x114" href="../images/apple-touch-icon-114x114.png" />
<link rel="stylesheet" href="../css/reset.css" />
->>>>>>> v3.3
<!-- Centurion Framework -->
<link rel="stylesheet" href="../css/centurion.css" />
<link rel="stylesheet" href="../css/elusive-webfont.css" />
<!-- End of Framework -->
<link rel="stylesheet" href="../css/custom.css" />
-<<<<<<< HEAD
-
-=======
->>>>>>> v3.3
<!--[if gte IE 9]>
<style type="text/css">
.gradient {
filter: none;
}
</style>
<![endif]-->
-<<<<<<< HEAD
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
- <script type="text/javascript" src="../js/centurion.js"></script>
-
- <!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="../css/centurion-ie.css" />
- <script src="../js/modernizr-2.6.2-custom-min.js"></script>
- <![endif]-->
-
-=======
<!--[if lt IE 9]>
<script src="../js/modernizr-2.6.2-custom-min.js"></script>
<![endif]-->
->>>>>>> v3.3
</head>
<body>
<!-- Navigation -->
@@ -2,21 +2,6 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<<<<<<< HEAD
- <title>Centurion Framework</title>
- <meta name="description" content="Centurion Framework">
- <meta name="author" content="">
-
- <meta name="viewport" content="width=device-width, initial-scale=1" />
-
- <link rel="shortcut icon" href="images/favicon.jpg" />
- <link rel="apple-touch-icon" href="images/apple-touch-icon.png" />
- <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png" />
- <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png" />
-
- <link rel="stylesheet" href="../css/reset.css" />
- <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
-=======
<title>Documentation | Centurion Framework</title>
<meta name="description" content="Centurion Framework">
@@ -30,49 +15,18 @@
<link rel="apple-touch-icon" sizes="114x114" href="../images/apple-touch-icon-114x114.png" />
<link rel="stylesheet" href="../css/reset.css" />
->>>>>>> v3.3
<!-- Centurion Framework -->
<link rel="stylesheet" href="../css/centurion.css" />
<link rel="stylesheet" href="../css/elusive-webfont.css" />
<!-- End of Framework -->
<link rel="stylesheet" href="../css/custom.css" />
-<<<<<<< HEAD
-
-=======
->>>>>>> v3.3
<!--[if gte IE 9]>
<style type="text/css">
.gradient {
filter: none;
}
</style>
<![endif]-->
-<<<<<<< HEAD
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
- <script type="text/javascript" src="../js/centurion.js"></script>
-
- <!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="../css/centurion-ie.css" />
- <script src="../js/modernizr-2.6.2-custom-min.js"></script>
- <![endif]-->
-
- <style type="text/css">
- code {
- background: #ededed;
- border: 1px solid #cccccc;
- display: inline-block;
- padding: 0 4px;
- font-size: 12px;
- }
- .highlight {
- background: lightblue;
- padding: 5px 10px;
- border: 1px solid #999;
- word-wrap: break-word;
- }
- </style>
-
-=======
<!--[if lt IE 9]>
<script src="../js/modernizr-2.6.2-custom-min.js"></script>
<![endif]-->
@@ -83,7 +37,6 @@
padding: 0 10px;
}
</style>
->>>>>>> v3.3
</head>
<body>
View
@@ -2,21 +2,6 @@
<html lang="en">
<head>
<meta charset="utf-8">
-<<<<<<< HEAD
- <title>Centurion Framework</title>
- <meta name="description" content="Centurion Framework">
- <meta name="author" content="">
-
- <meta name="viewport" content="width=device-width, initial-scale=1" />
-
- <link rel="shortcut icon" href="images/favicon.jpg" />
- <link rel="apple-touch-icon" href="images/apple-touch-icon.png" />
- <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png" />
- <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png" />
-
- <link rel="stylesheet" href="../css/reset.css" />
- <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
-=======
<title>Fluid | Centurion Framework</title>
<meta name="description" content="Centurion Framework">
@@ -30,39 +15,22 @@
<link rel="apple-touch-icon" sizes="114x114" href="../images/apple-touch-icon-114x114.png" />
<link rel="stylesheet" href="../css/reset.css" />
->>>>>>> v3.3
<!-- Centurion Framework -->
<link rel="stylesheet" href="../css/centurion.css" />
<link rel="stylesheet" href="../css/elusive-webfont.css" />
<!-- End of Framework -->
<link rel="stylesheet" href="../css/custom.css" />
-<<<<<<< HEAD
-
-=======
<link rel="stylesheet" href="../css/fluid.css" />
->>>>>>> v3.3
<!--[if gte IE 9]>
<style type="text/css">
.gradient {
filter: none;
}
</style>
<![endif]-->
-<<<<<<< HEAD
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
- <script type="text/javascript" src="../js/centurion.js"></script>
-
- <!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="../css/centurion-ie.css" />
- <script src="../js/modernizr-2.6.2-custom-min.js"></script>
- <![endif]-->
-
- <link rel="stylesheet" href="../css/fluid.css" />
-=======
<!--[if lt IE 9]>
<script src="../js/modernizr-2.6.2-custom-min.js"></script>
<![endif]-->
->>>>>>> v3.3
</head>
<body>
View
@@ -27,39 +27,9 @@
}
</style>
<![endif]-->
-<<<<<<< HEAD
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
- <script type="text/javascript" src="../js/centurion.js"></script>
-
- <!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="../css/centurion-ie.css" />
- <script src="../js/modernizr-2.6.2-custom-min.js"></script>
- <![endif]-->
-
- <script type="text/javascript">
- $(document).ready(function(){
-
- $('.calculate [class*="grid-"]').append('<p><span class="pixels"><!--px width--></span><br /><span class="percentage"><!--percentage--></span><br /></p>')
-
- $('.calculate [class*="grid-"]').each(function(){
-
- var el = $(this);
- var width = el.outerWidth() + 'px';
- //var per = el.outerWidth();
- //var percentage = (per * 10)/100 + '%';
- var gridClass = $(this).attr('class').split('grid-').join('').split(' ')[0];
-
- el.find('span.pixels').html(width);
- el.find('span.percentage').html(gridClass + '%');
- });
-
- });
- </script>
-=======
<!--[if lt IE 9]>
<script src="../js/modernizr-2.6.2-custom-min.js"></script>
<![endif]-->
->>>>>>> v3.3
</head>
<body>
@@ -328,8 +298,6 @@
</footer>
<!-- End of Footer -->
-<<<<<<< HEAD
-=======
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="../js/centurion.js"></script>
<!--[if lte IE 7]><script src="scripts/lte-ie7.js"></script><![endif]-->
@@ -369,6 +337,5 @@
</script>
->>>>>>> v3.3
</body>
</html>
View
@@ -27,17 +27,8 @@
}
</style>
<![endif]-->
-<<<<<<< HEAD
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
- <script type="text/javascript" src="js/centurion.js"></script>
-
- <!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="../css/centurion-ie.css" />
- <script src="../js/modernizr-2.6.2-custom-min.js"></script>
-=======
<!--[if lt IE 9]>
<script src="js/modernizr-2.6.2-custom-min.js"></script>
->>>>>>> v3.3
<![endif]-->
</head>
@@ -165,15 +156,11 @@
</div>
</footer>
<!-- End of Footer -->
-<<<<<<< HEAD
-
-=======
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="js/centurion.js"></script>
<!--[if lte IE 7]><script src="scripts/lte-ie7.js"></script><![endif]-->
->>>>>>> v3.3
</body>
</html>
Oops, something went wrong.

0 comments on commit 760381c

Please sign in to comment.