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

Adds Trinket Compare #113

Draft
wants to merge 42 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a9d3c5e
adds trinket compare feature
Nov 21, 2023
f159421
rm whitespace
Nov 21, 2023
c908de2
Submenu styling
Nov 26, 2023
62f0a19
adds item ids
Mar 10, 2024
3579dc4
caches trinket data for trinket_compare, updates fetching to be prima…
Apr 8, 2024
8ad944c
Merge branch 'Bloodmallet:develop' into develop
Apr 8, 2024
f023d00
rm most fetching/processing from general.py
Apr 9, 2024
ec12b74
Merge branch 'develop' of github.com:Ellimistdev/bloodmallet_web_fron…
Apr 9, 2024
8aa277b
cleans up general.py
Apr 9, 2024
429c44f
lint
Apr 9, 2024
5fd1448
some organization
Apr 9, 2024
97796c5
linting
Apr 9, 2024
da89ca4
Aligns trinket nav with displayed chart, redraws chart on nav selecti…
Apr 10, 2024
c84c47e
update for s4
Jun 22, 2024
700cd33
Merge remote-tracking branch 'upstream/develop' into develop
Ellimistdev Jun 22, 2024
f4528e0
adds trinket compare feature
Nov 21, 2023
6cedf97
rm whitespace
Nov 21, 2023
8295373
Submenu styling
Nov 26, 2023
89bbed1
adds item ids
Mar 10, 2024
205988a
caches trinket data for trinket_compare, updates fetching to be prima…
Apr 8, 2024
2651abc
rm most fetching/processing from general.py
Apr 9, 2024
ac9bd44
cleans up general.py
Apr 9, 2024
41f50e4
lint
Apr 9, 2024
667fd3f
some organization
Apr 9, 2024
7d76748
linting
Apr 9, 2024
b98c851
Aligns trinket nav with displayed chart, redraws chart on nav selecti…
Apr 10, 2024
8e08d36
update for s4
Jun 22, 2024
56acb03
Merge branch 'develop' of github.com:Ellimistdev/bloodmallet_web_fron…
Ellimistdev Sep 8, 2024
69670da
Merge pull request #2 from Bloodmallet/develop
Ellimistdev Oct 29, 2024
e8e6a25
Merge remote-tracking branch 'upstream/develop' into develop
Ellimistdev Feb 20, 2025
25047a9
fix merge
Ellimistdev Feb 20, 2025
f18b158
Rollup changes for trinket_compare
Ellimistdev Feb 23, 2025
f29084c
Fixes nav and trinket population. pulls in new data
Ellimistdev Feb 28, 2025
99204c7
linting
Ellimistdev Feb 28, 2025
6c67a37
ws
Ellimistdev Feb 28, 2025
6a77f0a
Fixes trinket compare localization. Adds bm-utils.js, comments.
Ellimistdev Feb 28, 2025
75c568a
linting
Ellimistdev Feb 28, 2025
487f1cb
Moves Fight style dictionary to bmutils.
Ellimistdev Feb 28, 2025
5f2f595
reverts bm_chart_import changes
Ellimistdev Feb 28, 2025
6afc594
ws
Ellimistdev Feb 28, 2025
dc093bc
rm debug logging
Ellimistdev Feb 28, 2025
713a3b4
rm comment
Ellimistdev Feb 28, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Generated by Django 5.1.6 on 2025-02-20 18:26

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("general_website", "0007_auto_20201126_0943"),
]

operations = [
migrations.AlterField(
model_name="simulation",
name="custom_apl",
field=models.TextField(
blank=True, help_text="Define your characters APL.", max_length=65536
),
),
migrations.AlterField(
model_name="simulation",
name="custom_profile",
field=models.TextField(
blank=True,
help_text='Define your own character here, instead of using the standard profile (your input will overwrite the standard profile). Paste your <a href="https://www.curseforge.com/wow/addons/simulationcraft" target="_blank">SimulationCraft</a> /simc output into this element.',
max_length=10000,
),
),
]
21 changes: 21 additions & 0 deletions general_website/static/general_website/css/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,33 @@ a:hover .svg-icon {
.dropdown-menu {
background-color: $darkest-color;
padding: 0rem;
min-width: 1rem;
}

.dropdown-item:hover,
.dropdown-item:focus {
background-color: $darkest-color;
}

.dropdown-menu::-webkit-scrollbar-track
{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
background-color: $darkest-color;
}

.dropdown-menu::-webkit-scrollbar
{
width: 10px;
background-color: $darkest-color;
}

.dropdown-menu::-webkit-scrollbar-thumb
{
background-color: $class-color-priest;
border: 2px solid $darkest-color
}


// create necessary class specific css for nav and tables
@each $class,
$color-value in $class-colors {
Expand Down Expand Up @@ -408,6 +428,7 @@ select {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
appearance: none;
-webkit-appearance: none;
-moz-appearance: none;

Expand Down
Loading