Content and sidebar resize #19

Merged
67 commits merged into from Jan 7, 2011

Projects

None yet

3 participants

@barraponto

No description provided.

fedorius and others added some commits Dec 15, 2010
@fedorius fedorius Changing topics inhetance logic for follow up questions 91cdba4
@fedorius fedorius fixing bug for new questions c2f451c
@fedorius fedorius Fixed email subject on answer notification and changes in structure t…
…o fit mvc
e9e95a3
Helder Ribeiro Merge remote branch 'fedorius/email_notify_subject' into merge
* fedorius/email_notify_subject:
  Fixed email subject on answer notification and changes in structure to fit mvc
86a58ba
Helder Ribeiro Added link to jobs. 94b0cf0
@arthuraa arthuraa Updated gem cache. 7fb7064
@arthuraa arthuraa Rake task to clean DB dumps. 1f9cf56
@arthuraa arthuraa Removed flash in VotesController.
File reformatting.
a2fd2b4
@arthuraa arthuraa Cleaned flash in UsersController. 3a82eb9
@arthuraa arthuraa Cleaned flash in QuestionsController. cca79bb
@arthuraa arthuraa Correcting errors in QuestionsController. 77594bd
@arthuraa arthuraa Cleaned flash in CommentsController. d722fba
@arthuraa arthuraa Updated sample configuration files.
It is easier now to clone the repository and run locally.
308405f
@arthuraa arthuraa Cleaned flash in AnswersController. 45fb144
@arthuraa arthuraa Cleaned flash in a couple of controllers.
These controllers are not being used right now and is the changes are
mostly untested, but it should be ok.
25d2430
@arthuraa arthuraa Showing first comment after AJAX request. 18bbc6e
@arthuraa arthuraa Displaying comments after new comment is posted. c20efc7
@arthuraa arthuraa Fixed (sorta) HTML-escaping problem in news feed. 79c12d3
Helder Ribeiro Simplify comments.
 * Remove duplicate code for question and answer comments;

 * No need for separate controls for collapsing/expanding list of
   comments *and* the new comment form. Now they're collapsed/hidden
   together.
d37f2b6
Helder Ribeiro Fix slideToggle for comments after adding a new one. 435f0c3
@arthuraa arthuraa Fixed invitation order in invitations page. 92b24ac
@arthuraa arthuraa First version of topic suggestions. 070f515
@arthuraa arthuraa First FUNCTIONAL version of topic suggestions. 812a65b
@arthuraa arthuraa Migrated topic suggestions widget to a cell. 6e9e8c1
@arthuraa arthuraa Redraw topic suggestions after following. 8f8062e
@arthuraa arthuraa User can now refuse topic suggestions. c98fb4a
@arthuraa arthuraa Denormalized topic suggestions. 6193262
@arthuraa arthuraa Fixed small problems in suggestions. 326b267
@arthuraa arthuraa Populating suggestions when user doesn't follow anything. 570bfd4
@arthuraa arthuraa Better random suggestions. 685f754
Helder Ribeiro Merge branch 'merge_comments'
* merge_comments:
  Fix slideToggle for comments after adding a new one.
  Simplify comments.
  Fixed (sorta) HTML-escaping problem in news feed.
  Displaying comments after new comment is posted.
  Showing first comment after AJAX request.
  Cleaned flash in a couple of controllers.
  Cleaned flash in AnswersController.
  Updated sample configuration files.
  Cleaned flash in CommentsController.
  Correcting errors in QuestionsController.
  Cleaned flash in QuestionsController.
  Cleaned flash in UsersController.
  Removed flash in VotesController.
  Rake task to clean DB dumps.
  Updated gem cache.
bac3765
Helder Ribeiro Merge branch 'topic_suggestions'
* topic_suggestions:
  Better random suggestions.
  Populating suggestions when user doesn't follow anything.
  Fixed small problems in suggestions.
  Denormalized topic suggestions.
  User can now refuse topic suggestions.
  Redraw topic suggestions after following.
  Migrated topic suggestions widget to a cell.
  First FUNCTIONAL version of topic suggestions.
  First version of topic suggestions.
3c60f98
@arthuraa arthuraa Fixed rake import task. 7299d32
Helder Ribeiro Add UserVoice tab. c54b76f
Helder Ribeiro Point feedback link on footer to UserVoice. 21f8e17
@barraponto barraponto brought changes to header from newtheme 5b46a49
@barraponto barraponto cleaning up old styles a8d4811
@barraponto barraponto cleaning up old styles 5274ab9
@barraponto barraponto smaller logo 465ecec
@barraponto barraponto added new button to search form 8065845
@barraponto barraponto fixed img underline dac7f79
@barraponto barraponto getting rid of faq and truncating username e427d3c
@barraponto barraponto proper size for question button 1ff32ab
@barraponto barraponto changes to the header 2923f77
@barraponto barraponto fixed list style position c8ca39a
@barraponto barraponto added blueprint support to main and sidebar areas e110ea4
@barraponto barraponto cleaning up some stylesheets c43750c
@barraponto barraponto proper typographic logo, some grid alignments abb2056
@barraponto barraponto reverting accidental change to logo.png c86f678
@barraponto barraponto fixing the follow button (though not happy with it yet) f443a9d
@barraponto barraponto changing the group default logo 5b2cdeb
@barraponto barraponto fixing the main content display 45dfb9c
@barraponto barraponto pressing enters searches or asks new question depending on question mark 62978ba
@barraponto barraponto added sidebar sass 5d3ae35
@barraponto barraponto removed reference to deleted searchbox stylesheet f1b5c2c
@barraponto barraponto adjusted the navigation title 1bdced1
@barraponto barraponto adjusted the topbar to the right of the grid 40bd2e7
@barraponto barraponto clear both on some sub navigation titles b4fe38e
@barraponto barraponto a better position for the searchbar a432016
@barraponto barraponto smaller font-size for navtitle ff5da7e
@barraponto barraponto fixing bug introduced during merge f2b2d41
@barraponto barraponto got rid of question voting 59cf18c
@barraponto barraponto Merge remote branch 'anarute/fancyheader' into content_and_sidebar_re…
…size

Conflicts:
	app/stylesheets/themes/plain/_questions.sass
	app/stylesheets/themes/plain/style.sass
	app/views/layouts/application.html.haml
	app/views/questions/show.html.haml
	app/views/shared/_topbar.html.haml
	public/images/default_logo.png
	public/javascripts/modules/show_question.js
8a27a7b
@barraponto

added anarute's styling to the header, and some minor stuff.

This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment