A pile of fixups

1 files changed, 20 insertions, 12 deletions

diff --git a/css/style.css b/css/style.css
index 2700ec30..6b892962 100644
--- a/css/style.css
+++ b/css/style.css
@@ -130,7 +130,7 @@
 }
 
 #header .padded{
-	margin-right:40px;
+	margin-right:12px;
 }
 
 #document-title {
@@ -170,6 +170,8 @@
 
 #mainContainer{
 	position: absolute;
+	width:100%;
+	height:100%;
 	z-index: 500;
 	background-color: #ddd !important;
 }
@@ -246,36 +248,42 @@
 }
 
 #members {
+	left: auto !important;
+	right:0px;
+	top: 4px !important;
 	padding-top: 47px !important;
 	background-color: #ddd !important;
+	z-index: 540;
 }
 
-.memberListButton {
+.webodfeditor-memberListButton {
 	background-color: transparent !important;
 	box-shadow: none !important;
 	border: none !important;
 }
 
-.memberListButton span {
+.webodfeditor-memberListButton span {
 	display: block;
-    border-radius: 3px;
-    display: block;
-    margin: auto;
+	border-radius: 3px;
+	display: block;
+	margin: auto;
 }
 
-.memberListButton img{
+.webodfeditor-memberListButton img{
     border: 0 none !important;
 }
 
-.memberListButton input{
+.webodfeditor-memberListButton input{
 	width:46px;
 }
 
-#memberList .memberListLabel {
+#memberList .webodfeditor-memberListLabel {
 	color: #555 !important;
 	border-radius: 3px !important;
 	padding: 0 !important;
+	margin-bottom: 10px;
 	font-size: 10px !important;
+	text-align:center;
 }
 
 #ocToolbar, #ocToolbarInside{
@@ -289,7 +297,7 @@
 	min-height: 29px !important;
 	border-bottom: none !important;
 	border-radius: 2px;
-	margin: 7px 30px 0 0 !important;
+	margin: 6px 30px 0 0 !important;
 	padding: 0 !important;
 	box-shadow: none !important;
 	background: #F5F5F5 !important;
@@ -313,11 +321,11 @@
 
 #toolbar > .dijitComboBox .dijitInputInner{
 vertical-align: middle;
-line-height: 1.45em;
+line-height: 1.7em;
 }
 
 #container {
-	top: 44px !important;
+	top: 39px !important;
 }
 
 #canvas > div {