aboutsummaryrefslogtreecommitdiff
path: root/views/default/css/elements
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-06-18 19:56:33 -0400
committerBrett Profitt <brett.profitt@gmail.com>2011-06-18 19:56:33 -0400
commitec7b94a64aef23b85866ecdac8e8acc712d29bb6 (patch)
treea108205c3fa0b694d8ce0ebaafd259480d6b530a /views/default/css/elements
parentc80ba5aa03264dd64c20ed8ae222e87f9371a44d (diff)
parent2b68a4d217c35a5587c462620789493cf2804ba2 (diff)
downloadelgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.gz
elgg-ec7b94a64aef23b85866ecdac8e8acc712d29bb6.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'views/default/css/elements')
-rw-r--r--views/default/css/elements/core.php5
-rw-r--r--views/default/css/elements/forms.php14
-rw-r--r--views/default/css/elements/icons.php4
-rw-r--r--views/default/css/elements/layout.php5
-rw-r--r--views/default/css/elements/misc.php4
-rw-r--r--views/default/css/elements/modules.php1
-rw-r--r--views/default/css/elements/navigation.php18
7 files changed, 38 insertions, 13 deletions
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index c5d99512f..61dcdb1fe 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -105,4 +105,7 @@
/* Inline-block: IE 6, 7 */
zoom: 1;
*display: inline;
-} \ No newline at end of file
+}
+
+/* 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..af7b2be19 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,6 +16,12 @@ fieldset > div {
fieldset > div:last-child {
margin-bottom: 0;
}
+.elgg-form-footer {
+}
+.elgg-form-footer-alt {
+ border-top: 1px solid #CCC;
+ padding: 10px 0;
+}
label {
font-weight: bold;
@@ -73,9 +79,17 @@ input[type="radio"] {
padding-right: 10px;
}
+.elgg-form-account input[type="text"],
+.elgg-form-account input[type="password"] {
+ width: 300px;
+}
+
/* ***************************************
FRIENDS PICKER
*************************************** */
+.friends-picker-main-wrapper {
+ margin-bottom: 15px;
+}
.friends-picker-container h3 {
font-size:4em !important;
text-align: left;
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index 08948df50..1bc056072 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -224,10 +224,10 @@
.elgg-icon-undo {
background-position: 0 -1206px;
}
-.elgg-icon-user:hover {
+.elgg-icon-user {
background-position: 0 -1224px;
}
-.elgg-icon-user {
+.elgg-icon-user:hover {
background-position: 0 -1242px;
}
.elgg-icon-users:hover {
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index d52938aee..a5854f8c1 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;
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index c8ba4f735..ebac2b91f 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -8,10 +8,6 @@
z-index: 100;
}
-#dashboard-info .elgg-inner {
- border: 2px solid #dedede;
-}
-
/* ***************************************
AVATAR UPLOADING & CROPPING
*************************************** */
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index a5b907ddc..c4808478b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -197,6 +197,7 @@ a.elgg-widget-edit-button {
width: 96%;
padding: 2%;
border-bottom: 2px solid #dedede;
+ background-color: #f9f9f9;
}
.elgg-widget-content {
padding: 10px;
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 25b45bbee..d930d3a89 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -130,15 +130,11 @@
}
.elgg-menu-topbar > li > a {
- padding: 2px 15px;
+ padding: 2px 15px 0;
color: #eee;
margin-top: 1px;
}
-.elgg-menu-topbar > li > a > span {
- vertical-align: middle;
-}
-
.elgg-menu-topbar > li > a:hover {
color: #4690D6;
text-decoration: none;
@@ -148,6 +144,18 @@
float: right;
}
+.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
*************************************** */