Parcourir la source

Styles fine tuning and nicer display of the main menu (no more animation on initial load).

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4062 a333f486-631f-4898-b8df-5754b55c2be0
dflaven il y a 9 ans
Parent
commit
554e7a4cb3

+ 1 - 4
application/itopwebpage.class.inc.php

@@ -235,10 +235,7 @@ EOF;
 		$sConfigureWestPane
 		
 		$('#left-pane').layout({ resizable: false, spacing_open: 0, south: { size: 94 }, enableCursorHotkey: false });
-	
-		// Accordion Menu
-		$("#accordion").accordion({ header: "h3", navigation: true, heightStyle: "content", collapsible: false, icons: false }); // collapsible will be enabled once the item will be selected
-	
+		
 		// Tabs, using JQuery BBQ to store the history
 		// The "tab widgets" to handle.
 		var tabs = $('div[id^=tabbedContent]');

+ 6 - 3
application/menunode.class.inc.php

@@ -184,9 +184,12 @@ class ApplicationMenu
 				$oPage->AddToMenu('</ul>');
 				if ($bActive)
 				{
-					//$oPage->add_ready_script("$('#accordion').accordion('activate', $iAccordion);");
-					// $oPage->add_ready_script("$('#accordion').accordion('option', {collapsible: true});"); // Make it auto-collapsible once it has been opened properly
-					$oPage->add_ready_script("$('#accordion').accordion('option', {collapsible: true, active: $iAccordion});"); // Make it auto-collapsible once it has been opened properly
+$oPage->add_ready_script(
+<<<EOF
+		// Accordion Menu
+		$("#accordion").css({display:'block'}).accordion({ header: "h3", navigation: true, heightStyle: "content", collapsible: true,  active: $iAccordion, icons: false, animate:true }); // collapsible will be enabled once the item will be selected
+EOF
+					);
 				}
 			}
 			$oPage->AddToMenu('</div>');

+ 16 - 0
css/light-grey.css

@@ -443,6 +443,11 @@ input.textSearch {
 }
 
 
+#accordion {
+  display: none;
+}
+
+
 #accordion h3 {
   padding: 10px;
 }
@@ -1466,6 +1471,12 @@ span.form_validation {
 }
 
 
+.HTML p, .caselog_entry_html p {
+  margin-top: 0.25em;
+  margin-bottom: 0.25em;
+}
+
+
 table.details {
   border-collapse: collapse;
   noborder-bottom: 2px white solid;
@@ -2344,3 +2355,8 @@ span.refresh-button {
 }
 
 
+.mfp-close {
+  cursor: pointer !important;
+}
+
+

+ 10 - 0
css/light-grey.scss

@@ -347,6 +347,9 @@ input.textSearch {
     color: #888888;
     background-color:#FFFFFF;
 }
+#accordion {
+	display:none;
+}
 
 #accordion h3 {
 	padding: 10px;
@@ -1095,6 +1098,10 @@ span.form_validation {
     white-space: -o-pre-wrap; /* Opera 7 */
     word-wrap: break-word; /* Internet Explorer 5.5+, CSS3 */
 }
+.caselog_entry_html p, .HTML p {
+	margin-top: 0.25em;
+	margin-bottom: 0.25em;
+}
 table.details {
   border-collapse: collapse;
   noborder-bottom: 2px #fff solid;
@@ -1771,4 +1778,7 @@ span.refresh-button {
 	overflow: auto;
 	border: #ccc 1px solid;
   }
+}
+.mfp-close {
+	cursor: pointer !important;
 }

+ 6 - 1
js/ckeditor/contents.css

@@ -21,7 +21,7 @@ body
 .cke_editable
 {
 	font-size: 12px;
-	line-height: 1.2;
+	line-height: 1.0;
 
 	/* Fix for missing scrollbars with RTL texts. (#10488) */
 	word-wrap: break-word;
@@ -133,3 +133,8 @@ a > img {
 	border: none;
 	outline: 1px solid #0782C1;
 }
+
+p {
+	margin-top: 0.25em;
+	margin-bottom: 0.25em;
+}