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

Merge remote-tracking branch 'upstream/pull/3697'

Browse source
This commit is contained in:
Tom Hughes 2022-09-18 18:32:12 +01:00
commit e24b624547
2 changed files with 1 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

64
app/assets/stylesheets/common.scss
View file

@ -1257,16 +1257,6 @@ tr.turn:hover {
display: inline !important;
}
/* Rules for the oauth settings page */
.oauth_clients .buttons .oauth-edit {
border-radius: 2px 0 0 2px;
}
.oauth_clients .buttons .oauth-delete {
border-radius: 0 2px 2px 0;
}
/* Rules for the oauth authorization page */
.oauth-authorize ul {
@ -1457,60 +1447,6 @@ div.secondary-actions {
text-align: center;
}
.buttons {
min-width: 200px;
input[type="submit"],
input[type="button"],
input[type="reset"],
.button,
.button_to {
box-sizing: border-box;
float: left;
border-radius: 0;
margin:0;
min-width: 75px;
max-width: 180px;
border-right:1px solid white;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
input:first-child,
.button:first-child,
.button_to:first-child {
border-radius:2px 0 0 2px;
}
input:last-child,
.button:last-child,
.button_to:last-child {
border-radius:0 2px 2px 0;
border-right-width: 0;
}
input:only-child,
.button:only-child,
.button_to:only-child,
*[value="Hide"] + input:last-child,
*[value="Hide"] + .button:last-child,
*[value="Hide"] + .button_to:last-child {
border-radius:2px;
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),
*[value="Hide"] + .button_to: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),
*[value="Hide"] + .button_to:nth-child(2):not(:last-child) {
border-radius:2px 0 0 2px;
border-right-width: 1px;
}
}
/* Create a single-line dl */
dl.dl-inline {

2
app/views/browse/new_note.html.erb
View file

@ -10,7 +10,7 @@
<div class="mb-3">
<textarea class="form-control" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t("javascripts.notes.new.advice") %>"></textarea>
</div>
<div class="buttons clearfix">
<div class="btn-wrapper">
<input type="submit" name="add" value="<%= t("javascripts.notes.new.add") %>" disabled="1" class="btn btn-primary">
</div>
</form>