-
Notifications
You must be signed in to change notification settings - Fork 0
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
Use SheafDisplay fr composed sheaf view in discuss #136
Draft
rtshkmr
wants to merge
23
commits into
feat/discussion/sheaf-creation-modal
Choose a base branch
from
feat/discussion/ui-iteration-improve-sheaf-display
base: feat/discussion/sheaf-creation-modal
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
81cb5be
Use SheafDisplay fr composed sheaf view in discuss
rtshkmr 5023450
Follow telegram ui for mark_quote in mark_content
rtshkmr a4d9dcc
Attempt to use hsla for colors
rtshkmr e719c1a
Fix functionality in TextareaAutoResize
rtshkmr 998bee6
Fix Control Panel interference bug
rtshkmr 98b1475
Use action_toggle_button for text-based buttons
rtshkmr 78e07ae
Use action toggle button for marks edit
rtshkmr 45587f4
Shift the edit buttongroups for marks inwards
rtshkmr b21fb63
Display clickable quote region for marks w/o quote
rtshkmr ea7beae
Rely on a fn for selector for pseudoform
rtshkmr fe4c134
Prettify indent guides, support tap to collapse
rtshkmr 17a404f
Prevent zoom-out beyond 1x scale on mobile
rtshkmr 8cdf697
Improve sheaf modal styling
rtshkmr 3e0bcd1
Style SheafCreationForm's replyto_context_display
rtshkmr 16697e2
Minor changes
rtshkmr 8dac303
Fix issue in make_reply for root sheaf creation
rtshkmr e74a947
Fix sheaf::publish on discussions mode
rtshkmr 80fa60c
Wire up 2 out of 4 of the alternative action btns
rtshkmr 0e1cd6c
Add action btn to create new thread @ discuss mode
rtshkmr 7950455
Fix the re-introduced scrolling bug
rtshkmr a3eeac3
Merge branch 'feat/discussion/sheaf-creation-modal' into feat/discuss…
rtshkmr f4ac084
Wire clear_reply_to, improve sheaf::publish
rtshkmr 8ac06d3
Use push_js_cmd to dispatch js actions fm srv
rtshkmr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Convenience js module that defines the site-wide colours | ||
*/ | ||
|
||
// Define individual HSLA colors as constants | ||
const chiliRed = "hsla(5, 100%, 55%, 1)"; // #e83a21 | ||
const pearl = "hsla(39, 40%, 90%, 1)"; // #e3dabe | ||
const black = "hsla(0, 0%, 3%, 1)"; // #070302 | ||
const dun = "hsla(39, 20%, 80%, 1)"; // #deb587 | ||
const bloodRed = "hsla(0, 100%, 20%, 1)"; // #5b1208 | ||
|
||
const whiteAlabaster = "hsla(40, 20%, 95%, 1)"; // #f3efe3 | ||
const linen = "hsla(40, 30%, 97%, 1)"; // #faf1e6 | ||
|
||
const aerospaceOrange = "hsla(30, 100%, 50%, 1)"; // #fd4f00 | ||
const coralOrange = "hsla(15, 100%, 60%, 1)"; // #ff8349 | ||
const atomicTangerine = "hsla(15, 100%, 70%, 1)"; // #ff9b6d | ||
|
||
const brown = "hsla(15, 80%, 30%, 1)"; // #922e00 | ||
const sienna = "hsla(10, 80%, 25%, 1)"; // #7f2800 | ||
const rust = "hsla(0, 85%, 40%, 1)"; // #ae3700 | ||
|
||
// Define color variables using the constants without the 'color' prefix | ||
const colors = { | ||
aerospaceOrange: "hsla(30, 100%, 50%, 1)", | ||
brand: aerospaceOrange, | ||
brandLight: atomicTangerine, | ||
brandExtraLight: linen, | ||
brandAccent: aerospaceOrange, | ||
brandAccentLight: atomicTangerine, | ||
|
||
brandDark: brown, | ||
brandExtraDark: sienna, | ||
|
||
primary: chiliRed, | ||
primaryAccent: chiliRed, | ||
primaryBackground: whiteAlabaster, | ||
secondary: bloodRed, | ||
secondaryBackground: dun, | ||
text: black, | ||
}; | ||
|
||
export default colors; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
/** | ||
* Autofocuses on the textarea that the hook is applied to. | ||
* Just a client-side shortcut. | ||
* */ | ||
export default TextareaFocus = { | ||
mounted() { | ||
this.el.focus(); | ||
}, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FIXME odd tailwind config issue:
So after the annoyance about using css variables to define other css variables and how even after doing the hsl syntax, when using them in tailwind utility classes, it wasn’t possible to add opacity classes to it,
here’s a related gh comment for it
I decided to try using an external
colors.js
so that I can make my best friend, JS, do the magic.Turns out this breaks the tailwindconfig file and some other import doesn’t get its name resolved. I have no idea why, let me know if you know this.
Using JS might be more convenient.
perhaps this functional fetching of colors might make work as seen here?
I’m going to side-step this for now.