Refs #3286: Removed css/elements/chrome.php, putting all the style rules into sensibl...

git-svn-id: http://code.elgg.org/elgg/trunk@8957 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
deleted file mode 100644 (file)
index 42fe910..0000000
--- a/views/default/css/elements/chrome.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/**
- * Visual styling
- *
- * @package Elgg.Core
- * @subpackage UI
- */
-
-/* Colors:
-
-       #4690D6 - elgg light blue
-       #0054A7 - elgg dark blue
-       #e4ecf5 - elgg very light blue
-*/
-
-?>
-
-a {
-       color: #4690D6;
-}
-a:hover,
-a.selected {
-       color: #555555;
-       text-decoration: underline;
-}
-
-h1, h2, h3, h4, h5, h6 {
-       color: #0054A7;
-}
-p {
-       margin-bottom: 15px;
-}
-p:last-child {
-       margin-bottom: 0;
-}
-
-dt {
-       font-weight: bold;
-}
-dd {
-       margin: 0 0 1em 1em;
-}
-pre, code {
-       background:#EBF5FF;
-       color:#000000;
-       overflow:auto;
-
-       overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
-
-       white-space: pre-wrap;
-       word-wrap: break-word; /* IE 5.5-7 */
-}
-code {
-       padding:2px 3px;
-}
-pre {
-       padding:3px 15px;
-       margin:0px 0 15px 0;
-       line-height:1.3em;
-}
-blockquote {
-       padding:3px 15px;
-       margin:0px 0 15px 0;
-       background:#EBF5FF;
-       border:none;
-       
-       -webkit-border-radius: 4px;
-       -moz-border-radius: 4px;
-       border-radius: 4px;
-}
-
-h2 {
-       padding-bottom:5px;
-}
-
-.elgg-quiet {
-       color: #666;
-}
-
-.elgg-loud {
-       color: #0054A7;
-}
-
-.elgg-photo {
-       border: 1px solid #ccc;
-       padding: 3px;
-       background-color: white;
-}
-
-.elgg-transition:hover {
-       opacity: .7;
-}
-
-.elgg-comments {
-       margin-top: 25px;
-}
-.elgg-comments > form {
-       margin-top: 15px;
-}
-
-/* ***************************************
-       BORDERS AND SEPARATORS
-*************************************** */
-.elgg-border-plain {
-       border: 1px solid #eeeeee;
-}
-.elgg-border-transition {
-       border: 1px solid #eeeeee;
-}
-.elgg-divide-top {
-       border-top: 1px solid #CCCCCC;
-}
-.elgg-divide-bottom {
-       border-bottom: 1px solid #CCCCCC;
-}
-.elgg-divide-left {
-       border-left: 1px solid #CCCCCC;
-}
-.elgg-divide-right {
-       border-right: 1px solid #CCCCCC;
-}
-
-/* ***************************************
-       USER INPUT DISPLAY RESET
-*************************************** */
-.elgg-output {
-       margin-top: 10px;
-}
-.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;
-}
-.elgg-output img {
-       max-width: 100%;
-}

diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index bbd6b4cfb3888e323ddf36db80bad80a6cc15a54..bb573f4ec6ee6cfd87a25a35c374b1039cb4616a 100644 (file)
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -264,6 +264,26 @@
        margin: 0 0 0 10px;
 }
 
+
+/* **************************************
+       Comments (from elgg_view_comments)
+************************************** */
+.elgg-comments {
+       margin-top: 25px;
+}
+.elgg-comments > form {
+       margin-top: 15px;
+}
+
+/* ***************************************
+       Image-related
+*************************************** */
+.elgg-photo {
+       border: 1px solid #ccc;
+       padding: 3px;
+       background-color: white;
+}
+
 /* ***************************************
        Tags
 *************************************** */

diff --git a/views/default/css/elements/helpers.php b/views/default/css/elements/helpers.php
index 3ad9f828715a4f96ea077fdbbadb90dfee97ae1a..21e3dd984af477b544515952afdee14258fea51e 100644 (file)
--- a/views/default/css/elements/helpers.php
+++ b/views/default/css/elements/helpers.php
@@ -70,6 +70,32 @@
        display: block;
 }
 
+.elgg-transition:hover {
+       opacity: .7;
+}
+
+/* ***************************************
+       BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {
+       border: 1px solid #eeeeee;
+}
+.elgg-border-transition {
+       border: 1px solid #eeeeee;
+}
+.elgg-divide-top {
+       border-top: 1px solid #CCCCCC;
+}
+.elgg-divide-bottom {
+       border-bottom: 1px solid #CCCCCC;
+}
+.elgg-divide-left {
+       border-left: 1px solid #CCCCCC;
+}
+.elgg-divide-right {
+       border-right: 1px solid #CCCCCC;
+}
+
 /* ***************************************
        Spacing (from OOCSS)
 *************************************** */

diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index 2661372f29d8e317405ec178c6a943ebfe80cd98..a50f85c8c3a14796ec3d2f453f831cd9290a172a 100644 (file)
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -15,30 +15,81 @@ body {
        line-height: 1.4em;
        font-family: "Lucida Grande", Arial, Tahoma, Verdana, sans-serif;
 }
+
+a {
+       color: #4690D6;
+}
+
+a:hover,
+a.selected { <?php //@todo remove .selected ?>
+       color: #555555;
+       text-decoration: underline;
+}
+
+p {
+       margin-bottom: 15px;
+}
+
+p:last-child {
+       margin-bottom: 0;
+}
+
+dt { font-weight: bold }
+dd { margin: 0 0 1em 1em }
+
 pre, code {
        font-family: Monaco, "Courier New", Courier, monospace;
        font-size: 12px;
+       
+       background:#EBF5FF;
+       color:#000000;
+       overflow:auto;
+
+       overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
+
+       white-space: pre-wrap;
+       word-wrap: break-word; /* IE 5.5-7 */
+       
+}
+
+pre {
+       padding:3px 15px;
+       margin:0px 0 15px 0;
+       line-height:1.3em;
+}
+
+code {
+       padding:2px 3px;
 }
-input, textarea {
-       font: 120% Arial, Helvetica, sans-serif;
+
+.elgg-monospace {
+       font-family: Monaco, "Courier New", Courier, monospace;
 }
+
 blockquote {
        line-height: 1.3em;
+       padding:3px 15px;
+       margin:0px 0 15px 0;
+       background:#EBF5FF;
+       border:none;
+       
+       -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+       border-radius: 4px;
 }
+
 h1, h2, h3, h4, h5, h6 {
        font-weight: bold;
+       color: #0054A7;
 }
+
 h1 { font-size: 1.8em; }
-h2 { font-size: 1.5em; line-height: 1.1em; }
+h2 { font-size: 1.5em; line-height: 1.1em; padding-bottom:5px}
 h3 { font-size: 1.2em; }
 h4 { font-size: 1.0em; }
 h5 { font-size: 0.9em; }
 h6 { font-size: 0.8em; }
 
-.elgg-monospace {
-       font-family: Monaco, "Courier New", Courier, monospace;
-}
-
 .elgg-heading-site, .elgg-heading-site:hover {
        font-size: 2em;
        line-height: 1.4em;
@@ -48,6 +99,7 @@ h6 { font-size: 0.8em; }
        text-shadow: 1px 2px 4px #333333;
        text-decoration: none;
 }
+
 .elgg-heading-main {
        float: left;
        max-width: 530px;
@@ -71,3 +123,38 @@ h6 { font-size: 0.8em; }
        font-size: 85%;
        font-style: italic;
 }
+
+.elgg-quiet {
+       color: #666;
+}
+
+.elgg-loud {
+       color: #0054A7;
+}
+
+/* ***************************************
+       USER INPUT DISPLAY RESET
+*************************************** */
+.elgg-output {
+       margin-top: 10px;
+}
+.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;
+}
+.elgg-output img {
+       max-width: 100%;
+}
\ No newline at end of file

diff --git a/views/default/css/elgg.php b/views/default/css/elgg.php
index 96ef4587b133aa4d1cbb0588df2ab0239afc8b72..977eb9f2f0fad7d1f2ec6051ed7f4c856b86edb8 100644 (file)
--- a/views/default/css/elgg.php
+++ b/views/default/css/elgg.php
@@ -6,6 +6,13 @@
  * @subpackage UI
  */
 
+/* 
+ * Colors:
+ *  #4690D6 - elgg light blue
+ *  #0054A7 - elgg dark blue
+ *  #e4ecf5 - elgg very light blue
+ */
+
 // check if there is a theme overriding the old css view and use it, if it exists
 $old_css_view = elgg_get_view_location('css');
 if ($old_css_view != elgg_get_config('viewpath')) {
@@ -31,7 +38,6 @@ echo elgg_view('css/elements/grid', $vars);
 
 Skin CSS
  * typography     - fonts, line spacing
- * chrome         - general skin
  * forms          - forms, inputs
  * buttons        - action, cancel, delete, submit, dropdown, special
  * navigation     - menus, breadcrumbs, pagination