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

Simplify border and background in admin header

Browse Source 
Instead of defining them for all headers and then overwriting them, we
can add it just to the body of the public layout.
This commit is contained in:
Javi Martín
2021-07-05 22:50:09 +02:00
parent 7d50fed2a3
commit b5fd875133
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/admin.scss
View File

@@ -52,13 +52,9 @@ $table-header: #ecf1f6;
float: none; float: none;
} }
.header {
background: transparent;
border: 0;
}
.top-links { .top-links {
background: #000; background: #000;
color: $white;
a { a {
line-height: rem-calc($line-height * 1.5); line-height: rem-calc($line-height * 1.5);
@@ -67,7 +63,6 @@ $table-header: #ecf1f6;
.top-bar { .top-bar {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
color: $text;
height: auto; height: auto;
padding-top: $line-height / 2; padding-top: $line-height / 2;

8
app/assets/stylesheets/layout.scss
View File

@@ -473,8 +473,6 @@ a {
body > header, body > header,
.wrapper > header { .wrapper > header {
@extend %brand-background;
border-bottom: 1px solid $border;
margin-bottom: $line-height; margin-bottom: $line-height;
@include breakpoint(small down) { @include breakpoint(small down) {
@@ -517,6 +515,12 @@ body > header,
} }
} }
.public > .wrapper > header,
.proposal-dashboard > header {
@extend %brand-background;
border-bottom: 1px solid $border;
}
.top-bar { .top-bar {
background-color: inherit; background-color: inherit;
padding-bottom: 0; padding-bottom: 0;

2
app/views/layouts/application.html.erb
View File

@@ -13,7 +13,7 @@
<%= raw setting["html.per_page_code_head"] %> <%= raw setting["html.per_page_code_head"] %>
</head> </head>
<body class="<%= yield (:body_class) %>"> <body class="<%= yield (:body_class) %> public">
<%= raw setting["html.per_page_code_body"] %> <%= raw setting["html.per_page_code_body"] %>
<div class="wrapper <%= yield (:wrapper_class) %>"> <div class="wrapper <%= yield (:wrapper_class) %>">