Updated base of code.

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index c02d43512b126311fc4cc98a116d008bc3800c4d..b996e563671fd1565bffc4b81660493e3a7a464b 100644 (file)
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -25,7 +25,6 @@ table, caption, tbody, tfoot, thead, tr, th, td {
        margin: 0;
        padding: 0;
        border: 0;
-       outline: 0;
        font-weight: inherit;
        font-style: inherit;
        font-size: 100%;
@@ -41,9 +40,6 @@ img {
        border-width: 0;
        border-color: transparent;
 }
-:focus {
-       outline: 0 none;
-}
 ol, ul {
        list-style: none;
 }
@@ -106,7 +102,14 @@ a:hover {
        text-decoration: underline;
 }
 pre, code {
-       background: #EBF5FF;
+       background-color: #EEE;
+       border: 1px solid #DDD;
+       color: #444;
+       font-family: Monaco, "Courier New", Courier, monospace;
+       font-size: 13px;
+       overflow: auto;
+       margin: 15px 0;
+       padding: 5px;
 }
 blockquote {
        background: #EBF5FF;
@@ -120,14 +123,23 @@ p {
 }
 
 /* Clearfix! */
+.clearfix:after,
 .elgg-grid:after,
-.clearfix:after {
+.elgg-layout:after,
+.elgg-inner:after,
+.elgg-page-header:after,
+.elgg-page-footer:after,
+.elgg-head:after,
+.elgg-foot:after,
+.elgg-col:after,
+.elgg-image-block:after {
        content: ".";
        display: block;
        height: 0;
        clear: both;
        visibility: hidden;
 }
+
 .elgg-body {
        width: auto;
        word-wrap: break-word;
@@ -138,6 +150,7 @@ p {
        visibility: hidden;
        height: 0 !important;
        line-height: 0;
+       overflow: hidden;
        font-size: xx-large;
        content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
 }
@@ -279,14 +292,6 @@ p {
 .elgg-main h2 {
        color: #333333;
 }
-<?php // elgg-layout gets clearfix ?>
-.elgg-layout:after {
-       content: ".";
-       display: block;
-       height: 0;
-       clear: both;
-       visibility: hidden;
-}
 
 /* ***************************************
        FOOTER
@@ -350,6 +355,8 @@ p {
 .elgg-table td, .elgg-table th {
        background: white;
        border: 1px solid #ccc;
+       padding: 4px 8px;
+       vertical-align: middle;
 }
 .elgg-table th {
        background-color: #ddd;
@@ -357,10 +364,10 @@ p {
 .elgg-table .alt td {
        background: #eee;
 }
-.elgg-table td {
-       padding: 4px 8px;
-       border-bottom: 1px solid #ccc;
+.elgg-table input[type=checkbox] {
+       margin-top: 3px;
 }
+
 .elgg-table-alt {
        width: 100%;
        border-top: 1px solid #ccc;
@@ -432,7 +439,9 @@ input {
        -webkit-border-radius: 5px;
        -moz-border-radius: 5px;
        border-radius: 5px;
+       margin: 0;
 }
+
 /* default elgg core input field classes */
 .elgg-input-text,
 .elgg-input-tags,
@@ -462,7 +471,6 @@ textarea {
        width: auto;
        padding: 2px 4px;
        cursor: pointer;
-       outline: none;
 }
 a.elgg-button {
        padding: 3px 6px;
@@ -529,20 +537,20 @@ a.elgg-button {
        -webkit-border-radius: 5px;
 }
 .ui-datepicker-prev, .ui-datepicker-next {
-    position: absolute;
-    top: 9px;
+       position: absolute;
+       top: 9px;
        cursor: pointer;
 }
 .ui-datepicker-prev {
-    left: 6px;
+       left: 6px;
 }
 .ui-datepicker-next {
-    right: 6px;
+       right: 6px;
 }
 .ui-datepicker-title {
-    line-height: 1.8em;
-    margin: 0 30px;
-    text-align: center;
+       line-height: 1.8em;
+       margin: 0 30px;
+       text-align: center;
        font-weight: bold;
 }
 .ui-datepicker-calendar {
@@ -550,38 +558,236 @@ a.elgg-button {
 }
 .ui-datepicker th {
        border: none;
-    font-weight: bold;
-    padding: 5px 6px;
-    text-align: center;
+       font-weight: bold;
+       padding: 5px 6px;
+       text-align: center;
 }
 .ui-datepicker td {
        padding: 1px;
 }
 .ui-datepicker td span, .ui-datepicker td a {
-    display: block;
-    padding: 2px;
+       display: block;
+       padding: 2px;
        line-height: 1.2em;
-    text-align: right;
-    text-decoration: none;
+       text-align: right;
+       text-decoration: none;
 }
 .ui-datepicker-calendar .ui-state-default {
        border: 1px solid #ccc;
-    color: #555;
+       color: #555;
        background: #fafafa;
 }
 .ui-datepicker-calendar .ui-state-hover {
        border: 1px solid #aaa;
-    color: #333;
+       color: #333;
        background: #ccc;
 }
 .ui-datepicker-calendar .ui-state-active,
 .ui-datepicker-calendar .ui-state-active.ui-state-hover {
        font-weight: bold;
-    border: 1px solid #999;
-    color: #333;
+       border: 1px solid #999;
+       color: #333;
        background: #ddd;
 }
 
+/* ***************************************
+       AUTOCOMPLETE
+*************************************** */
+<?php //autocomplete will expand to fullscreen without max-width ?>
+.ui-autocomplete {
+       position: absolute;
+       cursor: default;
+}
+.elgg-autocomplete-item .elgg-body {
+       max-width: 600px;
+}
+.ui-autocomplete {
+       background-color: white;
+       border: 1px solid #ccc;
+       overflow: hidden;
+
+       -webkit-border-radius: 5px;
+       -moz-border-radius: 5px;
+       border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item {
+       padding: 0px 4px;
+
+       -webkit-border-radius: 5px;
+       -moz-border-radius: 5px;
+       border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item:hover {
+       background-color: #eee;
+}
+.ui-autocomplete a:hover {
+       text-decoration: none;
+       color: #4690D6;
+}
+
+/* ***************************************
+       USER PICKER
+*************************************** */
+.elgg-user-picker-list li:first-child {
+       border-top: 1px dotted #ccc;
+       margin-top: 5px;
+}
+.elgg-user-picker-list > li {
+       border-bottom: 1px dotted #ccc;
+}
+
+/* ***************************************
+       FRIENDS PICKER
+*************************************** */
+.friends-picker-main-wrapper {
+       margin-bottom: 15px;
+}
+.friends-picker-container h3 {
+       font-size:4em !important;
+       text-align: left;
+       margin:10px 0 20px !important;
+       color:#999 !important;
+       background: none !important;
+       padding:0 !important;
+}
+.friends-picker .friends-picker-container .panel ul {
+       text-align: left;
+       margin: 0;
+       padding:0;
+}
+.friends-picker-wrapper {
+       margin: 0;
+       padding:0;
+       position: relative;
+       width: 730px;
+}
+.friends-picker {
+       position: relative;
+       overflow: hidden;
+       margin: 0;
+       padding:0;
+       width: 730px;
+       height: auto;
+       background-color: #dedede;
+
+       -webkit-border-radius: 8px;
+       -moz-border-radius: 8px;
+       border-radius: 8px;
+}
+.friendspicker-savebuttons {
+       background: white;
+
+       -webkit-border-radius: 8px;
+       -moz-border-radius: 8px;
+       border-radius: 8px;
+
+       margin:0 10px 10px;
+}
+.friends-picker .friends-picker-container { /* long container used to house end-to-end panels. Width is calculated in JS  */
+       position: relative;
+       left: 0;
+       top: 0;
+       width: 100%;
+       list-style-type: none;
+}
+.friends-picker .friends-picker-container .panel {
+       float:left;
+       height: 100%;
+       position: relative;
+       width: 730px;
+       margin: 0;
+       padding:0;
+}
+.friends-picker .friends-picker-container .panel .wrapper {
+       margin: 0;
+       padding:4px 10px 10px 10px;
+       min-height: 230px;
+}
+.friends-picker-navigation {
+       margin: 0 0 10px;
+       padding:0 0 10px;
+       border-bottom:1px solid #ccc;
+}
+.friends-picker-navigation ul {
+       list-style: none;
+       padding-left: 0;
+}
+.friends-picker-navigation ul li {
+       float: left;
+       margin:0;
+       background:white;
+}
+.friends-picker-navigation a {
+       font-weight: bold;
+       text-align: center;
+       background: white;
+       color: #999;
+       text-decoration: none;
+       display: block;
+       padding: 0;
+       width:20px;
+
+       -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+       border-radius: 4px;
+}
+.tabHasContent {
+       background: white;
+       color:#333 !important;
+}
+.friends-picker-navigation li a:hover {
+       background: #333;
+       color:white !important;
+}
+.friends-picker-navigation li a.current {
+       background: #4690D6;
+       color:white !important;
+}
+.friends-picker-navigation-l, .friends-picker-navigation-r {
+       position: absolute;
+       top: 46px;
+       text-indent: -9000em;
+}
+.friends-picker-navigation-l a, .friends-picker-navigation-r a {
+       display: block;
+       height: 40px;
+       width: 40px;
+}
+.friends-picker-navigation-l {
+       right: 48px;
+       z-index:1;
+}
+.friends-picker-navigation-r {
+       right: 0;
+       z-index:1;
+}
+.friends-picker-navigation-l {
+       background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left top;
+}
+.friends-picker-navigation-r {
+       background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px top;
+}
+.friends-picker-navigation-l:hover {
+       background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left -44px;
+}
+.friends-picker-navigation-r:hover {
+       background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px -44px;
+}
+.friendspicker-savebuttons .elgg-button-submit,
+.friendspicker-savebuttons .elgg-button-cancel {
+       margin:5px 20px 5px 5px;
+}
+.friendspicker-members-table {
+       background: #dedede;
+
+       -webkit-border-radius: 8px;
+       -moz-border-radius: 8px;
+       border-radius: 8px;
+
+       margin:10px 0 0;
+       padding:10px 10px 0;
+}
+
 /* ***************************************
        PAGINATION
 *************************************** */
@@ -815,6 +1021,27 @@ a.elgg-button {
        vertical-align: baseline;
 }
 
+/* ***************************************
+       WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+       position: absolute;
+       top: 4px;
+       display: inline-block;
+       width: 18px;
+       height: 18px;
+       padding: 2px 2px 0 0;
+}
+.elgg-menu-widget > .elgg-menu-item-collapse {
+       left: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-delete {
+       right: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-settings {
+       right: 25px;
+}
+
 /* ***************************************
        MORE MENUS
 *************************************** */
@@ -914,22 +1141,16 @@ a.elgg-button {
        height: 26px;
        overflow: hidden;
 }
+.elgg-module-widget.elgg-state-draggable .elgg-widget-handle {
+       cursor: move;
+}
 .elgg-module-widget > .elgg-head h3 {
        float: left;
        padding: 4px 45px 0 20px;
        color: #333;
 }
-.elgg-module-widget > .elgg-head a {
-       position: absolute;
-       top: 4px;
-       display: inline-block;
-       width: 18px;
-       height: 18px;
-       padding: 2px 2px 0 0;
-}
 
 .elgg-widget-collapse-button {
-       left: 5px;
        color: #c5c5c5;
        text-decoration: none;
 }
@@ -944,12 +1165,6 @@ a.elgg-widget-collapse-button:before {
 a.elgg-widget-collapsed:before {
        content: "\25BA";
 }
-.elgg-widget-delete-button {
-       right: 5px;
-}
-.elgg-widget-edit-button {
-       right: 25px;
-}
 .elgg-module-widget > .elgg-body {
        border-top: 1px solid #dedede;
        background-color: white;
@@ -1245,6 +1460,14 @@ a.elgg-widget-collapsed:before {
        padding: 5px 10px;
        margin: 4px 0;
 }
+ul.elgg-plugin-categories, ul.elgg-plugin-categories > li,
+ul.elgg-plugin-resources, ul.elgg-plugin-resources > li {
+       display: inline;
+}
+.elgg-plugin-category-bundled {
+       border-width: 2px;
+       border-color: #0054A7;
+}
 
 /****************************************
        MARKDOWN
@@ -1288,6 +1511,12 @@ a.elgg-widget-collapsed:before {
        margin-bottom: 5px;
 }
 
+.elgg-text-help {
+       display: block;
+       font-size: 85%;
+       font-style: italic;
+}
+
 .elgg-longtext-control {
        margin-left: 14px;
        font-size: 80%;

diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 8f2c3925a65ad9120398a69dfc926417304e05df..1edf58df169289d635fe5c015dd5fdc2664a7462 100644 (file)
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -7,17 +7,6 @@
  * @package Elgg.Core
  * @subpackage UI
  */
-/**
- * elgg-body fills the space available to it.
- * It uses hidden text to expand itself. The combination of auto width, overflow
- * hidden, and the hidden text creates this effect.
- *
- * This allows us to float fixed width divs to either side of an .elgg-body div
- * without having to specify the body div's width.
- *
- * @todo check what happens with long <pre> tags or large images
- * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
- */
 ?>
 
 /* ***************************************
@@ -96,7 +85,11 @@
        width: 100%;
        border-top: 1px solid #ccc;
 }
-.elgg-table-alt td {
+.elgg-table-alt th {
+       background-color: #eee;
+       font-weight: bold;
+}
+.elgg-table-alt td, .elgg-table-alt th {
        padding: 2px 4px 2px 4px;
        border-bottom: 1px solid #ccc;
 }
@@ -287,17 +280,16 @@
        Tags
 *************************************** */
 .elgg-tags {
-       display: inline;
        font-size: 85%;
 }
-.elgg-tags li {
-       display: inline;
+.elgg-tags > li {
+       float:left;
        margin-right: 5px;
 }
-.elgg-tags li:after {
+.elgg-tags li.elgg-tag:after {
        content: ",";
 }
-.elgg-tags li:last-child:after {
+.elgg-tags li.elgg-tag:last-child:after {
        content: "";
 }
 .elgg-tagcloud {

diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index ace6048bb6d98b77ffef983e7f40e4568a22ebb9..74f21ee5998eb66ae50585b76c5e837ce020b7db 100644 (file)
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -46,13 +46,28 @@
        *overflow:visible;
 }
 
-<?php //@todo isn't this only needed if we use display:table-cell? ?>
+<?php
+/**
+ * elgg-body fills the space available to it.
+ * It uses hidden text to expand itself. The combination of auto width, overflow
+ * hidden, and the hidden text creates this effect.
+ *
+ * This allows us to float fixed width divs to either side of an .elgg-body div
+ * without having to specify the body div's width.
+ *
+ * @todo check what happens with long <pre> tags or large images
+ * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
+ */
+
+//@todo isn't this only needed if we use display:table-cell?
+?>
 .elgg-body:after,
 .elgg-col-last:after {
        display: block;
        visibility: hidden;
        height: 0 !important;
        line-height: 0;
+       overflow: hidden;
        
        /* Stretch to fill up available space */
        font-size: xx-large;

diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 746fd8204d66963dc898da99b393ae2f1768c941..62c65ca905b35268a86ae4284cd263448f39c5f9 100644 (file)
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -39,7 +39,7 @@ input, textarea {
        box-sizing: border-box;
 }
 
-input:focus, textarea:focus {
+input[type=text]:focus, textarea:focus {
        border: solid 1px #ff4c12;
        background: #ffede2;
        color:#333;
@@ -102,7 +102,7 @@ input[type="radio"] {
        margin: 0;
        padding:0;
        position: relative;
-       width: 100%;
+       width: 730px;
 }
 .friends-picker {
        position: relative;
@@ -313,20 +313,20 @@ input[type="radio"] {
        color: white;
 }
 .ui-datepicker-prev, .ui-datepicker-next {
-    position: absolute;
-    top: 5px;
+       position: absolute;
+       top: 5px;
        cursor: pointer;
 }
 .ui-datepicker-prev {
-    left: 6px;
+       left: 6px;
 }
 .ui-datepicker-next {
-    right: 6px;
+       right: 6px;
 }
 .ui-datepicker-title {
-    line-height: 1.8em;
-    margin: 0 30px;
-    text-align: center;
+       line-height: 1.8em;
+       margin: 0 30px;
+       text-align: center;
        font-weight: bold;
 }
 .ui-datepicker-calendar {
@@ -335,34 +335,34 @@ input[type="radio"] {
 .ui-datepicker th {
        color: #d86c2c;
        border: none;
-    font-weight: bold;
-    padding: 5px 6px;
-    text-align: center;
+       font-weight: bold;
+       padding: 5px 6px;
+       text-align: center;
 }
 .ui-datepicker td {
        padding: 1px;
 }
 .ui-datepicker td span, .ui-datepicker td a {
-    display: block;
-    padding: 2px;
+       display: block;
+       padding: 2px;
        line-height: 1.2em;
-    text-align: right;
-    text-decoration: none;
+       text-align: right;
+       text-decoration: none;
 }
 .ui-datepicker-calendar .ui-state-default {
        border: 1px solid #ccc;
-    color: #ff4c12;
+       color: #ff4c12;
        background: #fafafa;
 }
 .ui-datepicker-calendar .ui-state-hover {
        border: 1px solid #aaa;
-    color: #d86c2c;
+       color: #d86c2c;
        background: #eee;
 }
 .ui-datepicker-calendar .ui-state-active,
 .ui-datepicker-calendar .ui-state-active.ui-state-hover {
        font-weight: bold;
-    border: 1px solid #d86c2c;
-    color: #d86c2c;
+       border: 1px solid #d86c2c;
+       color: #d86c2c;
        background: #ffede2;
 }

diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index f99a41a7ca9cbd8c6759b8fc8ef6b0106b54889d..c9d0c3d3bf52165b23d6bb3159c55c1df418e5c9 100644 (file)
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -292,8 +292,8 @@
 
 .elgg-ajax-loader {
        background: white url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif) no-repeat center center;
-       min-height: 33px;
-       min-width: 33px;
+       min-height: 31px;
+       min-width: 31px;
 }
 
 /* ***************************************

diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index 9ecfff8adb59faf8d72f1647d137cd1fc6727cd7..cbd77ff8ad2d0ed62d475eec2f8483c66b4698b8 100644 (file)
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -155,19 +155,10 @@
        padding: 4px 45px 0 20px;
        color: #666;
 }
-.elgg-module-widget.elgg-state-draggable > .elgg-head {
+.elgg-module-widget.elgg-state-draggable .elgg-widget-handle {
        cursor: move;
 }
-.elgg-module-widget > .elgg-head a {
-       position: absolute;
-       top: 4px;
-       display: inline-block;
-       width: 18px;
-       height: 18px;
-       padding: 2px 2px 0 0;
-}
 a.elgg-widget-collapse-button {
-       left: 5px;
        color: #c5c5c5;
 }
 a.elgg-widget-collapse-button:hover,
@@ -181,12 +172,6 @@ a.elgg-widget-collapse-button:before {
 a.elgg-widget-collapsed:before {
        content: "\25BA";
 }
-a.elgg-widget-delete-button {
-       right: 5px;
-}
-a.elgg-widget-edit-button {
-       right: 25px;
-}
 .elgg-module-widget > .elgg-body {
        background-color: white;
        width: 100%;

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 8b22e1d7d5690ebe1ead05d6fb2345f5655e1a4a..4145912eaa0fe738301f0f21000447d084821158 100644 (file)
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -368,7 +368,10 @@
        position: absolute;
        z-index: 10000;
 
-       width: 165px;
+       overflow: hidden;
+
+       min-width: 165px;
+       max-width: 250px;
        border: solid 1px;
        border-color: #E5E5E5 #999 #999 #E5E5E5;
        background-color: #FFF;
@@ -527,4 +530,26 @@
 *************************************** */
 .elgg-menu-extras {
        margin-bottom: 15px;
-}
\ No newline at end of file
+}
+
+/* ***************************************
+       WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+       position: absolute;
+       top: 4px;
+       display: inline-block;
+       width: 18px;
+       height: 18px;
+       padding: 2px 2px 0 0;
+}
+
+.elgg-menu-widget > .elgg-menu-item-collapse {
+       left: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-delete {
+       right: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-settings {
+       right: 25px;
+}

diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index ccd0a3222a8c473bc1a915b9c6de75771d2dae81..2438dc93ca8d35df144b2a7072fd729b7e689c51 100644 (file)
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -25,7 +25,7 @@
 }
 
 body {
-       font-size: 75%;
+       font-size: 80%;
        line-height: 1.4em;
        font-family: "Open Sans", Arial, Tahoma, Verdana, sans-serif;
 }
@@ -152,7 +152,7 @@ h6 { font-size: 0.8em; }
 .elgg-output dt { font-weight: bold }
 .elgg-output dd { margin: 0 0 1em 1em }
 
-.elgg-output ul, ol {
+.elgg-output ul, .elgg-output ol {
        margin: 0 1.5em 1.5em 0;
        padding-left: 1.5em;
 }

diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php
index ea2543587237dcc3acbcd55c5e65e85644f5fe7a..f6f7f97dc3c35d08bbf00f5de178bd6192541d30 100644 (file)
--- a/views/default/css/walled_garden.php
+++ b/views/default/css/walled_garden.php
@@ -54,8 +54,8 @@ $url = elgg_get_site_url();
        padding: 0 8px;
 }
 
-.elgg-walledgarden-single > .elgg-body > .elgg-inner {
-       padding: 0 8px;
+.elgg-walledgarden-single > .elgg-body {
+       padding: 0 18px;
 }
 
 .elgg-module-walledgarden-login {
@@ -68,7 +68,14 @@ $url = elgg_get_site_url();
 }
 
 .elgg-heading-walledgarden {
-       color: #666666;
        margin-top: 60px;
        line-height: 1.1em;
 }
+
+h1, h2, h3, h4, h5, h6 {
+       color: #666;
+}
+
+a {
+       color: #999;
+}
\ No newline at end of file