starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

web: modified some theme css settings to properly display pages

This commit is contained in:
Bart Van Der Meerssche 2009-10-01 10:00:27 +00:00
parent f40851ab3d
commit ba303a2c1d
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/drupal/themes/flukso/style.css
View File

@ -31,7 +31,7 @@ body {
p { p {
margin: 1em 0; margin: 1em 0;
padding: 0em 2.6em; padding: 1.5em 2.6em;
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
@ -267,7 +267,7 @@ h3.searchresult a:hover {
} }
.node .content p { .node .content p {
margin: 2em 0; margin: 0 0;
letter-spacing: 1px; letter-spacing: 1px;
} }
@ -367,6 +367,11 @@ br.clear {
text-align: center; text-align: center;
} }
#footer p {
margin: 1em 0;
padding: 0em 2.6em;
}
/* icons */ /* icons */
a.read-more, a.read-more,
.icon-print, .icon-print,

7
web/drupal/themes/flukso/template.php
View File

@ -145,6 +145,7 @@ function phptemplate_image_body($node, $size) {
'editable' => user_access('administer image annotations') || user_access('create image annotations'), 'editable' => user_access('administer image annotations') || user_access('create image annotations'),
)); ));
module_load_include('module', 'jquery_ui');
// Load all the JS and CSS magic // Load all the JS and CSS magic
drupal_add_js(array('imageAnnotate' => $settings), 'setting'); drupal_add_js(array('imageAnnotate' => $settings), 'setting');
jquery_ui_add(array('ui.resizable', 'ui.draggable')); jquery_ui_add(array('ui.resizable', 'ui.draggable'));
@ -204,7 +205,8 @@ function phptemplate_img_assist_inline($node, $size, $attributes) {
'top' => $note->position_top, 'top' => $note->position_top,
'left' => $note->position_left, 'left' => $note->position_left,
'text' => $text, 'text' => $text,
'editable' => $editable, // notes should be added when residing on the image page
'editable' => FALSE,
); );
} }
@ -215,7 +217,8 @@ function phptemplate_img_assist_inline($node, $size, $attributes) {
'notes' => $notes, 'notes' => $notes,
'editable' => user_access('administer image annotations') || user_access('create image annotations'), 'editable' => user_access('administer image annotations') || user_access('create image annotations'),
)); ));
module_load_include('module', 'jquery_ui');
// Load all the JS and CSS magic // Load all the JS and CSS magic
drupal_add_js(array('imageAnnotate' => $settings), 'setting'); drupal_add_js(array('imageAnnotate' => $settings), 'setting');
jquery_ui_add(array('ui.resizable', 'ui.draggable')); jquery_ui_add(array('ui.resizable', 'ui.draggable'));