diff options
| author | friendica <info@friendica.com> | 2014-12-29 23:57:33 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-29 23:57:33 -0800 |
| commit | 9b2c71a5dcdeb7ef7a1b1e09ad906bc750b1d0d6 (patch) | |
| tree | 3e011882f060906cb3a7f797c873d8025046fcff /view/theme | |
| parent | 20356217c57b70a4673ae37f5d6655f38f0eb891 (diff) | |
| parent | 619733e297708f49646bb220658c90223a8648c6 (diff) | |
| download | volse-hubzilla-9b2c71a5dcdeb7ef7a1b1e09ad906bc750b1d0d6.tar.gz volse-hubzilla-9b2c71a5dcdeb7ef7a1b1e09ad906bc750b1d0d6.tar.bz2 volse-hubzilla-9b2c71a5dcdeb7ef7a1b1e09ad906bc750b1d0d6.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 12 | ||||
| -rw-r--r-- | view/theme/redbasic/tpl/theme_settings.tpl | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 357718623..b778c43b5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -689,18 +689,6 @@ footer { overflow: hidden; } -#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { - color: #8888FF; - text-decoration: none; - cursor: pointer; -} - -#photos-upload-perms-menu:hover { - color: #0000FF; - text-decoration: underline; - cursor: pointer; -} - #photo-view-wrapper { background-color: $item_colour; } diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index 70b42b6cd..adf2e632d 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -34,7 +34,7 @@ {{include file="field_input.tpl" field=$nav_min_opacity}} {{include file="field_input.tpl" field=$top_photo}} {{include file="field_input.tpl" field=$reply_photo}} -{{include file="field_checkbox.tpl" field=$sloppy_photos}} +{{*include file="field_checkbox.tpl" field=$sloppy_photos*}} <script> $(function(){ $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker(); |