diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-02-17 20:32:19 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-02-17 20:32:19 +0000 |
| commit | 2eb6a6a9b02b51d9c8aa2f7bcff559681dd33b90 (patch) | |
| tree | 7067e5f771c81a74bb5954c9b5149ce655716d81 /lib | |
| parent | dfd08519d6cd7719290d2652394eeadbb4704f80 (diff) | |
| parent | 07c6537898a7c839469b50121b6c6d63be07613c (diff) | |
Merge branch 'mobile-style' of git://gitorious.org/laconica/meitar into review
Conflicts:
lib/action.php
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/action.php b/lib/action.php index 79e8c9547..8ff9e646b 100644 --- a/lib/action.php +++ b/lib/action.php @@ -158,8 +158,6 @@ class Action extends HTMLOutputter // lawsuit 'type' => 'text/css', 'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION, 'media' => 'screen, projection, tv')); - - $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => theme_path('css/modal.css', 'base') . '?version=' . LACONICA_VERSION, @@ -168,6 +166,13 @@ class Action extends HTMLOutputter // lawsuit 'type' => 'text/css', 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, 'media' => 'screen, projection, tv')); + if (common_config('site', 'mobile')) { + $this->element('link', array('rel' => 'stylesheet', + 'type' => 'text/css', + 'href' => theme_path('css/mobile.css', 'base') . '?version=' . LACONICA_VERSION, + // TODO: "handheld" CSS for other mobile devices + 'media' => 'only screen and (max-device-width: 480px)')); // Mobile WebKit + } Event::handle('EndShowLaconicaStyles', array($this)); } if (Event::handle('StartShowUAStyles', array($this))) { |