cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/2698'

Browse source
This commit is contained in:
Tom Hughes 2020-07-08 19:10:01 +01:00
commit cfb2f2988c
3 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/assets/stylesheets/common.scss
View file

@ -1195,16 +1195,6 @@ tr.turn:hover {
background: $lightgrey; background: $lightgrey;
} }
.content-body {
h1, h2, h3, p, ul, ol {
margin-bottom: $lineheight;
}
h1, h2, h3 {
margin-top: $lineheight/2;
}
}
.content-inner { .content-inner {
position: relative; position: relative;
max-width: 900px; max-width: 900px;
@ -1308,21 +1298,14 @@ tr.turn:hover {
/* Rules for the user profile page */ /* Rules for the user profile page */
#userinformation { #userinformation {
min-height: 100px; min-height: 100px;
.userinformation-inner { .userinformation-inner {
float: left; float: left;
} }
h2 {
margin-top: 0;
}
.user-description { .user-description {
width: 100%; width: 100%;
clear: both; clear: both;
} }
.deemphasize {
margin: 0;
}
} }
.admin-user-info small { .admin-user-info small {

1
app/assets/stylesheets/small.scss
View file

@ -87,7 +87,6 @@ body.small {
.compact-hide { .compact-hide {
display: inline-block; display: inline-block;
} }
.overlay-sidebar #sidebar .welcome.visible { .overlay-sidebar #sidebar .welcome.visible {
display: none; display: none;

6
app/views/traces/index.html.erb
View file

@ -26,12 +26,6 @@
<%= render :partial => "trace_paging_nav" %> <%= render :partial => "trace_paging_nav" %>
<table id="trace_list" class="table table-borderless table-striped"> <table id="trace_list" class="table table-borderless table-striped">
<thead>
<tr>
<th></th>
<th></th>
</tr>
</thead>
<tbody> <tbody>
<%= render @traces unless @traces.nil? %> <%= render @traces unless @traces.nil? %>
</tbody> </tbody>