Merge branch 'master' of http://code.vtiger.com/vtiger/vtigercrm

layouts/v7/skins/vtiger/style.less

@@ -238,8 +238,8 @@ body{
 }
 
 .company-logo img{
-    height: 100%;
-    width: auto;
+	max-height: 100%;
+	max-width: 100%;
 }
 
 .navbar .fa{
@@ -890,6 +890,10 @@ a.menu-item:hover{
 .fieldValue .value{
     max-width:85%; //for every field values
     display:inline-block;
+	word-break: break-word;
+	a {
+		color: #15c !important;
+	}
 }
 
 .modal-header button.close{
@@ -1628,8 +1632,8 @@ ul.unstyled{
 }
 .listViewEntries .relatedListEntryValues .value{
     vertical-align: middle;
-        width: 80%;
-        display: inline-block;
+	width: 80%;
+	display: inline-block;
 }
 
 .floatThead-table{
@@ -1638,7 +1642,7 @@ ul.unstyled{
 
 .listview-table-norecords .table-actions,
 .listview-table .table-actions{
-    width: 110px;
+	width: 120px;
     font-size: 15px;
     color: #555;
     margin-left: 7px;
@@ -1915,7 +1919,10 @@ input[type=checkbox]:checked{
 **********************************/
 
 .detailViewButtoncontainer{
-    padding-top:5px;   
+    padding-top:5px;
+}
+.detailViewButtoncontainer button.btn {
+	margin: 0px 1px !important;
 }
 .detailview-header .recordBasicInfo > .info-row{
     margin-bottom: 4px;
@@ -2014,6 +2021,10 @@ strong, b, th{
     margin-right: 2%;
 }
 
+overlayDetailHeader button.btn {
+	margin: 0px 1px !important;
+}
+
 //detail view header edit end
 
 //detailview reference style removed
@@ -2623,6 +2634,25 @@ strong, b, th{
         width:208px;
         float:left;
     }
+	.fieldLabel {
+		min-width: 100px;
+		width: 20%;
+		word-break: break-all;
+	}
+	.fieldValue {
+		width:30%;
+	}
+	td.fieldValue[colspan="3"] {
+		width:80%;
+	}
+	textarea.textAreaElement {
+		width: 88%;
+	}
+	input[type="checkbox"],
+	input[type="radio"] {
+		width: 15px;
+		height: 15px;
+	}
 }
 .input-group.inputElement .input-group-addon{
     border:none;
@@ -3168,6 +3198,9 @@ strong, b, th{
 .active .stepNum{
     color: @white;
 }
+.mailBoxEditDiv .crumbs li {
+	width: 22%;
+}
 .stepNum{
     display: inline-block;
     padding: 0 5px;
@@ -5118,6 +5151,7 @@ form[name="notification_settings"] .select2-choice {
 }
 #tagCloud {
 	.tag {
+		padding: 0px;
 		background-color: @white;
 		border-color: @white;
 		border-radius: 0px;
@@ -5443,7 +5477,7 @@ li.dashboardWidget {
     border-radius: 1px;
 }
 .modal {
-    z-index:1070;
+	z-index:1100;
 }
 .select2-container .select2-choice {
     height:28px;
@@ -8332,3 +8366,103 @@ input:focus:-ms-input-placeholder { color:transparent; } /* IE 10+ */
 .importServiceSelectionContainer .app-item {
     text-align: center;
 }
+#composeEmailContainer .modal-body,
+#QuickCreate .modal-body,
+#create {
+	.quickCreateContent {
+		margin-top: 25px;
+	}
+}
+.settingsgroup-panel .widgetContainer .menuItemLabel .pinUnpinShortCut {
+	display: none;
+	margin-top: 2px;
+}
+.settingsgroup-panel .widgetContainer .menuItemLabel:hover .pinUnpinShortCut {
+	display: inline-block;
+}
+@-moz-document url-prefix() {
+	.duplicateHandlingContainer .tooltip-inner {
+		width: 550px;
+		max-width: 550px;
+	}
+}
+.duplicateHandlingContainer{
+	.tooltip-inner {
+		text-align: left !important;
+	}
+	.syncMessage {
+		margin-top: 5px !important;
+	}
+	.actionsList {
+		width: 230px !important;
+	}
+}
+.duplicationMessageContainer {
+	background-color: #f2dede !important;
+	color: #b94a48 !important;
+	.duplicationMessageHeader {
+		margin-bottom: 8px;
+	}
+}
+.listViewRecordActions .quickView, .listViewRecordActions .markStar,
+.listViewRecordActions .markAsHeld,.listViewRecordActions .holdFollowupOn {
+	margin-top: 4px;
+}
+.app-menu .module-icon .custom-module {
+	font-size: 14px;
+	border-radius: 4px;
+	color: #000;
+	background-color: @white;
+	padding: 4px 10px 4px 5px !important
+}
+.menu-item .custom-module {
+	font-family: 'OpenSans-Regular', sans-serif;
+	font-size: 12px;
+	border-radius: 4px;
+	padding: 2px;
+	color: #000;
+	background-color: @white;
+}
+.modules-menu .custom-module {
+	color: @white;
+	margin-left: 0px;
+	display: inline;
+	border: 1px solid @white;
+	border-radius: 4px;
+	padding: 3px 4px 3px 2px !important;
+	font-weight: bold;
+}
+#quickCreateModules .custom-module,
+.workflowListContainer .custom-module,
+.dashBoardTabContents .custom-module {
+	border-radius: 4px;
+	padding: 3px 5px;
+	color: @white;
+	background-color: #777;
+}
+.menuEditorItem .custom-module {
+	border-radius: 4px;
+	padding: 3px 5px;
+	color: @black;
+	background-color: @white;
+}
+.task-details .custom-module {
+	border-radius: 4px;
+	padding: 1px 4px;
+	color: @white;
+	background-color: #777;
+}
+.related-tabs .custom-module,
+#relatedmenuList .custom-module {
+	border-radius: 4px;
+	color: @white;
+	background-color: #777;
+	padding: 5px 7px;
+	font-weight: bold;
+}
+.record-header .custom-module {
+	font-size: 30px;
+}
+.moduleIcon .custom-module {
+	font-weight: bold;
+}
\ No newline at end of file

pkg/vtiger/modules/ModComments/manifest.xml

@@ -3,7 +3,7 @@
 	<exporttime>2010-04-27 15:17:37</exporttime>
 	<name>ModComments</name>
 	<label>Comments</label>
-	<parent>Tools</parent>
+	<parent></parent>
 	<version>2.1</version>
 	<dependencies>
 		<vtiger_version>6.0.0rc</vtiger_version>