moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-27 03:12:21 -05:00
Code Issues Releases Wiki Activity

Merging changes with dev

Browse Source
This commit is contained in:
Jay Sitter 2014-10-31 13:47:45 -04:00
commit 15eb5ca4b8
5 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/3rdparty/class.messages.php vendored
View File

@ -44,7 +44,7 @@ class Messages {
var $msgId; var $msgId;
var $msgTypes = array( 'help', 'info', 'warning', 'success', 'error' ); var $msgTypes = array( 'help', 'info', 'warning', 'success', 'error' );
var $msgClass = 'messages'; var $msgClass = 'messages';
var $msgWrapper = "<div class='%s %s'><a href='#' class='closeMessage'>X</a>\n%s</div>\n"; var $msgWrapper = "<div class='%s %s'><a href='#' class='closeMessage'>&times;</a>\n%s</div>\n";
var $msgBefore = '<p>'; var $msgBefore = '<p>';
var $msgAfter = "</p>\n"; var $msgAfter = "</p>\n";

2
themes/baggy/_pocheit-form.twig
View File

@ -1,7 +1,7 @@
<div id="bagit-form" class="messages info popup-form"> <div id="bagit-form" class="messages info popup-form">
<form method="get" action="index.php" target="_blank" id="bagit-form-form"> <form method="get" action="index.php" target="_blank" id="bagit-form-form">
<h2>{% trans "Save a link" %}</h2> <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 type="hidden" name="autoclose" value="1" />
<input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
<span id="add-link-result"></span> <span id="add-link-result"></span>

44
themes/baggy/css/main.css
View File

@ -571,24 +571,32 @@ footer a {
margin-left: 0; margin-left: 0;
} }
.popup-close { .closeMessage,
.close-button {
background: #000; background: #000;
color: #FFF; color: #FFF;
font-size: 1.4em; font-size: 1.2em;
line-height: 1.6em; line-height: 1.6;
width: 1.6em; width: 1.6em;
height: 1.6em; height: 1.6em;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
}
.closeMessage:hover,
.closeMessage:focus,
.close-button:hover,
.close-button:focus {
background: #999;
color: #000;
}
.close-button--popup {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
font-size: 1.4em;
} }
.popup-close:hover {
background: #999;
color: #000;
}
.active-current { .active-current {
background-color: #999; background-color: #999;
@ -750,18 +758,6 @@ a.add-to-wallabag-link-after:after {
.messages > * { display: inline-block;} .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 { .warning {
/* font-size: 3em; /* font-size: 3em;
color: #999; color: #999;
@ -1020,8 +1016,16 @@ pre code {
display: none; display: none;
} }
.popup-form { .popup-form, #bagit-form, #search-form {
left: 0; left: 0;
width: 100%;
border-left: none;
}
.popup-form form,
#bagit-form form,
#search-form form {
width: 100%;
} }
} }

5
themes/default/css/messages.css
View File

@ -8,11 +8,6 @@
border-radius: 4px; border-radius: 4px;
} }
/* Search form message needs a little more width, depending on translations */
#search-form {
width: 420px;
}
.messages a.closeMessage { .messages a.closeMessage {
display: none; display: none;
float: right; float: right;

11
themes/default/css/style.css
View File

@ -417,6 +417,15 @@ a.add-to-wallabag-link-after:after {
padding-left: 10px; padding-left: 10px;
} }
/* ==========================================================================
"Search" popup div related styles
========================================================================== */
/* Search form message needs a little more width, depending on translations */
#search-form {
width: 420px;
}
.opacity03 { .opacity03 {
/*opacity: 0.3;*/ /*opacity: 0.3;*/
} }
@ -435,4 +444,4 @@ pre code {
font-family: "Courier New", Courier, monospace; font-family: "Courier New", Courier, monospace;
border: 1px solid #ddd; border: 1px solid #ddd;
font-size: 0.96em; font-size: 0.96em;
} }