consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some css. Pass scss-lint

Browse Source
This commit is contained in:
Alessandro Cuoghi
2017-08-09 18:24:15 +02:00
committed by taitus
parent 1c1ac4c1f7
commit 1e60bc5cc2
3 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/assets/stylesheets/community.scss
View File

@@ -1,55 +1,55 @@
.communities-show{ .communities-show {
.wide-order-selector{ .wide-order-selector {
margin-top: 0; margin-top: 0;
} }
.panel{ .panel {
background: #fff; min-height: 7rem;
border: 1px solid; margin: 0.375rem 0;
border-color: #e5e6e9 #dfe0e4 #d0d1d5;
border-radius: 0; .button {
box-shadow: 0 1px 3px 0 #dee0e3; margin-top: $line-height;
margin-bottom: 0.75rem; }
min-height:7rem;
padding: 0.75rem 0.75rem 0;
} }
.panel { //Participations.scss line 412
h3{ .btn-new-theme-small {
font-weight: bold;
margin-top: $line-height / 2;
}
a { h2 {
color: $text; border-top: 2px solid $brand;
} display: inline-block;
.nopadding{ font-size: rem-calc(16);
padding: 0; margin: -1px 0 rem-calc(12);
} padding-top: rem-calc(6);
.button{ text-transform: uppercase;
margin-top: $line-height;
} }
} }
} }
.communities-participant{ .communities-participant {
.comment-body{
.comment-body {
display: inline-block; display: inline-block;
float: left; float: left;
margin-right: $line-height; margin-right: $line-height;
margin-bottom: $line-height; margin-bottom: $line-height;
} }
} }
.topic-show{
p{ .topic-show {
p {
margin-bottom: 0; margin-bottom: 0;
} }
ul li { ul li {
margin-bottom:0; margin-bottom: 0;
} }
.comments{
.first-comment{ .comments {
.first-comment {
margin-top: $line-height; margin-top: $line-height;
margin-bottom: $line-height; margin-bottom: $line-height;
} }

9
app/views/communities/show.html.erb
View File

@@ -10,6 +10,13 @@
</div> </div>
<div class="row"> <div class="row">
<div class="btn-new-theme-small show-for-small-only small-12 column">
<div class="sidebar-divider"></div>
<h2><%= t("community.sidebar.topic.title") %></h2>
<%= link_to t("community.sidebar.topic.new_topic"), new_community_topic_path(@community.id), class: 'button expanded' %>
</div>
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<div id="topics" class="topics-list"> <div id="topics" class="topics-list">
<%= render "topics/topics", topics: @topics %> <%= render "topics/topics", topics: @topics %>
@@ -17,7 +24,7 @@
<%= paginate @topics %> <%= paginate @topics %>
</div> </div>
<aside class="small-12 medium-3 column"> <aside class="small-12 medium-3 hide-for-small-only column">
<div class="sidebar-divider"></div> <div class="sidebar-divider"></div>
<h2><%= t("community.sidebar.topic.title") %></h2> <h2><%= t("community.sidebar.topic.title") %></h2>
<%= link_to t("community.sidebar.topic.new_topic"), new_community_topic_path(@community.id), class: 'button expanded' %> <%= link_to t("community.sidebar.topic.new_topic"), new_community_topic_path(@community.id), class: 'button expanded' %>

4
app/views/topics/_topics.html.erb
View File

@@ -7,7 +7,7 @@
<% topics.each do |topic| %> <% topics.each do |topic| %>
<div id="<%= dom_id(topic) %>" class="panel"> <div id="<%= dom_id(topic) %>" class="panel">
<div class="small-12 medium-11 column"> <div class="small-10 medium-10 column">
<h3><%= link_to topic.title, community_topic_path(@community, topic) %></h3> <h3><%= link_to topic.title, community_topic_path(@community, topic) %></h3>
<p class="topic-info"> <p class="topic-info">
<span class="icon-comments"></span>&nbsp; <span class="icon-comments"></span>&nbsp;
@@ -18,7 +18,7 @@
<%= topic.author.name %> <%= topic.author.name %>
</p> </p>
</div> </div>
<div class="small-12 medium-1 column text-center nopadding"> <div class="small-2 medium-2 column text-center">
<% if topic.author == current_user %> <% if topic.author == current_user %>
<%= link_to t("community.topic.edit_button"), edit_community_topic_path(@community.id, topic), class: 'button small hollow' %> <%= link_to t("community.topic.edit_button"), edit_community_topic_path(@community.id, topic), class: 'button small hollow' %>
<% end %> <% end %>