Skip to content

Commit

Permalink
Revert "Move the contents of lib/gallery.common.css into themes/wind/…
Browse files Browse the repository at this point in the history
…css/screen.php and themes/admin_wind/css/screen.php. Most themers seem to copy the contents into their theme's screen.css anyway."

This reverts commit 4251704.
  • Loading branch information
bharat committed Sep 19, 2010
1 parent f14290f commit 93d1a81
Show file tree
Hide file tree
Showing 5 changed files with 924 additions and 1,716 deletions.

8 comments on commit 93d1a81

@mamouneyya
Copy link
Contributor

Choose a reason for hiding this comment

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

I was wondering why you reverted those modifications as it makes sense to me to have the file contents directly in the theme files. However, since Tim has updated my Browny Wind theme also, it will be nice if you reverted the commits belong to it too:
http://github.com/gallery/gallery3-contrib/commit/b3d25ac9d26b9e393fb4d2016d6ba72446af7ec1
http://github.com/gallery/gallery3-contrib/commit/f8e91efb4313eb50af15b337a56c4d9fb49b7191

Thanks!

@bharat
Copy link
Member Author

@bharat bharat commented on 93d1a81 Sep 19, 2010

Choose a reason for hiding this comment

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

Sorry about the runaround -- that change broke a bunch of images and I didn't have time to figure out what went wrong. Tim may roll it forward again, but I'll revert your browny_wind changes for now so that your theme isn't busted.

@talmdal
Copy link
Member

Choose a reason for hiding this comment

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

Yea, i blew it, and forgot the images. I will probably look at fixing the images in the next day or so and roll it forward, sorry about not thinking of the images

@mamouneyya
Copy link
Contributor

Choose a reason for hiding this comment

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

I can fix this for you, the way I followed in Browny Wind theme. I will give it a try and keep you posted.

@mamouneyya
Copy link
Contributor

Choose a reason for hiding this comment

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

@talmdal
Copy link
Member

Choose a reason for hiding this comment

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

No that's good, that's exactly how I was thinking of resolving it for admin_wind and wind themes... so i'll review the change tomorrow night in more detail

@mamouneyya
Copy link
Contributor

Choose a reason for hiding this comment

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

I am really sorry for bothering you, but could some of you please return my changes again (revert the revert!).. as Tim has redone it this. I am not so familiar with GIT. The commit:
http://github.com/gallery/gallery3-contrib/commit/b3d25ac9d26b9e393fb4d2016d6ba72446af7ec1
And from my fork:
http://github.com/mamouneyya/gallery3-contrib/commit/a79aede1d7233908eab04a928a1a7db362b8c889
http://github.com/mamouneyya/gallery3-contrib/commit/3416eb1d910818d6374f2cc99abdc92d8881c721

@bharat
Copy link
Member Author

@bharat bharat commented on 93d1a81 Sep 27, 2010

Choose a reason for hiding this comment

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

Done! I hope I got it right :-) Let me know if I didn't

Please sign in to comment.