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.

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

Fix sticky footer issue #80

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,20 @@ New:

Fixes:

- Add ``barceloneta-mixin-font`` to the registerless profile.
[pcdummy]

- Inline ``style`` tags in head are no more skipped
[keul]

- Follow best practice for readme.rst
[allcaps]

- Center the leadimage on the modal window.
Partially close `#321`_.
[keul]
- Fix sticky footer. (closes `#36`)


1.6.16 (2016-01-08)
-------------------
Expand Down Expand Up @@ -329,3 +340,6 @@ Fixes:
.. _`#1091`: https://github.com/plone/Products.CMFPlone/issues/1091
.. _`#1105`: https://github.com/plone/Products.CMFPlone/issues/1105
.. _`#1226`: https://github.com/plone/Products.CMFPlone/issues/1226
.. _`#24`: https://github.com/plone/plonetheme.barceloneta/issues/24
.. _`#57`: https://github.com/plone/plonetheme.barceloneta/issues/57
.. _`#321`: https://github.com/plone/plone.app.contenttypes/issues/321
7 changes: 7 additions & 0 deletions plonetheme/barceloneta/profiles/registerless/registry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@
</value>
</records>

<records prefix="plone.resources/barceloneta-mixin-font"
interface='Products.CMFPlone.interfaces.IResourceRegistry'>
<value key="css">
<element>++theme++barceloneta/less/mixin.font.plone.less</element>
</value>
</records>

<records prefix="plone.resources/barceloneta-mixin-borderradius"
interface='Products.CMFPlone.interfaces.IResourceRegistry'>
<value key="css">
Expand Down
18 changes: 18 additions & 0 deletions plonetheme/barceloneta/theme/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,23 @@
<footer id="portal-footer-wrapper" role="contentinfo">
<div class="container" id="portal-footer"></div>
</footer>

<!-- STICKY FOOTER -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
<script>
function stickyFooter() {
var footerHeight = $('#portal-footer-wrapper').outerHeight()
$('body').css('padding-bottom', footerHeight);
$('footer').css('height', footerHeight);
}

$(document).ready(function(){
stickyFooter();
});

$( window ).resize(function() {
stickyFooter();
});
</script>
</body>
</html>
24 changes: 13 additions & 11 deletions plonetheme/barceloneta/theme/less/barceloneta-compiled.css

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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
@import "@{barceloneta-mixin-clearfix}";
@import "@{barceloneta-mixin-gridframework}";
@import "@{barceloneta-mixin-grid}";
@import "@{barceloneta-mixin-font}";


//*// Reset and dependencies
Expand Down
3 changes: 1 addition & 2 deletions plonetheme/barceloneta/theme/less/contents.plone.less
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ body#visual-portal-wrapper.pat-plone .outer-wrapper {
body#visual-portal-wrapper.pat-plone #edit-zone {
[class*="contenttype-"] {padding: 5px 15px 5px 50px;}

a {color: @plone-btn-context-color;}
[class*="contenttype-"]:after {
font-family:"Fontello"; font-size: 100%;
padding: 0; margin:0; position: relative; left: 25px; display: inline-block; color: inherit;
Expand All @@ -42,4 +41,4 @@ body#visual-portal-wrapper.pat-plone #edit-zone {
//*// thumbnails for images, leadimages in listings and portlets
.image-icon, .image-tile {
float:right;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we removing this as well? Does this rule need a more specific selector maybe?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I think it was removed by mistake. I've fixed it now.

}
}
8 changes: 8 additions & 0 deletions plonetheme/barceloneta/theme/less/footer.plone.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
//*// FOOTER //*//

footer{
position: absolute;
left: 0;
bottom: 0;
height: auto;
width: 100%;
}

#portal-footer-wrapper {
padding: 30px 15px;
background-color: @plone-footer-bg;
Expand Down
3 changes: 3 additions & 0 deletions plonetheme/barceloneta/theme/less/modal.plone.less
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
}
.plone-modal-body {
padding: @plone-padding-base-horizontal;
.modal-image {
text-align: center;
}
}
.plone-modal-footer {
.formControls;
Expand Down
9 changes: 2 additions & 7 deletions plonetheme/barceloneta/theme/less/scaffolding.plone.less
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@

//*// Body reset
html {
position: relative;
min-height: 100%;
font-size: 62.5%;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}

body {
font-family: @plone-font-family-base;
font-size: @plone-font-size-base;
font-weight: @plone-font-weight-medium;
line-height: @plone-line-height-base;
color: @plone-text-color;
background-color: @plone-body-bg;
Expand Down Expand Up @@ -93,12 +94,6 @@ hr {
overflow: hidden;
clip: rect(0,0,0,0);
border: 0;
color: #fff;
background-color: #000;
}
.sr-only a, .hiddenStructure a {
color: #fff;
background-color: #000;
}

// Use in conjunction with .sr-only to only display content when it's focused.
Expand Down
1 change: 1 addition & 0 deletions plonetheme/barceloneta/theme/rules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<drop css:content="head link[rel='shortcut icon']" />
<!-- CSS -->
<after css:theme-children="head" css:content="head link" />
<after css:theme-children="head" css:content="head style" />
<!-- Script -->
<after css:theme-children="head" css:content="head script" />
</rules>
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def read(*rnames):
keywords='web zope plone theme',
author='Plone Foundation',
author_email='[email protected]',
url='http://pypi.python.org/pypi/plonetheme.barceloneta',
url='https://pypi.python.org/pypi/plonetheme.barceloneta',
license='GPL version 2',
packages=find_packages(exclude=['ez_setup']),
namespace_packages=['plonetheme'],
Expand Down