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

[UI] Make menu styles like on design #153

Merged
merged 16 commits into from
Nov 13, 2024
Merged

[UI] Make menu styles like on design #153

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3427f94
#153: Make menu styles like on design
andriyParashchuk Oct 31, 2024
3cfc506
test: upds scrns
pftg Nov 2, 2024
37b6f3c
test: upds scrns
pftg Nov 2, 2024
370f544
test: do not use absolute paths in generated path for assets
pftg Nov 2, 2024
92035f7
test: upds scrns
pftg Nov 2, 2024
9e2bf19
Update bin/build
pftg Nov 2, 2024
22513b1
Merge branch 'master' into 153-make-menu-styles-like-on-design
pftg Nov 2, 2024
3156c89
improve
pftg Nov 2, 2024
3365823
test: upd scrns
pftg Nov 2, 2024
de7b68a
Merge branch 'master' into 153-make-menu-styles-like-on-design
pftg Nov 2, 2024
a680e78
merge master
pftg Nov 6, 2024
9e9abe3
Merge remote-tracking branch 'origin/master' into 153-make-menu-style…
pftg Nov 6, 2024
553a293
updates test
pftg Nov 6, 2024
88a58a3
test: upds scrns
pftg Nov 6, 2024
1de8e39
test: upds scrns
pftg Nov 6, 2024
1b4fe93
Merge remote-tracking branch 'origin/master' into 153-make-menu-style…
pftg Nov 13, 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
6 changes: 3 additions & 3 deletions test/desktop_site_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ def test_blog_index
click_on "Blog"
end

assert_matches_screenshot "blog/index"
assert_matches_screenshot "blog/index", skip_area: [".blog-post"]
end

def test_blog_index_pagination
visit "/blog/"

scroll_to find("#pagination")

assert_matches_screenshot "blog/index/_pagination", wait: 3, stability_time_limit: 0.25
assert_matches_screenshot "blog/index/_pagination", skip_area: [".blog-post"], wait: 3, stability_time_limit: 0.25
end

def test_visit_blog_post
Expand Down Expand Up @@ -177,7 +177,7 @@ def test_not_found
private

def within_top_bar
within "nav" do
within ".navigation" do
yield
end
end
Expand Down
Binary file modified test/fixtures/screenshots/macos/mobile/nav/hamburger_menu.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/fixtures/screenshots/macos/mobile/nav/hamburger_menu/services.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions test/mobile_site_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ def test_homepage
def test_blog_index
visit "/blog/"

assert_matches_screenshot "blog/index"
assert_matches_screenshot "blog/index", skip_area: [".blog-post"]
pftg marked this conversation as resolved.
Show resolved Hide resolved
end

def test_blog_index_pagination
visit "/blog/"

scroll_to find("#pagination")

assert_matches_screenshot "blog/index/_pagination", wait: 3, stability_time_limit: 0.25
assert_matches_screenshot "blog/index/_pagination", skip_area: [".blog-post"], wait: 3, stability_time_limit: 0.25
end

def test_visit_blog_post
Expand Down
27 changes: 22 additions & 5 deletions themes/beaver/assets/css/navigation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.btn,
.btn:hover {
padding: 10px 18px;
padding: 11px 18px;
font-size: 16px;
line-height: 24px;
font-weight: 700;
Expand Down Expand Up @@ -90,8 +90,8 @@

.menu-close {
display: none;
width: 25px;
height: 25px;
width: 30px;
height: 30px;
position: absolute;
top: 24px;
left: 16px;
Expand Down Expand Up @@ -181,7 +181,7 @@
transition: .3s;
}

.navigation .-active .link {
.navigation .-active .link {
color: #1a8cff;
}

Expand Down Expand Up @@ -337,7 +337,7 @@
background-color: #121212;
color: #fff;
border-radius: 6px;
margin-top: 10px;
margin-top: 15px;
}

.navigation .item {
Expand Down Expand Up @@ -402,6 +402,17 @@

.navigation .item .arrow {
top: 25px;
right: 15px;
}

.navigation .item .arrow:before {
content: '';
position: absolute;
left: -15px;
right: -15px;
top: -15px;
bottom: -15px;
cursor: pointer;
}

.navigation .item.-open .arrow {
Expand All @@ -411,8 +422,14 @@
.navigation .item:hover .arrow {
border-color: inherit;
}

.navigation .item:hover .link,
.navigation .sub-item:hover .sub-name {
color: inherit;
}

.navigation .link {
font-size: 18px;
padding-right: 15px;
}
}
Loading