gitlabhq/app/assets/stylesheets
Riyad Preukschas 3022786948 Merge commit 'master' into discussions
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
..
gitlab_bootstrap a bit of restyling for issues and merge request lists 2013-01-08 08:14:05 +03:00
highlight Fix fark background highlight 2012-12-21 23:22:52 +02:00
sections Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
themes Make the logo icon more awesome 2012-12-24 21:18:23 +02:00
application.scss Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
behaviors.scss Fix common form and note preview 2012-12-03 22:51:56 +01:00
common.scss Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
gitlab_bootstrap.scss Move mixins and variables under gitlab bootstrap 2012-12-19 19:02:12 +02:00
jquery.ui.gitlab.css Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03:00
ref_select.scss replaced redundant -*-border-radius box-shadows and others with corresponding mixins 2012-11-29 12:18:44 +01:00