Merge pull request #909 from jsit/closebutton

Standardizing class names and styles for close buttons
This commit is contained in:
Thomas Citharel 2014-10-31 18:44:42 +01:00
commit 224528f1de
3 changed files with 26 additions and 22 deletions

View file

@ -1,7 +1,7 @@
<div id="bagit-form" class="messages info">
<form method="get" action="index.php" target="_blank" id="bagit-form-form">
<h2>{% trans "Save a link" %}</h2>
<a href="javascript: void(null);" id="bagit-form-close" class="popup-close">&times;</a>
<a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
<input type="hidden" name="autoclose" value="1" />
<input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
<span id="add-link-result"></span>

View file

@ -1,6 +1,6 @@
<div id="search-form" class="messages info">
<form method="get" action="index.php">
<a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
<a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
<input type="hidden" name="view" value="search"></input>
<label>{% trans "Search" %}:</label><input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
<input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>

View file

@ -572,24 +572,32 @@ footer a {
margin-left: 0;
}
.popup-close {
.closeMessage,
.close-button {
background: #000;
color: #FFF;
font-size: 1.4em;
line-height: 1.6em;
font-size: 1.2em;
line-height: 1.6;
width: 1.6em;
height: 1.6em;
text-align: center;
text-decoration: none;
}
.closeMessage:hover,
.closeMessage:focus,
.close-button:hover,
.close-button:focus {
background: #999;
color: #000;
}
.close-button--popup {
display: inline-block;
position: absolute;
top: 0;
right: 0;
font-size: 1.4em;
}
.popup-close:hover {
background: #999;
color: #000;
}
.active-current {
background-color: #999;
@ -787,18 +795,6 @@ margin-top:1em;
.messages > * { display: inline-block;}
.closeMessage {
background: #000;
color: #FFF;
padding: 0.2em 0.5em;
text-decoration: none;
}
.closeMessage:hover, .closeMessage:focus {
background: #FFF;
color: #000;
}
.warning {
/* font-size: 3em;
color: #999;
@ -1057,8 +1053,16 @@ pre code {
display: none;
}
#bagit-form, #search-form {
.popup-form, #bagit-form, #search-form {
left: 0;
width: 100%;
border-left: none;
}
.popup-form form,
#bagit-form form,
#search-form form {
width: 100%;
}
}