Skip to content

Commit

Permalink
Item12192: better readability on mobile devices
Browse files Browse the repository at this point in the history
using <link /> elems now instead of <style>@import()</style> for better performance



git-svn-id: http://svn.foswiki.org/trunk@17427 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Mar 20, 2014
1 parent ce29c95 commit 9305838
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
10 changes: 3 additions & 7 deletions core/templates/css.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@
%TMPL:P{"styles:iespecific"}%
%TMPL:P{"templatestyle"}%%TMPL:END%
%{}%
%TMPL:DEF{"styles:base"}%<style type="text/css" media="all">
@import url('%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/base.css');
</style>%TMPL:END%
%TMPL:DEF{"styles:base"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/base.css' media='all' />%TMPL:END%
%{}%
%TMPL:DEF{"styles:default"}%<style type="text/css" media="all">
@import url('%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/default.css');
</style>%TMPL:END%
%TMPL:DEF{"styles:default"}%<link rel='stylesheet' href='%PUBURLPATH%/%SYSTEMWEB%/SkinTemplates/default.css' media='all' />%TMPL:END%
%{}%
%TMPL:DEF{"styles:iespecific"}%<!--[if IE]><style type="text/css" media="screen">
pre {
overflow-x:auto;
padding-bottom:expression(this.scrollWidth > this.offsetWidth ? 16 : 0);
}
</style>
<![endif]-->%TMPL:END%
<![endif]-->%TMPL:END%
7 changes: 6 additions & 1 deletion core/templates/foswiki.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ JQUERYPLUGIN is not a hard requirement, but it must sort earlier.
---------------------------------------------------
}%%TMPL:DEF{"head"}%<head>
%TMPL:P{"windowtitle"}%
<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" /> <meta name="robots" content="noindex" /> %HTTP_EQUIV_ON_VIEW%
<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" /> <meta name="robots" content="noindex" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.5, user-scalable=yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-status-bar-style" content="black-translucent">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> %HTTP_EQUIV_ON_VIEW%
<link rel="icon" href="%FAVICON%" type="image/x-icon" /> <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
<link rel="alternate" href="%SCRIPTURL{edit}%/%BASEWEB%/%BASETOPIC%?t=%GMTIME{"$epoch"}%" type="application/x-wiki" title="edit %BASETOPIC%" />
<meta name="description" content="%TOPIC%" />
Expand Down

0 comments on commit 9305838

Please sign in to comment.