developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' into ldap

Browse Source 
Conflicts:
	config/environments/development.rb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-09 13:51:00 +08:00
2 parents 083963af65 f9f7ddc8ee
commit d88d4e58dc
48 files changed
+916 -246
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/stylesheets/inc/permission-checkbox.css.erb
+6 -3
View File
@@ -10,7 +10,7 @@
}
.checkbox{
padding: 5px;
margin: 0;
margin: 10px;
display: inline-block;
color:#777777;
text-shadow: 0 1px 0px rgba(255,255,255,.4);
@@ -20,7 +20,7 @@
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:-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);
@@ -28,7 +28,7 @@
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;*/
-webkit-border-radius: 3px;
}
.checkbox .check-icon {
display: none;
@@ -79,4 +79,7 @@ img.member-img {
}
.popover-content p {
font-size: 12px;
}
.preview_trigger {
margin: 5px 10px 0 0;
}