Skip to content

Commit

Permalink
Merge pull request #29 from plone/toolbar-fixup
Browse files Browse the repository at this point in the history
Toolbar fixup
  • Loading branch information
bloodbare committed Jul 16, 2015
2 parents a48d470 + 174c2ad commit 1025054
Show file tree
Hide file tree
Showing 13 changed files with 337 additions and 118 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Changelog
does not reference original theme file
[vangheem]

- various mobile fixes
[agitator]


1.6.7 (2015-06-05)
------------------
Expand Down
2 changes: 1 addition & 1 deletion plonetheme/barceloneta/theme/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div id="mainnavigation">
</div>
</div>
<div class="principal" role="banner">
<div class="principal" role="complementary">
<div class="container">
<div class="gigantic">
<h1>Welcome!</h1>
Expand Down
174 changes: 154 additions & 20 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.

1 change: 1 addition & 0 deletions plonetheme/barceloneta/theme/less/barceloneta.plone.less
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
@import "thumbs.plone.less";
@import "alerts.plone.less";
@import "portlets.plone.less";
@import "controlpanels.plone.less";
@import "tags.plone.less";
@import "contents.plone.less";

Expand Down
4 changes: 2 additions & 2 deletions plonetheme/barceloneta/theme/less/breadcrumbs.plone.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
display: inline-block;
color: @plone-gray-light;
padding: @plone-breadcrumb-padding-vertical 0;
font-weight: @plone-font-weight-light;
font-weight: @plone-font-weight-regular;
@media (max-width: @plone-screen-sm-min) {
display: none;
}
}
ol {
display: inline-block;
padding: @plone-breadcrumb-padding-vertical @plone-breadcrumb-padding-horizontal ;
padding: @plone-breadcrumb-padding-vertical 0;
list-style: none;
margin: 0;
> li {
Expand Down
63 changes: 63 additions & 0 deletions plonetheme/barceloneta/theme/less/controlpanels.plone.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
//*// Site Setup
.portlet.portletSiteSetup .portletContent > ul > li a:before {content:"";}
.portlet.portletSiteSetup .portletContent > ul li:hover {background: #edecec;}
.portletNavigationTree {
// nav.portletContent > ul > li a {border:none; padding:0px;}
&.portletSiteSetup {
nav.portletContent > ul > li a {border:none; padding:0px;}
a {
// padding-left: 30px; //adjust icons of products
border: none;
text-align: center;
height: 100%;
padding: 0;
// img {
// position: absolute;
// margin-left: -22px;
// margin-top: 2px;
// display:none; //remove to show images
// }
span {font-size: 50px; text-align: center; display: block; color: #4d4d4d;}
}
ul {background: #edecec; padding-bottom: 20px;}
li {vertical-align: top;}
ul > li > a:hover:after {content:""}
.inner-configlet {
margin-top: 10px; padding-bottom: 10px;
&:hover {
background: rgba(255,255,255,.67);
border-radius: 5px;
span {
color: #333;
}
}
}
}
}
.template-overview-controlpanel .portlet.portletSiteSetup .portletContent > ul > li {height: 120px;}

#portlet-prefs ul ul {
padding-top: 10px;
li {
padding-top: 10px;
a {
text-align: inherit;
padding-left: 40px;
&:before {
content:""; position: absolute; font-size: @plone-font-size-h3+1; margin-top: -9px; left: 15px;
color: lighten(@plone-portlet-list-bullet, 15%);
}
}
}
}


.template-usergroup-groupprefs,
.template-usergroup-userprefs,
.template-usergroup-controlpanel,
.template-member-registration {
.field { margin-top: 2em;}
.formControls { border-top: 0; box-shadow: none; margin-bottom: 1em; }
table.listing { margin-bottom: 0.5em; }
input.quickSearch { margin-bottom: 0.5em; }
}
Loading

0 comments on commit 1025054

Please sign in to comment.