From: Michiel de Jong Date: Mon, 14 May 2012 15:05:35 +0000 (+0200) Subject: move auth.css and remoteStorage-big.png to assets folders From where they can be... X-Git-Tag: v4.0.0RC2~63 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4c6d11e223580d9652dedf6a1d7de42be896fe1a;p=nextcloud-server.git move auth.css and remoteStorage-big.png to assets folders From where they can be included --- diff --git a/.htaccess b/.htaccess index 085cc665ded..79904f8a9da 100644 --- a/.htaccess +++ b/.htaccess @@ -13,7 +13,7 @@ RewriteEngine on RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}] RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L] RewriteRule ^.well-known/carddav /remote.php/carddav/ [R] -RewriteRule ^.well-known/caldav /remote.php/caldav/ [R] +RewriteRule ^.well-known/caldav /remote.php/caldav/ [R] RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L] RewriteRule ^remote/(.*) remote.php [QSA,L] diff --git a/apps/remoteStorage/auth.css b/apps/remoteStorage/auth.css deleted file mode 100644 index 2dedad5dd0f..00000000000 --- a/apps/remoteStorage/auth.css +++ /dev/null @@ -1,8 +0,0 @@ -h2 { font-size:2em; font-weight:bold; margin-bottom:1em; white-space:nowrap; } -ul.scopes { list-style:disc; } -ul.scopes li { white-space:nowrap; } -h2 img { width: 50% } -#oauth { margin:4em auto 2em; width:20em; } -#allow-auth { background-color:#5c3; text-shadow:#5e3 0 1px 0; color:#fff; --webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; } -#deny-auth { padding:0; margin:.7em; border:0; background:none; font-size:1.2em; -moz-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; -webkit-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; } diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php index fcbeda44910..a54be37b2e6 100755 --- a/apps/remoteStorage/auth.php +++ b/apps/remoteStorage/auth.php @@ -67,7 +67,7 @@ if($userId && $appUrl && $categories) { - +