cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fine tune button styling for note popups

Browse source
This commit is contained in:
Saman Bemel-Benrud 2013-06-13 13:52:08 -04:00 • committed by Tom Hughes
parent 34edfdb9ba
commit 2e444eb7bb
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/templates/notes/show.jst.ejs
View file

@ -24,8 +24,8 @@
<form action="#">
<textarea class="comment" name="text" cols="40" rows="5"></textarea>
<div class="buttons clearfix">
<input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-method="DELETE" data-url="<%- note.url %>">
<input type="submit" name="close" value="<%- I18n.t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-method="POST" data-url="<%- note.close_url %>">
<input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator" data-method="DELETE" data-url="<%- note.url %>">
<input type="submit" name="comment" value="<%- I18n.t('javascripts.notes.show.comment') %>" data-method="POST" data-url="<%- note.comment_url %>" disabled="1">
</div>
</form>
@ -33,7 +33,7 @@
<form action="#">
<input type="hidden" name="text" value="">
<div class="buttons clearfix">
<input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator" data-method="DELETE" data-url="<%- note.url %>">
<input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-method="DELETE" data-url="<%- note.url %>">
<input type="submit" name="reopen" value="<%- I18n.t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-method="POST" data-url="<%- note.reopen_url %>">
</div>
</form>

27
app/assets/stylesheets/common.css.scss
View file

@ -1640,27 +1640,40 @@ a.button {
.button {
box-sizing: border-box;
float: left;
margin-bottom:0;
border-radius: 0;
margin:0;
min-width: 100px;
max-width: 150px;
border-right:1px solid white;
}
input:first-child,
.button:first-child {
border-radius:2px 0 0 2px;
border-right:1px solid white;
margin-left: 0px;
}
input:last-child,
.button:last-child {
border-radius:0 2px 2px 0;
margin-right: 0px;
border-right-width: 0;
}
input:only-child,
.button:only-child {
.button:only-child,
*[value="Hide"] + input:last-child,
*[value="Hide"] + .button:last-child {
border-radius:2px;
margin-right: 0px;
border-right-width: 0;
}
/* if a 3-button set has a hidden middle button */
*[value="Hide"] + input:nth-child(3),
*[value="Hide"] + .button:nth-child(3) {
border-radius:0 2px 2px 0;
border-right-width: 0;
}
/* if a 3-button set starts with a hidden button */
*[value="Hide"] + input:nth-child(2):not(:last-child),
*[value="Hide"] + .button:nth-child(2):not(:last-child) {
border-radius:2px 0 0 2px;
border-right-width: 1px solid white;
}
}
/* Rules for doing distinct colour of alternate table rows */