Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pagination markup and switches deprecated 'listingBar' CSS cla… #77

Merged
merged 4 commits into from
Jan 21, 2016
Merged

Update pagination markup and switches deprecated 'listingBar' CSS cla… #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a348d2d
Update pagination markup and switches deprecated 'listingBar' CSS cla…
davilima6 Jan 13, 2016
6605696
fix pagination styles
thet Jan 20, 2016
62de9a7
let list elements float instead beeing placed without any connection …
thet Jan 20, 2016
bed5ba2
needs plone.batching 1.1+ for pagination styles to take effect
thet Jan 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ Changelog

New:

- *add item here*
- Modernize pagination markup and switches deprecated ``listingBar`` CSS class to ``pagination``.
[davilima6]

Fixes:

Expand All @@ -16,7 +17,6 @@ Fixes:
1.6.16 (2016-01-08)
-------------------


Fixes:

- Add 2014 Roboto
Expand Down Expand Up @@ -50,7 +50,6 @@ Fixes:
[allcaps]



1.6.15 (2015-11-28)
-------------------

Expand Down Expand Up @@ -132,6 +131,7 @@ Fixes:
sense
[sneridagh]


1.6.12 (2015-09-12)
-------------------

Expand Down Expand Up @@ -234,7 +234,6 @@ Fixes:
1.6.6 (2015-05-13)
------------------


- provide some spacing between event summary and content
[vangheem]

Expand All @@ -249,7 +248,6 @@ Fixes:
1.6.4 (2015-05-04)
------------------


- fix in and out widget button style
[vangheme]

Expand Down
70 changes: 32 additions & 38 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ <h2 id="basic">Basic</h2>
<div class="field">
<label for="exampleInputFile">File input</label>
<p class="formHelp">Example block-level help text here.</p>
<input type="file" id="exampleInputFile">
<input type="file" id="exampleInputFile">
</div>
<div class="field">
<label for="exampleInputFile">Select</label>
Expand Down Expand Up @@ -376,7 +376,7 @@ <h2 id="buttons">Buttons</h2>
<div class="test-example">
<form>
<fieldset>
<legend>Fieldset legend</legend>
<legend>Fieldset legend</legend>
<div class="formControls">
<input class="context" type="submit" value="Context submit">
<input class="standalone" type="submit" value="Standalone submit">
Expand Down Expand Up @@ -438,30 +438,24 @@ <h2>Plone pages listings</h2>
<div class="test-example">
<p>Need to be changed in structure a correct markup <span class="accent-label">Must be changed</span>
<p class="discreet">Appears on search page</p>
<div class="listingBar">
<span class="previous">
<a href="">« Previous 10 items</a>
</span>
<span class="next">
<a href=""> Next 10 items »</a>
</span>
<a href="">1</a>
[<span>2</span>]
<a href="">3</a>
<a href="">4</a>
<a href="">5</a>
<a href="">6</a>
<a href="">7</a>
<span>
<a href="">8</a>
</span>
</div>
<nav class="pagination">
<ul>
<li class="previous"><a href="">« Previous 10 items</a></li>
<li class="next"><a href="">Next 10 items »</a></li>
<li class="first"><a href="">1</a></li>
<li class="disabled">...</li>
<li><a href="">4</a></li>
<li><a href="">5</a></li>
<li><a href="">6</a></li>
<li class="active">[<span>7</span>]</li>
<li><a href="">8</a></li>
<li><a href="">9</a></li>
<li class="disabled">...</li>
<li class="last"><a href="">12</a></li>
</ul>
</nav>
</div>





<div class="row" id="mainnavigation-wrapper">
<div class="container-fluid" id="mainnavigation">
<p class="hiddenStructure">Navigation</p>
Expand All @@ -478,26 +472,26 @@ <h2>Plone pages listings</h2>

<div class="collapse navbar-collapse" id="portal-globalnav-collapse">
<ul class="nav navbar-nav" id="portal-globalnav">

<li id="portaltab-index_html" class="selected">
<a href="http://localhost:8080/Plone" title="">Inici</a>
</li>


<li id="portaltab-news" class="plain">
<a href="http://localhost:8080/Plone/news" title="Noticies del lloc">Noticies</a>
</li>


<li id="portaltab-events" class="plain">
<a href="http://localhost:8080/Plone/events" title="Esdeveniments del lloc">Esdeveniments</a>
</li>


<li id="portaltab-Members" class="plain">
<a href="http://localhost:8080/Plone/Members" title="Contenidor per als directoris personals dels usuaris del portal">Usuaris</a>
</li>

