From 64ae37a0a14a5bbeefaec44a896a5b6e264de43f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 3 Jul 2014 12:15:43 +0200 Subject: [PATCH 1/7] fix header style to look the same as rest of ownCloud --- css/style.css | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/css/style.css b/css/style.css index 8a67773f..6a999022 100755 --- a/css/style.css +++ b/css/style.css @@ -126,7 +126,7 @@ } #body-user #document-title #header{ - height: 32px; + height: 45px; } #document-title{ @@ -140,23 +140,21 @@ } #document-title div.logo-wide{ - float:left; - height: 24px; - width: 110px; - margin: 3px; - background-size:110px 24px; + float: left; + margin: 5px; z-index: 110; } #document-title div{ position: relative; } -#document-title #header input { - height:14px; - margin: 0; - padding:3px 6px; +#document-title .filename { + margin-top: 8px !important; width: 300px; - font-size: 12px; +} +#document-title-container { + padding-top: 7px; + font-weight: normal; } #odf-close{ @@ -176,7 +174,7 @@ #documents-overlay, #documents-overlay-below{ position: fixed; - top: 32px; + top: 45px; left: 0; width: 100%; height: 100%; @@ -187,8 +185,8 @@ } #documents-overlay-below{ - right:72px; - top:65px; + right: 72px; + top: 83px; filter:alpha(opacity=100); opacity: 1; background:#fff; @@ -263,7 +261,7 @@ } #toolbar { - top:30px !important; + top: 45px !important; border-bottom: none !important; padding: 5px 0 0 !important; } From 0fffa7d826651e1c4fa2b1ad3a042a07e0306bdb Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 3 Jul 2014 12:17:02 +0200 Subject: [PATCH 2/7] add use icons for close and share buttons, fix position --- css/style.css | 9 +++++++-- js/documents.js | 6 ++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/css/style.css b/css/style.css index 6a999022..8c8dc237 100755 --- a/css/style.css +++ b/css/style.css @@ -158,13 +158,18 @@ } #odf-close{ - margin-top:0; + margin-top: 0; float: right; + height: 29px; + width: 29px; } #odf-invite{ - margin-top:0; + margin-top: 0; + margin-left: 3px; float: left; + background-position: 5px center; + padding-left: 24px; } #mainContainer{ diff --git a/js/documents.js b/js/documents.js index fba8023b..932d5195 100644 --- a/js/documents.js +++ b/js/documents.js @@ -152,12 +152,10 @@ $.widget('oc.documentToolbar', { '' + '' + - ' ' + - ' ' + + ' ' + ' ' + From 5318b7dc6193bcbe280e4f68cbaf1616622372fe Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 3 Jul 2014 12:29:50 +0200 Subject: [PATCH 3/7] fix wording of empty content message --- js/documents.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/documents.js b/js/documents.js index 932d5195..0204531e 100644 --- a/js/documents.js +++ b/js/documents.js @@ -118,7 +118,7 @@ $.widget('oc.documentGrid', { if (!hasDocuments){ $(this.options.context).before('
' - + 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!') + '
' ); } else { From 6d1afe1c14417718211fabbdb0a75e91a8095516 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 3 Jul 2014 12:45:48 +0200 Subject: [PATCH 4/7] fix position and style of document and memberlist, get rid of excessive shadows and styling --- css/3rdparty/webodf/editor.css | 18 ++++++------------ css/style.css | 11 ++++------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/css/3rdparty/webodf/editor.css b/css/3rdparty/webodf/editor.css index 6f23a0c8..3c48845c 100644 --- a/css/3rdparty/webodf/editor.css +++ b/css/3rdparty/webodf/editor.css @@ -8,7 +8,7 @@ body.claro, #mainContainer { } #mainContainer { - background-color: gray; + background-color: #ddd; } #editor *:focus { @@ -17,7 +17,6 @@ body.claro, #mainContainer { #editor { border: none; - box-shadow: 0px 0px 14px #555; overflow: hidden; padding: 0px !important; z-index: 4; @@ -30,7 +29,7 @@ body.claro, #mainContainer { right: 0; position: absolute; z-index: 5; - box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25); + background-color: rgba(255,255,255,.95); } #container { @@ -63,7 +62,6 @@ body.claro, #mainContainer { * every time a gesture ends */ #canvas > div { - box-shadow: 0px 0px 20px #aaa; border: 1px solid #ccc; } @@ -96,7 +94,7 @@ body.claro, #mainContainer { width: 70px; padding: 2px; text-align: center; - background-color: gray; + background-color: #ddd; border: none; } @@ -140,17 +138,13 @@ 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: white; - border-radius: 5px; - padding: 2px; - font-size: 8pt; + color: #555; + border-radius: 3px; + font-size: 10px; word-wrap: break-word; text-align: center justify; } diff --git a/css/style.css b/css/style.css index 8c8dc237..9489b731 100755 --- a/css/style.css +++ b/css/style.css @@ -244,15 +244,12 @@ } #members{ - padding-top: 69px !important; + padding-top: 86px !important; } -.memberListButton span{ +.memberListButton span { display: block; - box-shadow: 0px 0px 5px rgb(90, 90, 90) inset; - background-color: rgb(200, 200, 200); - border-radius: 5px; - border: 2px solid; + border-radius: 3px; display: block; margin: auto; } @@ -279,7 +276,7 @@ } #container { - top: 38px !important; + top: 83px !important; } cursor > div { From 1a588929603c165e3c14508f5c60fce1321cbdab Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 3 Jul 2014 13:56:55 +0200 Subject: [PATCH 5/7] fix save text overlaying close x for shared documents --- css/style.css | 2 ++ js/documents.js | 1 + 2 files changed, 3 insertions(+) diff --git a/css/style.css b/css/style.css index 9489b731..d737ee25 100755 --- a/css/style.css +++ b/css/style.css @@ -160,6 +160,8 @@ #odf-close{ margin-top: 0; float: right; +} +#odf-close.icon-close { height: 29px; width: 29px; } diff --git a/js/documents.js b/js/documents.js index 0204531e..8485574b 100644 --- a/js/documents.js +++ b/js/documents.js @@ -378,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; From 3a03ebc76fa6f8b3e5e9b05238462b17ad7fa2b2 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 11 Jul 2014 12:24:58 +0200 Subject: [PATCH 6/7] correctly position share dropdown --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index d737ee25..1a9be14e 100755 --- a/css/style.css +++ b/css/style.css @@ -122,7 +122,7 @@ #odf-toolbar #dropdown{ right: auto; - top: 66px; + top: 83px; } #body-user #document-title #header{ From cb126f0a157c63df002bca72639935dcba326236 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 11 Jul 2014 13:02:48 +0200 Subject: [PATCH 7/7] move changes from editor.css to style.css --- css/3rdparty/webodf/editor.css | 18 ++++++++++++------ css/style.css | 31 ++++++++++++++++++++++++++++--- 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; }