Merge branch 'master' of git.raylu.net:pathery

Conflicts:
	globe.php
	pages/login.php

1 files changed, 7 insertions, 4 deletions

diff --git a/css/page.css b/css/page.css
index ec0f1c9..97f3882 100644
--- a/css/page.css
+++ b/css/page.css
@@ -149,9 +149,10 @@ a img {border: none;} /* IE specific: remove outline around image links */
 #oid_box {

 	width:500px;

 	height:300px;

-	background-color:#ccc;

+	background-color:#999;

 	padding: 5px 15px 5px 15px;

 	box-shadow: 0 0 4px #888;

+	border-radius: 10px;

 }

 #oid_btn  {

 	background-color: #bbb;

@@ -180,16 +181,18 @@ position:absolute;color:#333;left:25px;bottom:20px;
 	-moz-animation: signinAnimate 1s; /* Firefox */

 	position:fixed;

 	color:#000;

-	background-color:#999;

+	background-color: rgb(216, 216, 216);

+	background-color: rgba(216, 216, 216, 0.95);

 	box-shadow: 0 0 5px #888;

 	z-index:200;

 	padding: 0px 15px 15px 15px;

 	text-align: left;

 	left:50%;	

-	top:120px;

+	top:100px;

 	width:530px;

 	margin-left:-275px;

 	display:inline;

+	border-radius:15px;

 }

 #oid_hidden {

 	position:fixed;

@@ -296,7 +299,7 @@ position:absolute;color:#333;left:25px;bottom:20px;
 	font-weight:bold;

 	padding: 15px 0px 15px 0px;

 	padding: 0px;

-	height:50px

+	height:50px;

 	text-align:center;

 	position: relative;

 	min-width: 960px;