github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-23 21:26:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Change admin display-row css so that multiple lines can fit in the control column. Don't hard-code a height on the rows.

Browse Source
This commit is contained in:
Neil Lalonde 2013-11-11 15:03:17 -05:00
parent d65cd0f97e
commit 2f8866add5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/user.js.handlebars
View File

@ -22,7 +22,7 @@
<div class='value'><a href="mailto:{{unbound email}}">{{email}}</a></div> <div class='value'><a href="mailto:{{unbound email}}">{{email}}</a></div>
</div> </div>
<div class='display-row' style='height: 50px'> <div class='display-row'>
<div class='field'>{{i18n user.avatar.title}}</div> <div class='field'>{{i18n user.avatar.title}}</div>
<div class='value'>{{avatar content imageSize="large"}}</div> <div class='value'>{{avatar content imageSize="large"}}</div>
</div> </div>
@ -46,7 +46,7 @@
</div> </div>
</div> </div>
<div class='display-row' style='height: 50px'> <div class='display-row'>
<div class='field'>{{i18n user.ip_address.title}}</div> <div class='field'>{{i18n user.ip_address.title}}</div>
<div class='value'>{{ip_address}}</div> <div class='value'>{{ip_address}}</div>
<div class='controls'> <div class='controls'>

4
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -195,7 +195,6 @@ table {
} }
.display-row { .display-row {
height: 30px;
line-height: 30px; line-height: 30px;
padding: 5px; padding: 5px;
&:nth-of-type(1) { &:nth-of-type(1) {
@ -235,6 +234,9 @@ table {
} }
.controls { .controls {
width: 600px;
float: left;
margin-left: 12px;
.btn { .btn {
margin-right: 5px; margin-right: 5px;
} }

2
spec/services/staff_action_logger_spec.rb
View File

@ -117,7 +117,7 @@ describe StaffActionLogger do
end end
describe "log_user_suspend" do describe "log_user_suspend" do
let(:user) { Fabricate(:user) } let(:user) { Fabricate(:user, suspended_at: 10.minutes.ago, suspended_till: 1.day.from_now) }
it "raises an error when arguments are missing" do it "raises an error when arguments are missing" do
expect { logger.log_user_suspend(nil, nil) }.to raise_error(Discourse::InvalidParameters) expect { logger.log_user_suspend(nil, nil) }.to raise_error(Discourse::InvalidParameters)