diff --git a/Changelog.md b/Changelog.md
index ee95b50dc4ba295ac6813f91095a9d3ee5f49aca..e4adaa8bf97b519560e9c725d7ad9ada55d37c7f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -74,6 +74,7 @@ For more details see https://wiki.diasporafoundation.org/Updating
* Slight redesign of mobile publisher [#4604](https://github.com/diaspora/diaspora/pull/4604)
* Port conversations to Bootstrap [#4622](https://github.com/diaspora/diaspora/pull/4622)
* Remove participants popover and improve conversations menu [#4644](https://github.com/diaspora/diaspora/pull/4644)
+* Refactor right side bar [#4793](https://github.com/diaspora/diaspora/pull/4793)
## Bug fixes
* Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441)
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 9568f2edb49d5f79ecec0914b68f8ee43880ba87..edbf995785007acf8b1e269599135e4eb8ec98f5 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -982,87 +982,6 @@ h1.tag
:font
:weight bold
-.rightBar
- .title
- :position relative
- :border
- :bottom 1px solid $border-grey
- :padding 2px 0
- :top 0
-
- &.no_icon
- :padding
- :left 8px
-
- .right
- :right 4px
- :top 3px
- :font-size smaller
- :font-weight bold
- :color $text-dark-grey
-
- .icons-plus,
- .icons-heart,
- .icons-question,
- .icons-monotone_wrench_settings,
- .icons-coffee,
- .icons-mail,
- .icons-bookmark,
- :position absolute
- :margin-left 3px
-
- .icons-plus
- :width 14px
- :height 14px
-
- .icons-heart
- :width 13px
- :height 13px
-
- .icons-question
- :width 16px
- :height 16px
-
- .icons-monotone_wrench_settings
- :width 16px
- :height 16px
-
- .icons-bookmark
- :width 14px
- :height 16px
-
- .icons-coffee
- :width 16px
- :height 14px
-
- .icons-mail
- :width 16px
- :height 13px
-
- h5.title-header
- :margin-left 22px
-
- h5
- :font-size 12px
- :margin 0
- :color $text-dark-grey
-
- .section
- .content
- :padding 8px
- :color $text-grey
- :font-size 11px
- li
- :list-style none
- :float left
- :padding-right 10px
- :margin
- :bottom 25px
-
- #invite_code
- :width 100%
- @include box-sizing(border-box)
-
.subtle
:color $text-grey
:font
diff --git a/app/assets/stylesheets/sidebar.css.scss b/app/assets/stylesheets/sidebar.css.scss
index b458ad8dd81ba9c02f4d009ac20a5b55f89404d6..70e667269e6420d1bd71f3f93dde0facce09ff95 100644
--- a/app/assets/stylesheets/sidebar.css.scss
+++ b/app/assets/stylesheets/sidebar.css.scss
@@ -137,3 +137,101 @@ $bluebg: #e7f2f7;
}
/* ---- end override app/stylesheets/vendor/autoSuggest.css ---- */
}
+
+.rightBar {
+ .section {
+ margin-bottom: 20px;
+
+ .title {
+ position: relative;
+ border-bottom: 1px solid $border-grey;
+ padding-bottom: 2px;
+
+ &.no_icon { padding-left: 8px; }
+
+ .right {
+ right: 4px;
+ top: 3px;
+ font-size: smaller;
+ font-weight: bold;
+ color: $text-dark-grey;
+ }
+
+ .icons-plus,
+ .icons-heart,
+ .icons-question,
+ .icons-monotone_wrench_settings,
+ .icons-coffee,
+ .icons-mail,
+ .icons-bookmark {
+ position: absolute;
+ margin-left: 3px;
+ }
+
+ .icons-plus {
+ width: 14px;
+ height: 14px;
+ }
+
+ .icons-heart {
+ width: 13px;
+ height: 13px;
+ }
+
+ .icons-question,
+ .icons-monotone_wrench_settings {
+ width: 16px;
+ height: 16px;
+ }
+
+ .icons-bookmark {
+ width: 14px;
+ height: 16px;
+ }
+
+ .icons-coffee {
+ width: 16px;
+ height: 14px;
+ }
+
+ .icons-mail {
+ width: 16px;
+ height: 13px;
+ }
+
+
+ h5.title-header {
+ margin-left: 22px;
+ }
+
+ h5 {
+ font-size: 12px;
+ margin: 0;
+ color: $text-dark-grey;
+ }
+ }
+
+ .content {
+ padding: 8px;
+ color: $text-grey;
+ font-size: 11px;
+
+ p, ul {
+ margin: 5px 0px;
+ }
+
+ ul {
+ padding-left: 0;
+
+ li {
+ list-style: none;
+ }
+ }
+
+ #invite_code {
+ width: 100%;
+ @include box-sizing(border-box);
+ }
+ }
+ }
+}
diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index 4be85865006537f674382d90028586f316826ca9..3a9bea11e29ef46a92bf19241e756909536c4bbe 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -18,7 +18,7 @@
%h5.title-header
= t('aspects.index.new_here.title')
.content
- != t('aspects.index.new_here.follow', :link => link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(:name => t('shared.publisher.new_user_prefill.newhere'))))
+ != t('aspects.index.new_here.follow', link: link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(name: t('shared.publisher.new_user_prefill.newhere'))))
%br
= link_to(t('aspects.index.new_here.learn_more'), "http://wiki.diasporafoundation.org/Welcoming_Committee")
@@ -28,17 +28,17 @@
%h5.title-header
= t('aspects.index.help.need_help')
.content
- = t('aspects.index.help.here_to_help')
- %br
- = t('aspects.index.help.do_you')
- %br
- != t('aspects.index.help.have_a_question', :link => link_to("#"+t('aspects.index.help.tag_question'), tag_path(:name => t('aspects.index.help.tag_question'))))
- %br
- != t('aspects.index.help.find_a_bug', :link => link_to("#"+t('aspects.index.help.tag_bug'), tag_path(:name => t('aspects.index.help.tag_bug'))))
- %br
- != t('aspects.index.help.feature_suggestion', :link => link_to("#"+t('aspects.index.help.tag_feature'), tag_path(:name => t('aspects.index.help.tag_feature'))))
- %br
- %br
+ %p
+ = t('aspects.index.help.here_to_help')
+ %p
+ = t('aspects.index.help.do_you')
+ %ul
+ %li
+ != t('aspects.index.help.have_a_question', :link => link_to("#"+t('aspects.index.help.tag_question'), tag_path(:name => t('aspects.index.help.tag_question'))))
+ %li
+ != t('aspects.index.help.find_a_bug', :link => link_to("#"+t('aspects.index.help.tag_bug'), tag_path(:name => t('aspects.index.help.tag_bug'))))
+ %li
+ != t('aspects.index.help.feature_suggestion', :link => link_to("#"+t('aspects.index.help.tag_feature'), tag_path(:name => t('aspects.index.help.tag_feature'))))
%p
!= t('aspects.index.help.tutorials_and_wiki',
:faq => link_to(t('_help'), help_path),
@@ -75,8 +75,8 @@
%h5.title-header
= t('aspects.index.donate')
.content
- = t('aspects.index.keep_pod_running', :pod => AppConfig.pod_uri.host)
- %br
+ %p
+ = t('aspects.index.keep_pod_running', :pod => AppConfig.pod_uri.host)
= render 'shared/donatepod'
- if AppConfig.admins.podmin_email.present?
@@ -86,10 +86,10 @@
%h5.title-header
= t('aspects.index.help.any_problem')
.content
- = t('aspects.index.help.contact_podmin')
- %br
- %br
- = link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button"
+ %p
+ = t('aspects.index.help.contact_podmin')
+ %p
+ = link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button"
.section
.title