Permalink
Browse files

Merge

  • Loading branch information...
2 parents 1f886c7 + cbd76a2 commit 7d368ec941750fdb15dc7ce49cc8398bc27dd291 @Dare-NZ committed Apr 24, 2012
Showing with 116 additions and 1 deletion.
  1. +1 −0 .gitignore
  2. +7 −0 functions/settings.php
  3. BIN images/bg2.jpg
  4. +82 −0 index.php
  5. +25 −0 page-home.php
  6. +1 −1 style.css
View
@@ -1,4 +1,5 @@
.htaccess
+*.orig
wp-*.php
xmlrpc.php
wp-admin/
View
@@ -1,9 +1,16 @@
<?php
+<<<<<<< HEAD
/*
if (!current_user_can('manage_options')) {
wp_die('You do not have sufficient permissions to access this page.');
}
*/
+=======
+
+if (!current_user_can('manage_options')) {
+ wp_die('You do not have sufficient permissions to access this page.');
+}
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
function setup_theme_admin_menus() {
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -2,6 +2,7 @@
<div class="wrapper">
<div class="content">
<div class="content-inner test">
+<<<<<<< HEAD
<div class="inner"><h2><span>Content inner</span></h2></div>
</div>
<div class="sidebar test">
@@ -13,97 +14,178 @@
</div>
<div class="content-inner test">
<div class="inner"><h2><span>Content inner</span></h2></div>
+=======
+ <div class="inner"><h2>Content inner</h2></div>
+ </div>
+ <div class="sidebar test">
+ <div class="inner"><h2>Sidebar</h2></div>
+ </div>
+ <hr class="clr" />
+ <div class="sidebar test">
+ <div class="inner"><h2>Sidebar</h2></div>
+ </div>
+ <div class="content-inner test">
+ <div class="inner"><h2>Content inner</h2></div>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
<hr class="clr" />
<div class="half test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Half</span></h2>
+=======
+ <h2>Half</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="half test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Half</span></h2>
+=======
+ <h2>Half</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<hr class="clr"/>
<div class="third test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Third</span></h2>
+=======
+ <h2>Third</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="third test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Third</span></h2>
+=======
+ <h2>Third</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="third test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Third</span></h2>
+=======
+ <h2>Third</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<hr class="clr" />
<div class="third test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Third</span></h2>
+=======
+ <h2>Third</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="twothird test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Two third</span></h2>
+=======
+ <h2>Two third</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<hr class="clr" />
<div class="twothird test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Two third</span></h2>
+=======
+ <h2>Two third</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="third test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Third</span></h2>
+=======
+ <h2>Third</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<hr class="clr" />
<div class="quarter test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Quarter</span></h2>
+=======
+ <h2>Quarter</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="quarter test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Quarter</span></h2>
+=======
+ <h2>Quarter</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="quarter test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Quarter</span></h2>
+=======
+ <h2>Quarter</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="quarter test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Quarter</span></h2>
+=======
+ <h2>Quarter</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<hr class="clr" />
<div class="threequarter test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Three quarter</span></h2>
+=======
+ <h2>Three quarter</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="quarter test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Quarter</span></h2>
+=======
+ <h2>Quarter</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<hr class="clr" />
<div class="quarter test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Quarter</span></h2>
+=======
+ <h2>Quarter</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<div class="threequarter test">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Three quarter</span></h2>
+=======
+ <h2>Three quarter</h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
</div>
</div>
<hr class="clr" />
View
@@ -27,7 +27,11 @@
</div>
<img src="<?php bloginfo('template_url') ?>/images/home/process.png" alt="">
<div class="inner">
+<<<<<<< HEAD
<h2><span>Services / Skillset</span></h2>
+=======
+ <h2><span>My Skillset</span></h2>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
<script type="text/javascript">
Raphael.fn.pieChart = function (cx, cy, r, values, labels, stroke, colours) {
var paper = this,
@@ -61,12 +65,20 @@ function sector(cx, cy, r, startAngle, endAngle, params) {
txt.stop().animate({opacity: 1}, ms, "elastic");
$('#details').animate({'margin-top' : -(133 * 4) + (-133 * j) + 'px'});
$('#details li h2').css({'color' : '#ccc'});
+<<<<<<< HEAD
$('#details li:eq(' + (5 + j) + ') h2').css({'color' : '#000'});
console.log(j);
}).mouseout(function () {
p.stop().animate({transform: ""}, ms, "elastic");
txt.stop().animate({opacity: 0.5}, ms);
});/*.click(function() {
+=======
+ $('#details li:eq(' + 7 + j + ') h2').css({'color' : '#000'});
+ }).mouseout(function () {
+ p.stop().animate({transform: ""}, ms, "elastic");
+ txt.stop().animate({opacity: 0.5}, ms);
+ }).click(function() {
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
if(toggle == true){
p.stop().animate({fill: '#000'}, ms, "elastic");
txt.stop().animate({fill: "#fff"}, ms);
@@ -76,7 +88,11 @@ function sector(cx, cy, r, startAngle, endAngle, params) {
$('#details').animate({'margin-top' : '0'});
}
toggle = !toggle;
+<<<<<<< HEAD
});*/
+=======
+ });
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
angle += angleplus;
chart.push(p);
@@ -106,10 +122,15 @@ function sector(cx, cy, r, startAngle, endAngle, params) {
});
$("table").hide();
+<<<<<<< HEAD
var size = 380;
Raphael("holder", size, size).pieChart((size / 2), (size / 2), (size * .45), values, labels, "#fff", colours);
+=======
+
+ Raphael("holder", 400, 400).pieChart(200, 200, 190, values, labels, "#fff", colours);
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
for (var i = 3; i >= 0; i--) {
@@ -120,6 +141,10 @@ function sector(cx, cy, r, startAngle, endAngle, params) {
});
</script>
+<<<<<<< HEAD
+=======
+ <div class="switch">Skills / services</div>
+>>>>>>> cbd76a282b3688fb5525e48bf8ae9b296ae2d84e
<table>
<tbody>
<tr>
View
@@ -140,4 +140,4 @@ blockquote { border-left:4px solid #666; background:#eee; padding:20px; margin:2
.home .slider { padding-top:0;height:366px; background:#35475c url('images/feature-home.jpg') bottom center no-repeat ; margin-top:-170px; position:relative; z-index:0; border-bottom:1px solid #bbb }
.home .slider .overlay {position:absolute;top:0;left:0;width:100%;height:100%;background:url('images/feature-overlay-home.png') top left repeat}
.home .slider .text {position:relative;width:960px;margin:0 auto;height:100%;background:url('images/feature-text-home.png') 50% 140px no-repeat}
-.home .slider .zigzag {position:absolute;bottom:-4px;left:0;width:100%;height:9px;background:url('images/feature-zigzag-home.png') bottom left repeat-x}
+.home .slider .zigzag {position:absolute;bottom:-4px;left:0;width:100%;height:9px;background:url('images/feature-zigzag-home.png') bottom left repeat-x}

0 comments on commit 7d368ec

Please sign in to comment.