move changes from editor.css to style.css

2 files changed, 40 insertions, 9 deletions

diff --git a/css/3rdparty/webodf/editor.css b/css/3rdparty/webodf/editor.css
index 3c48845c..6f23a0c8 100644
--- a/css/3rdparty/webodf/editor.css
+++ b/css/3rdparty/webodf/editor.css
@@ -8,7 +8,7 @@ body.claro, #mainContainer {
 }
 
 #mainContainer {
-    background-color: #ddd;
+    background-color: gray;
 }
 
 #editor *:focus {
@@ -17,6 +17,7 @@ body.claro, #mainContainer {
 
 #editor {
     border: none;
+    box-shadow: 0px 0px 14px #555;
     overflow: hidden;
     padding: 0px !important;
     z-index: 4;
@@ -29,7 +30,7 @@ body.claro, #mainContainer {
     right: 0;
     position: absolute;
     z-index: 5;
-    background-color: rgba(255,255,255,.95);
+    box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25);
 }
 
 #container {
@@ -62,6 +63,7 @@ body.claro, #mainContainer {
  * every time a gesture ends
  */
 #canvas > div {
+    box-shadow: 0px 0px 20px #aaa;
     border: 1px solid #ccc;
 }
 
@@ -94,7 +96,7 @@ body.claro, #mainContainer {
     width: 70px;  
     padding: 2px;
     text-align: center;
-    background-color: #ddd;
+    background-color: gray;
     border: none;
 }
 
@@ -138,13 +140,17 @@ body.claro, #mainContainer {
     width: 68px;
     border-radius: 5px;
     text-align: center;
+    background-color: black;
+    box-shadow: 0px 0px 5px rgb(90, 90, 90);
+    border: 1px solid black;
     cursor: pointer;
 }
 
 #memberList .memberListLabel {
-    color: #555;
-    border-radius: 3px;
-    font-size: 10px;
+    color: white;
+    border-radius: 5px;
+    padding: 2px;
+    font-size: 8pt;
     word-wrap: break-word;
     text-align: center justify;
 }
diff --git a/css/style.css b/css/style.css
index 1a9be14e..1792e896 100755
--- a/css/style.css
+++ b/css/style.css
@@ -7,6 +7,10 @@
 }
 /* end IE 8 fixes */
 
+#editor {
+	box-shadow: none !important;
+}
+
 #editor ::-webkit-scrollbar-thumb {
 	background-color: #fff;
 }
@@ -175,8 +179,9 @@
 }
 
 #mainContainer{
-	position:absolute;
-	z-index:500;
+	position: absolute;
+	z-index: 500;
+	background-color: #ddd !important;
 }
 
 #documents-overlay,  #documents-overlay-below{
@@ -245,8 +250,15 @@
 	width: 70px;padding:5px;
 }
 
-#members{
+#members {
 	padding-top: 86px !important;
+	background-color: #ddd !important;
+}
+
+.memberListButton {
+	background-color: transparent !important;
+	box-shadow: none !important;
+	border: none !important;
 }
 
 .memberListButton span {
@@ -264,10 +276,19 @@
 	width:46px;
 }
 
+#memberList .memberListLabel {
+	color: #555 !important;
+	border-radius: 3px !important;
+	padding: 0 !important;
+	font-size: 10px !important;
+}
+
 #toolbar {
 	top: 45px !important;
 	border-bottom: none !important;
 	padding: 5px 0 0 !important;
+	box-shadow: none !important;
+	background-color: rgba(255,255,255,.95);
 }
 
 #toolbar > .dijit{
@@ -281,6 +302,10 @@
 	top: 83px !important;
 }
 
+#canvas > div {
+	box-shadow: none !important;
+}
+
 cursor > div {
 	padding-bottom: 0 !important;
 }