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

fix: format updates #1337

Merged
merged 4 commits into from
May 26, 2023
Merged

fix: format updates #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9686878
fix: format updates
marvin9257 May 26, 2023
c6a7c04
Update twodsix.css
marvin9257 May 26, 2023
c6e0725
fix: prosemirror menu dropdown highlight
marvin9257 May 26, 2023
31970aa
fix prosemirror pop-up forms
marvin9257 May 26, 2023
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
20 changes: 17 additions & 3 deletions static/styles/twodsix.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3645,15 +3645,29 @@ div.app.window-app.minimized.twodsix.ship.actor header a.close {
color: var(--s2d6-form-light);
}

.prosemirror menu .pm-dropdown li:hover {
color: var(--s2d6-background-opaque);
}

.prosemirror menu {
flex-wrap: nowrap;
padding: 4px 2px;
justify-content: space-around;
}

.prosemirror menu > li {
margin: 6px 0px;
}

.prosemirror.menu-dialog form {
background-image: url(../assets/workbg2.webp);
color: var(--s2d6-default-color);
box-shadow: 0 0 8px 0 var(--s2d6-default-color);
}

.prosemirror menu button, .prosemirror menu .pm-dropdown {
padding: 0 2px;
height: auto;
background: var(--s2d6-background-transparent);
/*height: auto;*/
background-color: var(--s2d6-background-transparent);
border: solid 1px var(--s2d6-form-light);
color: var(--s2d6-form-light);
}
Expand Down
2 changes: 1 addition & 1 deletion static/styles/twodsix_moduleFix.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/* fix for dice-tray input box shift for default mode*/
input.dice-tray__input {
margin-top: 8px;
margin-top: 4px;
}

/* Fix GM Screen background for dark formats*/
Expand Down