Skip to content

Move navbar #117

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

Merged
bxngyn merged 8 commits into from
Jul 29, 2025
Merged

Move navbar #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3240ed3
move navbar to top
bxngyn Jul 29, 2025
107e563
clean up
bxngyn Jul 29, 2025
9ea4714
update css
bxngyn Jul 29, 2025
559f97b
update css
bxngyn Jul 29, 2025
2c7142d
Merge branch 'develop' into move-navbar
rongxin-liu Jul 29, 2025
bd39cfd
move navbar to bottom
bxngyn Jul 29, 2025
c875139
clean up
bxngyn Jul 29, 2025
8f34aa3
clean up
bxngyn Jul 29, 2025
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
41 changes: 21 additions & 20 deletions compare50/_renderer/static/match.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ body, h1, h4, h5 {

body {
font-family: Proxima-Nova, sans-serif;
overflow: hidden;
}

.wrapper {
margin-left: 10em;
margin-bottom: 3em;
}

.view {
Expand All @@ -30,7 +31,7 @@ body {

.sub_name {
margin-top: 0.33em;
padding-right: 0px;
padding-left: 10px;
}

.row {
Expand All @@ -56,7 +57,7 @@ pre {
border-top: 0;
max-width:100%;
width: 100%;
height: 100%;
height: 90vh;
}

.right {
Expand All @@ -67,7 +68,7 @@ pre {
border-top: 0;
max-width:100%;
width: 100%;
height: 100%;
height: 90vh;
}

.fragment:before {
Expand Down Expand Up @@ -119,36 +120,36 @@ pre {
font-family: Consolas, monospace;
}

#sidebar {
padding-left: 5px;
padding-right: 5px;
margin-left: -10em;
left: 10em;
width: 10em;
#botbar {
position: fixed;
height: 100%;
bottom: 0;
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0.5em 1em;
z-index: 1000;
}

#next_prev_match {
margin-top: .4em;
.botbar-right {
display: flex;
align-items: center;
gap: 0.5em;
}

#passes {
margin-top: 10%;
margin-bottom: 10%;
#next_prev_match {
margin: 0;
}

.matches_group {
margin-bottom: .4em;
#passes {
margin: 0;
}

.brand {
text-align: center;
vertical-align: middle;
width: 100%;
height: 2.20em;
margin-top: 0.13em;
margin: 0;
}

a.index-link {
Expand Down
25 changes: 12 additions & 13 deletions compare50/_renderer/templates/match_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,21 @@
</head>
<body>
<div class="wrapper" id="page">
<nav class="bg-dark text-center" id="sidebar">
<nav class="bg-dark text-light" id="botbar">
<div class="brand text-light">
<h4><a href="index.html" class="index-link"><b>compare50</b></a></h4>
</div>
<br/>
<div class="text-light id" id="{{id}}">{{id}} / {{max_id}}</div>
<div class="btn-group" role="group" aria-label="NextPrev" id="next_prev_match">
<button type="button" class="btn btn-outline-light prev_match" id="prev_match" {{'disabled' if id <= 1 else ''}}><<</button>
<button type="button" class="btn btn-outline-light next_match" id="next_match" {{'disabled' if id >= max_id else ''}}>>></button>
</div>
<div class="btn-group-vertical" role="group" aria-label="Views" id="passes">
{% for pass_ in passes %}
<button type="button" class="btn btn-outline-light view_selector" id="{{pass_.__name__}}selector" title="{{pass_.__doc__}}">{{pass_.__name__}}</button>
{% endfor %}
</div>
<div id="group_nav">
<div class="botbar-right">
<div class="text-light id" id="{{id}}">{{id}} / {{max_id}}</div>
<div class="btn-group" role="group" aria-label="NextPrev" id="next_prev_match">
<button type="button" class="btn btn-outline-light prev_match" id="prev_match" {{'disabled' if id <= 1 else ''}}><<</button>
<button type="button" class="btn btn-outline-light next_match" id="next_match" {{'disabled' if id >= max_id else ''}}>>></button>
</div>
<div class="btn-group" role="group" aria-label="Views" id="passes">
{% for pass_ in passes %}
<button type="button" class="btn btn-outline-light view_selector" id="{{pass_.__name__}}selector" title="{{pass_.__doc__}}">{{pass_.__name__}}</button>
{% endfor %}
</div>
<div class="btn-group" role="group" aria-label="NextPrevGroup">
<button type="button" class="btn btn-outline-light matches_group" id="previous_group">&lt;</button>
<button type="button" class="btn btn-outline-light matches_group" id="next_group">&gt;</button>
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
packages=find_packages(exclude=["tests"]),
scripts=["bin/compare50"],
url="https://github.com/cs50/compare50",
version="1.2.15",
version="1.2.14",
include_package_data=True,
)