Return-Path: X-Original-To: apmail-tapestry-commits-archive@minotaur.apache.org Delivered-To: apmail-tapestry-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33F6CD135 for ; Wed, 7 Nov 2012 19:48:12 +0000 (UTC) Received: (qmail 42766 invoked by uid 500); 7 Nov 2012 19:48:11 -0000 Delivered-To: apmail-tapestry-commits-archive@tapestry.apache.org Received: (qmail 42617 invoked by uid 500); 7 Nov 2012 19:48:11 -0000 Mailing-List: contact commits-help@tapestry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tapestry.apache.org Delivered-To: mailing list commits@tapestry.apache.org Received: (qmail 42341 invoked by uid 99); 7 Nov 2012 19:48:10 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Nov 2012 19:48:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 93DF745364; Wed, 7 Nov 2012 19:48:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hlship@apache.org To: commits@tapestry.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [5/12] git commit: Merge CSS rules together Message-Id: <20121107194810.93DF745364@tyr.zones.apache.org> Date: Wed, 7 Nov 2012 19:48:10 +0000 (UTC) Merge CSS rules together Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/84f5a6a8 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/84f5a6a8 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/84f5a6a8 Branch: refs/heads/5.4-js-rewrite Commit: 84f5a6a8b0b39c579ee74acecb406358715669a9 Parents: 36f13d5 Author: Howard M. Lewis Ship Authored: Wed Nov 7 10:26:04 2012 -0800 Committer: Howard M. Lewis Ship Committed: Wed Nov 7 10:26:04 2012 -0800 ---------------------------------------------------------------------- .../resources/META-INF/assets/core/Palette.css | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/84f5a6a8/tapestry-core/src/main/resources/META-INF/assets/core/Palette.css ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/core/Palette.css b/tapestry-core/src/main/resources/META-INF/assets/core/Palette.css index ca9e3d7..b2aa921 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/core/Palette.css +++ b/tapestry-core/src/main/resources/META-INF/assets/core/Palette.css @@ -14,6 +14,7 @@ DIV.t-palette-title { font-weight: bold; margin-bottom: 3px; display: block; + width: 200px; } DIV.t-palette-available { @@ -40,8 +41,4 @@ DIV.t-palette-selected { DIV.t-palette-spacer { clear: left; -} - -DIV.t-palette-title { - width: 200px; } \ No newline at end of file