Skip to content

Commit

Permalink
Merge pull request #142 from plone/thet-contenttypes-simplify
Browse files Browse the repository at this point in the history
Contenttypes simplify + Bugfix
  • Loading branch information
agitator committed Aug 21, 2017
2 parents bb3fd6a + e1a7294 commit 14452bd
Show file tree
Hide file tree
Showing 19 changed files with 201 additions and 293 deletions.
8 changes: 6 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ Changelog

Breaking changes:

- *add item here*
- Simplify ``contents.plone.less``.
Contenttype icons now use the ``::before`` instead of ``::after`` pseudo element selector.
[thet]


New features:

Expand All @@ -18,7 +21,8 @@ New features:

Bug fixes:

- *add item here*
- Change ``:before`` and ``:after`` to ``::before`` and ``::after`` to follow CSS3 specs.
[thet]


1.7.3 (2017-07-04)
Expand Down
10 changes: 5 additions & 5 deletions plonetheme/barceloneta/theme/less/alerts.plone.less
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
font-weight: @plone-alert-link-font-weight;
color: darken(@plone-link-color, 12%);
}
> strong:before, > dt:before {
> strong::before, > dt::before {
font-size:@plone-font-size-base;
font-weight: @plone-font-weight-regular;
margin-left: -30px;
Expand All @@ -52,17 +52,17 @@
&.alert-success,
&.info {
.portalMessage-variant(@plone-alert-info-bg; @plone-alert-info-border; @plone-alert-info-text);
& > strong:before, & > dt:before {background-color: @plone-alert-info-bullet; content:"i";}
& > strong::before, & > dt::before {background-color: @plone-alert-info-bullet; content:"i";}
}
&.alert-warning,
&.warning {
.portalMessage-variant(@plone-alert-warning-bg; @plone-alert-warning-border; @plone-alert-warning-text);
& > strong:before, & > dt:before {background-color: @plone-alert-warning-bullet; content:"!";}
& > strong::before, & > dt::before {background-color: @plone-alert-warning-bullet; content:"!";}
}
&.alert-error,
&.error {
.portalMessage-variant(@plone-alert-error-bg; @plone-alert-error-border; @plone-alert-error-text);
& > strong:before, & > dt:before {background-color: @plone-alert-error-bullet; content:"×";}
& > strong::before, & > dt::before {background-color: @plone-alert-error-bullet; content:"×";}
}
}
.portlet .portletContent > .portalMessage {
Expand All @@ -75,7 +75,7 @@
/* special octogonal shape for error
.alert.status.alert-error,
.portalMessage.error {
& > strong:before, & > dt:before {
& > strong::before, & > dt::before {
border-radius: 8px; //soften border
background: @plone-alert-error-bullet;
background:
Expand Down
Loading

0 comments on commit 14452bd

Please sign in to comment.