From 5144def99bf084f1e415a8734909363725d2925d Mon Sep 17 00:00:00 2001 From: Jake Wilson Date: Thu, 10 Oct 2013 12:29:13 -0600 Subject: [PATCH 01/37] Moved Core Theme Logos to CSS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to make it easier for a user/developer to replace logos in the core theme, I removed the hardcoded `logo.svg` and `logo-wide.svg` from the html, and replaced them with `div`s that use css background-image instead. This has multiple advantages: 1. The user can now use any filename they want for the logo. They are no longer forced to use logo.svg or logo-wide.svg. 2. The user can now easily use a JPG, PNG or GIF logo instead of SVG (SVG's are awesome, but used by an unfortunately small percentage of web developers at the current time. Most probably don't even know how to make an SVG…). 3. The user doesn't have to resort to hacking the core theme template files in order to use a different filename or file type. 4. Greatly simplifies documentation instructions for how to change the logos (http://owncloud.org/theming/). Signed-off-by: Jake Wilson --- core/css/styles.css | 13 +++++++++++++ core/templates/layout.guest.php | 2 +- core/templates/layout.user.php | 5 +++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 728fd47bc9..1ec2abbc8e 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -46,6 +46,19 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari opacity: 1; } +#header .logo { + background-image: url(../img/logo.svg); + width: 250px; + height: 118px; + margin: 0 auto; +} + +#header .logo-wide { + background-image: url(../img/logo-wide.svg); + width: 147px; + height: 32px; +} + /* INPUTS */ input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea, select, diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index cecd97ace2..6f0f2cbd68 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -36,7 +36,7 @@
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 39cc43fc46..6c0b8766f8 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -43,8 +43,9 @@