aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-19 16:48:50 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-19 16:48:50 +0000
commit5949dbad2a6aa3512256900862a1833a62ebabcc (patch)
treeb118dfad036659a5ac24ea85a0bb9b185f5f65fe /views
parent7a77598711f5a2bd6f9c29214901e2b4718f1e6f (diff)
downloadelgg-5949dbad2a6aa3512256900862a1833a62ebabcc.tar.gz
elgg-5949dbad2a6aa3512256900862a1833a62ebabcc.tar.bz2
added elgg-output class for displaying user input with typical styling for lists and tables
git-svn-id: http://code.elgg.org/elgg/trunk@8332 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/css/elements/chrome.php53
-rw-r--r--views/default/css/elements/typography.php13
-rw-r--r--views/default/output/longtext.php2
3 files changed, 39 insertions, 29 deletions
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
index a9b82d41d..157b00c6e 100644
--- a/views/default/css/elements/chrome.php
+++ b/views/default/css/elements/chrome.php
@@ -81,6 +81,12 @@ h2 {
color: #0054A7;
}
+.elgg-photo {
+ border: 1px solid #ccc;
+ padding: 3px;
+ background-color: white;
+}
+
<?php //@todo remove ?>
.radius8 {
-webkit-border-radius: 8px;
@@ -88,11 +94,32 @@ h2 {
}
/* ***************************************
+ USER INPUT DISPLAY RESET
+*************************************** */
+.elgg-output ul, ol {
+ margin: 0 1.5em 1.5em 0;
+ padding-left: 1.5em;
+}
+.elgg-output ul {
+ list-style-type: disc;
+}
+.elgg-output ol {
+ list-style-type: decimal;
+}
+.elgg-output table {
+ border: 1px solid #ccc;
+}
+.elgg-output table td {
+ border: 1px solid #ccc;
+ padding: 3px 5px;
+}
+
+/* ***************************************
Borders (inspired by OOCSS)
b<location><type>
*************************************** */
-<?php //@todo style is 'a' or 'b' because I didn't want to think of something cooler ?>
+<?php //@todo remove ?>
/* a */
.bta, .bva, .baa {border-top: 1px solid #ccc}
.bba, .bva, .baa {border-bottom: 1px solid #ccc}
@@ -104,27 +131,3 @@ h2 {
.bbb, .bvb, .bab {border-bottom: 1px solid #eee}
.blb, .bhb, .bab {border-left: 1px solid #eee}
.brb, .bhb, .bab {border-right: 1px solid #eee}
-
-.elgg-text ul, ol {
- margin: 0 1.5em 1.5em 0;
- padding-left: 1.5em;
-}
-.elgg-text ul {
- list-style-type: disc;
-}
-.elgg-text ol {
- list-style-type: decimal;
-}
-
-.elgg-subtext {
- color: #666666;
- font-size: 85%;
- line-height: 1.2em;
- font-style: italic;
-}
-
-.elgg-photo {
- border: 1px solid #ccc;
- padding: 3px;
- background-color: white;
-}
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index bd62363c3..82d55cc04 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -13,10 +13,10 @@
body {
font-size: 80%;
line-height: 1.4em;
- font-family: "Lucida Grande",Arial,Tahoma,Verdana,sans-serif;
+ font-family: "Lucida Grande", Arial, Tahoma, Verdana, sans-serif;
}
pre, code {
- font-family: Monaco,"Courier New",Courier,monospace;
+ font-family: Monaco, "Courier New", Courier, monospace;
font-size: 12px;
}
input, textarea {
@@ -36,7 +36,7 @@ h5 { font-size: 0.9em; }
h6 { font-size: 0.8em; }
.elgg-monospace {
- font-family: Monaco,"Courier New",Courier,monospace;
+ font-family: Monaco, "Courier New", Courier, monospace;
}
.elgg-heading-site, .elgg-heading-site:hover {
@@ -58,3 +58,10 @@ h6 { font-size: 0.8em; }
font-size: 1.2em;
font-weight: bold;
}
+
+.elgg-subtext {
+ color: #666666;
+ font-size: 85%;
+ line-height: 1.2em;
+ font-style: italic;
+}
diff --git a/views/default/output/longtext.php b/views/default/output/longtext.php
index 703bb0868..c188d0e16 100644
--- a/views/default/output/longtext.php
+++ b/views/default/output/longtext.php
@@ -11,7 +11,7 @@
* @uses $vars['class']
*/
-$class = 'elgg-text';
+$class = 'elgg-output';
$additional_class = elgg_extract('class', $vars, '');
if ($additional_class) {
$class = "$class $additional_class";