Merge branch 'design_team' into ldap

app/assets/stylesheets/sidebar.css.erb

@@ -1,12 +1,23 @@
 /*sidebar*/
 
-#back_sidebar {
-	left: 0;
-	position: fixed;
-	top: 0;
-	width: 160px;
+.nav-list {
+	padding: 0px 0px 100px 5px;
 }
-
+.nav-list li {
+	position: relative;
+}
+.nav-list ul {
+	margin-left: 10px;
+}
+.nav-list ul li {
+	padding: 5px 0;
+}
+.nav-list ul li a {
+	font-size: 13px;
+	padding: 3px 0px;
+	display: block;
+}
+/*
 #back_sidebar h1 {
     background: url(<%= asset_path "h1_bg.png" %>) repeat-x scroll left top transparent;
     border-bottom: 1px solid #1B1B1B;
@@ -106,36 +117,35 @@
 }
 #main-sidebar ul ul li a{
     padding: 10px 0 10px 20px;
+}*/
+.with_action:hover .hide {
+	display: block;
 }
-#main-sidebar li:hover .quick-edit{
-	display:block;
-}
-#main-sidebar .quick-edit{
+#main-sidebar .quick-edit {
     background: none repeat scroll 0 0 #FFFFFF;
     border: 1px solid #DDDDDD;
     border-radius: 5px 5px 5px 5px;
-    display: none;
-    margin:-3px 0 0 3px;
-    padding: 3px;
+    margin: 0 0 0 3px;
+    padding: 0;
     z-index:1;
+	position: absolute;
+	left: -3px;
+	width: 70px;
 }
-#main-sidebar .quick-edit:after{
-    content: "."; 
-    display: block;
-    height: 0; 
-    clear: both; 
-    visibility: hidden;
-}
-#main-sidebar .quick-edit a{
+#main-sidebar .quick-edit a {
+	display: block;
+	line-height: 22px;
     border-bottom: medium none;
-    border-radius: 5px 5px 5px 5px;
     font-size:12px;
-    float: left;
-    margin: 0 3px 0 0;
-    padding: 3px;
+    margin: 0;
+    padding: 3px 5px;
 }
-
-#main-sidebar .quick-edit a:hover{
-    background: none repeat scroll 0 0 #EEEEEE;
-    border-bottom:none;
+#main-sidebar .quick-edit a:first-child {
+    border-radius: 5px 5px 0px 0px;
+}
+#main-sidebar .quick-edit a:last-child {
+    border-radius: 0px 0px 5px 5px;
+}
+#main-sidebar .quick-edit a:hover {
+	background-color: #DDDDDD;
 }

app/assets/stylesheets/style.css.erb

@@ -632,12 +632,10 @@
 	margin-right: 20px;
 }
 .adbanner-action {
-	position: absolute;
-	top: -32px;
-	right: 0;
-}
-#bulletin_link_qe form {
-	margin: 0;
+	margin-bottom: 20px;
+}
+#bulletin_link_qe form {
+	margin: 0;
 }
 [class^="icons-"] {
 	display: inline-block;

app/assets/stylesheets/widgets.css

@@ -53,11 +53,11 @@
 	display:inline-block;
 	margin-right: 5px;
 	opacity: 0.8;
-	filter: alpha(opacity:80);
+	filter: alpha(opacity=80);
 }
 .action:hover {
 	opacity: 1;
-	filter: alpha(opacity:100);
+	filter: alpha(opacity=100);
 	cursor: pointer;
 }
 .select-role {
@@ -95,23 +95,23 @@
 	opacity:.0;
     font-size: 60px;
     left: -595px/9;
-	filter: alpha(opacity: 0);
+	filter: alpha(opacity= 0);
 	outline: none;
 }
 .file-upload .upload:focus {
 	position:absolute;
-}
-.file-upload .input-medium {
-    border-radius: 3px 3px 3px 3px !important;
-    width: 267px;
-    position: relative;
-	z-index: 5;
-	display: block;
-	clear: both;
-}
-.file-upload .control-label {
-	margin-top: 0;
-	margin-bottom: 5px;
+}
+.file-upload .input-medium {
+    border-radius: 3px 3px 3px 3px !important;
+    width: 267px;
+    position: relative;
+	z-index: 5;
+	display: block;
+	clear: both;
+}
+.file-upload .control-label {
+	margin-top: 0;
+	margin-bottom: 5px;
 }
 .upload-picture {
 	margin-bottom: 5px;