mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-22 17:11:07 +00:00
corrections mise en page avec utilisation de jquery.masonry.js
This commit is contained in:
nicosomb
parent
c775c8436b
commit
b70971e06b
5 changed files with 92 additions and 107 deletions
154
css/style.css
154
css/style.css
|
|
@ -47,101 +47,14 @@ header {
|
|||
color: #F1F1F1;
|
||||
}
|
||||
|
||||
footer {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
/*** ***/
|
||||
/*** GRID DISPLAY ***/
|
||||
|
||||
#content {
|
||||
width: 1000px;
|
||||
width: 800px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
#entries {
|
||||
-moz-column-count: 4;
|
||||
-moz-column-gap: 20px;
|
||||
-webkit-column-count: 4;
|
||||
-webkit-column-gap: 20px;
|
||||
column-count: 4;
|
||||
column-gap: 20px;
|
||||
width: 1000px;
|
||||
}
|
||||
|
||||
#entries span.content {
|
||||
display: inline-block;
|
||||
margin-bottom: 0px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@media only screen and (max-width : 1199px),
|
||||
only screen and (max-device-width : 1199px){
|
||||
#entries {
|
||||
-moz-column-count: 5;
|
||||
-moz-column-gap: 20px;
|
||||
-webkit-column-count: 5;
|
||||
-webkit-column-gap: 20px;
|
||||
column-count: 5;
|
||||
column-gap: 20px;
|
||||
width: 1000px;
|
||||
}
|
||||
|
||||
#content {
|
||||
width: 1000px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@media only screen and (max-width : 999px),
|
||||
only screen and (max-device-width : 999px){
|
||||
#entries {
|
||||
-moz-column-count: 4;
|
||||
-moz-column-gap: 15px;
|
||||
-webkit-column-count: 4;
|
||||
-webkit-column-gap: 15px;
|
||||
column-count: 4;
|
||||
column-gap: 15px;
|
||||
width: 800px;
|
||||
}
|
||||
|
||||
#content {
|
||||
width: 800px;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width : 799px),
|
||||
only screen and (max-device-width : 799px){
|
||||
#entries {
|
||||
-moz-column-count: 3;
|
||||
-moz-column-gap: 10px;
|
||||
-webkit-column-count: 3;
|
||||
-webkit-column-gap: 10px;
|
||||
column-count: 3;
|
||||
column-gap: 10px;
|
||||
width: 600px;
|
||||
}
|
||||
|
||||
#content {
|
||||
width: 600px;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width : 599px),
|
||||
only screen and (max-device-width : 599px){
|
||||
#entries {
|
||||
-moz-column-count: 2;
|
||||
-moz-column-gap: 10px;
|
||||
-webkit-column-count: 2;
|
||||
-webkit-column-gap: 10px;
|
||||
column-count: 2;
|
||||
column-gap: 10px;
|
||||
width: 400px;
|
||||
}
|
||||
|
||||
#content {
|
||||
width: 400px;
|
||||
}
|
||||
footer {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
/*** ***/
|
||||
|
|
@ -152,32 +65,34 @@ only screen and (max-device-width : 599px){
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
#main #entries {
|
||||
#main #content {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
#main #entries .entrie {
|
||||
#main .entrie {
|
||||
color: rgb(46, 46, 46);
|
||||
position:relative;
|
||||
background-color: #ffffff;
|
||||
padding: 15px;
|
||||
min-height: 6em;
|
||||
min-height: 8em;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
-webkit-box-shadow: 0px 0px 2px -1px #000;
|
||||
box-shadow: 0px 0px 2px -1px #000;
|
||||
list-style-type: none;
|
||||
width: 30%;
|
||||
margin: 10px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
#main #entries .entrie h2 a {
|
||||
#main .entrie h2 a {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
#main #entries .entrie h2 a:hover {
|
||||
#main .entrie h2 a:hover {
|
||||
color: #F5BE00;
|
||||
}
|
||||
|
||||
#main #entries .entrie .tools {
|
||||
#main .entrie .tools {
|
||||
position:absolute;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
|
|
@ -185,7 +100,7 @@ only screen and (max-device-width : 599px){
|
|||
margin-left: -20px;
|
||||
}
|
||||
|
||||
#main #entries .entrie .tools a.tool span {
|
||||
#main .entrie .tools a.tool span {
|
||||
display: inline-block;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
|
|
@ -238,4 +153,45 @@ body.article {
|
|||
text-decoration: none;
|
||||
}
|
||||
|
||||
/*** ***/
|
||||
/*** ***/
|
||||
#main
|
||||
{
|
||||
max-width: 60em; /* 960 px */
|
||||
margin: 0 auto;
|
||||
}
|
||||
#content
|
||||
{
|
||||
width: 103.125%; /* 990px */
|
||||
overflow: hidden;
|
||||
margin-left: -1.562%; /* 15px */
|
||||
margin-bottom: -1.875em; /* 30px */
|
||||
}
|
||||
.entrie
|
||||
{
|
||||
width: 30.303%; /* 300px */
|
||||
float: left;
|
||||
margin: 0 1.515% 1.875em; /* 15px 30px */
|
||||
}
|
||||
|
||||
@media only screen and ( max-width: 40em ) /* 640px */
|
||||
{
|
||||
.entrie
|
||||
{
|
||||
width: 46.876%; /* 305px */
|
||||
margin-bottom: 0.938em; /* 15px */
|
||||
}
|
||||
}
|
||||
@media only screen and ( max-width: 20em ) /* 640px */
|
||||
{
|
||||
#content
|
||||
{
|
||||
width: 100%;
|
||||
margin-left: 0;
|
||||
}
|
||||
.entrie
|
||||
{
|
||||
width: 100%;
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
23
index.php
23
index.php
|
|
@ -129,12 +129,11 @@ catch (Exception $e)
|
|||
<li><a style="cursor: move" title="i am a bookmarklet, use me !" href="javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('<?php echo url()?>?action=add&url='%20+%20encodeURIComponent(url),'_self');})();">poche it !</a></li>
|
||||
</ul>
|
||||
<div id="content">
|
||||
<ul id="entries">
|
||||
<?php
|
||||
foreach ($entries as $entry)
|
||||
{
|
||||
?>
|
||||
<li id="entry-<?php echo $entry['id']; ?>" class="entrie mb2">
|
||||
<div id="entry-<?php echo $entry['id']; ?>" class="entrie mb2">
|
||||
<span class="content">
|
||||
<h2 class="h6-like">
|
||||
<a href="readityourself.php?url=<?php echo urlencode($entry['url']); ?>"><?php echo $entry['title']; ?>
|
||||
|
|
@ -145,17 +144,33 @@ catch (Exception $e)
|
|||
<a href="?action=delete&id=<?php echo $entry['id']; ?>" title="toggle delete" onclick="return confirm('Are you sure?')" class="tool delete"><span></span></a>
|
||||
</div>
|
||||
</span>
|
||||
</li>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<footer class="mr2 mt3 smaller">
|
||||
<p>download poche on <a href="http://github.com/nicosomb/github">github</a><br />follow us on <a href="https://twitter.com/getpoche" title="follow us on twitter">twitter</a></p>
|
||||
</footer>
|
||||
<script type="text/javascript" src="js/jquery-1.9.1.min.js"></script>
|
||||
<script type="text/javascript" src="js/jquery.masonry.min.js"></script>
|
||||
<script type="text/javascript" src="js/poche.js"></script>
|
||||
<script type="text/javascript">
|
||||
$( window ).load( function()
|
||||
{
|
||||
var columns = 3,
|
||||
setColumns = function() { columns = $( window ).width() > 640 ? 3 : $( window ).width() > 320 ? 2 : 1; };
|
||||
|
||||
setColumns();
|
||||
$( window ).resize( setColumns );
|
||||
|
||||
$( '#content' ).masonry(
|
||||
{
|
||||
itemSelector: '.entrie',
|
||||
columnWidth: function( containerWidth ) { return containerWidth / columns; }
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
10
js/jquery.masonry.min.js
vendored
Normal file
10
js/jquery.masonry.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
10
js/poche.js
10
js/poche.js
|
|
@ -6,11 +6,15 @@ function toggle_favorite(element,id) {
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
function toggle_archive(id) {
|
||||
$('#entry-'+id).toggle();
|
||||
/*$('#entry-'+id).toggle();*/
|
||||
$.ajax ({
|
||||
url: "process.php?action=toggle_archive",
|
||||
data:{id:id}
|
||||
});
|
||||
}
|
||||
var obj = $('#entry-'+id);
|
||||
$('#content').masonry('remove',obj);
|
||||
|
||||
$('#content').masonry('reloadItems');
|
||||
$('#content').masonry('reload');
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
<footer class="mr2 mt3 smaller">
|
||||
<p><a href="https://twitter.com/getpoche" title="follow us on twitter">Follow @getpoche on twitter</a></p>
|
||||
<p>download poche on <a href="http://github.com/nicosomb/github">github</a><br />follow us on <a href="https://twitter.com/getpoche" title="follow us on twitter">twitter</a></p>
|
||||
</footer>
|
||||
|
|
|
|||
Loading…
Reference in a new issue