diff options
| author | friendica <info@friendica.com> | 2013-01-06 15:13:31 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-01-06 15:13:31 -0800 |
| commit | a8afbec5fed4803823092714528cca27c8db6598 (patch) | |
| tree | 657d0ef4a1888add77f55c01ed5541eb076832a6 /view | |
| parent | 8766616e354a7074e695fc4189729fdd85c8e907 (diff) | |
| parent | 61b8ea9e1af74e2056e18b02c170a899de9abd1b (diff) | |
| download | volse-hubzilla-a8afbec5fed4803823092714528cca27c8db6598.tar.gz volse-hubzilla-a8afbec5fed4803823092714528cca27c8db6598.tar.bz2 volse-hubzilla-a8afbec5fed4803823092714528cca27c8db6598.zip | |
Merge https://github.com/friendica/red into zpull
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a3dbf6c3d..97d5f440e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3526,6 +3526,7 @@ div.jGrowl div.info { } + .jslider .jslider-scale ins { color: #333; font-size: 12px; @@ -3533,11 +3534,13 @@ div.jGrowl div.info { text-align: center; } + .jslider .jslider-bg, .jslider .jslider-pointer { background: url("../../../img/jslider.png") !important; } + .slider { margin-top: 10px; margin-bottom: 30px; |