aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJay Sitter <jsitter@gmail.com>2014-10-31 13:47:45 -0400
committerJay Sitter <jsitter@gmail.com>2014-10-31 13:47:45 -0400
commit15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c (patch)
tree5cc06a2a014a6b29e9b0e2ef98fef05fa7e86bd0
parent4bc70ed4012bcefa6a3a01a051fcbd18456403df (diff)
parent224528f1debb06b40524fd84ed9a324c0b6131e2 (diff)
downloadwallabag-15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c.tar.gz
wallabag-15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c.tar.zst
wallabag-15eb5ca4b83710059c1bb7a7a6aa270ed3cb704c.zip
Merging changes with dev
-rw-r--r--inc/3rdparty/class.messages.php2
-rwxr-xr-xthemes/baggy/_pocheit-form.twig2
-rwxr-xr-xthemes/baggy/css/main.css44
-rw-r--r--themes/default/css/messages.css5
-rwxr-xr-xthemes/default/css/style.css11
5 files changed, 36 insertions, 28 deletions
diff --git a/inc/3rdparty/class.messages.php b/inc/3rdparty/class.messages.php
index 27c28f43..fbca0df0 100644
--- a/inc/3rdparty/class.messages.php
+++ b/inc/3rdparty/class.messages.php
@@ -44,7 +44,7 @@ class Messages {
44 var $msgId; 44 var $msgId;
45 var $msgTypes = array( 'help', 'info', 'warning', 'success', 'error' ); 45 var $msgTypes = array( 'help', 'info', 'warning', 'success', 'error' );
46 var $msgClass = 'messages'; 46 var $msgClass = 'messages';
47 var $msgWrapper = "<div class='%s %s'><a href='#' class='closeMessage'>X</a>\n%s</div>\n"; 47 var $msgWrapper = "<div class='%s %s'><a href='#' class='closeMessage'>&times;</a>\n%s</div>\n";
48 var $msgBefore = '<p>'; 48 var $msgBefore = '<p>';
49 var $msgAfter = "</p>\n"; 49 var $msgAfter = "</p>\n";
50 50
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index 88d32757..bf2ae903 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -1,7 +1,7 @@
1<div id="bagit-form" class="messages info popup-form"> 1<div id="bagit-form" class="messages info popup-form">
2 <form method="get" action="index.php" target="_blank" id="bagit-form-form"> 2 <form method="get" action="index.php" target="_blank" id="bagit-form-form">
3 <h2>{% trans "Save a link" %}</h2> 3 <h2>{% trans "Save a link" %}</h2>
4 <a href="javascript: void(null);" id="bagit-form-close" class="popup-close">&times;</a> 4 <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
5 <input type="hidden" name="autoclose" value="1" /> 5 <input type="hidden" name="autoclose" value="1" />
6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> 6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
7 <span id="add-link-result"></span> 7 <span id="add-link-result"></span>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 2f3af95e..ce314860 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -571,24 +571,32 @@ footer a {
571 margin-left: 0; 571 margin-left: 0;
572} 572}
573 573
574.popup-close { 574.closeMessage,
575.close-button {
575 background: #000; 576 background: #000;
576 color: #FFF; 577 color: #FFF;
577 font-size: 1.4em; 578 font-size: 1.2em;
578 line-height: 1.6em; 579 line-height: 1.6;
579 width: 1.6em; 580 width: 1.6em;
580 height: 1.6em; 581 height: 1.6em;
581 text-align: center; 582 text-align: center;
582 text-decoration: none; 583 text-decoration: none;
584}
585 .closeMessage:hover,
586 .closeMessage:focus,
587 .close-button:hover,
588 .close-button:focus {
589 background: #999;
590 color: #000;
591 }
592
593.close-button--popup {
583 display: inline-block; 594 display: inline-block;
584 position: absolute; 595 position: absolute;
585 top: 0; 596 top: 0;
586 right: 0; 597 right: 0;
598 font-size: 1.4em;
587} 599}
588 .popup-close:hover {
589 background: #999;
590 color: #000;
591 }
592 600
593.active-current { 601.active-current {
594 background-color: #999; 602 background-color: #999;
@@ -750,18 +758,6 @@ a.add-to-wallabag-link-after:after {
750 758
751.messages > * { display: inline-block;} 759.messages > * { display: inline-block;}
752 760
753.closeMessage {
754 background: #000;
755 color: #FFF;
756 padding: 0.2em 0.5em;
757 text-decoration: none;
758}
759
760 .closeMessage:hover, .closeMessage:focus {
761 background: #FFF;
762 color: #000;
763 }
764
765.warning { 761.warning {
766 /* font-size: 3em; 762 /* font-size: 3em;
767 color: #999; 763 color: #999;
@@ -1020,8 +1016,16 @@ pre code {
1020 display: none; 1016 display: none;
1021 } 1017 }
1022 1018
1023 .popup-form { 1019 .popup-form, #bagit-form, #search-form {
1024 left: 0; 1020 left: 0;
1021 width: 100%;
1022 border-left: none;
1023 }
1024
1025 .popup-form form,
1026 #bagit-form form,
1027 #search-form form {
1028 width: 100%;
1025 } 1029 }
1026} 1030}
1027 1031
diff --git a/themes/default/css/messages.css b/themes/default/css/messages.css
index 3ad4e34e..46b54795 100644
--- a/themes/default/css/messages.css
+++ b/themes/default/css/messages.css
@@ -8,11 +8,6 @@
8 border-radius: 4px; 8 border-radius: 4px;
9} 9}
10 10
11/* Search form message needs a little more width, depending on translations */
12#search-form {
13 width: 420px;
14}
15
16.messages a.closeMessage { 11.messages a.closeMessage {
17 display: none; 12 display: none;
18 float: right; 13 float: right;
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index e254d481..b25373d6 100755
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -417,6 +417,15 @@ a.add-to-wallabag-link-after:after {
417 padding-left: 10px; 417 padding-left: 10px;
418} 418}
419 419
420/* ==========================================================================
421 "Search" popup div related styles
422 ========================================================================== */
423
424/* Search form message needs a little more width, depending on translations */
425#search-form {
426 width: 420px;
427}
428
420.opacity03 { 429.opacity03 {
421 /*opacity: 0.3;*/ 430 /*opacity: 0.3;*/
422} 431}
@@ -435,4 +444,4 @@ pre code {
435 font-family: "Courier New", Courier, monospace; 444 font-family: "Courier New", Courier, monospace;
436 border: 1px solid #ddd; 445 border: 1px solid #ddd;
437 font-size: 0.96em; 446 font-size: 0.96em;
438} \ No newline at end of file 447}