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.

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

move tools to header #1229

Merged
merged 2 commits into from
Aug 28, 2024
Merged

move tools to header #1229

merged 2 commits into from
Aug 28, 2024

Conversation

dnoneill
Copy link
Contributor

@dnoneill dnoneill commented Aug 21, 2024

closes #673

Screenshot 2024-08-23 at 3 34 59 PM
Screenshot 2024-08-23 at 3 34 49 PM

@dbranchini This can't go into production until backlight is released but if you want you can review the screenshots attached to this PR. Also there are two differences I can see from the Figma that I didn't address for the following reasons.

  1. The line goes past the tools, didn't fix because it was going to be a pain
  2. The tools in the upper right are underlined. In order to do this you have to underline the icons as well which I think looks weird.
    Screenshot 2024-08-23 at 3 43 42 PM

@dnoneill dnoneill force-pushed the 673-page-header branch 6 times, most recently from d14d804 to eb39ea1 Compare August 23, 2024 19:47
@dnoneill dnoneill marked this pull request as ready for review August 28, 2024 17:25
@@ -1,3 +1,3 @@
@import 'bootstrap/scss/bootstrap';
@import 'blacklight-frontend/app/assets/stylesheets/blacklight/blacklight';
@import 'blacklight/blacklight';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it ok to commit this change and the bin/build-css file? (not questioning it so much as verifying it's ok)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to remember to undo it, but I think it's OK

@thatbudakguy
Copy link
Member

can we throw a comment in the gemfile near the pin to main explaining that we need to revert this commit once a new release is out?

@@ -61,7 +61,8 @@ group :production do
gem 'pg'
end

gem 'blacklight', '~> 8.3'
#gem 'blacklight', '~> 8.3'
gem 'blacklight', github: 'projectblacklight/blacklight', branch: 'main'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After release

  1. remove line 65, comment back in 64
  2. In app/assets/stylesheets/geoblacklight.scss change @import 'blacklight/blacklight'; to @import 'blacklight-frontend/app/assets/stylesheets/blacklight/blacklight';
  3. remove bin/build-css
  4. update package.json scripts to "build:css": "sass ./app/assets/stylesheets/geoblacklight.scss:./app/assets/builds/geoblacklight.css --load-path=node_modules"

@dbranchini
Copy link

The line going past the tools looks fine. I guess what bothers me a little is that the line aligns with the map on the right, but it doesn't align with the sidebar on the left.

The lack of underline should be fine. In cases where the link is within a body of text, it should be accompanied by an indicator (in addition to color) to signify that it's a link. I don't think it applies here.

@dnoneill dnoneill merged commit 20279df into bl8 Aug 28, 2024
3 checks passed
@dnoneill dnoneill deleted the 673-page-header branch August 28, 2024 20:56
@dnoneill
Copy link
Contributor Author

I am going to open a separate ticket for that, just so we can get this in.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants