Merge branch 'design_team' into ldap

Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

app/assets/stylesheets/sidebar.css.erb

@@ -18,6 +18,18 @@
 	padding: 3px 0px;
 	display: block;
 }
+.nav-list>li>ol {
+	margin-left: 0;
+}
+.nav-list>li>.with_action {
+	padding-left: 0;
+}
+.nav-list>li>.with_action>.quick-edit {
+	margin: 0 0 0 3px !important;
+}
+.nav-list>li>.with_action>i {
+	display: none;
+}
 /*
 #back_sidebar h1 {
     background: url(<%= asset_path "h1_bg.png" %>) repeat-x scroll left top transparent;
@@ -126,7 +138,7 @@
     background: none repeat scroll 0 0 #FFFFFF;
     border: 1px solid #DDDDDD;
     border-radius: 5px 5px 5px 5px;
-    margin: 0 0 0 3px;
+    margin: 0 0 0 20px;
     padding: 0;
     z-index:1;
 	position: absolute;
@@ -155,7 +167,7 @@ ol.nav>li>.icons-moves {
 }
 .sortable i {
 	position: absolute;
-	left: -20px;
+	left: 0px;
 	top: 6px;
 	margin-right: 0;
 	opacity: 0.3;
@@ -166,6 +178,9 @@ ol.nav>li>.icons-moves {
 	opacity: 0.7;
 	filter: alpha(opacity=70);
 }
+.with_action {
+	padding-left: 20px;
+}
 .placeholder {
 	background-color: rgba(0,136,204,.6);
 	border-radius: 3px;