diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss
index 1142980436b1cb0473dc104d044c200a85974afa..1e7f268d10a6388c1539bc5434b81bc3436bc471 100644
--- a/app/assets/stylesheets/base.scss
+++ b/app/assets/stylesheets/base.scss
@@ -5,11 +5,6 @@ body {
.container-fluid { max-width: $screen-lg-min; }
-.page-streams,
-.page-tags.action-show {
- > .container-fluid { max-width: 100%; }
-}
-
// These names are generated by a rails controller
// scss-lint:disable SelectorFormat
.page-contacts,
@@ -22,10 +17,11 @@ body {
.page-profiles.action-edit,
.page-services.action-index,
.page-streams,
+.page-tags,
.page-user_applications,
.page-users.action-edit,
.page-users.action-privacy_settings {
- background-color: $sidebars-background;
+ background-color: $main-background;
}
// scss-lint:enable SelectorFormat
diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss
index 9d91ae065d83e015f483efcd92415284cd47fb89..99d0719a76fe1043764aca623ca290b295234f68 100644
--- a/app/assets/stylesheets/navbar_left.scss
+++ b/app/assets/stylesheets/navbar_left.scss
@@ -1,16 +1,6 @@
-/* Fixed backgrounds are a common practice to avoid height issues */
-.left-navbar-fixed-background {
- position: fixed;
- height: 100%;
-}
-
-.left-navbar,
-.left-navbar-fixed-background {
- border-right: 1px solid $light-grey;
- background: $sidebars-background;
-}
-
.left-navbar {
+ padding: 0;
+
a {
text-decoration: none;
outline: 0;
@@ -20,9 +10,6 @@
margin: 0;
padding: 0;
list-style: none;
- &#stream_selection {
- margin: 0px -15px; /* -15px overrides Bootstrap's default gutter width */
- }
}
.hoverable {
@@ -114,10 +101,10 @@
}
.info-bar {
- margin-top: 25px;
+ padding: 0 20px;
.section {
- margin-bottom: 20px;
+ margin-top: 20px;
}
.title {
@@ -179,10 +166,4 @@
display: inline-block;
}
}
-
- .stream-faces {
- display: flex;
- flex-flow: row wrap;
- img { margin: 1px; }
- }
}
diff --git a/app/assets/stylesheets/sidebar.scss b/app/assets/stylesheets/sidebar.scss
index 9242840e60c5fd36e3094cce4fc555203958084c..1df833b427409f54eb9e42c586fc69f53395f6c7 100644
--- a/app/assets/stylesheets/sidebar.scss
+++ b/app/assets/stylesheets/sidebar.scss
@@ -2,9 +2,8 @@
.framed-content {
background-color: $white;
border: 1px solid $light-grey;
+ border-top: 0;
box-shadow: $card-shadow;
- margin-top: -10px;
- padding-top: 10px;
.header,
.sidebar-header {
diff --git a/app/assets/stylesheets/stream.scss b/app/assets/stylesheets/stream.scss
index 3af6bf16899f2ea10aef2331f65ab1f999cd575a..f6000eb96472d7080794043e8386ed4a628c2f96 100644
--- a/app/assets/stylesheets/stream.scss
+++ b/app/assets/stylesheets/stream.scss
@@ -1,14 +1,4 @@
-.page-streams,
-.page-people,
-.page-photos,
-.page-tags {
- background-color: $main-background;
-}
-
.stream_container {
- margin: auto;
- max-width: 900px;
-
.stream-title {
margin: 12px 0;
}
@@ -29,7 +19,7 @@
@media(max-width: $screen-xs) {
- .publisher {
+ .main-stream-publisher .publisher {
margin-left: 0;
}
}
diff --git a/app/assets/stylesheets/tag.scss b/app/assets/stylesheets/tag.scss
index 037cc1c70db3e6377ae6b03c09a578d87daa64fa..bce8ad6c6e656129373c302d32dec9d20846462d 100644
--- a/app/assets/stylesheets/tag.scss
+++ b/app/assets/stylesheets/tag.scss
@@ -23,11 +23,8 @@ h1.tag {
}
}
.page-tags {
- background-color: $sidebars-background;
- .left-navbar-fixed-background { border-right: 0; }
#tags_show {
.col-md-3 {
- h4 { margin: 25px 0 15px; }
.side_stream #people_stream {
.name { display: block; }
.name, .diaspora_handle {
@@ -37,7 +34,7 @@ h1.tag {
}
}
}
- .col-md-7 {
+ .col-md-9 {
.tag-following-action {
max-width: 100%;
input[type="submit"] {
diff --git a/app/views/api/openid_connect/user_applications/index.html.haml b/app/views/api/openid_connect/user_applications/index.html.haml
index 667abc2185c742d711dc0d51d3fa8648c7114136..b90082995ab17fb6cb461835b5620b91d02240e8 100644
--- a/app/views/api/openid_connect/user_applications/index.html.haml
+++ b/app/views/api/openid_connect/user_applications/index.html.haml
@@ -7,7 +7,7 @@
.sidebar
= render "shared/settings_nav"
.col-md-9
- .framed-content
+ .framed-content.clearfix
%h3= t(".title")
.row
.col-md-12
diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml
index b4cf0ce4f353a5eae880827623fe151d0a60d353..abee4ac839ae215293d5908639f88f71d09ea613 100644
--- a/app/views/aspects/_aspect_stream.haml
+++ b/app/views/aspects/_aspect_stream.haml
@@ -10,9 +10,8 @@
.pull-left.hidden-xs
= owner_image_link
= render "publisher/publisher", publisher_aspects_for(stream)
-= render "aspects/no_posts_message"
-.stream#main_stream{title: popover_with_close_html("3. #{t('.stay_updated')}"),
+.stream#main_stream{:title => popover_with_close_html("3. #{t('.stay_updated')}"),
"data-content" => t(".stay_updated_explanation")}
#paginate
diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index 47c1e76d69a774b1d3d980a6a32b84630a4fc815..31297c79e5182d1951b94449f2c7f2267779183f 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -34,7 +34,7 @@
- else
.stream_container.hidden
#conversation_show
- .framed-content#conversation_new
+ .framed-content.clearfix#conversation_new
.new-conversation
%h3.text-center
= t("conversations.index.new_conversation")
diff --git a/app/views/profiles/edit.haml b/app/views/profiles/edit.haml
index 8eee45d2a32eddeec55edc89aa1b018ce49b7ba0..043cbfe88e0bc99a0e125451d5767df956706d41 100644
--- a/app/views/profiles/edit.haml
+++ b/app/views/profiles/edit.haml
@@ -8,7 +8,7 @@
.sidebar
= render "shared/settings_nav"
.col-md-9
- .framed-content
+ .framed-content.clearfix
- content_for :submit_block do
= link_to t("cancel"), local_or_remote_person_path(current_user.person), class: "btn btn-default"
= submit_tag t(".update_profile"), class: "btn btn-primary pull-right", id: "update_profile"
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index 3828b102fd9325ff4562f939e9746fc21d4c5c8c..432dafdb32d2e650c0d8806bfc33aa79c63a3711 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -11,7 +11,7 @@
.sidebar
= render "shared/settings_nav"
.col-md-9
- .framed-content
+ .framed-content.clearfix
%h3= t(".title")
.row
.col-md-12
diff --git a/app/views/shared/_settings_nav.haml b/app/views/shared/_settings_nav.haml
index 7c4b74460da156db22a51912a959bd7409f64719..53794791ebdf5778d6363ec4660a1d645196aa34 100644
--- a/app/views/shared/_settings_nav.haml
+++ b/app/views/shared/_settings_nav.haml
@@ -1,6 +1,7 @@
#section_header
- %h3.sidebar-header
- = t("settings")
+ .sidebar-header.clearfix
+ %h3
+ = t("settings")
.list-group#settings_nav
= link_to t("profile"), edit_profile_path,
class: current_page?(edit_profile_path) ? "list-group-item active" : "list-group-item"
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index 3fe7e0165e92116f1f0c4c6dfb21bdc1602401f0..a31fb85c8453500bb46006f8d316ccda4f27b499 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -22,132 +22,126 @@
.container-fluid
.row
- .left-navbar-fixed-background.col-lg-2.col-sm-3.hidden-sm.hidden-xs
- .left-navbar.col-lg-2.col-sm-3
- %ul#stream_selection
- %li{data: {stream: "stream"}}
- = link_to t("streams.multi.title"), stream_path, rel: "backbone", class: "hoverable"
- %li{data: {stream: "activity"}}
- = link_to t("streams.activity.title"), activity_stream_path, rel: "backbone", class: "hoverable"
- %li{data: {stream: "mentions"}}
- = link_to t("streams.mentions.title"), mentioned_stream_path, rel: "backbone", class: "hoverable"
- %li.all-aspects
- = render "aspects/aspect_listings", stream: @stream
- %li.followed-tags-sidebar
- = render "tags/followed_tags_listings"
- %li{data: {stream: "public"}}
- = link_to t("streams.public.title"), public_stream_path, rel: "backbone", class: "hoverable"
+ .col-md-3
+ .sidebar.left-navbar
+ %ul#stream_selection
+ %li{data: {stream: "stream"}}
+ = link_to t("streams.multi.title"), stream_path, rel: "backbone", class: "hoverable"
+ %li{data: {stream: "activity"}}
+ = link_to t("streams.activity.title"), activity_stream_path, rel: "backbone", class: "hoverable"
+ %li{data: {stream: "mentions"}}
+ = link_to t("streams.mentions.title"), mentioned_stream_path, rel: "backbone", class: "hoverable"
+ %li.all-aspects
+ = render "aspects/aspect_listings", stream: @stream
+ %li.followed-tags-sidebar
+ = render "tags/followed_tags_listings"
+ %li{data: {stream: "public"}}
+ = link_to t("streams.public.title"), public_stream_path, rel: "backbone", class: "hoverable"
- .info-bar.hidden-xs
- .section#selected_aspect_contacts
- .title
- %h5.stream-title
- = @stream.title
- .content
+ .info-bar.hidden-xs
+ - if AppConfig.settings.invitations.open?
+ .section
+ .title
+ %h5.title-header
+ = t("shared.invitations.invite_your_friends")
+ .content
+ = render "shared/invitations"
- - if AppConfig.settings.invitations.open?
.section
.title
%h5.title-header
- = t("shared.invitations.invite_your_friends")
+ = t("aspects.index.new_here.title")
.content
- = render "shared/invitations"
+ != 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")
- .section
- .title
- %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"))))
- %br
- = link_to(t("aspects.index.new_here.learn_more"),
- "http://wiki.diasporafoundation.org/Welcoming_Committee")
-
- .section
- .title
- %h5.title-header
- = t("aspects.index.help.need_help")
- .content
- %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),
- tutorial: link_to(t("aspects.index.help.tutorial_link_text"),
- "https://diasporafoundation.org/tutorials", target: "_blank"),
- wiki: link_to("Wiki", "http://wiki.diasporafoundation.org",
- target: "_blank"),
- target: "_blank")
-
- - unless AppConfig.configured_services.blank? || all_services_connected?
.section
.title
%h5.title-header
- = t("aspects.index.services.heading")
+ = t("aspects.index.help.need_help")
.content
- %div
- = t("aspects.index.services.content")
+ %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),
+ tutorial: link_to(t("aspects.index.help.tutorial_link_text"),
+ "https://diasporafoundation.org/tutorials", target: "_blank"),
+ wiki: link_to("Wiki", "http://wiki.diasporafoundation.org",
+ target: "_blank"),
+ target: "_blank")
- .right-service-icons
- - AppConfig.configured_services.each do |service|
- - if AppConfig.show_service?(service, current_user)
- - unless current_user.services.any? {|x| x.provider == service }
- = link_to(content_tag(:div, nil,
- class: "social-media-logos-#{service.to_s.downcase}-24x24",
- title: service.to_s.titleize), "/auth/#{service}")
+ - unless AppConfig.configured_services.blank? || all_services_connected?
+ .section
+ .title
+ %h5.title-header
+ = t("aspects.index.services.heading")
+ .content
+ %div
+ = t("aspects.index.services.content")
- .section
- .title
- %h5.title-header
- = t("bookmarklet.heading")
- .content
- != t("bookmarklet.explanation", link: link_to(t("bookmarklet.post_something"), bookmarklet_code))
+ .right-service-icons
+ - AppConfig.configured_services.each do |service|
+ - if AppConfig.show_service?(service, current_user)
+ - unless current_user.services.any? {|x| x.provider == service }
+ = link_to(content_tag(:div, nil,
+ class: "social-media-logos-#{service.to_s.downcase}-24x24",
+ title: service.to_s.titleize), "/auth/#{service}")
- - if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address
.section
.title
%h5.title-header
- = t("aspects.index.donate")
+ = t("bookmarklet.heading")
.content
- %p
- = t("aspects.index.keep_pod_running", pod: AppConfig.pod_uri.host)
- = render "shared/donatepod"
+ != t("bookmarklet.explanation", link: link_to(t("bookmarklet.post_something"), bookmarklet_code))
+
+ - if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address
+ .section
+ .title
+ %h5.title-header
+ = t("aspects.index.donate")
+ .content
+ %p
+ = t("aspects.index.keep_pod_running", pod: AppConfig.pod_uri.host)
+ = render "shared/donatepod"
+
+ - if AppConfig.admins.podmin_email.present?
+ .section
+ .title
+ %h5.title-header
+ = t("aspects.index.help.any_problem")
+ .content
+ %p
+ = t("aspects.index.help.contact_podmin")
+ %p
+ = link_to t("aspects.index.help.mail_podmin"), "mailto:#{AppConfig.admins.podmin_email}"
- - if AppConfig.admins.podmin_email.present?
.section
.title
- %h5.title-header
- = t("aspects.index.help.any_problem")
.content
- %p
- = t("aspects.index.help.contact_podmin")
- %p
- = link_to t("aspects.index.help.mail_podmin"), "mailto:#{AppConfig.admins.podmin_email}"
-
- .section
- .title
- .content
- %ul
- = render "shared/links"
+ %ul
+ = render "shared/links"
- .col-lg-10.col-sm-9
+ .col-md-9
.stream_container#aspect_stream_container
= render "aspects/aspect_stream", stream: @stream
diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml
index 90026b4951201cc1ffaa2dc2250db70cf3845435..ebb468b28a3a404713b12709dd798711de770f3e 100644
--- a/app/views/tags/show.haml
+++ b/app/views/tags/show.haml
@@ -10,13 +10,14 @@
.container-fluid#tags_show
.row
- .col-lg-3.hidden-xs.left-navbar-fixed-background
.col-md-3.hidden-xs
- %h4
- = t('.tagged_people', count: @stream.tagged_people_count, tag: @stream.display_tag_name)
+ .sidebar
+ .sidebar-header.clearfix
+ %h3
+ = t(".tagged_people", count: @stream.tagged_people_count, tag: @stream.display_tag_name)
- .side_stream.stream
- = render partial: 'people/index', locals: {people: @stream.tagged_people}
+ .side_stream.stream
+ = render partial: "people/index", locals: {people: @stream.tagged_people}
.col-md-9
.stream_container