Merge pull request #298 from owncloud/design-fixes

Design fixes

css/style.css

@@ -7,6 +7,10 @@
 }
 /* end IE 8 fixes */
 
+#editor {
+	box-shadow: none !important;
+}
+
 #editor ::-webkit-scrollbar-thumb {
 	background-color: #fff;
 }
@@ -122,11 +126,11 @@
 
 #odf-toolbar #dropdown{
 	right: auto;
-	top: 66px;
+	top: 83px;
 }
 
 #body-user #document-title #header{
-	height: 32px;
+	height: 45px;
 }
 
 #document-title{
@@ -141,42 +145,48 @@
 
 #document-title div.logo-wide{
 	float: left;
-	height: 24px;
+	margin: 5px;
-	width: 110px;
-	margin: 3px;
-	background-size:110px 24px;
 	z-index: 110;
 }
 
 #document-title div{
 	position: relative;
 }
-#document-title #header input {
+#document-title .filename {
-	height:14px;
+	margin-top: 8px !important;
-	margin: 0;
-	padding:3px 6px;
 	width: 300px;
-	font-size: 12px;
+}
+#document-title-container {
+	padding-top: 7px;
+	font-weight: normal;
 }
 
 #odf-close{
 	margin-top: 0;
 	float: right;
 }
+#odf-close.icon-close {
+	height: 29px;
+	width: 29px;
+}
 
 #odf-invite{
 	margin-top: 0;
+	margin-left: 3px;
 	float: left;
+	background-position: 5px center;
+	padding-left: 24px;
 }
 
 #mainContainer{
 	position: absolute;
 	z-index: 500;
+	background-color: #ddd !important;
 }
 
 #documents-overlay,  #documents-overlay-below{
     position: fixed;
-    top: 32px;
+    top: 45px;
     left: 0;
     width: 100%;
     height: 100%;
@@ -188,7 +198,7 @@
 
 #documents-overlay-below{
 	right: 72px;
-	top:65px;
+	top: 83px;
     filter:alpha(opacity=100);
     opacity: 1;
 	background:#fff;
@@ -241,15 +251,19 @@
 }
 
 #members {
-	padding-top: 69px !important;
+	padding-top: 86px !important;
+	background-color: #ddd !important;
+}
+
+.memberListButton {
+	background-color: transparent !important;
+	box-shadow: none !important;
+	border: none !important;
 }
 
 .memberListButton span {
 	display: block;
-    box-shadow: 0px 0px 5px rgb(90, 90, 90) inset;
+    border-radius: 3px;
-    background-color: rgb(200, 200, 200);
-    border-radius: 5px;
-    border: 2px solid;
     display: block;
     margin: auto;
 }
@@ -262,10 +276,19 @@
 	width:46px;
 }
 
+#memberList .memberListLabel {
+	color: #555 !important;
+	border-radius: 3px !important;
+	padding: 0 !important;
+	font-size: 10px !important;
+}
+
 #toolbar {
-	top:30px !important;
+	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{
@@ -276,7 +299,11 @@
 }
 
 #container {
-	top: 38px !important;
+	top: 83px !important;
+}
+
+#canvas > div {
+	box-shadow: none !important;
 }
 
 cursor > div {

js/documents.js

@@ -118,7 +118,7 @@ $.widget('oc.documentGrid', {
 		
 		if (!hasDocuments){
 			$(this.options.context).before('<div id="emptycontent">'
-				+ t('documents', 'No documents are found. Please upload or create a document!')
+				+ t('documents', 'No documents were found. Upload or create a document to get started!')
 				+ '</div>'
 			);
 		} else {
@@ -152,12 +152,10 @@ $.widget('oc.documentToolbar', {
 					'</div>' +
 					
 					'<span id="toolbar" class="claro">' +
-					'  <button id="odf-invite" class="drop hidden">' +
+					'  <button id="odf-invite" class="drop hidden icon-share svg">' +
 					t('documents', 'Share') +
 					'  </button>' +
-					'  <button id="odf-close">' +
+					'  <button id="odf-close" class="icon-close svg"></button>' +
-					t('documents', 'Close') +
-					'  </button>' +
 					'  <img id="saving-document" alt=""' +
 					'    src="' + OC.imagePath('core', 'loading.gif') + '"' +
 					'  />' +
@@ -380,6 +378,7 @@ var documentsMain = {
 				);
 				if (documentsMain.isGuest){
 					$('#odf-close').text(t('documents', 'Save') );
+					$('#odf-close').removeClass('icon-close');
 				}
 				var serverFactory = new ServerFactory();
 				documentsMain.esId = response.es_id;