Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update heading, stripes and tab border colors #4658

Merged
merged 4 commits into from
Apr 7, 2024
Merged

Update heading, stripes and tab border colors #4658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e5abf4
Use default table stripe color
AntonKhorev Apr 7, 2024
55d3b33
Use secondary body background in heading sections
AntonKhorev Apr 7, 2024
e7d82be
Adapt tab borders to secondary body background
AntonKhorev Apr 7, 2024
f3a9d2e
Add a page-wide bottom border to heading sections
AntonKhorev Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions app/assets/stylesheets/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,10 +719,6 @@ tr.turn:hover {

/* Rules for non-map content pages */

.content-heading {
background: $lightgrey;
}

.content-inner {
position: relative;
max-width: 960px;
Expand Down Expand Up @@ -1067,4 +1063,12 @@ div.secondary-actions {
}
}

/* Rules for tabs inside secondary background sections */

.bg-body-secondary .nav-tabs {
--bs-border-color: var(--bs-secondary-border-subtle);
--bs-secondary-bg: var(--bs-secondary-border-subtle);
margin-bottom: -1px;
}

@import 'browse';
2 changes: 0 additions & 2 deletions app/assets/stylesheets/parameters.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,4 @@ $link-hover-color: #24d;
$link-decoration: none;
$link-hover-decoration: underline;

$table-striped-bg: $offwhite;

$enable-negative-margins: true;
2 changes: 1 addition & 1 deletion app/views/layouts/_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<% else %>
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
<% if content_for? :heading %>
<div class="content-heading">
<div class="content-heading bg-body-secondary border-bottom border-secondary-subtle">
<div class="content-inner <%= yield :heading_class %>">
<%= yield :heading %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/traces/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<% end %>

<li class="nav-item ms-auto">
<div class="nav-link pe-0">
<div class="nav-link pe-0 border-0">
<%= link_to({ :action => :georss, :display_name => @target_user&.display_name, :tag => params[:tag] }, { :class => "btn btn-secondary btn-sm my-n2 align-baseline border-0" }) do %>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" class="align-text-bottom">
<circle cx="2" cy="14" r="2" fill="white" />
Expand Down