gitlabhq/app/assets/stylesheets/sections
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
..
commits.scss Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
editor.scss replaced redundant -*-border-radius box-shadows and others with corresponding mixins 2012-11-29 12:18:44 +01:00
events.scss Tests are fixed now 2013-01-05 12:12:02 +02:00
graph.scss replaced redundant -*-border-radius box-shadows and others with corresponding mixins 2012-11-29 12:18:44 +01:00
header.scss Make the logo icon more awesome 2012-12-24 21:18:23 +02:00
issues.scss a bit of restyling for issues and merge request lists 2013-01-08 08:14:05 +03:00
login.scss replaced redundant -*-border-radius box-shadows and others with corresponding mixins 2012-11-29 12:18:44 +01:00
merge_requests.scss a bit of restyling for issues and merge request lists 2013-01-08 08:14:05 +03:00
nav.scss Tiny nav 2012-12-06 16:54:53 +02:00
notes.scss Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
profile.scss replaced redundant -*-border-radius box-shadows and others with corresponding mixins 2012-11-29 12:18:44 +01:00
projects.scss Fixed styles, ProjectHook specs etc 2013-01-05 00:35:38 +02:00
snippets.scss Add ace editor to snippets 2012-12-12 19:42:08 +02:00
themes.scss Added some uniformity, all css properties and values are separated by a colon and a space : 2012-11-29 12:18:44 +01:00
tree.scss renamed blue_link var to primary_color 2012-11-29 12:18:44 +01:00
votes.scss bit reordering and cleanup unused styles 2012-12-13 21:44:55 +02:00