Closed MunishMummadi closed 1 month ago
Initially this PR was right: https://github.com/servo/stylo/compare/2024-03-01...c2a6b596ce9d5e3d7ff888f748d19cacb94dd239 But then I guess you did some rebase wrong? https://github.com/servo/stylo/compare/2024-03-01...e15424fdd8dbd9e08b2c3a423729942f5ed81fb8 I have force-pushed main so I will rebase the original c2a6b596ce9d5e3d7ff888f748d19cacb94dd239
this might off-topic. You can reply if u want to. While resolving conflicts from various commits(rebase conflicts). vscode isn't showing the conflicts as soon as I resolve them(conflicts) in one commit. So, I am manually resolving them in vim or nvim. I am accidentally deleting a line of code e.t.c. What do u suggest ?.
I don't use vscode. I run git rebase
into the console. If there are conflicts, I run git mergetool
which I set up to use kdiff3
.
But I don't think you should be getting conflicts here, if you rebase correctly. Note that when we import commits from Gecko, we force-push the main branch, breaking the linear history. So you need to use the right git rebase --onto
command.
For example, above I used something like
git reset --hard c2a6b596ce9d5e3d7ff888f748d19cacb94dd239
git rebase --onto main upstream/2024-03-01 new-text-25
I get it now. Reason behind that onto
command is clear to me now. Now I understood that I have to use a mergetool such as kdiff3
to resolve the conflicts. This information is new and highly helpful to me. I will do some digging and upgrade myself. Thanks a lot for covering for the mistakes I am doing. Learned a lot. I will try my best such that my next PR won't put any pressure or work on you. Sorry for the delays. I am struck with assignments and learning stuff to do something useful for servo. As the holidays are approaching, I will come with full force.
This pull request is a continuation of #31, which was closed due to the need for rebasing. I have rebased my changes as requested by the maintainer.
Changes
sub_properties
attribute of thetext-decoration
shorthand to includetext-decoration-style
andtext-decoration-color
for the Servo engine.parse_value
function to parsetext-decoration-style
andtext-decoration-color
properties when the engine is Servo. The parsed values are stored in thestyle
andcolor
variables, respectively.ToCss
implementation to serializetext-decoration-style
andtext-decoration-color
properties for the Servo engine.These changes ensure that the
text-decoration
shorthand in Servo correctly parses and serializes thetext-decoration-style
andtext-decoration-color
properties, providing a complete implementation of the shorthand.Resolves: #25