Skip to content

Commit

Permalink
Move content list style classes (ul, ol, li) from base.css to public.…
Browse files Browse the repository at this point in the history
…css. They were always problematic in themes, based on Sunburst which excluded public.css.
  • Loading branch information
thet committed May 27, 2014
1 parent 8bb7db2 commit e513658
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 26 deletions.
5 changes: 4 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ Changelog
1.5.1 (unreleased)
------------------

- Nothing changed yet.
- Move content list style classes (ul, ol, li) from base.css to public.css.
They were always problematic in themes, based on Sunburst which excluded
public.css.
[thet]


1.5.0 (2014-03-02)
Expand Down
23 changes: 0 additions & 23 deletions plonetheme/sunburst/skins/sunburst_styles/base.css
Original file line number Diff line number Diff line change
@@ -1,28 +1,5 @@
/* @group Content Area */

/* Content list styles */
#content ul {
list-style-type: disc;
margin-left: 2em;
}

#content ol,
dl.portlet ol,
div.portletStaticText ol {
list-style-type: decimal;
margin-left: 2em;
}

#content li,
dl.portlet li,
div.portletStaticText li {
margin-bottom: 0.25em;
line-height: 1.5em;
display: list-item;
}



/* Editor styles */
#content .discreet,
#sidebar .discreet {
Expand Down
23 changes: 21 additions & 2 deletions plonetheme/sunburst/skins/sunburst_styles/public.css
Original file line number Diff line number Diff line change
Expand Up @@ -365,11 +365,30 @@ dl.portlet {
margin-bottom: 1em;
}

#content ul,
#content ol {

/* Content list styles */
#content ul {
list-style-type: disc;
margin-left: 2em;
}

#content ol,
dl.portlet ol,
div.portletStaticText ol {
list-style-type: decimal;
margin-left: 2em;
}

#content li,
dl.portlet li,
div.portletStaticText li {
margin-bottom: 0.25em;
line-height: 1.5em;
display: list-item;
}
/* End content list styles */


#content a:link,
dl.portlet a:link {
color: #205c90;
Expand Down

6 comments on commit e513658

@mister-roboto
Copy link

Choose a reason for hiding this comment

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

TESTS FAILED
Mr.Roboto url : http://jenkins.plone.org/roboto/get_info?push=d615a6e9e2a04cd3b3959e45e188bc03
[FAILURE] kgs-plonetheme.sunburst-plone-5.0-python-2.7 kgs
[FAILURE] kgs-plonetheme.sunburst-plone-4.3-python-2.6 kgs
[SUCCESS] kgs-plonetheme.sunburst-plone-4.3-python-2.7 kgs

@tisto
Copy link
Member

@tisto tisto commented on e513658 Jul 10, 2014

Choose a reason for hiding this comment

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

@thet Plone 4.3.x uses the 1.4.x branch of plonetheme.sunburst and your commit is not in that branch.

Not sure why we cut that branch in the first place because as far as I know Plone 5.0 does not ship with plonetheme.sunburst at all ( @bloodbare is that correct?).

So what shall we do? Switch plonetheme.sunburst to master in Plone 4.3? cc @esteele

@thet
Copy link
Member Author

@thet thet commented on e513658 Jul 10, 2014

Choose a reason for hiding this comment

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

@tisto my change here is quite small, but could break the design of some sites, where not all standard plonetheme.sunburst styles are included.

But the most incompatible changes with 1.5 is the base-tag removal. I think, that's out of scope for Plone 4.3. Altough I'm using this master branch it in a current Plone 4.3 project - so far nothing is broken except the addon wildcard.foldercontents 1.x, which I already fixed.

Since plonetheme.sunburst should work with Plone 5, a new 1.5 release with the base-tag removal PLIP branch merged makes sense.

@tisto
Copy link
Member

@tisto tisto commented on e513658 Jul 10, 2014

Choose a reason for hiding this comment

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

Ok, that makes sense. Will make a 1.5 release then.

@tisto
Copy link
Member

@tisto tisto commented on e513658 Jul 10, 2014

Choose a reason for hiding this comment

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

@thet
Copy link
Member Author

@thet thet commented on e513658 Jul 10, 2014

Choose a reason for hiding this comment

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

Thanks!

Please sign in to comment.