You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/06 20:40:13 UTC
svn commit: r1608280 - in /roller/trunk/app/src/main/webapp: roller-ui/yui3/
roller-ui/yui3/cssgrids/ themes/fauxcoly/ themes/sotto/
Author: gmazza
Date: Sun Jul 6 18:40:12 2014
New Revision: 1608280
URL: http://svn.apache.org/r1608280
Log:
Removed Sotto (again) as other themes in better shape; switched Fauxcoly to YUI 3 (more YUI 3 upgrades forthcoming.)
Added:
roller/trunk/app/src/main/webapp/roller-ui/yui3/
roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/
roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids-min.css
roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids.css
Removed:
roller/trunk/app/src/main/webapp/themes/sotto/
Modified:
roller/trunk/app/src/main/webapp/themes/fauxcoly/archives.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/style_css.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/tags_index.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
Added: roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids-min.css
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids-min.css?rev=1608280&view=auto
==============================================================================
--- roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids-min.css (added)
+++ roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids-min.css Sun Jul 6 18:40:12 2014
@@ -0,0 +1,18 @@
+/*
+YUI 3.17.2 (build 9c3c78e)
+Copyright 2014 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+http://yuilibrary.com/license/
+*/
+
+/*!
+Pure v0.4.2
+Copyright 2014 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+https://github.com/yui/pure/blob/master/LICENSE.md
+*/.yui3-g{letter-spacing:-0.31em;*letter-spacing:normal;*word-spacing:-0.43em;text-rendering:optimizespeed;font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif;display:-webkit-flex;-webkit-flex-flow:row wrap;display:-ms-flexbox;-ms-flex-flow:row wrap}.opera-only :-o-prefocus,.yui3-g{word-spacing:-0.43em}.yui3-u{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.yui3-g [class *= "yui3-u"]{font-family:sans-serif}/*!
+Pure v0.4.2
+Copyright 2014 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+https://github.com/yui/pure/blob/master/LICENSE.md
+*/.yui3-u-1,.yui3-u-1-1,.yui3-u-1-2,.yui3-u-1-3,.yui3-u-2-3,.yui3-u-1-4,.yui3-u-3-4,.yui3-u-1-5,.yui3-u-2-5,.yui3-u-3-5,.yui3-u-4-5,.yui3-u-5-5,.yui3-u-1-6,.yui3-u-5-6,.yui3-u-1-8,.yui3-u-3-8,.yui3-u-5-8,.yui3-u-7-8,.yui3-u-1-12,.yui3-u-5-12,.yui3-u-7-12,.yui3-u-11-12,.yui3-u-1-24,.yui3-u-2-24,.yui3-u-3-24,.yui3-u-4-24,.yui3-u-5-24,.yui3-u-6-24,.yui3-u-7-24,.yui3-u-8-24,.yui3-u-9-24,.yui3-u-10-24,.yui3-u-11-24,.yui3-u-12-24,.yui3-u-13-24,.yui3-u-14-24,.yui3-u-15-24,.yui3-u-16-24,.yui3-u-17-24,.yui3-u-18-24,.yui3-u-19-24,.yui3-u-20-24,.yui3-u-21-24,.yui3-u-22-24,.yui3-u-23-24,.yui3-u-24-24{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.yui3-u-1-24{width:4.1667%;*width:4.1357%}.yui3-u-1-12,.yui3-u-2-24{width:8.3333%;*width:8.3023%}.yui3-u-1-8,.yui3-u-3-24{width:12.5000%;*width:12.4690%}.yui3-u-1-6,.yui3-u-4-24{width:16.6667%;*width:16.6357%}.yui3-u-1-5{width:20%;*width:19.9690%}.yui3-u-5-24{width:20.8333%;*
width:20.8023%}.yui3-u-1-4,.yui3-u-6-24{width:25%;*width:24.9690%}.yui3-u-7-24{width:29.1667%;*width:29.1357%}.yui3-u-1-3,.yui3-u-8-24{width:33.3333%;*width:33.3023%}.yui3-u-3-8,.yui3-u-9-24{width:37.5000%;*width:37.4690%}.yui3-u-2-5{width:40%;*width:39.9690%}.yui3-u-5-12,.yui3-u-10-24{width:41.6667%;*width:41.6357%}.yui3-u-11-24{width:45.8333%;*width:45.8023%}.yui3-u-1-2,.yui3-u-12-24{width:50%;*width:49.9690%}.yui3-u-13-24{width:54.1667%;*width:54.1357%}.yui3-u-7-12,.yui3-u-14-24{width:58.3333%;*width:58.3023%}.yui3-u-3-5{width:60%;*width:59.9690%}.yui3-u-5-8,.yui3-u-15-24{width:62.5000%;*width:62.4690%}.yui3-u-2-3,.yui3-u-16-24{width:66.6667%;*width:66.6357%}.yui3-u-17-24{width:70.8333%;*width:70.8023%}.yui3-u-3-4,.yui3-u-18-24{width:75%;*width:74.9690%}.yui3-u-19-24{width:79.1667%;*width:79.1357%}.yui3-u-4-5{width:80%;*width:79.9690%}.yui3-u-5-6,.yui3-u-20-24{width:83.3333%;*width:83.3023%}.yui3-u-7-8,.yui3-u-21-24{width:87.5000%;*width:87.4690%}.yui3-u-11-12,.yui3-u-22-24{width
:91.6667%;*width:91.6357%}.yui3-u-23-24{width:95.8333%;*width:95.8023%}.yui3-u-1,.yui3-u-1-1,.yui3-u-5-5,.yui3-u-24-24{width:100%}#yui3-css-stamp.cssgrids{display:none}
Added: roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids.css
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids.css?rev=1608280&view=auto
==============================================================================
--- roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids.css (added)
+++ roller/trunk/app/src/main/webapp/roller-ui/yui3/cssgrids/cssgrids.css Sun Jul 6 18:40:12 2014
@@ -0,0 +1,303 @@
+/*
+YUI 3.17.2 (build 9c3c78e)
+Copyright 2014 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+http://yuilibrary.com/license/
+*/
+
+/*!
+Pure v0.4.2
+Copyright 2014 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+https://github.com/yui/pure/blob/master/LICENSE.md
+*/
+
+/*csslint regex-selectors:false, known-properties:false, duplicate-properties:false*/
+
+.yui3-g {
+ letter-spacing: -0.31em;
+ /* Webkit: collapse white-space between units */
+ *letter-spacing: normal;
+ /* reset IE < 8 */
+ *word-spacing: -0.43em;
+ /* IE < 8: collapse white-space between units */
+ text-rendering: optimizespeed;
+ /* Webkit: fixes text-rendering: optimizeLegibility */
+ /*
+ Sets the font stack to fonts known to work properly with the above letter
+ and word spacings. See: https://github.com/yui/pure/issues/41/
+
+ The following font stack makes Pure Grids work on all known environments.
+
+ * FreeSans: Ships with many Linux distros, including Ubuntu
+
+ * Arimo: Ships with Chrome OS. Arimo has to be defined before Helvetica and
+ Arial to get picked up by the browser, even though neither is available
+ in Chrome OS.
+
+ * Droid Sans: Ships with all versions of Android.
+
+ * Helvetica, Arial, sans-serif: Common font stack on OS X and Windows.
+ */
+ font-family: FreeSans, Arimo, "Droid Sans", Helvetica, Arial, sans-serif;
+ /*
+ Use flexbox when possible to avoid `letter-spacing` side-effects.
+
+ NOTE: Firefox (as of 25) does not currently support flex-wrap, so the
+ `-moz-` prefix version is omitted.
+ */
+ display: -webkit-flex;
+ -webkit-flex-flow: row wrap;
+ /* IE10 uses display: flexbox */
+ display: -ms-flexbox;
+ -ms-flex-flow: row wrap;
+}
+
+/* Opera as of 12 on Windows needs word-spacing.
+ The ".opera-only" selector is used to prevent actual prefocus styling
+ and is not required in markup.
+*/
+
+.opera-only :-o-prefocus,
+.yui3-g {
+ word-spacing: -0.43em;
+}
+
+.yui3-u {
+ display: inline-block;
+ *display: inline;
+ /* IE < 8: fake inline-block */
+ zoom: 1;
+ letter-spacing: normal;
+ word-spacing: normal;
+ vertical-align: top;
+ text-rendering: auto;
+}
+
+/*
+Resets the font family back to the OS/browser's default sans-serif font,
+this the same font stack that Normalize.css sets for the `body`.
+*/
+
+.yui3-g [class *= "yui3-u"] {
+ font-family: sans-serif;
+}/*!
+Pure v0.4.2
+Copyright 2014 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+https://github.com/yui/pure/blob/master/LICENSE.md
+*/
+
+.yui3-u-1,
+.yui3-u-1-1,
+.yui3-u-1-2,
+.yui3-u-1-3,
+.yui3-u-2-3,
+.yui3-u-1-4,
+.yui3-u-3-4,
+.yui3-u-1-5,
+.yui3-u-2-5,
+.yui3-u-3-5,
+.yui3-u-4-5,
+.yui3-u-5-5,
+.yui3-u-1-6,
+.yui3-u-5-6,
+.yui3-u-1-8,
+.yui3-u-3-8,
+.yui3-u-5-8,
+.yui3-u-7-8,
+.yui3-u-1-12,
+.yui3-u-5-12,
+.yui3-u-7-12,
+.yui3-u-11-12,
+.yui3-u-1-24,
+.yui3-u-2-24,
+.yui3-u-3-24,
+.yui3-u-4-24,
+.yui3-u-5-24,
+.yui3-u-6-24,
+.yui3-u-7-24,
+.yui3-u-8-24,
+.yui3-u-9-24,
+.yui3-u-10-24,
+.yui3-u-11-24,
+.yui3-u-12-24,
+.yui3-u-13-24,
+.yui3-u-14-24,
+.yui3-u-15-24,
+.yui3-u-16-24,
+.yui3-u-17-24,
+.yui3-u-18-24,
+.yui3-u-19-24,
+.yui3-u-20-24,
+.yui3-u-21-24,
+.yui3-u-22-24,
+.yui3-u-23-24,
+.yui3-u-24-24 {
+ display: inline-block;
+ *display: inline;
+ zoom: 1;
+ letter-spacing: normal;
+ word-spacing: normal;
+ vertical-align: top;
+ text-rendering: auto;
+}
+
+.yui3-u-1-24 {
+ width: 4.1667%;
+ *width: 4.1357%;
+}
+
+.yui3-u-1-12,
+.yui3-u-2-24 {
+ width: 8.3333%;
+ *width: 8.3023%;
+}
+
+.yui3-u-1-8,
+.yui3-u-3-24 {
+ width: 12.5000%;
+ *width: 12.4690%;
+}
+
+.yui3-u-1-6,
+.yui3-u-4-24 {
+ width: 16.6667%;
+ *width: 16.6357%;
+}
+
+.yui3-u-1-5 {
+ width: 20%;
+ *width: 19.9690%;
+}
+
+.yui3-u-5-24 {
+ width: 20.8333%;
+ *width: 20.8023%;
+}
+
+.yui3-u-1-4,
+.yui3-u-6-24 {
+ width: 25%;
+ *width: 24.9690%;
+}
+
+.yui3-u-7-24 {
+ width: 29.1667%;
+ *width: 29.1357%;
+}
+
+.yui3-u-1-3,
+.yui3-u-8-24 {
+ width: 33.3333%;
+ *width: 33.3023%;
+}
+
+.yui3-u-3-8,
+.yui3-u-9-24 {
+ width: 37.5000%;
+ *width: 37.4690%;
+}
+
+.yui3-u-2-5 {
+ width: 40%;
+ *width: 39.9690%;
+}
+
+.yui3-u-5-12,
+.yui3-u-10-24 {
+ width: 41.6667%;
+ *width: 41.6357%;
+}
+
+.yui3-u-11-24 {
+ width: 45.8333%;
+ *width: 45.8023%;
+}
+
+.yui3-u-1-2,
+.yui3-u-12-24 {
+ width: 50%;
+ *width: 49.9690%;
+}
+
+.yui3-u-13-24 {
+ width: 54.1667%;
+ *width: 54.1357%;
+}
+
+.yui3-u-7-12,
+.yui3-u-14-24 {
+ width: 58.3333%;
+ *width: 58.3023%;
+}
+
+.yui3-u-3-5 {
+ width: 60%;
+ *width: 59.9690%;
+}
+
+.yui3-u-5-8,
+.yui3-u-15-24 {
+ width: 62.5000%;
+ *width: 62.4690%;
+}
+
+.yui3-u-2-3,
+.yui3-u-16-24 {
+ width: 66.6667%;
+ *width: 66.6357%;
+}
+
+.yui3-u-17-24 {
+ width: 70.8333%;
+ *width: 70.8023%;
+}
+
+.yui3-u-3-4,
+.yui3-u-18-24 {
+ width: 75%;
+ *width: 74.9690%;
+}
+
+.yui3-u-19-24 {
+ width: 79.1667%;
+ *width: 79.1357%;
+}
+
+.yui3-u-4-5 {
+ width: 80%;
+ *width: 79.9690%;
+}
+
+.yui3-u-5-6,
+.yui3-u-20-24 {
+ width: 83.3333%;
+ *width: 83.3023%;
+}
+
+.yui3-u-7-8,
+.yui3-u-21-24 {
+ width: 87.5000%;
+ *width: 87.4690%;
+}
+
+.yui3-u-11-12,
+.yui3-u-22-24 {
+ width: 91.6667%;
+ *width: 91.6357%;
+}
+
+.yui3-u-23-24 {
+ width: 95.8333%;
+ *width: 95.8023%;
+}
+
+.yui3-u-1,
+.yui3-u-1-1,
+.yui3-u-5-5,
+.yui3-u-24-24 {
+ width: 100%;
+}
+/* YUI CSS Detection Stamp */
+#yui3-css-stamp.cssgrids { display: none; }
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/archives.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/archives.vm?rev=1608280&r1=1608279&r2=1608280&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/archives.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/archives.vm Sun Jul 6 18:40:12 2014
@@ -65,32 +65,24 @@
</head>
<body>
-<!-- use layout yui-t6: 300px sidebar on right -->
-<div id="doc2" class="yui-t6">
-
-
<!-- *************************************************** -->
<!-- HEADER -->
<!-- *************************************************** -->
-<div id="hd">
<div id="header_content">
#includeTemplate($model.weblog "standard_header")
</div>
-</div>
<!-- *************************************************** -->
<!-- BODY -->
<!-- *************************************************** -->
-<div id="bd">
+<div class="yui3-g">
<!-- *************************************************** -->
<!-- BODY - MAIN -->
<!-- *************************************************** -->
-<div id="yui-main">
-<div class="yui-b">
-
+<div class="yui3-u-2-3">
<div id="main_content">
<h3>Browse the $model.weblog.name archives</h3>
@@ -103,15 +95,12 @@
#showWeblogEntryCalendarBig($model.weblog "nil")
</div>
-
-</div>
</div>
<!-- *************************************************** -->
<!-- BODY - SIDEBAR -->
<!-- *************************************************** -->
-<div class="yui-b">
-
+<div class="yui3-u-1-3">
<div id="sidebar_content">
<form id="searchForm" method="get" action="$url.search"
@@ -148,19 +137,15 @@
#end</ul>
</div> <!-- close sidebar_content -->
-</div>
-</div>
+</div> <!-- close yui3-u-1-3 -->
+</div> <!-- close yui3-g -->
<!-- *************************************************** -->
<!-- FOOTER -->
<!-- *************************************************** -->
-<div id="ft">
<div id="footer_content">
#includeTemplate($model.weblog "standard_footer")
</div>
-</div>
-
-</div>
</body>
</html>
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm?rev=1608280&r1=1608279&r2=1608280&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/entry.vm Sun Jul 6 18:40:12 2014
@@ -146,33 +146,26 @@
</head>
<body>
-<!-- use layout yui-t6: 300px sidebar on right -->
-<div id="doc2" class="yui-t6">
-
-
<!-- *************************************************** -->
<!-- HEADER -->
<!-- *************************************************** -->
-<div id="hd">
<div id="header_content">
#includeTemplate($model.weblog "standard_header")
</div>
-</div>
<!-- *************************************************** -->
<!-- BODY -->
<!-- *************************************************** -->
-<div id="bd">
+<div class="yui3-g">
<!-- *************************************************** -->
<!-- BODY - MAIN -->
<!-- *************************************************** -->
-<div id="yui-main">
-<div class="yui-b">
-
+<div class="yui3-u-2-3">
<div id="main_content">
+
#set($pager = $model.getWeblogEntriesPager())
<div id="nextprev">
#showNextPrevEntriesControl($pager)
@@ -182,7 +175,6 @@
#showWeblogEntryComments($entry)
#showWeblogEntryCommentForm($entry)
#end
-</div>
</div>
</div>
@@ -190,8 +182,7 @@
<!-- *************************************************** -->
<!-- BODY - SIDEBAR -->
<!-- *************************************************** -->
-<div class="yui-b">
-
+<div class="yui3-u-1-3">
<div id="sidebar_content">
<h3>Welcome</h3>
@@ -241,20 +232,15 @@
</div> <!-- close sidebar_content -->
-</div>
-</div>
+</div> <!-- close yui3-u-1-3 -->
+</div> <!-- close yui3-g -->
<!-- *************************************************** -->
<!-- FOOTER -->
<!-- *************************************************** -->
-<div id="ft">
<div id="footer_content">
#includeTemplate($model.weblog "standard_footer")
</div>
-</div>
-
-</div>
</body>
</html>
-
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm?rev=1608280&r1=1608279&r2=1608280&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm Sun Jul 6 18:40:12 2014
@@ -26,32 +26,24 @@
</head>
<body onload="loadSearchHighlight()">
-<!-- use layout yui-t6: 300px sidebar on right -->
-<div id="doc2" class="yui-t6">
-
-
<!-- *************************************************** -->
<!-- HEADER -->
<!-- *************************************************** -->
-<div id="hd">
<div id="header_content">
#includeTemplate($model.weblog "standard_header")
</div>
-</div>
<!-- *************************************************** -->
<!-- BODY -->
<!-- *************************************************** -->
-<div id="bd">
+<div class="yui3-g">
<!-- *************************************************** -->
<!-- BODY - MAIN -->
<!-- *************************************************** -->
-<div id="yui-main">
-<div class="yui-b">
-
+<div class="yui3-u-2-3">
<div id="main_content">
<h2>Search Results for '$model.term'</h2>
@@ -97,18 +89,14 @@
#end
</div>
-
-</div>
</div>
<!-- *************************************************** -->
<!-- BODY - SIDEBAR -->
<!-- *************************************************** -->
-<div class="yui-b">
-
+<div class="yui3-u-1-3">
<div id="sidebar_content">
-
<h3>Welcome</h3>
<p class="details">
@@ -119,19 +107,15 @@
<a href="$url.home">visit the main page</a> of the weblog.</p>
</div> <!-- close sidebar_content -->
-</div>
-</div>
+</div> <!-- close yui3-u-1-3 -->
+</div> <!-- close yui3-g -->
<!-- *************************************************** -->
<!-- FOOTER -->
<!-- *************************************************** -->
-<div id="ft">
<div id="footer_content">
#includeTemplate($model.weblog "standard_footer")
</div>
-</div>
-
-</div>
</body>
</html>
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm?rev=1608280&r1=1608279&r2=1608280&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/std_head.vm Sun Jul 6 18:40:12 2014
@@ -1,4 +1,3 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <link rel="stylesheet" type="text/css" href="$url.site/roller-ui/yui/reset-fonts-grids/reset-fonts-grids.css" />
- <link rel="stylesheet" type="text/css" href="$url.site/roller-ui/yui/base/base-min.css" />
+ <link rel="stylesheet" type="text/css" href="$url.site/roller-ui/yui3/cssgrids/cssgrids-min.css">
<link rel="stylesheet" type="text/css" href="$url.page('style.css')" />
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/style_css.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/style_css.vm?rev=1608280&r1=1608279&r2=1608280&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/style_css.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/style_css.vm Sun Jul 6 18:40:12 2014
@@ -1,7 +1,8 @@
body, html {
background: url($url.resource("images/faux-columns-950.png")) repeat-y scroll 0 0;
background-position: center;
- margin: 0;
+ margin: auto;
+ width: 950px;
height: 100%;
}
@@ -82,13 +83,9 @@ span.setup {
/* HEADER */
/* ------------------------------------------------------------ */
-#hd {
+#header_content {
background-image: url($url.resource("images/background-950x250.png"));
height: 200px;
-}
-
-#header_content {
- height: 100%;
width: 100%;
position: relative;
}
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/tags_index.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/tags_index.vm?rev=1608280&r1=1608279&r2=1608280&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/tags_index.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/tags_index.vm Sun Jul 6 18:40:12 2014
@@ -7,32 +7,24 @@
</head>
<body>
-<!-- use layout yui-t6: 300px sidebar on right -->
-<div id="doc2" class="yui-t6">
-
-
<!-- *************************************************** -->
<!-- HEADER -->
<!-- *************************************************** -->
-<div id="hd">
<div id="header_content">
#includeTemplate($model.weblog "standard_header")
</div>
-</div>
<!-- *************************************************** -->
<!-- BODY -->
<!-- *************************************************** -->
-<div id="bd">
+<div class="yui3-g">
<!-- *************************************************** -->
<!-- BODY - MAIN -->
<!-- *************************************************** -->
-<div id="yui-main">
-<div class="yui-b">
-
+<div class="yui3-u-2-3">
<div id="main_content">
<h2>Entries tagged $model.tags</h2>
@@ -47,15 +39,12 @@
</div>
</div>
-
-</div>
</div>
<!-- *************************************************** -->
<!-- BODY - SIDEBAR -->
<!-- *************************************************** -->
-<div class="yui-b">
-
+<div class="yui3-u-1-3">
<div id="sidebar_content">
<h3>Welcome</h3>
@@ -68,19 +57,15 @@
<a href="$url.home">visit the main page</a> of the weblog.</p>
</div> <!-- close sidebar_content -->
-</div>
-</div>
+</div> <!-- close yui3-u-1-3 -->
+</div> <!-- close yui3-g -->
<!-- *************************************************** -->
<!-- FOOTER -->
<!-- *************************************************** -->
-<div id="ft">
<div id="footer_content">
#includeTemplate($model.weblog "standard_footer")
</div>
-</div>
-
-</div>
</body>
</html>
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm?rev=1608280&r1=1608279&r2=1608280&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm Sun Jul 6 18:40:12 2014
@@ -11,32 +11,24 @@
</head>
<body>
-<!-- use layout yui-t6: 300px sidebar on right -->
-<div id="doc2" class="yui-t6">
-
-
<!-- *************************************************** -->
<!-- HEADER -->
<!-- *************************************************** -->
-<div id="hd">
<div id="header_content">
#includeTemplate($model.weblog "standard_header")
</div>
-</div>
<!-- *************************************************** -->
<!-- BODY -->
<!-- *************************************************** -->
-<div id="bd">
+<div class="yui3-g">
<!-- *************************************************** -->
<!-- BODY - MAIN -->
<!-- *************************************************** -->
-<div id="yui-main">
-<div class="yui-b">
-
+<div class="yui3-u-2-3">
<div id="main_content">
<!--
@@ -58,15 +50,12 @@
</div>
</div>
-
-</div>
</div>
<!-- *************************************************** -->
<!-- BODY - SIDEBAR -->
<!-- *************************************************** -->
-<div class="yui-b">
-
+<div class="yui3-u-1-3">
<div id="sidebar_content">
<form id="searchForm" method="get" action="$url.search"
@@ -117,20 +106,15 @@ Click the link below to subscribe via yo
</div>
</div> <!-- close sidebar_content -->
-</div>
-</div>
+</div> <!-- close yui3-u-1-3 -->
+</div> <!-- close yui3-g -->
<!-- *************************************************** -->
<!-- FOOTER -->
<!-- *************************************************** -->
-<div id="ft">
<div id="footer_content">
#includeTemplate($model.weblog "standard_footer")
</div>
-</div>
-
-</div>
-
</body>
</html>