-
Notifications
You must be signed in to change notification settings - Fork 9
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
Veue 211 - Improve "Videos#index" display #123
Conversation
Task linked: VEUE-211 Improve "Videos#index" display |
@Seraphyne can you attach some screenshots? If you take a screenshot, Github lets you drop the image right into the text field and will automatically upload it! MAGIC. |
app/javascript/style/_global.scss
Outdated
@@ -5,7 +5,7 @@ body, | |||
* { | |||
font-family: font.$nunito; | |||
font-weight: font.$normal-weight; | |||
min-width: 0; | |||
// min-width: 0; |
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.
I'm pretttty sure this is going to break the video watch page!
desktop.ini
Outdated
[ViewState] | ||
Mode= | ||
Vid= | ||
FolderType=StorageProviderGeneric |
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.
@Seraphyne Do you know what this file is?
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.
I saw it ran changes on it, but I didn't personally changed it.
@@ -28,7 +28,7 @@ $veue-lilac: #6460f1; | |||
$neutral-dark: #40424f; | |||
$neutral-regular: #9595a5; | |||
$neutral-middle: #c1c1cc; | |||
$neutral-soft: #eaeaf00; | |||
$neutral-soft: #eaeaf0; |
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.
Was this intentional?
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.
Nope! I dunno what happened there..
app/javascript/style/_layout.scss
Outdated
flex-wrap: wrap; | ||
margin: 3rem; | ||
} | ||
} |
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.
I think this would be better column, maybe wrap the h2 in a div and let it just push the contents down?
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.
Will restart the changes right now..
VEUE-211 - Changes made:
Here are the pictures of the final result: |
Oh, and since I had to install the webpacker again, it changed the version to "@rails/webpacker": "5.2.1", so the other files that was changed, has to do with my re-installation of the webpacker. |
Needs rspec to pass! |
Changes that I have done:
Changes that Rubocop did:
I see on the comment saying that "This branch has conflicts that must be resolved" is because Windows weren't starting my server. The error I was having was: ERROR: worker mode not supported. For that reason, I saw the solution about it in here. So I went and commented out the line # workers ENV.fetch("WEB_CONCURRENCY") { 4 } @config/puma.rb. If this line is important, I don't mind commenting it out and in every time I ran the server and NOT adding to my commit. Not a problem! Please, let me know if all the differences are corrected or if I need to tweak something else. |
7ac7710
to
a24adf4
Compare
585cc29
to
d5cdca6
Compare
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.
LGTM (this is renata's code)
Branch VEUE-211: