You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2012/08/15 20:32:14 UTC
svn commit: r1373556 [3/3] - in /shiro/site-template/src/main/webapp:
index.html inner.html static/assets/css/confluence.css
static/assets/css/style.css
Modified: shiro/site-template/src/main/webapp/static/assets/css/confluence.css
URL: http://svn.apache.org/viewvc/shiro/site-template/src/main/webapp/static/assets/css/confluence.css?rev=1373556&r1=1373555&r2=1373556&view=diff
==============================================================================
--- shiro/site-template/src/main/webapp/static/assets/css/confluence.css (original)
+++ shiro/site-template/src/main/webapp/static/assets/css/confluence.css Wed Aug 15 18:32:09 2012
@@ -112,7 +112,7 @@ th.confluenceTh {
border: 1px dashed #1a6c0b;
font-size: 1em;
font-family: 'courier new', Courier, serif;
- margin: 1em;
+ margin: 1em 0;
line-height: 1em;
}
Modified: shiro/site-template/src/main/webapp/static/assets/css/style.css
URL: http://svn.apache.org/viewvc/shiro/site-template/src/main/webapp/static/assets/css/style.css?rev=1373556&r1=1373555&r2=1373556&view=diff
==============================================================================
--- shiro/site-template/src/main/webapp/static/assets/css/style.css (original)
+++ shiro/site-template/src/main/webapp/static/assets/css/style.css Wed Aug 15 18:32:09 2012
@@ -1,11 +1,26 @@
@charset "UTF-8";
-/* CSS Document */
-
-html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;background:transparent;vertical-align:top;}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outline:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0;}address{font-style:normal;}
-button,a,input[type="submit"],input.iesubmit{cursor:pointer} small{font-size:0.625em}
-html {overflow: auto;}
-a img {border:0;} strong {font-weight:bold;}
-abbr,acronym{border-bottom:1px dotted #000000;cursor:help;}del{text-decoration:line-through;}ins{text-decoration:underline;font-style:italic}
+/*
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements. See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership. The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License. You may obtain a copy of the License at
+ -
+ - http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied. See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+*/
+
+/* ========================================================
+ * Global Styling
+ * ======================================================== */
a:link {color:#3254a0; text-decoration:none;}
a:visited {color:#3254a0; text-decoration:none;}
@@ -15,10 +30,8 @@ a:active {color:#3254a0; text-decoration
body {
background:url(../images/back.jpg);
font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
- text-shadow: 1px 1px 0px #fff;
+ text-shadow: 1px 1px 0 #fff;
filter: dropshadow(color=#fff, offx=1, offy=1);
- font-size:14px;
- line-height:18px;
}
.wrapper {
@@ -35,13 +48,29 @@ body {
h1 {
font-size:32px;
color:#3254a0;
- margin:10px 0 10px 0;
}
h2 {
color:#3254a0;
}
+menu, ol, ul {
+ padding: 0 0 0 2em;
+}
+
+dl, menu, ol, ul, li {
+ margin: 1em 0;
+}
+
+/* Table of Contents chunks: */
+.toc ol {margin: 0.5em 0;}
+.toc ul {margin: 0.5em 0;}
+.toc li {margin: 0.5em 0;}
+
+/* ========================================================
+ * Header Styling
+ * ======================================================== */
+
#top-bar {
background:url(../images/topbar.jpg);
height:6px;
@@ -96,11 +125,9 @@ h2 {
}
#secondary-navigation {
- position:relative;
float:right;
- width:480px;
- margin:4px 10px 0 0;
- padding:5px 0 0 0px;
+ margin:-7px 13px 0 0;
+ padding:0;
}
#secondary-navigation li {
@@ -121,61 +148,94 @@ h2 {
margin:25px 0 0 0;
}
+/* ========================================================
+ * 2-Column Page Styling (e.g. index.html)
+ * ======================================================== */
+
+/* ============ 2-Column Main Content ===================== */
+
#main-content {
float:left;
width:640px;
}
-/* RIGHT COLUMN */
+#main-content > h1 {
+ margin: 0.5em 0 0.5em 0;
+}
+
+/* Home page intro paragraph: */
+#main-content > p {
+ font-size: 0.9em;
+ margin: 0 0 2em 0;
+}
+
+#main-content table {margin:20px 0 20px 0;}
+#main-content td {padding:2px;}
+
+/* ============ 2-Column Right Column ===================== */
+
#right-column {
float:right;
width:240px;
}
-.title {
- background:#3254a0;
- color:#FFF;
- font-size:16px;
- font-weight:bold;
- width:234px;
- padding:3px 0 3px 3px;
- text-shadow:none;
- display:block;
- margin:20px 0 5px 0;
- clear:both;
-}
-
+/* Download button: */
.download {
- background:url(../images/download.png) 0px 0px;
- width:243px;
- height:42px;
- clear:both;
- margin:20px 0 20px 0;
+ background:url(../images/download.png) 0px 0px;
+ width:243px;
+ height:42px;
+ clear:both;
+ margin:20px 0 20px 0;
}
.download:hover {
- background:url(../images/download.png) 0px -42px;
+ background:url(../images/download.png) 0px -42px;
}
+/* Email (announce@) signup: */
.email {margin:20px 0 0 0;}
.email-form {
- width:165px;
- height:26px;
- border:#333 1px solid;
- float:left;
- padding:0 0 0 3px;
+ width:165px;
+ height:26px;
+ border:#333 1px solid;
+ float:left;
+ padding:0 0 0 3px;
}
.join-email {
- background:url(../images/join-email.png) 0px 0px;
- width:68px;
- height:28px;
- float:right;
+ background:url(../images/join-email.png) 0px 0px;
+ width:68px;
+ height:28px;
+ float:right;
}
.join-email:hover {
- background:url(../images/join-email.png) 0px -28px;
+ background:url(../images/join-email.png) 0px -28px;
+}
+
+/* NEWS */
+#right-column h2 {
+ background:#3254a0;
+ color:#FFF;
+ font-size:16px;
+ font-weight:bold;
+ width:234px;
+ padding:3px 0 3px 3px;
+ text-shadow:none;
+ display:block;
+ margin:20px 0 5px 0;
+ clear:both;
+}
+
+#right-column h3 {
+ font-size: 0.95em;
+ margin: 12px 0 0 0;
+}
+
+#right-column p {
+ font-size: 0.87em;
+ margin: 0.85em 0;
}
#right-column .more {
@@ -187,10 +247,7 @@ h2 {
text-align:right;
}
-#right-column h2 {
- margin:10px 0 0 0;
-}
-
+/* Communities */
.communities {
width:100%;
text-align:center;
@@ -219,7 +276,8 @@ h2 {
}
.service-tabs h2 {
- font-size:18px;
+ padding: 0;
+ margin: 0;
color:#3254a0;
}
@@ -242,7 +300,19 @@ h2 {
margin:50px 0 0 0;
}
-/* PAGE */
+.video-box td {
+ vertical-align: top;
+}
+
+.video-box h1 {
+ margin: 0;
+ padding: 0;
+}
+
+/* ========================================================
+ * Single Column (Normal) Page Styling
+ * ======================================================== */
+
.breadcrumbs {
font-size:11px;
}
@@ -263,9 +333,6 @@ h2 {
list-style:inside;
}
-#main-content table {margin:20px 0 20px 0; border:1px #CCCCCC solid;}
-#main-content td {border:1px #CCCCCC solid; padding:2px; width:33%;}
-
.table-header {
background-color:#f0f0f0;
text-align:center;
@@ -278,7 +345,9 @@ h2 {
padding:3px;
}
-/* FOOTER */
+/* ========================================================
+ * Footer Styling
+ * ======================================================== */
#footer {
width:100%;