From 1e60bc5cc23212b44834a93aa06407e3c6c06320 Mon Sep 17 00:00:00 2001 From: Alessandro Cuoghi Date: Wed, 9 Aug 2017 18:24:15 +0200 Subject: [PATCH] Remove some css. Pass scss-lint --- app/assets/stylesheets/community.scss | 62 +++++++++++++-------------- app/views/communities/show.html.erb | 11 ++++- app/views/topics/_topics.html.erb | 4 +- 3 files changed, 42 insertions(+), 35 deletions(-) diff --git a/app/assets/stylesheets/community.scss b/app/assets/stylesheets/community.scss index 55db691ad..96e5d0b75 100644 --- a/app/assets/stylesheets/community.scss +++ b/app/assets/stylesheets/community.scss @@ -1,55 +1,55 @@ -.communities-show{ +.communities-show { - .wide-order-selector{ + .wide-order-selector { margin-top: 0; } - .panel{ - background: #fff; - border: 1px solid; - border-color: #e5e6e9 #dfe0e4 #d0d1d5; - border-radius: 0; - box-shadow: 0 1px 3px 0 #dee0e3; - margin-bottom: 0.75rem; - min-height:7rem; - padding: 0.75rem 0.75rem 0; + .panel { + min-height: 7rem; + margin: 0.375rem 0; + + .button { + margin-top: $line-height; + } } - .panel { - h3{ - font-weight: bold; - margin-top: $line-height / 2; - } + //Participations.scss line 412 + .btn-new-theme-small { - a { - color: $text; - } - .nopadding{ - padding: 0; - } - .button{ - margin-top: $line-height; + h2 { + border-top: 2px solid $brand; + display: inline-block; + font-size: rem-calc(16); + margin: -1px 0 rem-calc(12); + padding-top: rem-calc(6); + text-transform: uppercase; } } } -.communities-participant{ - .comment-body{ +.communities-participant { + + .comment-body { display: inline-block; float: left; margin-right: $line-height; margin-bottom: $line-height; } } -.topic-show{ - p{ + +.topic-show { + + p { margin-bottom: 0; } + ul li { - margin-bottom:0; + margin-bottom: 0; } - .comments{ - .first-comment{ + + .comments { + + .first-comment { margin-top: $line-height; margin-bottom: $line-height; } diff --git a/app/views/communities/show.html.erb b/app/views/communities/show.html.erb index 041e1776f..40f14b2a2 100644 --- a/app/views/communities/show.html.erb +++ b/app/views/communities/show.html.erb @@ -10,6 +10,13 @@
+ +
+ +

<%= t("community.sidebar.topic.title") %>

+ <%= link_to t("community.sidebar.topic.new_topic"), new_community_topic_path(@community.id), class: 'button expanded' %> +
+
<%= render "topics/topics", topics: @topics %> @@ -17,7 +24,7 @@ <%= paginate @topics %>
-
diff --git a/app/views/topics/_topics.html.erb b/app/views/topics/_topics.html.erb index 96a7fbdd8..075c8dd82 100644 --- a/app/views/topics/_topics.html.erb +++ b/app/views/topics/_topics.html.erb @@ -7,7 +7,7 @@ <% topics.each do |topic| %>
-
+

<%= link_to topic.title, community_topic_path(@community, topic) %>

  @@ -18,7 +18,7 @@ <%= topic.author.name %>

-
+
<% if topic.author == current_user %> <%= link_to t("community.topic.edit_button"), edit_community_topic_path(@community.id, topic), class: 'button small hollow' %> <% end %>