diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php index c00f9d5555..2be648642a 100644 --- a/apps/remoteStorage/auth.php +++ b/apps/remoteStorage/auth.php @@ -77,7 +77,7 @@ if(count($pathParts) == 2 && $pathParts[0] == '') {
diff --git a/apps/user_openid/templates/nomode.php b/apps/user_openid/templates/nomode.php index f85d28cdc9..3bab4c2edd 100644 --- a/apps/user_openid/templates/nomode.php +++ b/apps/user_openid/templates/nomode.php @@ -5,7 +5,7 @@ global $profile; ?>
- " alt="ownCloud" /> + " alt="ownCloud" />
  • diff --git a/core/css/styles.css b/core/css/styles.css index 6380a3d74c..9c48ba3a2b 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -17,7 +17,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Lucida Grande", Arial, Verdan /* HEADERS */ #body-user #header, #body-settings #header { position:fixed; top:0; z-index:100; width:100%; height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; } -#body-login #header { margin: -2em auto 0; text-align:center; height:10em; +#body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em; -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5); background: #1d2d44; /* Old browsers */ background: -moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */ diff --git a/core/img/favicon-touch.png b/core/img/favicon-touch.png index 20af826523..cfaaa4399a 100644 Binary files a/core/img/favicon-touch.png and b/core/img/favicon-touch.png differ diff --git a/core/img/favicon-touch.svg b/core/img/favicon-touch.svg new file mode 100644 index 0000000000..6d766d3ced --- /dev/null +++ b/core/img/favicon-touch.svg @@ -0,0 +1,787 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/img/favicon.png b/core/img/favicon.png index a7ee766dfa..c1b1cb6546 100644 Binary files a/core/img/favicon.png and b/core/img/favicon.png differ diff --git a/core/img/favicon.svg b/core/img/favicon.svg new file mode 100644 index 0000000000..f055c32efb --- /dev/null +++ b/core/img/favicon.svg @@ -0,0 +1,796 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/img/icon-error.png b/core/img/icon-error.png new file mode 100644 index 0000000000..ed438a32fd Binary files /dev/null and b/core/img/icon-error.png differ diff --git a/core/img/icon-error.svg b/core/img/icon-error.svg new file mode 100644 index 0000000000..6392d819ad --- /dev/null +++ b/core/img/icon-error.svg @@ -0,0 +1,813 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/img/icon-sync.png b/core/img/icon-sync.png new file mode 100644 index 0000000000..99a43d4c69 Binary files /dev/null and b/core/img/icon-sync.png differ diff --git a/core/img/icon-sync.svg b/core/img/icon-sync.svg new file mode 100644 index 0000000000..f9ebec4a5b --- /dev/null +++ b/core/img/icon-sync.svg @@ -0,0 +1,815 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/img/icon.png b/core/img/icon.png new file mode 100644 index 0000000000..24a4b1c3e8 Binary files /dev/null and b/core/img/icon.png differ diff --git a/core/img/icon.svg b/core/img/icon.svg new file mode 100644 index 0000000000..95eac44548 --- /dev/null +++ b/core/img/icon.svg @@ -0,0 +1,821 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/img/logo-inverted.png b/core/img/logo-inverted.png new file mode 100644 index 0000000000..d9fd119dc1 Binary files /dev/null and b/core/img/logo-inverted.png differ diff --git a/core/img/logo-inverted.svg b/core/img/logo-inverted.svg index 427531bc7a..9ac167cc41 100644 --- a/core/img/logo-inverted.svg +++ b/core/img/logo-inverted.svg @@ -14,94 +14,97 @@ id="Layer_1" x="0px" y="0px" - width="595.275px" - height="311.111px" - viewBox="0 0 595.275 311.111" + width="250.00002" + height="118.22803" + viewBox="0 0 250.00001 118.22802" enable-background="new 0 0 595.275 311.111" xml:space="preserve" - inkscape:version="0.48.1 r9760" - sodipodi:docname="logo inverted.svg">image/svg+xml + x1="346.77341" + y1="55.888199" + x2="346.77341" + y2="339.22119" /> @@ -132,10 +135,10 @@ + inkscape:current-layer="Layer_1" + units="mm" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + showguides="true" + inkscape:guide-bbox="true" /> - - - - - - - - - - - + inkscape:export-filename="/home/user/owncloud/core/img/logo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + inkscape:connector-curvature="0" /> + + + + + + + + + + \ No newline at end of file diff --git a/core/img/logo-sticker.svg b/core/img/logo-sticker.svg new file mode 100644 index 0000000000..e48f7a78c7 --- /dev/null +++ b/core/img/logo-sticker.svg @@ -0,0 +1,764 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png index b2c16a0f60..ea10828db5 100644 Binary files a/core/img/logo-wide.png and b/core/img/logo-wide.png differ diff --git a/core/img/logo-wide.svg b/core/img/logo-wide.svg index 73b37cc7aa..37fc000747 100644 --- a/core/img/logo-wide.svg +++ b/core/img/logo-wide.svg @@ -14,16 +14,16 @@ id="Layer_1" x="0px" y="0px" - width="140" + width="147.33263" height="32" - viewBox="0 0 139.99999 32" + viewBox="0 0 147.33262 32" enable-background="new 0 0 595.275 311.111" xml:space="preserve" - inkscape:version="0.48.1 r9760" + inkscape:version="0.48.2 r9819" sodipodi:docname="logo-wide.svg">image/svg+xml + inkscape:guide-bbox="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> \ No newline at end of file + id="g4811" + transform="matrix(0.49975595,0,0,0.49975595,82.761244,31.693374)"> \ No newline at end of file diff --git a/core/img/logo.png b/core/img/logo.png new file mode 100644 index 0000000000..8177c4cdba Binary files /dev/null and b/core/img/logo.png differ diff --git a/core/img/logo.svg b/core/img/logo.svg index c1df6cb715..bd928cccfa 100644 --- a/core/img/logo.svg +++ b/core/img/logo.svg @@ -14,94 +14,97 @@ id="Layer_1" x="0px" y="0px" - width="595.275px" - height="311.111px" - viewBox="0 0 595.275 311.111" + width="250.00002" + height="118.22803" + viewBox="0 0 250.00001 118.22802" enable-background="new 0 0 595.275 311.111" xml:space="preserve" - inkscape:version="0.48.1 r9760" - sodipodi:docname="owncloud-logo.svg">image/svg+xml + x1="346.77341" + y1="55.888199" + x2="346.77341" + y2="339.22119" /> @@ -132,10 +135,10 @@ + inkscape:current-layer="Layer_1" + units="mm" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + showguides="true" + inkscape:guide-bbox="true" /> - - - - - - - - - - - - + inkscape:connector-curvature="0" /> + + + + + + + + + + \ No newline at end of file diff --git a/core/img/owncloud-logo-medium-white.png b/core/img/owncloud-logo-medium-white.png deleted file mode 100644 index d4d06fdd62..0000000000 Binary files a/core/img/owncloud-logo-medium-white.png and /dev/null differ diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index e1f8928fc9..2bd2e20df7 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -28,7 +28,7 @@