Commit graph

12 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
36fd4de825 Replace page_title with page-title. Correct margin for some blocks/layouts 2013-07-13 08:45:48 +03:00
Dmitriy Zaporozhets
f438bd415f Merge branch 'master' into 6-0-dev
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
2013-06-30 11:35:40 +03:00
Izaak Alpert
c1b05e7b86 Gravatar image fixes when gravatar unavailable
-Alt text to image was set to hash, which would make the page display hashes if the image/gravatar  wasn't available, set the alt text to '', and made the main tool bar image follow the same or similar constraints as the other images (.avatar, .s26)

Conflicts:
	app/assets/stylesheets/themes/ui_bb.scss
	app/views/snippets/_snippet.html.haml

Change-Id: I42e1e86f535486fd2556d4b3e4591f3676eea033
2013-06-26 08:53:03 -04:00
Dmitriy Zaporozhets
2c482097fc Remove invalid information from /u/:user page 2013-06-21 16:16:05 +03:00
Dmitriy Zaporozhets
4d149ac8a9 Dark color for group name at header. Better name for activity 2013-06-20 15:59:39 +03:00
Dmitriy Zaporozhets
fa9a8c3847 Remove team_member show page -> use user_path instead 2013-03-13 19:16:36 +02:00
Dmitriy Zaporozhets
ed3f44085e Redesign Admin -> user -> show page 2013-02-13 19:14:35 +02:00
Dmitriy Zaporozhets
e2fb18a3ec replace right with pull-right 2013-01-30 16:40:43 +02:00
Dmitriy Zaporozhets
fb617c61b9 refactor buttons pt2 2013-01-29 22:29:21 +02:00
Dmitriy Zaporozhets
f6c482c06f User can create group 2013-01-24 17:47:09 +02:00
Dmitriy Zaporozhets
96d97c4857 Fix routing. Finalize user show page 2013-01-22 19:45:13 +02:00
Dmitriy Zaporozhets
70690e1971 base implementation 2013-01-22 19:05:01 +02:00