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

Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb

app/assets/stylesheets/list.css

@@ -35,6 +35,9 @@
 	width: 350px;
 	left: -8px;
 }
+.main-list tr:first-child td {
+	border-top: 1px solid #DDDDDD;
+}
 .main-list td {
 	background-color: #FFFFFF;
 	border-bottom: 1px solid #DDDDDD;
@@ -75,6 +78,9 @@
 	-moz-border-radius: 3px;
 	z-index: 5;
 }
+.qe-edit-div .table-condensed {
+	background-color: #F2F2F2;
+}
 .table-label {
     background-color: #F2F2F2;
     position: relative;
@@ -94,6 +100,18 @@
 	height:auto;
 	padding: 0;
 }
+.qe-block legend {
+	padding-left: 8px;
+	margin-bottom: 0;
+	padding-bottom: 0;
+}
+.qe-block .control-group {
+	margin-bottom: 0;
+}
+.qe-block .controls, .qe-block .control-label {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
 .qe-block .table td, .qe-block .table th {
 	padding: 8px;
 }

app/assets/stylesheets/style.css.erb

@@ -1,5 +1,5 @@
-/*style*/
-
+/*style*/
+
 @font-face{ 
 	font-family: 'WebSymbolsRegular';
 	src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
@@ -109,7 +109,7 @@
 	text-indent: -9999px;
 	padding:6px;
 }
-#orbit-bar .nav > li.search {
+#orbit-bar .nav > li.search {
 	background-image: none;
 	overflow: hidden;
 	width: 28px;
@@ -323,9 +323,9 @@
 #main-wrap .breadcrumb li {
 	font-size: 12px;
 	color: #999;
-}
-.form-actions .btn {
-	margin-bottom: 0;
+}
+.form-actions .btn {
+	margin-bottom: 0;
 }
 #sub-wiget {
 	clear: right;
@@ -569,8 +569,8 @@
     padding: 5px;
 }
 .popover-content {
-	-webkit-border-radius: 0 0 3px 3px;
-	-moz-border-radius: 0 0 3px 3px;
+	-webkit-border-radius: 0 0 3px 3px;
+	-moz-border-radius: 0 0 3px 3px;
 	border-radius: 0 0 3px 3px;
     padding: 5px;
 }
@@ -612,20 +612,32 @@
 }
 .text-green {
 	color: #39b54a !important;
+}
+.adbanner-setup {
+	margin-right: 10px;
+	margin-bottom: 30px !important;
+}
+.adbanner-list {
+	border-top: 1px solid #AAA;
+	margin-right: 10px;
+	padding-top: 10px;
+	position: relative;
+}
+.adbanner-list ul {
+	margin: 0px;
+}
+.adbanner-list ul li {
+	list-style: none;
+	margin-left: 0;
+	margin-right: 20px;
+}
+.adbanner-action {
+	position: absolute;
+	top: -32px;
+	right: 0;
 }
-.adbanner-list {
-	margin-top: 20px;
-}
-.adbanner-list ul {
-	margin: 0px;
-}
-.adbanner-list ul li {
-	list-style: none;
-	margin-left: 0;
-	margin-right: 20px;
-}
-.adbanner-action {
-	margin-bottom: 20px;
+#bulletin_link_qe form {
+	margin: 0;
 }
 [class^="icons-"] {
 	display: inline-block;

app/assets/stylesheets/widgets.css

@@ -1,5 +1,5 @@
-/*Widget*/
-
+/*Widget*/
+
 
 .widget-size-300 {
 	width:298px;
@@ -100,6 +100,18 @@
 }
 .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;
 }
 .upload-picture {
 	margin-bottom: 5px;
@@ -120,12 +132,6 @@
     margin : 0px 0 5px;
     padding: 5px 10px;
 }
-.file-upload .input-medium {
-    border-radius: 3px 3px 3px 3px !important;
-    width: 267px;
-    position: relative;
-	z-index: 5;
-}
 #widget-link table {
 	margin-bottom:0
 }