diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-26 02:51:40 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-26 02:51:40 -0400 |
commit | 629a66793c245d39ca47523a6fbc790fae0cbe3b (patch) | |
tree | e1714c8fca95087ff97a844688c40ade60c3b8ef /view/theme/duepuntozero | |
parent | 2147ffa48734e50c9df1ea91ce100bf5336eacc2 (diff) | |
parent | 37f02424f801b3132b75b39d4132f35025667a75 (diff) | |
download | volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.gz volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.tar.bz2 volse-hubzilla-629a66793c245d39ca47523a6fbc790fae0cbe3b.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
small fix
don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
position the theme-preview on settings page
more wordsmithing of the Friendica invitation email
screenshot gallery
theme preview for end users
* master:
Diffstat (limited to 'view/theme/duepuntozero')
-rw-r--r-- | view/theme/duepuntozero/screenshot.jpg | bin | 0 -> 72559 bytes | |||
-rwxr-xr-x | view/theme/duepuntozero/style.css | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/view/theme/duepuntozero/screenshot.jpg b/view/theme/duepuntozero/screenshot.jpg Binary files differnew file mode 100644 index 000000000..5f00ec39e --- /dev/null +++ b/view/theme/duepuntozero/screenshot.jpg diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b79b00ef4..b1c2fb77e 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -249,6 +249,10 @@ div.wall-item-content-wrapper.shiny { background: #FFFFC8; } +#theme-preview { + margin: 15px 0 15px 150px; +} + /* from default */ #jot-perms-icon, #profile-location, |