Merge https://github.com/friendica/red into zpull

Conflicts: view/theme/redbasic/css/style.css
2013-01-06 15:13:31 -08:00
parent 8766616e35 61b8ea9e1a
commit a8afbec5fe
1 changed files with 3 additions and 0 deletions
--- 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;