aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <redmatrix@redmatrix.me>2015-04-09 15:45:44 -0700
committerfriendica <redmatrix@redmatrix.me>2015-04-09 15:45:44 -0700
commit07248dbc803e99245e17dd80cfd3e884579a40b0 (patch)
tree7c4d79a7cf03348ab4fdea8855d3e64f0d3fbd77
parent2619b60721c328aacbf7bd30d47476a68ce9b203 (diff)
parent7f51c1ed45474aa64fe911c6c97cb39820f942c9 (diff)
downloadvolse-hubzilla-07248dbc803e99245e17dd80cfd3e884579a40b0.tar.gz
volse-hubzilla-07248dbc803e99245e17dd80cfd3e884579a40b0.tar.bz2
volse-hubzilla-07248dbc803e99245e17dd80cfd3e884579a40b0.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--app/bugreport.apd2
-rw-r--r--include/widgets.php4
-rw-r--r--library/jRange/jquery.range.js4
-rw-r--r--view/css/widgets.css25
4 files changed, 9 insertions, 26 deletions
diff --git a/app/bugreport.apd b/app/bugreport.apd
index 42c31f016..ea1f87b34 100644
--- a/app/bugreport.apd
+++ b/app/bugreport.apd
@@ -1,3 +1,3 @@
-url: https://github.com/friendica/red/issues
+url: https://github.com/redmatrix/redmatrix/issues
name: Bug Report
photo: $baseurl/app/bugreport.png
diff --git a/include/widgets.php b/include/widgets.php
index 243c4a25e..e84c029d2 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -431,7 +431,7 @@ function widget_affinity($arr) {
'$coworkers' => t('Co-workers'),
'$oldfriends' => t('Former Friends'),
'$acquaintances' => t('Acquaintances'),
- '$world' => t('Everybody')
+ '$world' => t('All')
));
$arr = array('html' => $x);
call_hooks('main_slider',$arr);
@@ -968,4 +968,4 @@ function widget_pubsites() {
if(get_app()->poi)
return;
return '<div class="widget"><ul class="nav nav-pills"><li><a href="pubsites">' . t('Public Hubs') . '</a></li></ul></div>';
-} \ No newline at end of file
+}
diff --git a/library/jRange/jquery.range.js b/library/jRange/jquery.range.js
index 4a35a380f..860b74511 100644
--- a/library/jRange/jquery.range.js
+++ b/library/jRange/jquery.range.js
@@ -71,7 +71,7 @@
console.log('jRange : no width found, returning');
return;
} else {
- this.domNode.css('width', this.options.width || this.inputNode.width());
+ this.domNode.width(this.options.width || this.inputNode.width());
this.inputNode.hide();
}
@@ -332,4 +332,4 @@
return result || this;
};
-})(jQuery, window, document); \ No newline at end of file
+})(jQuery, window, document);
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 43d132276..8f31a3603 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -50,8 +50,10 @@
}
-/* fileas */
-
+/* affinity slider */
+#main-slider {
+ margin: 10px 7px 45px 7px;
+}
/* posted date */
@@ -83,21 +85,6 @@ a.group-edit-tool {
li:hover .group-edit-icon {
opacity: 1;
}
-/* affinity - slider */
-
-#main-slider {
- position: relative;
- left: 5px;
- width: 90%;
-}
-
-.slider {
- margin-top: 10px;
- margin-bottom: 45px;
-}
-
-/* photo albums */
-
/* Chatrooms */
@@ -112,10 +99,6 @@ li:hover .group-edit-icon {
margin-right: 5px;
}
-.slider-container {
- padding: 15px;
-}
-
.rating-text-label {
margin-top: 30px;
}