aboutsummaryrefslogtreecommitdiff
path: root/views/default/css/elements
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/css/elements')
-rw-r--r--views/default/css/elements/components.php44
-rw-r--r--views/default/css/elements/core.php32
-rw-r--r--views/default/css/elements/forms.php322
-rw-r--r--views/default/css/elements/helpers.php17
-rw-r--r--views/default/css/elements/icons.php186
-rw-r--r--views/default/css/elements/layout.php15
-rw-r--r--views/default/css/elements/misc.php2
-rw-r--r--views/default/css/elements/modules.php21
-rw-r--r--views/default/css/elements/navigation.php146
-rw-r--r--views/default/css/elements/typography.php5
10 files changed, 405 insertions, 385 deletions
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 203f6d257..7fe535d57 100644
--- 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.
- */
?>
/* ***************************************
@@ -47,10 +36,10 @@
border-bottom: 1px dotted #CCCCCC;
}
-.elgg-list-item .elgg-subtext {
+.elgg-item .elgg-subtext {
margin-bottom: 5px;
}
-.elgg-list-content {
+.elgg-item .elgg-content {
margin: 10px 5px;
}
@@ -65,9 +54,12 @@
.elgg-gallery td {
padding: 5px;
}
-.elgg-gallery-fluid li {
+.elgg-gallery-fluid > li {
float: left;
}
+.elgg-gallery-users > li {
+ margin: 0 2px;
+}
/* ***************************************
Tables
@@ -93,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;
}
@@ -143,10 +139,10 @@
/* ***************************************
River
*************************************** */
-.elgg-river {
+.elgg-list-river {
border-top: 1px solid #CCC;
}
-.elgg-river > li {
+.elgg-list-river > li {
border-bottom: 1px solid #CCC;
}
.elgg-river-item {
@@ -171,9 +167,8 @@
margin: 8px 0 5px 0;
padding-left: 5px;
}
-
-<?php //@todo location-dependent styles ?>
-.elgg-river-content .elgg-avatar {
+.elgg-river-attachments .elgg-avatar,
+.elgg-river-attachments .elgg-icon {
float: left;
}
.elgg-river-layout .elgg-input-dropdown {
@@ -274,17 +269,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 61dcdb1fe..74f21ee59 100644
--- 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;
@@ -68,8 +83,9 @@
/* Enabled nesting of dropdown/flyout menus */
.elgg-menu > li { position: relative; }
-/* Separators should only come between list items */
-.elgg-menu > li:last-child:after { display: none }
+.elgg-menu > li:last-child::after {
+ display: none;
+}
/* Maximize click target */
.elgg-menu > li > a { display: block }
@@ -96,16 +112,6 @@
.elgg-menu-hz > li > span {
/* Google says do this, but why? */
position: relative;
-
- /* FF2 */
- display: -moz-inline-box;
display: inline-block;
-
- /* Inline-block: IE 6, 7 */
- zoom: 1;
- *display: inline;
}
-
-/* Looks much better when middle-aligned with surrounding text */
-.elgg-icon {vertical-align:middle} \ No newline at end of file
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 0230cbc54..068cc8fd6 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,6 +16,10 @@ fieldset > div {
fieldset > div:last-child {
margin-bottom: 0;
}
+.elgg-form-alt > fieldset > .elgg-foot {
+ border-top: 1px solid #CCC;
+ padding: 10px 0;
+}
label {
font-weight: bold;
@@ -37,7 +41,7 @@ input, textarea {
box-sizing: border-box;
}
-input:focus, textarea:focus {
+input[type=text]:focus, textarea:focus {
border: solid 1px #4690d6;
background: #e4ecf5;
color:#333;
@@ -65,17 +69,25 @@ input[type="radio"] {
margin:0 3px 0 0;
padding:0;
border:none;
+ border-radius:0;
width:auto;
}
.elgg-input-checkboxes.elgg-horizontal li,
-.elgg-input-radio.elgg-horizontal li {
+.elgg-input-radios.elgg-horizontal li {
display: inline;
padding-right: 10px;
}
+.elgg-form-login, .elgg-form-account {
+ max-width: 450px;
+}
+
/* ***************************************
FRIENDS PICKER
*************************************** */
+.friends-picker-main-wrapper {
+ margin-bottom: 15px;
+}
.friends-picker-container h3 {
font-size:4em !important;
text-align: left;
@@ -93,7 +105,7 @@ input[type="radio"] {
margin: 0;
padding:0;
position: relative;
- width: 100%;
+ width: 730px;
}
.friends-picker {
position: relative;
@@ -223,229 +235,141 @@ input[type="radio"] {
}
/* ***************************************
- USER PICKER
+ AUTOCOMPLETE
*************************************** */
-
-.user-picker .user-picker-entry {
- clear:both;
- height:25px;
- padding:5px;
- margin-top:5px;
- border-bottom:1px solid #cccccc;
+<?php //autocomplete will expand to fullscreen without max-width ?>
+.ui-autocomplete {
+ position: absolute;
+ cursor: default;
}
-.user-picker-entry .elgg-button-delete {
- margin-right:10px;
+.elgg-autocomplete-item .elgg-body {
+ max-width: 600px;
}
-/* ***************************************
- Datepicker
-**************************************** */
+.ui-autocomplete {
+ background-color: white;
+ border: 1px solid #ccc;
+ overflow: hidden;
-#ui-datepicker-div, .ui-datepicker-inline, .ui-datepicker-calendar{
- font-family: Arial, Helvetica, sans-serif;
- font-size: 14px;
- padding: 0;
- margin: 0;
- background: #E4ECF5;
- width: 220px;
- color: black;
-}
-#ui-datepicker-div {
- display: none;
- border: 1px solid #777;
- z-index: 9999; /*must have*/
-}
-.ui-datepicker-inline {
- float: left;
- display: block;
- border: 0;
-}
-.ui-datepicker-rtl {
- direction: rtl;
-}
-.ui-datepicker-dialog {
- padding: 5px !important;
- border: 4px ridge #ddd !important;
-}
-button.ui-datepicker-trigger {
- width: 25px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
}
-img.ui-datepicker-trigger {
- margin: 2px;
- vertical-align: middle;
+.ui-autocomplete .ui-menu-item {
+ padding: 0px 4px;
+
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
}
-.ui-datepicker-prompt {
- float: left;
- padding: 2px;
- background: #ddd;
- color: #000;
+.ui-autocomplete .ui-menu-item:hover {
+ background-color: #eee;
}
-* html .ui-datepicker-prompt {
- width: 185px;
+.ui-autocomplete a:hover {
+ text-decoration: none;
+ color: #4690D6;
}
-.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
- clear: both;
- float: left;
- width: 218px;
- color: #fff;
+.ui-autocomplete a.ui-state-hover {
+ background-color: #eee;
+ display: block;
}
-.ui-datepicker-control {
- background: #400;
- padding: 2px 0px;
+
+/* ***************************************
+ USER PICKER
+*************************************** */
+.elgg-user-picker-list li:first-child {
+ border-top: 1px dotted #ccc;
+ margin-top: 5px;
}
-.ui-datepicker-links {
- background: #000;
- padding: 2px 0px;
+.elgg-user-picker-list > li {
+ border-bottom: 1px dotted #ccc;
}
-.ui-datepicker-control, .ui-datepicker-links {
- font-weight: bold;
- font-size: 80%;
+
+/* ***************************************
+ DATE PICKER
+**************************************** */
+.ui-datepicker {
+ display: none;
+
+ margin-top: 3px;
+ width: 208px;
+ background-color: white;
+ border: 1px solid #0054A7;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+ overflow: hidden;
+
+ -webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+ box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
}
-.ui-datepicker-links label { /* disabled links */
- padding: 2px 5px;
- color: #888;
+.ui-datepicker-inline {
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
-.ui-datepicker-clear, .ui-datepicker-prev {
- float: left;
+
+.ui-datepicker-header {
+ position: relative;
+ background: #4690D6;
+ color: white;
+ padding: 2px 0;
+ border-bottom: 1px solid #0054A7;
}
-.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
- float: right;
- text-align: right;
+.ui-datepicker-header a {
+ color: white;
}
-.ui-datepicker-current {
- float: left;
- width: 30%;
- text-align: center;
+.ui-datepicker-prev, .ui-datepicker-next {
+ position: absolute;
+ top: 5px;
+ cursor: pointer;
}
-.ui-datepicker-close, .ui-datepicker-next {
- float: right;
- text-align: right;
- padding: 0px 0px 2px 0px;
+.ui-datepicker-prev {
+ left: 6px;
}
-.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl {
- float: left;
- text-align: left;
+.ui-datepicker-next {
+ right: 6px;
}
-.ui-datepicker-header {
- padding: 1px 0 3px;
- background: #4690D6;
+.ui-datepicker-title {
+ line-height: 1.8em;
+ margin: 0 30px;
text-align: center;
font-weight: bold;
- height: 1.3em;
- padding: 0 2px 3px 0;
}
-.ui-datepicker-header select {
- background: #333;
- color: #fff;
- border: 0px;
- font-weight: bold;
+.ui-datepicker-calendar {
+ margin: 4px;
}
-.ui-datepicker {
- background: #ccc;
+.ui-datepicker th {
+ color: #0054A7;
+ border: none;
+ font-weight: bold;
+ padding: 5px 6px;
text-align: center;
- font-size: 100%;
-}
-.ui-datepicker a {
- display: block;
- width: 30px;
-}
-.ui-datepicker-title-row {
- background: #777;
-}
-.ui-datepicker-days-row {
- background: #eee;
- color: #666;
-}
-.ui-datepicker-week-col {
- background: #777;
- color: #fff;
}
-.ui-datepicker-days-cell {
- color: #000;
- border: 1px solid #ddd;
+.ui-datepicker td {
+ padding: 1px;
}
-.ui-datepicker-days-cell a{
+.ui-datepicker td span, .ui-datepicker td a {
display: block;
+ padding: 2px;
+ line-height: 1.2em;
+ text-align: right;
+ text-decoration: none;
}
-.ui-datepicker-week-end-cell {
- background: #ddd;
-}
-.ui-datepicker-title-row .ui-datepicker-week-end-cell {
- background: #777;
-}
-.ui-datepicker-days-cell-over {
- background: #fff;
- border: 1px solid #777;
-}
-.ui-datepicker-unselectable {
- color: #E4ECF5;
-}
-.ui-datepicker-today {
- background: #4690D6 !important;
-}
-.ui-datepicker-current-day {
- background: #999 !important;
-}
-.ui-datepicker-status {
- background: #ddd;
- width: 100%;
- font-size: 80%;
- text-align: center;
-}
-
-/* ________ Datepicker Links _______
-
-** Reset link properties and then override them with !important */
-#ui-datepicker-div a, .ui-datepicker-inline a {
- cursor: pointer;
- margin: 0;
- padding: 0;
- background: none;
- color: #000;
- align: center !important;
-}
-.ui-datepicker-inline .ui-datepicker-links a {
- padding: 0 5px !important;
-}
-.ui-datepicker-control a, .ui-datepicker-links a {
- padding: 2px 5px !important;
- color: #eee !important;
-}
-.ui-datepicker-title-row a {
- color: #eee !important;
-}
-.ui-datepicker-control a:hover {
- background: #fdd !important;
- color: #333 !important;
-}
-.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
- background: #ddd !important;
- color: #333 !important;
+.ui-datepicker-calendar .ui-state-default {
+ border: 1px solid #ccc;
+ color: #4690D6;;
+ background: #fafafa;
}
-
-/* ___________ MULTIPLE MONTHS _________*/
-
-.ui-datepicker-multi .ui-datepicker {
- border: 1px solid #777;
+.ui-datepicker-calendar .ui-state-hover {
+ border: 1px solid #aaa;
+ color: #0054A7;
+ background: #eee;
}
-.ui-datepicker-one-month {
- float: left;
- width: 185px;
-}
-.ui-datepicker-new-row {
- clear: left;
-}
-
-/* ___________ IE6 IFRAME FIX ________ */
-
-.ui-datepicker-cover {
- display: none; /*sorry for IE5*/
- display/**/: block; /*sorry for IE5*/
- position: absolute; /*must have*/
- z-index: -1; /*must have*/
- filter: mask(); /*must have*/
- top: -4px; /*must have*/
- left: -4px; /*must have*/
- width: 200px; /*must have*/
- height: 200px; /*must have*/
+.ui-datepicker-calendar .ui-state-active,
+.ui-datepicker-calendar .ui-state-active.ui-state-hover {
+ font-weight: bold;
+ border: 1px solid #0054A7;
+ color: #0054A7;
+ background: #E4ECF5;
}
-
diff --git a/views/default/css/elements/helpers.php b/views/default/css/elements/helpers.php
index e6f59260d..e9a9e0a30 100644
--- a/views/default/css/elements/helpers.php
+++ b/views/default/css/elements/helpers.php
@@ -33,27 +33,10 @@
float: right;
}
-.right {
- float: right;
-}
-
-.left {
- float: left;
-}
-
.link {
cursor: pointer;
}
-<?php @todo // do we need something like large and small? ?>
-.large {
- font-size: 120%;
-}
-
-.small {
- font-size: 80%;
-}
-
.elgg-discover .elgg-discoverable {
display: none;
}
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index 1bc056072..9b12e0a57 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -27,215 +27,254 @@
.elgg-icon-arrow-two-head {
background-position: 0 -36px;
}
-.elgg-icon-calendar {
+.elgg-icon-attention:hover {
background-position: 0 -54px;
}
-.elgg-icon-checkmark:hover {
+.elgg-icon-attention {
background-position: 0 -72px;
}
-.elgg-icon-checkmark {
+.elgg-icon-calendar {
background-position: 0 -90px;
}
-.elgg-icon-clip:hover {
+.elgg-icon-cell-phone {
background-position: 0 -108px;
}
-.elgg-icon-clip {
+.elgg-icon-checkmark:hover {
background-position: 0 -126px;
}
-.elgg-icon-cursor-drag-arrow {
+.elgg-icon-checkmark {
background-position: 0 -144px;
}
-.elgg-icon-delete-alt:hover {
+.elgg-icon-clip:hover {
background-position: 0 -162px;
}
-.elgg-icon-delete-alt {
+.elgg-icon-clip {
background-position: 0 -180px;
}
-.elgg-icon-delete:hover {
+.elgg-icon-cursor-drag-arrow {
background-position: 0 -198px;
}
-.elgg-icon-delete {
+.elgg-icon-delete-alt:hover {
background-position: 0 -216px;
}
-.elgg-icon-download:hover {
+.elgg-icon-delete-alt {
background-position: 0 -234px;
}
-.elgg-icon-download {
+.elgg-icon-delete:hover {
background-position: 0 -252px;
}
-.elgg-icon-facebook {
+.elgg-icon-delete {
background-position: 0 -270px;
}
-.elgg-icon-home:hover {
+.elgg-icon-download:hover {
background-position: 0 -288px;
}
-.elgg-icon-home {
+.elgg-icon-download {
background-position: 0 -306px;
}
-.elgg-icon-hover-menu:hover {
+.elgg-icon-eye {
background-position: 0 -324px;
}
-.elgg-icon-hover-menu {
+.elgg-icon-facebook {
background-position: 0 -342px;
}
-.elgg-icon-link:hover {
+.elgg-icon-grid:hover {
background-position: 0 -360px;
}
-.elgg-icon-link {
+.elgg-icon-grid {
background-position: 0 -378px;
}
-.elgg-icon-mail-alt:hover {
+.elgg-icon-home:hover {
background-position: 0 -396px;
}
-.elgg-icon-mail-alt {
+.elgg-icon-home {
background-position: 0 -414px;
}
-.elgg-icon-mail:hover {
+.elgg-icon-hover-menu:hover {
background-position: 0 -432px;
}
-.elgg-icon-mail {
+.elgg-icon-hover-menu {
background-position: 0 -450px;
}
-.elgg-icon-print-alt {
+.elgg-icon-info:hover {
background-position: 0 -468px;
}
-.elgg-icon-print {
+.elgg-icon-info {
background-position: 0 -486px;
}
-.elgg-icon-push-pin-alt {
+.elgg-icon-link:hover {
background-position: 0 -504px;
}
-.elgg-icon-push-pin {
+.elgg-icon-link {
background-position: 0 -522px;
}
-.elgg-icon-redo {
+.elgg-icon-list {
background-position: 0 -540px;
}
-.elgg-icon-refresh:hover {
+.elgg-icon-lock-closed {
background-position: 0 -558px;
}
-.elgg-icon-refresh {
+.elgg-icon-lock-open {
background-position: 0 -576px;
}
-.elgg-icon-round-arrow-left {
+.elgg-icon-mail-alt:hover {
background-position: 0 -594px;
}
-.elgg-icon-round-arrow-right {
+.elgg-icon-mail-alt {
background-position: 0 -612px;
}
-.elgg-icon-round-checkmark {
+.elgg-icon-mail:hover {
background-position: 0 -630px;
}
-.elgg-icon-round-minus {
+.elgg-icon-mail {
background-position: 0 -648px;
}
-.elgg-icon-round-plus {
+.elgg-icon-photo {
background-position: 0 -666px;
}
-.elgg-icon-rss {
+.elgg-icon-print-alt {
background-position: 0 -684px;
}
-.elgg-icon-search-focus {
+.elgg-icon-print {
background-position: 0 -702px;
}
-.elgg-icon-search {
+.elgg-icon-push-pin-alt {
background-position: 0 -720px;
}
-.elgg-icon-settings-alt:hover {
+.elgg-icon-push-pin {
background-position: 0 -738px;
}
-.elgg-icon-settings-alt {
+.elgg-icon-redo {
background-position: 0 -756px;
}
-.elgg-icon-settings {
+.elgg-icon-refresh:hover {
background-position: 0 -774px;
}
-.elgg-icon-share:hover {
+.elgg-icon-refresh {
background-position: 0 -792px;
}
-.elgg-icon-share {
+.elgg-icon-round-arrow-left {
background-position: 0 -810px;
}
-.elgg-icon-shop-cart:hover {
+.elgg-icon-round-arrow-right {
background-position: 0 -828px;
}
-.elgg-icon-shop-cart {
+.elgg-icon-round-checkmark {
background-position: 0 -846px;
}
-.elgg-icon-speech-bubble-alt:hover {
+.elgg-icon-round-minus {
background-position: 0 -864px;
}
-.elgg-icon-speech-bubble-alt {
+.elgg-icon-round-plus {
background-position: 0 -882px;
}
-.elgg-icon-speech-bubble:hover {
+.elgg-icon-rss {
background-position: 0 -900px;
}
-.elgg-icon-speech-bubble {
+.elgg-icon-search-focus {
background-position: 0 -918px;
}
-.elgg-icon-star-alt {
+.elgg-icon-search {
background-position: 0 -936px;
}
-.elgg-icon-star-empty:hover {
+.elgg-icon-settings-alt:hover {
background-position: 0 -954px;
}
-.elgg-icon-star-empty {
+.elgg-icon-settings-alt {
background-position: 0 -972px;
}
-.elgg-icon-star:hover {
+.elgg-icon-settings {
background-position: 0 -990px;
}
-.elgg-icon-star {
+.elgg-icon-share:hover {
background-position: 0 -1008px;
}
-.elgg-icon-tag:hover {
+.elgg-icon-share {
background-position: 0 -1026px;
}
-.elgg-icon-tag {
+.elgg-icon-shop-cart:hover {
background-position: 0 -1044px;
}
-.elgg-icon-thumbs-down-alt:hover {
+.elgg-icon-shop-cart {
background-position: 0 -1062px;
}
-.elgg-icon-thumbs-down:hover,
-.elgg-icon-thumbs-down-alt {
+.elgg-icon-speech-bubble-alt:hover {
background-position: 0 -1080px;
}
-.elgg-icon-thumbs-down {
+.elgg-icon-speech-bubble-alt {
background-position: 0 -1098px;
}
-.elgg-icon-thumbs-up-alt:hover {
+.elgg-icon-speech-bubble:hover {
background-position: 0 -1116px;
}
-.elgg-icon-thumbs-up:hover,
-.elgg-icon-thumbs-up-alt {
+.elgg-icon-speech-bubble {
background-position: 0 -1134px;
}
-.elgg-icon-thumbs-up {
+.elgg-icon-star-alt {
background-position: 0 -1152px;
}
-.elgg-icon-trash {
+.elgg-icon-star-empty:hover {
background-position: 0 -1170px;
}
-.elgg-icon-twitter {
+.elgg-icon-star-empty {
background-position: 0 -1188px;
}
-.elgg-icon-undo {
+.elgg-icon-star:hover {
background-position: 0 -1206px;
}
-.elgg-icon-user {
+.elgg-icon-star {
background-position: 0 -1224px;
}
-.elgg-icon-user:hover {
+.elgg-icon-tag:hover {
background-position: 0 -1242px;
}
-.elgg-icon-users:hover {
+.elgg-icon-tag {
background-position: 0 -1260px;
}
-.elgg-icon-users {
+.elgg-icon-thumbs-down-alt:hover {
background-position: 0 -1278px;
}
+.elgg-icon-thumbs-down:hover,
+.elgg-icon-thumbs-down-alt {
+ background-position: 0 -1296px;
+}
+.elgg-icon-thumbs-down {
+ background-position: 0 -1314px;
+}
+.elgg-icon-thumbs-up-alt:hover {
+ background-position: 0 -1332px;
+}
+.elgg-icon-thumbs-up:hover,
+.elgg-icon-thumbs-up-alt {
+ background-position: 0 -1350px;
+}
+.elgg-icon-thumbs-up {
+ background-position: 0 -1368px;
+}
+.elgg-icon-trash {
+ background-position: 0 -1386px;
+}
+.elgg-icon-twitter {
+ background-position: 0 -1404px;
+}
+.elgg-icon-undo {
+ background-position: 0 -1422px;
+}
+.elgg-icon-user:hover {
+ background-position: 0 -1440px;
+}
+.elgg-icon-user {
+ background-position: 0 -1458px;
+}
+.elgg-icon-users:hover {
+ background-position: 0 -1476px;
+}
+.elgg-icon-users {
+ background-position: 0 -1494px;
+}
+.elgg-icon-video {
+ background-position: 0 -1512px;
+}
.elgg-avatar > .elgg-icon-hover-menu {
@@ -249,8 +288,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;
}
/* ***************************************
@@ -258,6 +297,7 @@
*************************************** */
.elgg-avatar {
position: relative;
+ display: inline-block;
}
.elgg-avatar > a > img {
display: block;
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index d52938aee..9d92752b4 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -15,6 +15,10 @@
PAGE LAYOUT
*************************************** */
/***** DEFAULT LAYOUT ******/
+<?php // the width is on the page rather than topbar to handle small viewports ?>
+.elgg-page-default {
+ min-width: 998px;
+}
.elgg-page-default .elgg-page-header > .elgg-inner {
width: 990px;
margin: 0 auto;
@@ -35,7 +39,6 @@
.elgg-page-topbar {
background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
border-bottom: 1px solid #000000;
- min-width: 998px;
position: relative;
height: 24px;
z-index: 9000;
@@ -50,7 +53,7 @@
top: 24px;
right: 20px;
max-width: 500px;
- z-index: 1000;
+ z-index: 2000;
}
.elgg-system-messages li {
margin-top: 10px;
@@ -72,15 +75,15 @@
.elgg-layout {
min-height: 360px;
}
-.elgg-layout-one-column {
- padding: 10px 0;
-}
.elgg-layout-one-sidebar {
background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top;
}
.elgg-layout-two-sidebar {
background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif) repeat-y right top;
}
+.elgg-layout-error {
+ margin-top: 20px;
+}
.elgg-sidebar {
position: relative;
padding: 20px 10px;
@@ -115,4 +118,4 @@
}
.elgg-page-footer a:hover {
color: #666;
-} \ No newline at end of file
+}
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index ebac2b91f..d9622d34a 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -18,7 +18,7 @@
#avatar-croppingtool {
border-top: 1px solid #ccc;
}
-#user-avatar {
+#user-avatar-cropper {
float: left;
}
#user-avatar-preview {
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index a5b907ddc..a37ae094b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -2,6 +2,7 @@
Modules
*************************************** */
.elgg-module {
+ overflow: hidden;
margin-bottom: 20px;
}
@@ -154,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,
@@ -180,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%;
@@ -197,6 +183,7 @@ a.elgg-widget-edit-button {
width: 96%;
padding: 2%;
border-bottom: 2px solid #dedede;
+ background-color: #f9f9f9;
}
.elgg-widget-content {
padding: 10px;
@@ -204,4 +191,4 @@ a.elgg-widget-edit-button {
.elgg-widget-placeholder {
border: 2px dashed #dedede;
margin-bottom: 15px;
-} \ No newline at end of file
+}
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index e4709cb27..6b29e4c19 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -16,7 +16,7 @@
text-align: center;
}
.elgg-pagination li {
- display: inline;
+ display: inline-block;
margin: 0 6px 0 0;
text-align: center;
}
@@ -24,7 +24,8 @@
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-
+
+ display: block;
padding: 2px 6px;
color: #4690d6;
border: 1px solid #4690d6;
@@ -98,7 +99,7 @@
.elgg-breadcrumbs > li {
display: inline-block;
}
-.elgg-breadcrumbs > li:after{
+.elgg-breadcrumbs > li:after {
content: "\003E";
padding: 0 4px;
font-weight: normal;
@@ -130,9 +131,9 @@
}
.elgg-menu-topbar > li > a {
- padding: 2px 15px;
+ padding-top: 2px;
color: #eee;
- margin-top: 1px;
+ margin: 1px 15px 0;
}
.elgg-menu-topbar > li > a:hover {
@@ -144,11 +145,28 @@
float: right;
}
+.elgg-menu-topbar .elgg-icon {
+ vertical-align: middle;
+ margin-top: -1px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-logo {
+ margin-top: 0;
+ padding-left: 5px;
+ width: 38px;
+ height: 20px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-avatar {
+ width: 18px;
+ height: 18px;
+}
+
/* ***************************************
SITE MENU
*************************************** */
.elgg-menu-site {
- z-index: 7000;
+ z-index: 1;
}
.elgg-menu-site > li > a {
@@ -161,7 +179,6 @@
text-decoration: none;
}
-
.elgg-menu-site-default {
position: absolute;
bottom: 0;
@@ -174,62 +191,68 @@
margin-right: 1px;
}
-.elgg-menu-site-default > li > a {color: white}
+.elgg-menu-site-default > li > a {
+ color: white;
+}
+.elgg-menu-site > li > ul {
+ display: none;
+ background-color: white;
+}
+
+.elgg-menu-site > li:hover > ul {
+ display: block;
+}
.elgg-menu-site-default > .elgg-state-selected > a,
.elgg-menu-site-default > li:hover > a {
background: white;
color: #555;
-
+
-webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-
+
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
}
.elgg-menu-site-more {
- display: none;
position: relative;
left: -1px;
width: 100%;
- z-index: 7000;
min-width: 150px;
border: 1px solid #999;
border-top: 0;
-
+
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
-
+
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
}
-li:hover > .elgg-menu-site-more {
- display: block;
-}
-
.elgg-menu-site-more > li > a {
- background: white;
+ background-color: white;
color: #555;
-
+
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-
+
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
+
.elgg-menu-site-more > li > a:hover {
background: #4690D6;
color: white;
}
+
.elgg-menu-site-more > li:last-child > a,
.elgg-menu-site-more > li:last-child > a:hover {
-webkit-border-radius: 0 0 4px 4px;
@@ -350,7 +373,10 @@ li:hover > .elgg-menu-site-more {
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;
@@ -385,12 +411,12 @@ li:hover > .elgg-menu-site-more {
}
/* ***************************************
- FOOTER
+ SITE FOOTER
*************************************** */
.elgg-menu-footer > li,
.elgg-menu-footer > li > a {
display: inline-block;
- color:#999;
+ color: #999;
}
.elgg-menu-footer > li:after {
@@ -407,22 +433,43 @@ li:hover > .elgg-menu-site-more {
}
/* ***************************************
- ENTITY
+ GENERAL MENU
*************************************** */
-.elgg-menu-entity {
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+ display: inline-block;
+ color: #999;
+}
+
+.elgg-menu-general > li:after {
+ content: "\007C";
+ padding: 0 4px;
+}
+
+/* ***************************************
+ ENTITY AND ANNOTATION
+*************************************** */
+<?php // height depends on line height/font size ?>
+.elgg-menu-entity, .elgg-menu-annotation {
float: right;
margin-left: 15px;
font-size: 90%;
color: #aaa;
+ line-height: 16px;
+ height: 16px;
}
-.elgg-menu-entity > li {
- display: inline-block;
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
margin-left: 15px;
}
-<?php // height depends on line height/font size ?>
-.elgg-menu-entity > li > a {
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
color: #aaa;
- height: 18px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+ display: block;
+}
+.elgg-menu-entity > li > span, .elgg-menu-annotation > li > span {
+ vertical-align: baseline;
}
/* ***************************************
@@ -464,15 +511,50 @@ li:hover > .elgg-menu-site-more {
margin-left: 15px;
font-size: 90%;
color: #aaa;
+ line-height: 16px;
+ height: 16px;
}
.elgg-menu-river > li {
display: inline-block;
margin-left: 5px;
}
+.elgg-menu-river > li > a {
+ color: #aaa;
+ height: 16px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-river > li > a {
+ display: block;
+}
+.elgg-menu-river > li > span {
+ vertical-align: baseline;
+}
/* ***************************************
SIDEBAR EXTRAS (rss, bookmark, etc)
*************************************** */
.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 f080a29b2..c044cb1cc 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -139,7 +139,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;
}
@@ -158,4 +158,5 @@ h6 { font-size: 0.8em; }
}
.elgg-output img {
max-width: 100%;
-} \ No newline at end of file
+ height: auto;
+}