Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 6 commits
  • 5 files changed
  • 0 commit comments
  • 3 contributors
Commits on Nov 21, 2011
@lzdych Deco page (plone.app.layoutpage) is installed by installing Deco (plo…
…ne.app.deco)
40c63aa
@garbas garbas Merge pull request #17 from lzdych/Deco-DC-91
Deco page (plone.app.layoutpage) is installed by installing Deco (plone....
25996cc
@davisagli davisagli fix mismatched tag 6099732
@garbas garbas toolbar.css is not needed anymore 2bd2e61
@lzdych - fixed deco installation broken by missing ending element in registr…
…y.xml

- plone.app.toolbar zcml included explicitly - fixes tests setup
465ccf3
@lzdych Merge remote branch 'origin/master' into Deco-DC-89
Conflicts:
	plone/app/deco/configure.zcml
e4e9f36
View
109 plone/app/deco/browser/stylesheets/toolbar.css
@@ -1,109 +0,0 @@
-/* @group Toolbar */
-
-.deco-toolbar {
- position: fixed;
- top: 40px;
- width: 100%;
- z-index: 10000000;
-}
-
-.deco-toolbar-content {
- background: #2c6596;
- background-image: -moz-linear-gradient(top, #2c6596, #3272aa);
- background-image: -ms-linear-gradient(top, #2c6596, #3272aa);
- background-image: -o-linear-gradient(top, #2c6596, #3272aa);
- background-image: -webkit-gradient(linear, left top, left bottom, from(#2c6596), to(#3272aa));
- background-image: -webkit-linear-gradient(top, #2c6596, #3272aa);
- background-image: linear-gradient(top, #2c6596, #3272aa);
- border-top: 1px solid #387fbe;
- border-bottom: 1px solid #1b3d5b;
- height: 36px;
- z-index: 800;
- position: relative;
- padding: 16px;
-}
-.deco-toolbar fieldset {
- margin: 0;
- padding: 0;
- border: 0px;
-}
-
-.deco-inline-toolbar {
- position: relative;
-}
-
-.deco-toolbar-primary-functions {
- float:left;
-}
-
-.deco-toolbar-secondary-functions {
- float:right;
-}
-
-.deco-toolbar select,
-.deco-toolbar button {
- float: left;
-}
-
-.deco-toolbar button,
-.deco-toolbar label.deco-icon {
-}
-
-deco-toolbar button, x:-moz-any-link, X:default {
-}
-
-.deco-toolbar button.deco-icon,
-.deco-toolbar label.deco-icon {
-}
-
-.deco-toolbar button:hover,
-.deco-toolbar label.deco-icon:hover {
-}
-
-.deco-toolbar select:hover,
-.deco-toolbar button.active,
-.deco-toolbar label.deco-icon.active {
-}
-
-.deco-toolbar select {
-}
-
-/* @group Button Group */
-
-.deco-toolbar .deco-button-group {
- float: left;
-}
-
-.deco-toolbar .deco-button-group button,
-.deco-toolbar .deco-button-group label.deco-icon {
-}
-
-.deco-toolbar .deco-button-group > :first-child {
-}
-
-.deco-toolbar .deco-button-group > :last-child {
-}
-
-.deco-toolbar button.deco-first-half,
-.deco-toolbar label.deco-first-half {
-}
-
-.deco-toolbar button.deco-last-half,
-.deco-toolbar label.deco-last-half {
-}
-
-/* @end */
-
-/* @group Selects */
-
-.deco-toolbar label.deco-icon {
-}
-
-.deco-toolbar .deco-icon select {
-}
-
-/* @end */
-
-.deco-hidden {
- display: none !important;
-}
View
2  plone/app/deco/configure.zcml
@@ -10,6 +10,8 @@
<include package="plone.app.contentlistingtile" />
<include package="plone.app.imagetile" />
<include package="plone.app.texttile" />
+ <include package="plone.app.toolbar" />
+ <include package="plone.app.layoutpage" />
<permission
id="plone.ModifyPageLayout"
View
13 plone/app/deco/profiles/default/cssregistry.xml
@@ -14,17 +14,4 @@
enabled="1"
expression=""/>
- <stylesheet title=""
- id="++resource++plone.app.deco.stylesheets/toolbar.css"
- bundle="deco"
- applyPrefix="true"
- media="screen"
- rel="stylesheet"
- rendering="import"
- cacheable="True"
- compression="safe"
- cookable="True"
- enabled="1"
- expression=""/>
-
</object>
View
1  plone/app/deco/profiles/default/metadata.xml
@@ -10,5 +10,6 @@
<dependency>profile-plone.app.contentlistingtile:default</dependency>
<dependency>profile-plone.app.imagetile:default</dependency>
<dependency>profile-plone.app.texttile:default</dependency>
+ <dependency>profile-plone.app.layoutpage:default</dependency>
</dependencies>
</metadata>
View
1  plone/app/deco/profiles/default/registry.xml
@@ -10,6 +10,7 @@
<element>tinymce</element>
<element>toolbar</element>
<element>deco</element>
+ </element>
</value>
</record>

No commit comments for this range

Something went wrong with that request. Please try again.