aboutsummaryrefslogtreecommitdiff
path: root/views/default/css
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-01 20:27:15 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-01 20:27:15 +0000
commit3e79004b04458c0ec11462a422dc67f2fb3c2bdb (patch)
tree854bf7ee1df19e44961f78ae90de645a7cd1bed9 /views/default/css
parent0fc7a5edbc518abd92c4fc8c34b31ca05836132f (diff)
downloadelgg-3e79004b04458c0ec11462a422dc67f2fb3c2bdb.tar.gz
elgg-3e79004b04458c0ec11462a422dc67f2fb3c2bdb.tar.bz2
using the info module for user settings
git-svn-id: http://code.elgg.org/elgg/trunk@7808 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/css')
-rw-r--r--views/default/css/elements/forms.php19
-rw-r--r--views/default/css/elements/misc.php34
-rw-r--r--views/default/css/screen.php1
3 files changed, 13 insertions, 41 deletions
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index b4f8c7429..ca03afd10 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -9,13 +9,12 @@
/* ***************************************
Form Elements
*************************************** */
-/* default elgg core input field classes */
label {
font-weight: bold;
color: #333333;
font-size: 110%;
}
-input {
+input, textarea {
font: 120% Arial, Helvetica, sans-serif;
padding: 5px;
border: 1px solid #cccccc;
@@ -23,8 +22,12 @@ input {
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
}
+textarea {
+ height: 200px;
+ width: 98%;
+}
input[type="text"], textarea {
- width: 96%;
+ width: 98%;
}
input[type="password"] {
width: 200px;
@@ -34,16 +37,6 @@ input[type="text"]:focus, input[type="password"]:focus {
background: #e4ecf5;
color:#333333;
}
-textarea {
- font: 120% Arial, Helvetica, sans-serif;
- border: solid 1px #cccccc;
- padding: 5px;
- color:#666666;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- height: 200px;
- width: 96%;
-}
textarea.monospace {
font-family: Monaco,"Courier New",Courier,monospace;
font-size: 13px;
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index 87b012b22..73d237b47 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -255,39 +255,23 @@
/* ***************************************
USER SETTINGS
*************************************** */
-.user-settings {
- margin-bottom:20px;
-}
-.user-settings h3 {
- background:#e4e4e4;
- color:#333333;
- padding:5px;
- margin-top:10px;
- margin-bottom:10px;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
-}
-.user-settings label {
- color:#333333;
- font-size:100%;
- font-weight:normal;
-}
-.user-settings table.styled {
+table.styled {
width:100%;
}
-.user-settings table.styled {
+table.styled {
border-top:1px solid #cccccc;
}
-.user-settings table.styled td {
+table.styled td {
padding:2px 4px 2px 4px;
border-bottom:1px solid #cccccc;
}
-.user-settings table.styled td.column-one {
+table.styled td.column-one {
width:200px;
}
-.user-settings table.styled tr:hover {
+table.styled tr:hover {
background: #E4E4E4;
}
+
.add-user form {
width:300px;
}
@@ -475,12 +459,6 @@
.user-picker-entry .delete-button {
margin-right:10px;
}
-#dashboard-info {
- float: left;
- margin-bottom: 15px;
-}
#dashboard-info .elgg-inner {
- margin: 0 5px;
border: 2px solid #dedede;
- padding: 5px;
}
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index ec8336d9e..93c08c83d 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -20,6 +20,7 @@ if ($old_css_view != "{$CONFIG->viewpath}") {
* CSS reset
* spacing
* grid
+ * base
*******************************************************************************/
echo elgg_view('css/elements/reset', $vars);