Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

app/assets/javascripts/orbit-1.0.js

@@ -14,6 +14,7 @@ $(document).ready(function(){
 		placement: "left"
 	});
 	
+	
 	$(document).on('click', '.privacy', function() {
 
 		switch ($(this).val()) {

app/assets/javascripts/orbit-bar-search.js

@@ -1,3 +1,9 @@
+
+$(document).ready(function(){
+	$('.search').tooltip({
+			placement: "bottom"
+	});
+});
 $(document).on('click', '.orbit-bar-search', function (){
 	if ($(this).parents('.search').hasClass('visible')){
 		$(this).parents('.search').stop().animate({

app/assets/javascripts/orbit_bar.js

@@ -4,4 +4,4 @@ $(document).ready(function() {
 		$('body').prepend($(this).html());
 		$(this).remove();
 	});
-});
+});

app/assets/stylesheets/inc/permission-checkbox.css.erb

@@ -10,22 +10,25 @@
 }
 .checkbox{
 	padding: 5px;
-	margin: 5px 5px 10px;
+	margin: 0;
 	display: inline-block;
 	color:#777777;
 	text-shadow: 0 1px 0px rgba(255,255,255,.4);
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
 	height: 30px;
 	position: relative;
 	cursor: pointer;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) );
+	border-style: solid;
+	border-width: 0px 1px 1px 0;
+	border-color: #dfdfdf;
+	/*background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) );
 	background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% );
 	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf');
 	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;*/
 }
 .checkbox .check-icon {
 	display: none;
@@ -40,7 +43,7 @@
 	cursor: pointer;
 	font-family: helvetica;
 	font-size: 12px;
-	line-height: 30px;
+	line-height: 15px;
 	padding: 0 10px 0 40px;
 	color: #333333;
 	display: inline-block;

app/assets/stylesheets/style.css.erb

@@ -10,7 +10,7 @@
 }
 .login-logo {
 	text-indent: -9999px;
-	background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 40px;
+	background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 80px;
 	padding-top: 40px;
 	height: 160px;
 }
@@ -61,8 +61,8 @@
 	margin-right: -20px;
 }
 #orbit-bar .search-query {
-	padding: 4px 9px;
-	height: 12px;
+	padding: 7px 9px 5px;
+	height: 10px;
     margin-top: 3px;
     border: 1px solid #333333;
     font-size: 11px;
@@ -119,7 +119,8 @@
 	background-position: -10px -10px;
 }
 #orbit-bar .nav > li > a.orbit-bar-desktop {
-	background-position: -106px -9px;
+	background-position: -73px -42px;
+	width: 48px;
 }
 #orbit-bar .nav > li > a.orbit-bar-member {
 	background-position: -4px -37px;

app/helpers/application_helper.rb

@@ -135,8 +135,8 @@ module ApplicationHelper
       javascripts << "<script type='text/javascript' src='/assets/jquery.tinyscrollbar.min.js'></script>\n"
       javascripts << "<script type='text/javascript' src='/assets/jquery.isotope.min.js'></script>\n"
       javascripts << "<script type='text/javascript' src='/assets/orbit-bar-member.js'></script>\n"
-      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
       javascripts << "<script type='text/javascript' src='/assets/orbit_bar.js'></script>\n"
+      javascripts << "<script type='text/javascript' src='/assets/orbit-bar-search.js'></script>\n"
     end
     javascripts << "<script type='text/javascript' src='/static/jquery.cycle.all.latest.js'></script>\n"
     javascripts << "<script type='text/javascript' src='/static/kernel.js'></script>\n"

app/views/layouts/_orbit_bar.html.erb

@@ -27,7 +27,7 @@
           </ul>
         </li>
 
-                <li class="search clear">
+                <li class="search clear" title="<%= t :search_nccu %>">
                     <a class="orbit-bar-search" href="#">search</a>
 					<form class="navbar-search" action="">
 		        		<input class="search-query span3" type="text" placeholder="<%= t(:search_nccu) %>">