aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rwxr-xr-xthemes/baggy/_pocheit-form.twig4
-rw-r--r--themes/baggy/_search-form.twig5
-rwxr-xr-xthemes/baggy/css/main.css63
-rwxr-xr-xthemes/baggy/home.twig2
-rwxr-xr-xthemes/baggy/tags.twig4
5 files changed, 37 insertions, 41 deletions
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index 57a928c0..409707f0 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"> 1<div id="bagit-form" class="messages info">
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><a href="javascript: void(null);" id="bagit-form-close">X</a> 3 <h2>{% trans "Save a link" %}</h2>
4 {% trans "Save a link" %}</h2> 4 <a href="javascript: void(null);" id="bagit-form-close" class="popup-close">&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/_search-form.twig b/themes/baggy/_search-form.twig
index 7b2c7082..45660b75 100644
--- a/themes/baggy/_search-form.twig
+++ b/themes/baggy/_search-form.twig
@@ -1,7 +1,8 @@
1<div id="search-form" class="messages info"> 1<div id="search-form" class="messages info">
2<form method="get" action="index.php"> 2<form method="get" action="index.php">
3 <a href="javascript: void(null);" id="search-form-close" class="popup-close">&times;</a>
3 <input type="hidden" name="view" value="search"></input> 4 <input type="hidden" name="view" value="search"></input>
4 <label><a href="javascript: void(null);" id="search-form-close">X</a>{% trans "Search" %}</label> : <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" /> 5 <label>{% trans "Search" %}</label>: <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
5 <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input> 6 <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
6</form> 7</form>
7</div> \ No newline at end of file 8</div>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 558fb208..ce30cb5a 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -192,7 +192,7 @@ h2:after {
192 padding-bottom: 1em; 192 padding-bottom: 1em;
193} 193}
194 194
195 #links a { 195 #links > li > a {
196 display: block; 196 display: block;
197 padding: 0.5em 2em 0.5em 1em; 197 padding: 0.5em 2em 0.5em 1em;
198 color: #FFF; 198 color: #FFF;
@@ -208,7 +208,7 @@ h2:after {
208 transition: all 0.5s ease; 208 transition: all 0.5s ease;
209 } 209 }
210 210
211 #links a:hover, #links a:focus { 211 #links > li > a:hover, #links > li > a:focus {
212 background: #999; 212 background: #999;
213 color: #000; 213 color: #000;
214 } 214 }
@@ -328,10 +328,6 @@ footer a {
328 margin-left: 0!important; 328 margin-left: 0!important;
329} 329}
330 330
331.listmode .entrie p {
332 display: none;
333}
334
335.list-entries + .results { 331.list-entries + .results {
336 margin-bottom: 2em; 332 margin-bottom: 2em;
337} 333}
@@ -360,11 +356,15 @@ footer a {
360 position: relative; 356 position: relative;
361 overflow: hidden; 357 overflow: hidden;
362 padding: 1.5em 1.5em 3em 1.5em; 358 padding: 1.5em 1.5em 3em 1.5em;
363 -webkit-transition: all 0.5s ease; 359
364 -moz-transition: all 0.5s ease; 360 /* Removing CSS transitions because they make the switch from list view to
365 -ms-transition: all 0.5s ease; 361 * table view jerky
366 -o-transition: all 0.5s ease; 362 */
367 transition: all 0.5s ease; 363 /* -webkit-transition: all 0.5s ease; */
364 /* -moz-transition: all 0.5s ease; */
365 /* -ms-transition: all 0.5s ease; */
366 /* -o-transition: all 0.5s ease; */
367 /* transition: all 0.5s ease; */
368} 368}
369 369
370.entrie:before { 370.entrie:before {
@@ -569,19 +569,28 @@ footer a {
569 padding: 2em; 569 padding: 2em;
570} 570}
571 571
572a#bagit-form-close, a#search-form-close { 572#bagit-form-form .addurl {
573 margin-left: 0;
574}
575
576.popup-close {
573 background: #000; 577 background: #000;
574 color: #FFF; 578 color: #FFF;
575 padding: 0.2em 0.5em; 579 font-size: 1.4em;
580 line-height: 1.6em;
581 width: 1.6em;
582 height: 1.6em;
583 text-align: center;
576 text-decoration: none; 584 text-decoration: none;
577 display: inline-block; 585 display: inline-block;
578 float: right; 586 position: absolute;
579 font-size: 0.6em; 587 top: 0;
580} 588 right: 0;
581a#bagit-form-close:hover, a#search-form-close:hover {
582 background: #999;
583 color: #000;
584} 589}
590 .popup-close:hover {
591 background: #999;
592 color: #000;
593 }
585 594
586.active-current { 595.active-current {
587 background-color: #999; 596 background-color: #999;
@@ -665,20 +674,6 @@ a.add-to-wallabag-link-after:after {
665 padding: 2em; 674 padding: 2em;
666} 675}
667 676
668a#search-form-close {
669 background: #000;
670 color: #FFF;
671 padding: 0.2em 0.5em;
672 text-decoration: none;
673 display: inline-block;
674 float: right;
675 font-size: 1.2em;
676}
677a#search-form-close:hover {
678 background: #999;
679 color: #000;
680}
681
682#submit-search{ 677#submit-search{
683margin-left: 4em; 678margin-left: 4em;
684margin-top:1em; 679margin-top:1em;
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index a870fc21..03de6b9b 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -38,7 +38,7 @@
38 {% endblock %} 38 {% endblock %}
39 <div id="list-entries" class="list-entries"> 39 <div id="list-entries" class="list-entries">
40 {% for entry in entries %} 40 {% for entry in entries %}
41 <div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}> 41 <div id="entry-{{ entry.id|e }}" class="entrie">
42 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2> 42 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
43 {% if entry.content| getReadingTime > 0 %} 43 {% if entry.content| getReadingTime > 0 %}
44 <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div> 44 <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
diff --git a/themes/baggy/tags.twig b/themes/baggy/tags.twig
index 9bb93a45..65930eb2 100755
--- a/themes/baggy/tags.twig
+++ b/themes/baggy/tags.twig
@@ -1,5 +1,5 @@
1{% extends "layout.twig" %} 1{% extends "layout.twig" %}
2{% block title %}tags{% endblock %} 2{% block title %}Tags{% endblock %}
3{% block menu %} 3{% block menu %}
4{% include '_menu.twig' %} 4{% include '_menu.twig' %}
5{% endblock %} 5{% endblock %}
@@ -10,4 +10,4 @@
10</li> 10</li>
11{% endfor %} 11{% endfor %}
12</ul> 12</ul>
13{% endblock %} \ No newline at end of file 13{% endblock %}