aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-11 19:43:44 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-11 19:43:44 +0000
commitc418d8c6666fc81e5861a234605d3cce8ef48538 (patch)
tree417f1275ed2340057db3ce08ce664fc7f9983e8d
parent32019b504528f192778c3c41e1584249fbdaa934 (diff)
downloadelgg-c418d8c6666fc81e5861a234605d3cce8ef48538.tar.gz
elgg-c418d8c6666fc81e5861a234605d3cce8ef48538.tar.bz2
Added css/elements/modules.php. Modules and widgets deserve their own space.
git-svn-id: http://code.elgg.org/elgg/trunk@8114 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--views/default/css/elements/layout_objects.php164
-rw-r--r--views/default/css/elements/modules.php171
-rw-r--r--views/default/css/screen.php12
3 files changed, 178 insertions, 169 deletions
diff --git a/views/default/css/elements/layout_objects.php b/views/default/css/elements/layout_objects.php
index 82524c625..21a3e4d15 100644
--- a/views/default/css/elements/layout_objects.php
+++ b/views/default/css/elements/layout_objects.php
@@ -127,60 +127,6 @@
}
/* ***************************************
- Modules
-*************************************** */
-.elgg-module {
- margin-bottom: 20px;
-}
-.elgg-module-aside .elgg-head {
- border-bottom: 1px solid #CCCCCC;
- margin-bottom: 5px;
- padding-bottom: 5px;
-}
-.elgg-module-info > .elgg-head {
- background: #e4e4e4;
- padding: 5px;
- margin-bottom: 10px;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
-}
-.elgg-module-info > .elgg-head * {
- color: #333333;
-}
-.elgg-module-popup {
- background-color: white;
- border: 1px solid #cccccc;
- z-index: 9999;
- margin-bottom: 0;
- padding: 5px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- -webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
-}
-.elgg-module-popup > .elgg-head {
- margin-bottom: 5px;
-}
-.elgg-module-popup > .elgg-head * {
- color: #0054A7;
-}
-.elgg-module-featured {
- border: 1px solid #4690D6;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
-}
-.elgg-module-featured > .elgg-head {
- padding: 5px;
- background-color: #4690D6;
-}
-.elgg-module-featured > .elgg-head * {
- color: white;
-}
-.elgg-module-featured > .elgg-body {
- padding: 10px;
-}
-
-/* ***************************************
Owner Block
*************************************** */
.elgg-owner-block {
@@ -193,116 +139,6 @@
}
/* ***************************************
- Widgets
-*************************************** */
-.elgg-widgets {
- float: right;
- min-height: 30px;
-}
-.elgg-widget-add-control {
- text-align: right;
- margin: 5px 5px 15px;
-}
-.elgg-widgets-add-panel {
- padding: 10px;
- margin: 0 5px 15px;
- background: #dedede;
- border: 2px solid #cccccc;
-}
-<?php //@todo location-dependent style: make an extension of elgg-gallery ?>
-.elgg-widgets-add-panel li {
- float: left;
- margin: 2px 10px;
- width: 200px;
- padding: 4px;
- background-color: #cccccc;
- border: 2px solid #b0b0b0;
- font-weight: bold;
-}
-.elgg-widgets-add-panel li a {
- display: block;
-}
-.elgg-widgets-add-panel .elgg-state-available {
- color: #333333;
- cursor: pointer;
-}
-.elgg-widgets-add-panel .elgg-state-available:hover {
- background-color: #bcbcbc;
-}
-.elgg-widgets-add-panel .elgg-state-unavailable {
- color: #888888;
-}
-
-<?php //@todo Still too many location-dependent/overly-qualified styles ?>
-.elgg-module-widget {
- background-color: #dedede;
- padding: 2px;
- margin: 0 5px 15px;
- position: relative;
-}
-.elgg-module-widget:hover {
- background-color: #cccccc;
-}
-.elgg-module-widget > .elgg-head {
- background-color: #dedede;
- height: 30px;
- line-height: 30px;
- overflow: hidden;
-}
-.elgg-module-widget > .elgg-head h3 {
- float: left;
- padding: 0 45px 0 20px;
- color: #333333;
-}
-.elgg-module-widget.elgg-state-draggable > .elgg-head {
- cursor: move;
-}
-.elgg-module-widget > .elgg-head a {
- position: absolute;
- top: 5px;
- display: block;
- width: 18px;
- height: 18px;
- border: 1px solid transparent;
-}
-a.elgg-widget-collapse-button {
- left: 5px;
- background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
-}
-a.elgg-widget-collapsed {
- background-position: 0px -365px;
-}
-a.elgg-widget-delete-button {
- right: 5px;
- background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -198px 3px;
-}
-a.elgg-widget-edit-button {
- right: 25px;
- background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -1px;
-}
-a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
- border: 1px solid #cccccc;
-}
-.elgg-module-widget > .elgg-body {
- background-color: white;
- width: 100%;
- overflow: hidden;
-}
-.elgg-widget-edit {
- display: none;
- width: 96%;
- padding: 2%;
- border-bottom: 2px solid #dedede;
-}
-.elgg-widget-content {
- padding: 10px;
-}
-.elgg-widget-placeholder {
- border: 2px dashed #dedede;
- margin-bottom: 15px;
-}
-
-/* ***************************************
Messages
*************************************** */
.elgg-message {
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
new file mode 100644
index 000000000..0f59e2cad
--- /dev/null
+++ b/views/default/css/elements/modules.php
@@ -0,0 +1,171 @@
+/* ***************************************
+ Modules
+*************************************** */
+.elgg-module {
+ margin-bottom: 20px;
+}
+
+/* Aside */
+.elgg-module-aside .elgg-head {
+ border-bottom: 1px solid #CCCCCC;
+ margin-bottom: 5px;
+ padding-bottom: 5px;
+}
+
+/* Info */
+.elgg-module-info > .elgg-head {
+ background: #e4e4e4;
+ padding: 5px;
+ margin-bottom: 10px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+}
+.elgg-module-info > .elgg-head * {
+ color: #333333;
+}
+
+/* Popup */
+.elgg-module-popup {
+ background-color: white;
+ border: 1px solid #cccccc;
+ z-index: 9999;
+ margin-bottom: 0;
+ padding: 5px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ -webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+}
+.elgg-module-popup > .elgg-head {
+ margin-bottom: 5px;
+}
+.elgg-module-popup > .elgg-head * {
+ color: #0054A7;
+}
+
+/* Featured */
+.elgg-module-featured {
+ border: 1px solid #4690D6;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+}
+.elgg-module-featured > .elgg-head {
+ padding: 5px;
+ background-color: #4690D6;
+}
+.elgg-module-featured > .elgg-head * {
+ color: white;
+}
+.elgg-module-featured > .elgg-body {
+ padding: 10px;
+}
+
+/* ***************************************
+ Widgets
+*************************************** */
+.elgg-widgets {
+ float: right;
+ min-height: 30px;
+}
+.elgg-widget-add-control {
+ text-align: right;
+ margin: 5px 5px 15px;
+}
+.elgg-widgets-add-panel {
+ padding: 10px;
+ margin: 0 5px 15px;
+ background: #dedede;
+ border: 2px solid #cccccc;
+}
+<?php //@todo location-dependent style: make an extension of elgg-gallery ?>
+.elgg-widgets-add-panel li {
+ float: left;
+ margin: 2px 10px;
+ width: 200px;
+ padding: 4px;
+ background-color: #cccccc;
+ border: 2px solid #b0b0b0;
+ font-weight: bold;
+}
+.elgg-widgets-add-panel li a {
+ display: block;
+}
+.elgg-widgets-add-panel .elgg-state-available {
+ color: #333333;
+ cursor: pointer;
+}
+.elgg-widgets-add-panel .elgg-state-available:hover {
+ background-color: #bcbcbc;
+}
+.elgg-widgets-add-panel .elgg-state-unavailable {
+ color: #888888;
+}
+
+<?php //@todo Still too many location-dependent/overly-qualified styles ?>
+.elgg-module-widget {
+ background-color: #dedede;
+ padding: 2px;
+ margin: 0 5px 15px;
+ position: relative;
+}
+.elgg-module-widget:hover {
+ background-color: #cccccc;
+}
+.elgg-module-widget > .elgg-head {
+ background-color: #dedede;
+ height: 30px;
+ line-height: 30px;
+ overflow: hidden;
+}
+.elgg-module-widget > .elgg-head h3 {
+ float: left;
+ padding: 0 45px 0 20px;
+ color: #333333;
+}
+.elgg-module-widget.elgg-state-draggable > .elgg-head {
+ cursor: move;
+}
+.elgg-module-widget > .elgg-head a {
+ position: absolute;
+ top: 5px;
+ display: block;
+ width: 18px;
+ height: 18px;
+ border: 1px solid transparent;
+}
+a.elgg-widget-collapse-button {
+ left: 5px;
+ background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
+}
+a.elgg-widget-collapsed {
+ background-position: 0px -365px;
+}
+a.elgg-widget-delete-button {
+ right: 5px;
+ background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -198px 3px;
+}
+a.elgg-widget-edit-button {
+ right: 25px;
+ background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -1px;
+}
+a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
+ border: 1px solid #cccccc;
+}
+.elgg-module-widget > .elgg-body {
+ background-color: white;
+ width: 100%;
+ overflow: hidden;
+}
+.elgg-widget-edit {
+ display: none;
+ width: 96%;
+ padding: 2%;
+ border-bottom: 2px solid #dedede;
+}
+.elgg-widget-content {
+ padding: 10px;
+}
+.elgg-widget-placeholder {
+ border: 2px dashed #dedede;
+ margin-bottom: 15px;
+} \ No newline at end of file
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index cab694385..4e2306ce1 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -16,7 +16,7 @@ if ($old_css_view != "{$CONFIG->viewpath}") {
/*******************************************************************************
- Base CSS
+Base CSS
* CSS reset
* helpers
* grid
@@ -28,23 +28,25 @@ echo elgg_view('css/elements/grid', $vars);
/*******************************************************************************
-
- Skin CSS
+
+Skin CSS
* typography - fonts, line spacing
* chrome - general skin
* forms - form elements, buttons
* navigation - menus, breadcrumbs, pagination
* icons - icons, sprites, graphics
- * layout_objects - modules, lists, content blocks, notifications, avatars, widgets
+ * modules - modules, widgets
+ * layout_objects - lists, content blocks, notifications, avatars
* page_layout - page layout
* misc - to be removed/redone
-
+
*******************************************************************************/
echo elgg_view('css/elements/typography', $vars);
echo elgg_view('css/elements/chrome', $vars);
echo elgg_view('css/elements/forms', $vars);
echo elgg_view('css/elements/icons', $vars);
echo elgg_view('css/elements/navigation', $vars);
+echo elgg_view('css/elements/modules', $vars);
echo elgg_view('css/elements/layout_objects', $vars);
echo elgg_view('css/elements/page_layout', $vars);
echo elgg_view('css/elements/misc', $vars);