diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-04 02:14:26 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-04 02:14:26 -0400 |
| commit | 2871e28df702f32fc780a84642f101931907d458 (patch) | |
| tree | 3d1e6ce8c5f044467d95844328ac15a4c6e79d0a /view/theme/three-d | |
| parent | 06942b36549668eb067650831f286d96aab14a40 (diff) | |
| parent | 8e928d101b628c5f562cee840882892f05a1b838 (diff) | |
| download | volse-hubzilla-2871e28df702f32fc780a84642f101931907d458.tar.gz volse-hubzilla-2871e28df702f32fc780a84642f101931907d458.tar.bz2 volse-hubzilla-2871e28df702f32fc780a84642f101931907d458.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
display settings hooks
re-opened bug #363
this is better
include contact_widgets for categories_widget when doing updates
remove loozah themes which fell too far behind to recover
smal fix
german translation for right_aside
make right_aside translatable and provide german translation... and some css-fixes
suppress duplicates in search
make contact ssl_policy change a function since it is used in a few places
more ssl policy fixes and prevent delivery to soapbox when using local delivery
don't change ssl settings on local photos for remote contact
* master:
Diffstat (limited to 'view/theme/three-d')
| -rw-r--r-- | view/theme/three-d/screenshot.jpg | bin | 74288 -> 0 bytes | |||
| -rwxr-xr-x | view/theme/three-d/style.css | 35 | ||||
| -rwxr-xr-x | view/theme/three-d/theme.php | 4 |
3 files changed, 0 insertions, 39 deletions
diff --git a/view/theme/three-d/screenshot.jpg b/view/theme/three-d/screenshot.jpg Binary files differdeleted file mode 100644 index c3f8e85dc..000000000 --- a/view/theme/three-d/screenshot.jpg +++ /dev/null diff --git a/view/theme/three-d/style.css b/view/theme/three-d/style.css deleted file mode 100755 index ca3f6786d..000000000 --- a/view/theme/three-d/style.css +++ /dev/null @@ -1,35 +0,0 @@ -@import url('../loozah/style.css'); - -.error-message { - -moz-box-shadow: 5px 5px 5px #888888; - -webkit-box-shadow: 5px 5px 5px #888888; - box-shadow: 5px 5px 5px #888888; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888'); - -} - -.nav-link { - -moz-box-shadow: 5px 5px 5px #888888; - -webkit-box-shadow: 5px 5px 5px #888888; - box-shadow: 5px 5px 5px #888888; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888'); -} - -.nav-commlink { - -moz-box-shadow: 5px 5px 5px #888888; - -webkit-box-shadow: 5px 5px 5px #888888; - box-shadow: 5px 5px 5px #888888; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888'); - -} - -.tab { - -moz-box-shadow: 5px 5px 5px #888888; - -webkit-box-shadow: 5px 5px 5px #888888; - box-shadow: 5px 5px 5px #888888; - -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888')"; - filter: progid:DXImageTransform.Microsoft.Shadow(Strength=5, Direction=135, Color='#888888'); -} diff --git a/view/theme/three-d/theme.php b/view/theme/three-d/theme.php deleted file mode 100755 index 47b43cf13..000000000 --- a/view/theme/three-d/theme.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$a->theme_info = array( - 'extends' => 'loozah', -); |
