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

Open customize.xul as a resizable window. Fixes #55. #79

Merged
merged 1 commit into from
Jun 12, 2012

Conversation

xabolcs
Copy link
Collaborator

@xabolcs xabolcs commented Jun 3, 2012

Also set it's dimensions to 3:2.

As I know, it applies almost cleanly to top of #74.

@whimboo
Copy link
Contributor

whimboo commented Jun 3, 2012

Why does it need pull #74 merged first? I don't see why. Otherwise it looks good, but not tested yet.

@xabolcs
Copy link
Collaborator Author

xabolcs commented Jun 4, 2012

whimbo commented

Why does it need pull #74 merged first? I don't see why. ...

I just wanted to note that these pulls (#55, #74) are independent from each other,
and the "merger" person is free to choice what to land first. :)

@whimboo
Copy link
Contributor

whimboo commented Jun 12, 2012

Looks good. Pushed:
05ae130

@whimboo whimboo closed this Jun 12, 2012
@xabolcs
Copy link
Collaborator Author

xabolcs commented Jun 12, 2012

I thought that I would be the author. :'(

@whimboo whimboo reopened this Jun 12, 2012
whimboo added a commit that referenced this pull request Jun 12, 2012
Open customize.xul as a resizable window (79)
@whimboo whimboo merged commit b19d86f into mozilla:master Jun 12, 2012
@whimboo
Copy link
Contributor

whimboo commented Jun 12, 2012

Sorry, something went wrong with the merge. Should be fixed now.

@whimboo
Copy link
Contributor

whimboo commented Jun 12, 2012

Is github broken? I'm still the author of this patch!?

@xabolcs
Copy link
Collaborator Author

xabolcs commented Jun 12, 2012

whimboo commented

Is github broken? I'm still the author of this patch!?

The reverted 05ae130 is still yours, but my commit is in the tree now too. :)
Thanks!

@whimboo
Copy link
Contributor

whimboo commented Jun 12, 2012

Wait. The merge commit is from myself but the actual code landing is yours. Solved! :) Sorry again.

@@ -41,9 +41,10 @@

<prefwindow id="NightlyTesterOptions" windowtype="NightlyTester:Customize"
title="&nightly.customize.title;"
style="width: 42.75em; height: 28.5em" persist="width height"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#74 (re)introduces titlebar.css. If that pull lands, move this styling there!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has this already been moved over?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whimboo commented on commit:

Has this already been moved over?

Yes! I did take care about this in ba06511 and 66c0392

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants