From: Jan-Christoph Borchardt Date: Thu, 28 Jul 2011 00:30:09 +0000 (+0200) Subject: rewrote header in pure CSS, smaller, less obtrusive X-Git-Tag: v3.0~267^2~364^2~21^2~23 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c5bc345604caee2a908c61ac42dad7f025da27de;p=nextcloud-server.git rewrote header in pure CSS, smaller, less obtrusive --- diff --git a/core/css/styles.css b/core/css/styles.css index 0782986eada..0e4ac7ac3eb 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -1,7 +1,7 @@ * { margin:0; padding:0; border:0; cursor:default; } body { background:#fefefe url('../img/body_background.jpg') repeat-y left top; font:normal 80%/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; } -#header { position:fixed; top:0; z-index:100; width:100%; height:2.5em; padding:0.5em 1.5em; background:url('../img/header-a.png') repeat-x left top; } -#body-settings #header { background-image:url('../img/header-settings-a.png'); } +#header { position:fixed; top:0; z-index:100; width:100%; height:2.5em; padding:0.5em 1.5em; background:#1d2d44; -moz-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px #000, inset 0 -2px 10px #222; box-shadow:0 0 10px #000, inset 0 -2px 10px #222; } +#body-settings #header { background:#313131; } #owncloud { float:left; margin:0 0 0 2em; } h1 { margin:1em 3em 1em 0; border-bottom:1px solid #666; text-transform:uppercase; font-weight:normal; font-style:italic; color:#666; } p.center { text-align:center; } @@ -28,9 +28,20 @@ div.controls { width:100%; margin:0px; background-color:#f7f7f7; border-bottom:1 /* LOG IN & INSTALLATION ------------------------------------------------------------ */ #body-login { width:100%; background-image:none; background-color:#ddd; } -#body-login p.info { width:16em; margin:4em auto; padding:1em; background-color:#eee; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } - -#login { margin:0 auto 0 auto; padding:2em 0 0 0; background-image:url(../img/header-login.png); background-position:left 0; background-repeat:repeat-x; background-color:#EEE; border-bottom:1px solid #FFF; text-align:center; } +#body-login p.info { width:16em; margin:2em auto; padding:1em; background-color:#eee; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } +#body-login p.info a { font-weight:bold; } + +#login header { margin-top:-2em; height:10em; + -moz-box-shadow:0 0 5px #000; -webkit-box-shadow:0 0 20px #000; box-shadow:0 0 20px #000; +background: #1d2d44; /* Old browsers */ +background: -moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */ +background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d42)); /* Chrome,Safari4+ */ +background: -webkit-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Chrome10+,Safari5.1+ */ +background: -o-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Opera11.10+ */ +background: -ms-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* IE10+ */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ +background: linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */ } +#login { margin:0 auto 0 auto; padding:2em 0 0 0; border-bottom:1px solid #FFF; text-align:center; background:#eee; } #login_form { width:20em; margin:4em auto; padding:0; } #login_form fieldset { background-color:transparent; border:0; } #login_form fieldset p { margin:0.5em 0 0 0; padding:0; text-align:left; } @@ -62,7 +73,7 @@ div.controls { width:100%; margin:0px; background-color:#f7f7f7; border-bottom:1 /* META NAVIGATION (Settings, Log out) ---------------------------------------------------------------- */ #metanav { float:right; position:relative; top:0.5em; right:2.5em; list-style:none; margin:0; padding:0; } #metanav li { display:inline; } -#metanav li a { margin:.1em; padding:1em; } +#metanav li a { margin:.2em; padding:.7em; } #metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; outline:0; box-shadow:#555 0 1px 0; -moz-box-shadow:#555 0 1px 0; -webkit-box-shadow:#555 0 1px 0; } #metanav li a img { vertical-align:middle; } diff --git a/core/img/actions/back.png b/core/img/actions/back.png new file mode 100644 index 00000000000..86abbe0cabe Binary files /dev/null and b/core/img/actions/back.png differ diff --git a/core/img/actions/back.svg b/core/img/actions/back.svg new file mode 100644 index 00000000000..2bdf50c7334 --- /dev/null +++ b/core/img/actions/back.svg @@ -0,0 +1,121 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png new file mode 100644 index 00000000000..74dcd33bee7 Binary files /dev/null and b/core/img/actions/logout.png differ diff --git a/core/img/actions/logout.svg b/core/img/actions/logout.svg new file mode 100644 index 00000000000..d95ac959778 --- /dev/null +++ b/core/img/actions/logout.svg @@ -0,0 +1,95 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png new file mode 100644 index 00000000000..ff650ecb0b0 Binary files /dev/null and b/core/img/actions/settings.png differ diff --git a/core/img/actions/settings.svg b/core/img/actions/settings.svg new file mode 100644 index 00000000000..67473520af6 --- /dev/null +++ b/core/img/actions/settings.svg @@ -0,0 +1,221 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/drop-arrow.png b/core/img/drop-arrow.png deleted file mode 100644 index 315395d5d42..00000000000 Binary files a/core/img/drop-arrow.png and /dev/null differ diff --git a/core/img/header-a.png b/core/img/header-a.png deleted file mode 100644 index 46fb0977ee2..00000000000 Binary files a/core/img/header-a.png and /dev/null differ diff --git a/core/img/header-login.png b/core/img/header-login.png deleted file mode 100644 index b0160e02d1f..00000000000 Binary files a/core/img/header-login.png and /dev/null differ diff --git a/core/img/header-settings-a.png b/core/img/header-settings-a.png deleted file mode 100644 index a72271be6a4..00000000000 Binary files a/core/img/header-settings-a.png and /dev/null differ diff --git a/core/img/header-settings.png b/core/img/header-settings.png deleted file mode 100644 index 7e6b70b5903..00000000000 Binary files a/core/img/header-settings.png and /dev/null differ diff --git a/core/img/header.png b/core/img/header.png deleted file mode 100644 index d377f65186d..00000000000 Binary files a/core/img/header.png and /dev/null differ diff --git a/core/img/layout/back.png b/core/img/layout/back.png deleted file mode 100644 index 86abbe0cabe..00000000000 Binary files a/core/img/layout/back.png and /dev/null differ diff --git a/core/img/layout/logout.png b/core/img/layout/logout.png deleted file mode 100644 index 74dcd33bee7..00000000000 Binary files a/core/img/layout/logout.png and /dev/null differ diff --git a/core/img/layout/settings.png b/core/img/layout/settings.png deleted file mode 100644 index ff650ecb0b0..00000000000 Binary files a/core/img/layout/settings.png and /dev/null differ diff --git a/core/img/owncloud-logo-small-white.png b/core/img/owncloud-logo-small-white.png index 397ddf91341..8374c133506 100644 Binary files a/core/img/owncloud-logo-small-white.png and b/core/img/owncloud-logo-small-white.png differ diff --git a/core/templates/installation.php b/core/templates/installation.php index c3bbe692c1c..0a6dacad955 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -1,5 +1,5 @@
- ownCloud +
ownCloud

diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php index e83cf6861bf..78ccf877221 100644 --- a/core/templates/layout.admin.php +++ b/core/templates/layout.admin.php @@ -30,8 +30,8 @@

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index ffdb7937ae7..f8beb79e81e 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -31,8 +31,8 @@ ownCloud
    -
    • -
    • +
    • +
diff --git a/core/templates/login.php b/core/templates/login.php index 19830a24993..fb3177eb0ee 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,5 +1,5 @@
- ownCloud +
ownCloud