</ul>
</div>
</nav>
Expand Down Expand Up @@ -767,7 +761,7 @@ <h2>Widgets</h2>
<div class="item">
<img data-src="holder.js/900x500/auto/#666:#444/text:Second slide" alt="Second slide" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5MDAiIGhlaWdodD0iNTAwIj48cmVjdCB3aWR0aD0iOTAwIiBoZWlnaHQ9IjUwMCIgZmlsbD0iIzY2NiI+PC9yZWN0Pjx0ZXh0IHRleHQtYW5jaG9yPSJtaWRkbGUiIHg9IjQ1MCIgeT0iMjUwIiBzdHlsZT0iZmlsbDojNDQ0O2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1zaXplOjU2cHg7Zm9udC1mYW1pbHk6QXJpYWwsSGVsdmV0aWNhLHNhbnMtc2VyaWY7ZG9taW5hbnQtYmFzZWxpbmU6Y2VudHJhbCI+U2Vjb25kIHNsaWRlPC90ZXh0Pjwvc3ZnPg=="> </div>
<div class="item">
<img data-src="holder.js/900x500/auto/#555:#333/text:Third slide" alt="Third slide" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5MDAiIGhlaWdodD0iNTAwIj48cmVjdCB3aWR0aD0iOTAwIiBoZWlnaHQ9IjUwMCIgZmlsbD0iIzU1NSI+PC9yZWN0Pjx0ZXh0IHRleHQtYW5jaG9yPSJtaWRkbGUiIHg9IjQ1MCIgeT0iMjUwIiBzdHlsZT0iZmlsbDojMzMzO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1zaXplOjU2cHg7Zm9udC1mYW1pbHk6QXJpYWwsSGVsdmV0aWNhLHNhbnMtc2VyaWY7ZG9taW5hbnQtYmFzZWxpbmU6Y2VudHJhbCI+VGhpcmQgc2xpZGU8L3RleHQ+PC9zdmc+">
<img data-src="holder.js/900x500/auto/#555:#333/text:Third slide" alt="Third slide" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5MDAiIGhlaWdodD0iNTAwIj48cmVjdCB3aWR0aD0iOTAwIiBoZWlnaHQ9IjUwMCIgZmlsbD0iIzU1NSI+PC9yZWN0Pjx0ZXh0IHRleHQtYW5jaG9yPSJtaWRkbGUiIHg9IjQ1MCIgeT0iMjUwIiBzdHlsZT0iZmlsbDojMzMzO2ZvbnQtd2VpZ2h0OmJvbGQ7Zm9udC1zaXplOjU2cHg7Zm9udC1mYW1pbHk6QXJpYWwsSGVsdmV0aWNhLHNhbnMtc2VyaWY7ZG9taW5hbnQtYmFzZWxpbmU6Y2VudHJhbCI+VGhpcmQgc2xpZGU8L3RleHQ+PC9zdmc+">
</div>
</div>

Expand Down Expand Up @@ -814,16 +808,16 @@ <h2>Widgets</h2>
</div>
<footer id="portal-footer-wrapper" role="contentinfo">
<div class="container-fluid" id="portal-footer">

<div class="portletWrapper" >
<section class="portlet portletClassic" id="portal-footer">
<div class="portletContent">
El
El
<a href="http://plone.org">Plone<sup>®</sup> Open Source CMS/WCM</a>
és <abbr title="Copyright">©</abbr> 2000-2014 de la
és <abbr title="Copyright">©</abbr> 2000-2014 de la
<a href="http://plone.org/foundation">Fundació Plone</a> i amics.

Distribuït sota la llicència
Distribuït sota la llicència
<a href="http://creativecommons.org/licenses/GPL/2.0/">Llicència GNU GPL</a>.
</div>
</section>
Expand All @@ -846,7 +840,7 @@ <h2>Widgets</h2>
<a href="index.html" class="pat-plone-modal" data-pat-plone-modal="{}">
<span>Contacte</span>
</a>
</li>
</li>
</ul>
</section>
</div>
Expand Down
44 changes: 19 additions & 25 deletions plonetheme/barceloneta/theme/less/barceloneta-compiled.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plonetheme/barceloneta/theme/less/barceloneta-compiled.css.map
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions plonetheme/barceloneta/theme/less/barceloneta.css.original-reference
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2714,21 +2714,21 @@ body {
.breadcrumb ol > #breadcrumbs-current {
color: #777777;
}
.listingBar {
.pagination {
display: inline-block;
padding: 0;
list-style: none;
margin: 20px 0;
}
.listingBar > li {
.pagination > li {
font-weight: 300;
display: inline;
line-height: 0;
position: relative;
padding: 0;
font-weight: 100;
}
.listingBar > li a {
.pagination > li a {
position: relative;
float: left;
padding: 6px 12px;
Expand All @@ -2739,47 +2739,47 @@ body {
border: 1px solid #e5e5e5;
margin-left: -1px;
}
.listingBar > li:first-child > a {
.pagination > li:first-child > a {
margin-left: 0;
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
}
.listingBar > li:last-child > a {
.pagination > li:last-child > a {
border-bottom-right-radius: 4px;
border-top-right-radius: 4px;
}
.listingBar > li a:hover,
.listingBar > li a:focus {
.pagination > li a:hover,
.pagination > li a:focus {
color: #004666;
background-color: #f2f1f1;
border-color: 1px solid #e5e5e5;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
.listingBar > .active > a,
.listingBar > .active > a:hover,
.listingBar > .active > a:focus {
.pagination > .active > a,
.pagination > .active > a:hover,
.pagination > .active > a:focus {
z-index: 2;
font-weight: 300;
color: #ffffff;
background-color: #007bb3;
border-color: #007bb3;
cursor: default;
}
.listingBar > .disabled > a,
.listingBar > .disabled > a:hover,
.listingBar > .disabled > a:focus {
.pagination > .disabled > a,
.pagination > .disabled > a:hover,
.pagination > .disabled > a:focus {
color: #cccccc;
background-color: #fcfcfd;
border-color: 1px solid #e5e5e5;
cursor: default;
}
@media (max-width: 480px) {
.listingBar li {
.pagination li {
display: none;
}
.listingBar li.previous,
.listingBar li.next {
.pagination li.previous,
.pagination li.next {
display: inline;
}
}
Expand Down Expand Up @@ -4876,4 +4876,4 @@ body.template-logged_out #content-core .portletFooter {
#viewlet-below-content .reply ~ .reply .loginbutton {
display: inline-block;
}
/*# sourceMappingURL=++resource++plonetheme.barceloneta/barceloneta.css.map */
/*# sourceMappingURL=++resource++plonetheme.barceloneta/barceloneta.css.map */
Loading