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

Jump to bottom

Welcome message: fix display of 'close' button #2872

Closed
wants to merge 3 commits into from
Closed

Welcome message: fix display of 'close' button #2872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81684b7
Sidebar width: 390 px <= 25vw <= 500 px
hiddewie Oct 1, 2020
49f7f6d
Change 390 to 380 pixels because it fits
hiddewie Oct 1, 2020
4bcbd15
Comments. Revert min/max-width, and add padding
hiddewie Oct 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions app/assets/stylesheets/common.scss
View file
Open in desktop
Expand Up @@ -364,9 +364,7 @@ body.compact-nav {

#sidebar {
float: left;
width: $defaultSidebarWidth;
min-width: $minSidebarWidth;
max-width: $maxSidebarWidth;
width: $sidebarWidth;
background: #fff;

#sidebar_loader {
Expand All @@ -383,6 +381,11 @@ body.compact-nav {
h2 {
padding: $lineheight $lineheight $lineheight/2;
font-size: 1.5rem;

&.welcome-header {
// This is exactly the width, including padding, of the close button
padding-right: 60px;
}
}

h3, h4 {
Expand Down Expand Up @@ -477,9 +480,7 @@ body.compact-nav {

img {
display: block;
width: $defaultSidebarWidth;
min-width: $minSidebarWidth;
max-width: $maxSidebarWidth;
width: $sidebarWidth;
}
}

Expand Down
4 changes: 1 addition & 3 deletions app/assets/stylesheets/parameters.scss
View file
Open in desktop
Expand Up @@ -12,9 +12,7 @@ $lightgrey: #EEE;
$darkgrey: #888;
$hovercolor: 20%;
$headerHeight: 55px;
$minSidebarWidth: 380px;
$defaultSidebarWidth: 25vw;
$maxSidebarWidth: 500px;
$sidebarWidth: 350px;
$keyline: 1px solid $lightgrey;
$border-radius: 3px;
$list-highlight: #FFFFC0;
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/map.html.erb
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@

<% unless current_user %>
<div class="welcome">
<h2><%= t "layouts.intro_header" %></h2>
<h2 class="welcome-header"><%= t "layouts.intro_header" %></h2>
<div class="close-wrap"><span class="icon close"></span></div>
<p><%= t "layouts.intro_text" %></p>
<p><%= t "layouts.hosting_partners_html",
Expand Down