diff --git a/layouts/v7/modules/Calendar/QuickCreate.tpl b/layouts/v7/modules/Calendar/QuickCreate.tpl index 9387164cc2059cd53efe8993d92da0679a974ac0..ba10c3b71dce452b67ac53c12e7fec22014ef6c2 100644 --- a/layouts/v7/modules/Calendar/QuickCreate.tpl +++ b/layouts/v7/modules/Calendar/QuickCreate.tpl @@ -11,8 +11,8 @@ {foreach key=index item=jsModel from=$SCRIPTS} <script type="{$jsModel->getType()}" src="{$jsModel->getSrc()}"></script> {/foreach} - <div class="modal-dialog modal-lg"> - <div class="modal-content" style='width: 525px;left:23%;'> + <div class="modal-dialog modal-md"> + <div class="modal-content"> <form class="form-horizontal recordEditView" id="QuickCreate" name="QuickCreate" method="post" action="index.php"> {if $MODE eq 'edit' && !empty($RECORD_ID)} {assign var=HEADER_TITLE value={vtranslate('LBL_EDITING', $MODULE)}|cat:" "|cat:{vtranslate('SINGLE_'|cat:$MODULE, $MODULE)}} @@ -83,25 +83,25 @@ </div> </div> </div> - - <table class="massEditTable table no-border"> - <tr> - {foreach key=FIELD_NAME item=FIELD_MODEL from=$RECORD_STRUCTURE name=blockfields} + <div class="container-fluid paddingTop15"> + <table class="massEditTable table no-border"> + <tr> + {foreach key=FIELD_NAME item=FIELD_MODEL from=$RECORD_STRUCTURE name=blockfields} {if $FIELD_NAME eq 'subject' || $FIELD_NAME eq 'date_start' || $FIELD_NAME eq 'due_date'} - </tr>{continue} + </tr>{continue} {/if} {assign var="isReferenceField" value=$FIELD_MODEL->getFieldDataType()} {assign var="referenceList" value=$FIELD_MODEL->getReferenceList()} {assign var="referenceListCount" value=count($referenceList)} {if $FIELD_MODEL->get('uitype') eq "19"} - {if $COUNTER eq '1'} - <td></td><td></td></tr><tr> - {assign var=COUNTER value=0} - {/if} + {if $COUNTER eq '1'} + <td></td><td></td></tr><tr> + {assign var=COUNTER value=0} + {/if} {/if} </tr><tr> <td class='fieldLabel col-lg-3'> - {if $isReferenceField neq "reference"}<label class="muted pull-right">{/if} + {if $isReferenceField neq "reference"}<label class="muted">{/if} {if $isReferenceField eq "reference"} {if $referenceListCount > 1} {assign var="DISPLAYID" value=$FIELD_MODEL->get('fieldvalue')} @@ -109,7 +109,7 @@ {if !empty($REFERENCED_MODULE_STRUCT)} {assign var="REFERENCED_MODULE_NAME" value=$REFERENCED_MODULE_STRUCT->get('name')} {/if} - <span class="pull-right"> + <span class=""> <select style="width: 150px;" class="select2 referenceModulesList"> {foreach key=index item=value from=$referenceList} <option value="{$value}" {if $value eq $REFERENCED_MODULE_NAME} selected {/if} >{vtranslate($value, $value)}</option> @@ -117,7 +117,7 @@ </select> </span> {else} - <label class="muted pull-right">{vtranslate($FIELD_MODEL->get('label'), $MODULE)} {if $FIELD_MODEL->isMandatory() eq true} <span class="redColor">*</span> {/if}</label> + <label class="muted">{vtranslate($FIELD_MODEL->get('label'), $MODULE)} {if $FIELD_MODEL->isMandatory() eq true} <span class="redColor">*</span> {/if}</label> {/if} {else} {vtranslate($FIELD_MODEL->get('label'), $MODULE)} {if $FIELD_MODEL->isMandatory() eq true} <span class="redColor">*</span> {/if} @@ -127,9 +127,10 @@ <td class="fieldValue col-lg-9" {if $FIELD_MODEL->get('uitype') eq '19'} colspan="3" {assign var=COUNTER value=$COUNTER+1} {/if}> {include file=vtemplate_path($FIELD_MODEL->getUITypeModel()->getTemplateName(),$MODULE)} </td> - {/foreach} - </tr> - </table> + {/foreach} + </tr> + </table> + </div> </div> </div> <div class="modal-footer"> diff --git a/layouts/v7/modules/Users/Login.tpl b/layouts/v7/modules/Users/Login.tpl index fe80966cccd8766163e86d220a0f3f22951fb218..d023a15b4bb0e01c89f9d14af6cf3dafeaadcfef 100644 --- a/layouts/v7/modules/Users/Login.tpl +++ b/layouts/v7/modules/Users/Login.tpl @@ -15,7 +15,6 @@ background-position: center; background-size: cover; width: 100%; - height: 96%; background-repeat: no-repeat; } hr { @@ -64,7 +63,7 @@ width: 50%; } #page { - padding-top: 6%; + padding-top: 86px; } .widgetHeight { height: 410px; @@ -204,7 +203,7 @@ </style> <span class="app-nav"></span> - <div class="col-lg-12"> + <div class="container-fluid loginPageContainer"> <div class="col-lg-5 col-md-12 col-sm-12 col-xs-12"> <div class="loginDiv widgetHeight"> <img class="img-responsive user-logo" src="layouts/v7/resources/Images/vtiger.png"> diff --git a/layouts/v7/modules/Vtiger/ModuleHeader.tpl b/layouts/v7/modules/Vtiger/ModuleHeader.tpl index b84a56362eca4265854153eb89ffcb1df3e9fe8e..ba7f1f6c1f9e6cf4218073a0c916feb7a90be2e5 100644 --- a/layouts/v7/modules/Vtiger/ModuleHeader.tpl +++ b/layouts/v7/modules/Vtiger/ModuleHeader.tpl @@ -50,7 +50,7 @@ </div> <div class="col-lg-5 col-md-6 col-sm-7 col-xs-1 padding0 pull-right"> <div id="appnav" class="navbar-right"> - <nav class="navbar navbar-inverse border0"> + <nav class="navbar navbar-inverse border0 margin0"> {if $MODULE_BASIC_ACTIONS|@count gt 0} <div class="container-fluid"> <div class="navbar-header bg-white marginTop5px"> diff --git a/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl b/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl index 9a04ce094480fa4b1f4f7bb5fa0183c2ce23cfc4..3d13ecf2919ef0fe2f45caa00d9c8ecdd52b41c8 100644 --- a/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl +++ b/layouts/v7/modules/Vtiger/ModuleRelatedTabs.tpl @@ -9,7 +9,7 @@ {strip} <div class='related-tabs row'> - <nav class="navbar margin0 border0" role="navigation"> + <nav class="navbar margin0" role="navigation"> <div class="navbar-header"> <button type="button" class="navbar-toggle btn-group-justified collapsed border0" data-toggle="collapse" data-target="#nav-tabs" aria-expanded="false"> <i class="fa fa-ellipsis-h"></i> diff --git a/layouts/v7/modules/Vtiger/RecentComments.tpl b/layouts/v7/modules/Vtiger/RecentComments.tpl index 4e19ee3ed7eb7389aef1d409cf797955c159ab4d..0e8e37490be175e7bd3d41d11cd1653ad97644d3 100644 --- a/layouts/v7/modules/Vtiger/RecentComments.tpl +++ b/layouts/v7/modules/Vtiger/RecentComments.tpl @@ -25,7 +25,7 @@ </div> </div> <div class='row'> - <div class="col-xs-6 pull-right paddingTop5 paddingLeft0"> + <div class="col-xs-6 pull-right paddingTop10 paddingLeft0"> <div style="text-align: right;"> {if in_array($MODULE_NAME, $PRIVATE_COMMENT_MODULES)} <div class="" style="margin: 7px 0;"> @@ -39,7 +39,7 @@ </div> </div> {if $FIELD_MODEL->getProfileReadWritePermission()} - <div class="col-xs-6 paddingTop5 pull-left"> + <div class="col-xs-6 paddingTop10 pull-left"> {include file=vtemplate_path($FIELD_MODEL->getUITypeModel()->getTemplateName(),$MODULE_NAME) MODULE="ModComments"} </div> {/if} diff --git a/layouts/v7/skins/contact/style.css b/layouts/v7/skins/contact/style.css index b3d0be8c4624e3c54059cb9851e835e23e27ded3..ac971fc9404a5e894c786e4c338772bb179a0b2a 100644 --- a/layouts/v7/skins/contact/style.css +++ b/layouts/v7/skins/contact/style.css @@ -49,32 +49,31 @@ a:active { /************ Layout **************/ /**********************************/ html { - height: 100%; + margin: 0; + padding: 0; overflow-y: auto; + min-height: 100%; } body { - width: 100%; margin: 0; padding: 0; - height: 100%; + font-family: 'OpenSans-Regular', sans-serif; + font-size: 12px; + font-weight: normal; + font-style: normal; + font-kerning: normal; + height: inherit; } body > .mCSB_inside > .mCSB_container { margin-right: 15px; } #page { - min-height: 100%; padding-top: 84px; + height: inherit; } .select2-container .select2-choice { font-family: 'OpenSans-Regular', sans-serif; } -body { - font-family: 'OpenSans-Regular', sans-serif; - font-size: 12px; - font-weight: normal; - font-style: normal; - font-kerning: normal; -} .app-fixed-navbar { background: #fff; border-bottom: 0; @@ -96,11 +95,12 @@ body { background: #FBFBFB; margin-bottom: 0; padding: 4px 0; - border-top: 1px solid #DDDDDD; + border-top: 1px solid #ccc; + border-width: thin; } .main-container { position: relative; - min-height: 100%; + min-height: calc(100vh - 108px); } .main-container:before, .main-container:after { @@ -108,6 +108,9 @@ body { display: block; clear: both; } +.main-container .row { + min-height: inherit; +} @media (min-width: 992px) { .global-nav .logo-container { display: inline-block; @@ -123,8 +126,6 @@ body { position: absolute; width: 100%; height: 43px; - /* border-top:1px solid #ddd;*/ - border-bottom: 1px solid #eee; } .app-nav .module-action-bar .module-action-content { background: #FBFBFB; @@ -157,14 +158,14 @@ body { min-height: 100%; background: #FFFFFF; border-right: 1px solid #DDDDDD; + overflow: auto; + border-width: thin; } .main-container .content-area { width: 100%; padding-left: 283px; - min-height: 768px; } .main-container .settingsPageDiv { - min-height: 768px; padding-left: 230px; } .main-container .settingsNav { @@ -392,12 +393,10 @@ body { } .app-nav .app-indicator-icon-container { top: 0px; - height: 43px; + height: 42px; text-align: center; - line-height: 43px; - /* background-color: #2c3b49;*/ + line-height: 42px; color: #ffffff; - /*border-bottom: 1px solid #272B46;*/ } .app-nav .app-indicator-icon-container .app-indicator-icon { font-size: 24px; @@ -796,6 +795,9 @@ a.menu-item:hover { /*************************************************/ /******** View styles (List/Edit/Detail..) *******/ /*************************************************/ +.viewContent { + height: inherit; +} .viewContent .content-area { padding-left: 3%; } @@ -1351,6 +1353,7 @@ ul.unstyled { border-radius: 0px; font-weight: 100; cursor: pointer; + border-width: thin; } .btn:hover { cursor: pointer; @@ -1366,6 +1369,7 @@ ul.unstyled { border: 1px solid #ddd; color: #666; background: #fff; + border-width: thin; } .module-buttons:hover, .module-buttons:focus, @@ -1987,18 +1991,23 @@ th { .quickPreviewModuleHeader .recordImage [class^="vicon-"] { font-size: 35px; } +.detailViewContainer { + background: #f9f9f9; + min-height: inherit; +} .detailViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; + border-width: thin; } .detailViewContainer .block hr { margin: 10px 0; } .editViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; } @@ -2190,10 +2199,11 @@ th { .editViewContents .fieldBlockContainer, .summaryView { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryView .fieldLabel { padding-left: 0px; @@ -2223,10 +2233,11 @@ th { } .summaryWidgetContainer { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryWidgetContainer .widget_header { margin-bottom: 6px; @@ -2235,8 +2246,7 @@ th { font-size: 16px; } .summaryWidgetContainer .commentTitle { - padding-left: 15px; - padding-right: 15px; + margin-bottom: 25px; } .summaryWidgetContainer .creatorName { color: blue; @@ -2246,7 +2256,7 @@ th { } .summaryWidgetContainer .commentContainer { background: white; - border-color: #F3F3F3; + border-color: #eee; } .summaryWidgetContainer .commentContainertextarea { width: 100%; @@ -2255,6 +2265,7 @@ th { .noCommentsMsgContainer, .quick-preview-modal .noContent { border: 1px solid #eee; + border-width: thin; } .summaryWidgetContainer .recordImage .name { display: table-cell; @@ -5085,6 +5096,7 @@ hr { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -o-box-sizing: border-box; + margin-bottom: 1px; } .row .nav > li > a:hover { border-bottom-color: #555; @@ -6020,6 +6032,8 @@ div.tooltip-inner { background: white; padding: 15px; padding-top: 25px; + border: 1px solid #eee; + border-width: thin; } .detailViewContainer .content-area, .editViewPageDiv .content-area, @@ -6035,13 +6049,15 @@ div.tooltip-inner { padding: 15px; } .detailview-content .details.row .relatedHeader { - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .detailview-content .details.row .relatedContents { background: white; padding: 0; margin-top: 0; - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .related-tabs.row { background: #FFFFFF; @@ -6050,7 +6066,7 @@ div.tooltip-inner { .detailViewContainer .commentContainer .commentTitle.row, .detailViewContainer .commentContainer .showcomments { background: #FFFFFF; - border-color: #F3F3F3; + border-color: #eee; } .detailViewTwitterImage { position: absolute; @@ -6122,7 +6138,8 @@ div.tooltip-inner { display: inline-block; } .input-group-addon { - line-height: 1.4; + line-height: 1.5; + border-width: thin; } .input-group { float: left; @@ -6331,7 +6348,6 @@ div.tooltip-inner { } .dashBoardContainer .tab-pane .dashBoardTabContents ul { position: relative; - height: 960px; width: 1260px; } .nav-tabs > li { @@ -7562,6 +7578,8 @@ body .fc { } .commentcontent { border: 1px solid #ddd; + border-width: thin; + background: #fcfcfc; } .editViewHeader { padding-top: 20px; @@ -7573,6 +7591,18 @@ body .fc { .floatThead-floatContainer { margin-left: 1px; } +.navbar { + border: 1px solid #eee; + border-width: thin; +} +#appnav .navbar { + border: 0; + background: none; +} +.dashBoardContainer, +.loginPageContainer { + min-height: calc(100vh - 110px); +} @media all and (min-width: 0px) and (max-width: 830px) { table.summary-table > tbody > tr > td, table.summary-table > tbody > tr > th, @@ -7649,7 +7679,7 @@ body .fc { font-size: 13px; } .overlay-container-60 { - margin-left: 0px ; + margin-left: 0 ; } .overlayPageContent { padding-bottom: 0; @@ -7682,5 +7712,14 @@ body .fc { margin-left: 1px; padding-top: 1px; } + .listViewPageDiv #table-content { + overflow: scroll !important; + } + #appnavcontent { + border: 1px solid #ccc; + background: #f0f0f0; + border-width: thin; + padding: 30px; + } } /*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/layouts/v7/skins/inventory/style.css b/layouts/v7/skins/inventory/style.css index 651709911bf5dcf55a8281792c698e81401c6a52..f2b10783adbb7ceecc080024df2805eeb51d2c2b 100644 --- a/layouts/v7/skins/inventory/style.css +++ b/layouts/v7/skins/inventory/style.css @@ -49,32 +49,31 @@ a:active { /************ Layout **************/ /**********************************/ html { - height: 100%; + margin: 0; + padding: 0; overflow-y: auto; + min-height: 100%; } body { - width: 100%; margin: 0; padding: 0; - height: 100%; + font-family: 'OpenSans-Regular', sans-serif; + font-size: 12px; + font-weight: normal; + font-style: normal; + font-kerning: normal; + height: inherit; } body > .mCSB_inside > .mCSB_container { margin-right: 15px; } #page { - min-height: 100%; padding-top: 84px; + height: inherit; } .select2-container .select2-choice { font-family: 'OpenSans-Regular', sans-serif; } -body { - font-family: 'OpenSans-Regular', sans-serif; - font-size: 12px; - font-weight: normal; - font-style: normal; - font-kerning: normal; -} .app-fixed-navbar { background: #fff; border-bottom: 0; @@ -96,11 +95,12 @@ body { background: #FBFBFB; margin-bottom: 0; padding: 4px 0; - border-top: 1px solid #DDDDDD; + border-top: 1px solid #ccc; + border-width: thin; } .main-container { position: relative; - min-height: 100%; + min-height: calc(100vh - 108px); } .main-container:before, .main-container:after { @@ -108,6 +108,9 @@ body { display: block; clear: both; } +.main-container .row { + min-height: inherit; +} @media (min-width: 992px) { .global-nav .logo-container { display: inline-block; @@ -123,8 +126,6 @@ body { position: absolute; width: 100%; height: 43px; - /* border-top:1px solid #ddd;*/ - border-bottom: 1px solid #eee; } .app-nav .module-action-bar .module-action-content { background: #FBFBFB; @@ -157,14 +158,14 @@ body { min-height: 100%; background: #FFFFFF; border-right: 1px solid #DDDDDD; + overflow: auto; + border-width: thin; } .main-container .content-area { width: 100%; padding-left: 283px; - min-height: 768px; } .main-container .settingsPageDiv { - min-height: 768px; padding-left: 230px; } .main-container .settingsNav { @@ -392,12 +393,10 @@ body { } .app-nav .app-indicator-icon-container { top: 0px; - height: 43px; + height: 42px; text-align: center; - line-height: 43px; - /* background-color: #2c3b49;*/ + line-height: 42px; color: #ffffff; - /*border-bottom: 1px solid #272B46;*/ } .app-nav .app-indicator-icon-container .app-indicator-icon { font-size: 24px; @@ -796,6 +795,9 @@ a.menu-item:hover { /*************************************************/ /******** View styles (List/Edit/Detail..) *******/ /*************************************************/ +.viewContent { + height: inherit; +} .viewContent .content-area { padding-left: 3%; } @@ -1351,6 +1353,7 @@ ul.unstyled { border-radius: 0px; font-weight: 100; cursor: pointer; + border-width: thin; } .btn:hover { cursor: pointer; @@ -1366,6 +1369,7 @@ ul.unstyled { border: 1px solid #ddd; color: #666; background: #fff; + border-width: thin; } .module-buttons:hover, .module-buttons:focus, @@ -1987,18 +1991,23 @@ th { .quickPreviewModuleHeader .recordImage [class^="vicon-"] { font-size: 35px; } +.detailViewContainer { + background: #f9f9f9; + min-height: inherit; +} .detailViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; + border-width: thin; } .detailViewContainer .block hr { margin: 10px 0; } .editViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; } @@ -2190,10 +2199,11 @@ th { .editViewContents .fieldBlockContainer, .summaryView { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryView .fieldLabel { padding-left: 0px; @@ -2223,10 +2233,11 @@ th { } .summaryWidgetContainer { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryWidgetContainer .widget_header { margin-bottom: 6px; @@ -2235,8 +2246,7 @@ th { font-size: 16px; } .summaryWidgetContainer .commentTitle { - padding-left: 15px; - padding-right: 15px; + margin-bottom: 25px; } .summaryWidgetContainer .creatorName { color: blue; @@ -2246,7 +2256,7 @@ th { } .summaryWidgetContainer .commentContainer { background: white; - border-color: #F3F3F3; + border-color: #eee; } .summaryWidgetContainer .commentContainertextarea { width: 100%; @@ -2255,6 +2265,7 @@ th { .noCommentsMsgContainer, .quick-preview-modal .noContent { border: 1px solid #eee; + border-width: thin; } .summaryWidgetContainer .recordImage .name { display: table-cell; @@ -5085,6 +5096,7 @@ hr { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -o-box-sizing: border-box; + margin-bottom: 1px; } .row .nav > li > a:hover { border-bottom-color: #555; @@ -6020,6 +6032,8 @@ div.tooltip-inner { background: white; padding: 15px; padding-top: 25px; + border: 1px solid #eee; + border-width: thin; } .detailViewContainer .content-area, .editViewPageDiv .content-area, @@ -6035,13 +6049,15 @@ div.tooltip-inner { padding: 15px; } .detailview-content .details.row .relatedHeader { - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .detailview-content .details.row .relatedContents { background: white; padding: 0; margin-top: 0; - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .related-tabs.row { background: #FFFFFF; @@ -6050,7 +6066,7 @@ div.tooltip-inner { .detailViewContainer .commentContainer .commentTitle.row, .detailViewContainer .commentContainer .showcomments { background: #FFFFFF; - border-color: #F3F3F3; + border-color: #eee; } .detailViewTwitterImage { position: absolute; @@ -6122,7 +6138,8 @@ div.tooltip-inner { display: inline-block; } .input-group-addon { - line-height: 1.4; + line-height: 1.5; + border-width: thin; } .input-group { float: left; @@ -6331,7 +6348,6 @@ div.tooltip-inner { } .dashBoardContainer .tab-pane .dashBoardTabContents ul { position: relative; - height: 960px; width: 1260px; } .nav-tabs > li { @@ -7562,6 +7578,8 @@ body .fc { } .commentcontent { border: 1px solid #ddd; + border-width: thin; + background: #fcfcfc; } .editViewHeader { padding-top: 20px; @@ -7573,6 +7591,18 @@ body .fc { .floatThead-floatContainer { margin-left: 1px; } +.navbar { + border: 1px solid #eee; + border-width: thin; +} +#appnav .navbar { + border: 0; + background: none; +} +.dashBoardContainer, +.loginPageContainer { + min-height: calc(100vh - 110px); +} @media all and (min-width: 0px) and (max-width: 830px) { table.summary-table > tbody > tr > td, table.summary-table > tbody > tr > th, @@ -7649,7 +7679,7 @@ body .fc { font-size: 13px; } .overlay-container-60 { - margin-left: 0px ; + margin-left: 0 ; } .overlayPageContent { padding-bottom: 0; @@ -7682,6 +7712,15 @@ body .fc { margin-left: 1px; padding-top: 1px; } + .listViewPageDiv #table-content { + overflow: scroll !important; + } + #appnavcontent { + border: 1px solid #ccc; + background: #f0f0f0; + border-width: thin; + padding: 30px; + } } .modules-menu ul li.active a { border-left: 3px solid #F1C40F; diff --git a/layouts/v7/skins/marketing/style.css b/layouts/v7/skins/marketing/style.css index 968b55517268eaac6cbf5013348f368795644d9b..07116fa520e6fbb659619424f375b00620ed6db4 100644 --- a/layouts/v7/skins/marketing/style.css +++ b/layouts/v7/skins/marketing/style.css @@ -49,32 +49,31 @@ a:active { /************ Layout **************/ /**********************************/ html { - height: 100%; + margin: 0; + padding: 0; overflow-y: auto; + min-height: 100%; } body { - width: 100%; margin: 0; padding: 0; - height: 100%; + font-family: 'OpenSans-Regular', sans-serif; + font-size: 12px; + font-weight: normal; + font-style: normal; + font-kerning: normal; + height: inherit; } body > .mCSB_inside > .mCSB_container { margin-right: 15px; } #page { - min-height: 100%; padding-top: 84px; + height: inherit; } .select2-container .select2-choice { font-family: 'OpenSans-Regular', sans-serif; } -body { - font-family: 'OpenSans-Regular', sans-serif; - font-size: 12px; - font-weight: normal; - font-style: normal; - font-kerning: normal; -} .app-fixed-navbar { background: #fff; border-bottom: 0; @@ -96,11 +95,12 @@ body { background: #FBFBFB; margin-bottom: 0; padding: 4px 0; - border-top: 1px solid #DDDDDD; + border-top: 1px solid #ccc; + border-width: thin; } .main-container { position: relative; - min-height: 100%; + min-height: calc(100vh - 108px); } .main-container:before, .main-container:after { @@ -108,6 +108,9 @@ body { display: block; clear: both; } +.main-container .row { + min-height: inherit; +} @media (min-width: 992px) { .global-nav .logo-container { display: inline-block; @@ -123,8 +126,6 @@ body { position: absolute; width: 100%; height: 43px; - /* border-top:1px solid #ddd;*/ - border-bottom: 1px solid #eee; } .app-nav .module-action-bar .module-action-content { background: #FBFBFB; @@ -157,14 +158,14 @@ body { min-height: 100%; background: #FFFFFF; border-right: 1px solid #DDDDDD; + overflow: auto; + border-width: thin; } .main-container .content-area { width: 100%; padding-left: 283px; - min-height: 768px; } .main-container .settingsPageDiv { - min-height: 768px; padding-left: 230px; } .main-container .settingsNav { @@ -392,12 +393,10 @@ body { } .app-nav .app-indicator-icon-container { top: 0px; - height: 43px; + height: 42px; text-align: center; - line-height: 43px; - /* background-color: #2c3b49;*/ + line-height: 42px; color: #ffffff; - /*border-bottom: 1px solid #272B46;*/ } .app-nav .app-indicator-icon-container .app-indicator-icon { font-size: 24px; @@ -796,6 +795,9 @@ a.menu-item:hover { /*************************************************/ /******** View styles (List/Edit/Detail..) *******/ /*************************************************/ +.viewContent { + height: inherit; +} .viewContent .content-area { padding-left: 3%; } @@ -1351,6 +1353,7 @@ ul.unstyled { border-radius: 0px; font-weight: 100; cursor: pointer; + border-width: thin; } .btn:hover { cursor: pointer; @@ -1366,6 +1369,7 @@ ul.unstyled { border: 1px solid #ddd; color: #666; background: #fff; + border-width: thin; } .module-buttons:hover, .module-buttons:focus, @@ -1987,18 +1991,23 @@ th { .quickPreviewModuleHeader .recordImage [class^="vicon-"] { font-size: 35px; } +.detailViewContainer { + background: #f9f9f9; + min-height: inherit; +} .detailViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; + border-width: thin; } .detailViewContainer .block hr { margin: 10px 0; } .editViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; } @@ -2190,10 +2199,11 @@ th { .editViewContents .fieldBlockContainer, .summaryView { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryView .fieldLabel { padding-left: 0px; @@ -2223,10 +2233,11 @@ th { } .summaryWidgetContainer { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryWidgetContainer .widget_header { margin-bottom: 6px; @@ -2235,8 +2246,7 @@ th { font-size: 16px; } .summaryWidgetContainer .commentTitle { - padding-left: 15px; - padding-right: 15px; + margin-bottom: 25px; } .summaryWidgetContainer .creatorName { color: blue; @@ -2246,7 +2256,7 @@ th { } .summaryWidgetContainer .commentContainer { background: white; - border-color: #F3F3F3; + border-color: #eee; } .summaryWidgetContainer .commentContainertextarea { width: 100%; @@ -2255,6 +2265,7 @@ th { .noCommentsMsgContainer, .quick-preview-modal .noContent { border: 1px solid #eee; + border-width: thin; } .summaryWidgetContainer .recordImage .name { display: table-cell; @@ -5085,6 +5096,7 @@ hr { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -o-box-sizing: border-box; + margin-bottom: 1px; } .row .nav > li > a:hover { border-bottom-color: #555; @@ -6020,6 +6032,8 @@ div.tooltip-inner { background: white; padding: 15px; padding-top: 25px; + border: 1px solid #eee; + border-width: thin; } .detailViewContainer .content-area, .editViewPageDiv .content-area, @@ -6035,13 +6049,15 @@ div.tooltip-inner { padding: 15px; } .detailview-content .details.row .relatedHeader { - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .detailview-content .details.row .relatedContents { background: white; padding: 0; margin-top: 0; - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .related-tabs.row { background: #FFFFFF; @@ -6050,7 +6066,7 @@ div.tooltip-inner { .detailViewContainer .commentContainer .commentTitle.row, .detailViewContainer .commentContainer .showcomments { background: #FFFFFF; - border-color: #F3F3F3; + border-color: #eee; } .detailViewTwitterImage { position: absolute; @@ -6122,7 +6138,8 @@ div.tooltip-inner { display: inline-block; } .input-group-addon { - line-height: 1.4; + line-height: 1.5; + border-width: thin; } .input-group { float: left; @@ -6331,7 +6348,6 @@ div.tooltip-inner { } .dashBoardContainer .tab-pane .dashBoardTabContents ul { position: relative; - height: 960px; width: 1260px; } .nav-tabs > li { @@ -7562,6 +7578,8 @@ body .fc { } .commentcontent { border: 1px solid #ddd; + border-width: thin; + background: #fcfcfc; } .editViewHeader { padding-top: 20px; @@ -7573,6 +7591,18 @@ body .fc { .floatThead-floatContainer { margin-left: 1px; } +.navbar { + border: 1px solid #eee; + border-width: thin; +} +#appnav .navbar { + border: 0; + background: none; +} +.dashBoardContainer, +.loginPageContainer { + min-height: calc(100vh - 110px); +} @media all and (min-width: 0px) and (max-width: 830px) { table.summary-table > tbody > tr > td, table.summary-table > tbody > tr > th, @@ -7649,7 +7679,7 @@ body .fc { font-size: 13px; } .overlay-container-60 { - margin-left: 0px ; + margin-left: 0 ; } .overlayPageContent { padding-bottom: 0; @@ -7682,6 +7712,15 @@ body .fc { margin-left: 1px; padding-top: 1px; } + .listViewPageDiv #table-content { + overflow: scroll !important; + } + #appnavcontent { + border: 1px solid #ccc; + background: #f0f0f0; + border-width: thin; + padding: 30px; + } } .modules-menu ul li.active a { border-left: 3px solid #EF5E29; diff --git a/layouts/v7/skins/marketing_and_sales/style.css b/layouts/v7/skins/marketing_and_sales/style.css index 45fa14a49f02858bc0bdd0f3bb19a802e46a055e..babb20e4e9adccbb6d9079e41438673ba1b7ba29 100644 --- a/layouts/v7/skins/marketing_and_sales/style.css +++ b/layouts/v7/skins/marketing_and_sales/style.css @@ -49,32 +49,31 @@ a:active { /************ Layout **************/ /**********************************/ html { - height: 100%; + margin: 0; + padding: 0; overflow-y: auto; + min-height: 100%; } body { - width: 100%; margin: 0; padding: 0; - height: 100%; + font-family: 'OpenSans-Regular', sans-serif; + font-size: 12px; + font-weight: normal; + font-style: normal; + font-kerning: normal; + height: inherit; } body > .mCSB_inside > .mCSB_container { margin-right: 15px; } #page { - min-height: 100%; padding-top: 84px; + height: inherit; } .select2-container .select2-choice { font-family: 'OpenSans-Regular', sans-serif; } -body { - font-family: 'OpenSans-Regular', sans-serif; - font-size: 12px; - font-weight: normal; - font-style: normal; - font-kerning: normal; -} .app-fixed-navbar { background: #fff; border-bottom: 0; @@ -96,11 +95,12 @@ body { background: #FBFBFB; margin-bottom: 0; padding: 4px 0; - border-top: 1px solid #DDDDDD; + border-top: 1px solid #ccc; + border-width: thin; } .main-container { position: relative; - min-height: 100%; + min-height: calc(100vh - 108px); } .main-container:before, .main-container:after { @@ -108,6 +108,9 @@ body { display: block; clear: both; } +.main-container .row { + min-height: inherit; +} @media (min-width: 992px) { .global-nav .logo-container { display: inline-block; @@ -123,8 +126,6 @@ body { position: absolute; width: 100%; height: 43px; - /* border-top:1px solid #ddd;*/ - border-bottom: 1px solid #eee; } .app-nav .module-action-bar .module-action-content { background: #FBFBFB; @@ -157,14 +158,14 @@ body { min-height: 100%; background: #FFFFFF; border-right: 1px solid #DDDDDD; + overflow: auto; + border-width: thin; } .main-container .content-area { width: 100%; padding-left: 283px; - min-height: 768px; } .main-container .settingsPageDiv { - min-height: 768px; padding-left: 230px; } .main-container .settingsNav { @@ -392,12 +393,10 @@ body { } .app-nav .app-indicator-icon-container { top: 0px; - height: 43px; + height: 42px; text-align: center; - line-height: 43px; - /* background-color: #2c3b49;*/ + line-height: 42px; color: #ffffff; - /*border-bottom: 1px solid #272B46;*/ } .app-nav .app-indicator-icon-container .app-indicator-icon { font-size: 24px; @@ -796,6 +795,9 @@ a.menu-item:hover { /*************************************************/ /******** View styles (List/Edit/Detail..) *******/ /*************************************************/ +.viewContent { + height: inherit; +} .viewContent .content-area { padding-left: 3%; } @@ -1351,6 +1353,7 @@ ul.unstyled { border-radius: 0px; font-weight: 100; cursor: pointer; + border-width: thin; } .btn:hover { cursor: pointer; @@ -1366,6 +1369,7 @@ ul.unstyled { border: 1px solid #ddd; color: #666; background: #fff; + border-width: thin; } .module-buttons:hover, .module-buttons:focus, @@ -1987,18 +1991,23 @@ th { .quickPreviewModuleHeader .recordImage [class^="vicon-"] { font-size: 35px; } +.detailViewContainer { + background: #f9f9f9; + min-height: inherit; +} .detailViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; + border-width: thin; } .detailViewContainer .block hr { margin: 10px 0; } .editViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; } @@ -2190,10 +2199,11 @@ th { .editViewContents .fieldBlockContainer, .summaryView { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryView .fieldLabel { padding-left: 0px; @@ -2223,10 +2233,11 @@ th { } .summaryWidgetContainer { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryWidgetContainer .widget_header { margin-bottom: 6px; @@ -2235,8 +2246,7 @@ th { font-size: 16px; } .summaryWidgetContainer .commentTitle { - padding-left: 15px; - padding-right: 15px; + margin-bottom: 25px; } .summaryWidgetContainer .creatorName { color: blue; @@ -2246,7 +2256,7 @@ th { } .summaryWidgetContainer .commentContainer { background: white; - border-color: #F3F3F3; + border-color: #eee; } .summaryWidgetContainer .commentContainertextarea { width: 100%; @@ -2255,6 +2265,7 @@ th { .noCommentsMsgContainer, .quick-preview-modal .noContent { border: 1px solid #eee; + border-width: thin; } .summaryWidgetContainer .recordImage .name { display: table-cell; @@ -5085,6 +5096,7 @@ hr { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -o-box-sizing: border-box; + margin-bottom: 1px; } .row .nav > li > a:hover { border-bottom-color: #555; @@ -6020,6 +6032,8 @@ div.tooltip-inner { background: white; padding: 15px; padding-top: 25px; + border: 1px solid #eee; + border-width: thin; } .detailViewContainer .content-area, .editViewPageDiv .content-area, @@ -6035,13 +6049,15 @@ div.tooltip-inner { padding: 15px; } .detailview-content .details.row .relatedHeader { - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .detailview-content .details.row .relatedContents { background: white; padding: 0; margin-top: 0; - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .related-tabs.row { background: #FFFFFF; @@ -6050,7 +6066,7 @@ div.tooltip-inner { .detailViewContainer .commentContainer .commentTitle.row, .detailViewContainer .commentContainer .showcomments { background: #FFFFFF; - border-color: #F3F3F3; + border-color: #eee; } .detailViewTwitterImage { position: absolute; @@ -6122,7 +6138,8 @@ div.tooltip-inner { display: inline-block; } .input-group-addon { - line-height: 1.4; + line-height: 1.5; + border-width: thin; } .input-group { float: left; @@ -6331,7 +6348,6 @@ div.tooltip-inner { } .dashBoardContainer .tab-pane .dashBoardTabContents ul { position: relative; - height: 960px; width: 1260px; } .nav-tabs > li { @@ -7562,6 +7578,8 @@ body .fc { } .commentcontent { border: 1px solid #ddd; + border-width: thin; + background: #fcfcfc; } .editViewHeader { padding-top: 20px; @@ -7573,6 +7591,18 @@ body .fc { .floatThead-floatContainer { margin-left: 1px; } +.navbar { + border: 1px solid #eee; + border-width: thin; +} +#appnav .navbar { + border: 0; + background: none; +} +.dashBoardContainer, +.loginPageContainer { + min-height: calc(100vh - 110px); +} @media all and (min-width: 0px) and (max-width: 830px) { table.summary-table > tbody > tr > td, table.summary-table > tbody > tr > th, @@ -7649,7 +7679,7 @@ body .fc { font-size: 13px; } .overlay-container-60 { - margin-left: 0px ; + margin-left: 0 ; } .overlayPageContent { padding-bottom: 0; @@ -7682,6 +7712,15 @@ body .fc { margin-left: 1px; padding-top: 1px; } + .listViewPageDiv #table-content { + overflow: scroll !important; + } + #appnavcontent { + border: 1px solid #ccc; + background: #f0f0f0; + border-width: thin; + padding: 30px; + } } .modules-menu ul li.active a { border-left: 3px solid #3CB878; diff --git a/layouts/v7/skins/project/style.css b/layouts/v7/skins/project/style.css index a1bd9cf5aefdd193124ecd06ec68df0c8e525eaf..d864babd672f49fc4138308b38a0b94dc8392085 100644 --- a/layouts/v7/skins/project/style.css +++ b/layouts/v7/skins/project/style.css @@ -49,32 +49,31 @@ a:active { /************ Layout **************/ /**********************************/ html { - height: 100%; + margin: 0; + padding: 0; overflow-y: auto; + min-height: 100%; } body { - width: 100%; margin: 0; padding: 0; - height: 100%; + font-family: 'OpenSans-Regular', sans-serif; + font-size: 12px; + font-weight: normal; + font-style: normal; + font-kerning: normal; + height: inherit; } body > .mCSB_inside > .mCSB_container { margin-right: 15px; } #page { - min-height: 100%; padding-top: 84px; + height: inherit; } .select2-container .select2-choice { font-family: 'OpenSans-Regular', sans-serif; } -body { - font-family: 'OpenSans-Regular', sans-serif; - font-size: 12px; - font-weight: normal; - font-style: normal; - font-kerning: normal; -} .app-fixed-navbar { background: #fff; border-bottom: 0; @@ -96,11 +95,12 @@ body { background: #FBFBFB; margin-bottom: 0; padding: 4px 0; - border-top: 1px solid #DDDDDD; + border-top: 1px solid #ccc; + border-width: thin; } .main-container { position: relative; - min-height: 100%; + min-height: calc(100vh - 108px); } .main-container:before, .main-container:after { @@ -108,6 +108,9 @@ body { display: block; clear: both; } +.main-container .row { + min-height: inherit; +} @media (min-width: 992px) { .global-nav .logo-container { display: inline-block; @@ -123,8 +126,6 @@ body { position: absolute; width: 100%; height: 43px; - /* border-top:1px solid #ddd;*/ - border-bottom: 1px solid #eee; } .app-nav .module-action-bar .module-action-content { background: #FBFBFB; @@ -157,14 +158,14 @@ body { min-height: 100%; background: #FFFFFF; border-right: 1px solid #DDDDDD; + overflow: auto; + border-width: thin; } .main-container .content-area { width: 100%; padding-left: 283px; - min-height: 768px; } .main-container .settingsPageDiv { - min-height: 768px; padding-left: 230px; } .main-container .settingsNav { @@ -392,12 +393,10 @@ body { } .app-nav .app-indicator-icon-container { top: 0px; - height: 43px; + height: 42px; text-align: center; - line-height: 43px; - /* background-color: #2c3b49;*/ + line-height: 42px; color: #ffffff; - /*border-bottom: 1px solid #272B46;*/ } .app-nav .app-indicator-icon-container .app-indicator-icon { font-size: 24px; @@ -796,6 +795,9 @@ a.menu-item:hover { /*************************************************/ /******** View styles (List/Edit/Detail..) *******/ /*************************************************/ +.viewContent { + height: inherit; +} .viewContent .content-area { padding-left: 3%; } @@ -1351,6 +1353,7 @@ ul.unstyled { border-radius: 0px; font-weight: 100; cursor: pointer; + border-width: thin; } .btn:hover { cursor: pointer; @@ -1366,6 +1369,7 @@ ul.unstyled { border: 1px solid #ddd; color: #666; background: #fff; + border-width: thin; } .module-buttons:hover, .module-buttons:focus, @@ -1987,18 +1991,23 @@ th { .quickPreviewModuleHeader .recordImage [class^="vicon-"] { font-size: 35px; } +.detailViewContainer { + background: #f9f9f9; + min-height: inherit; +} .detailViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; + border-width: thin; } .detailViewContainer .block hr { margin: 10px 0; } .editViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; } @@ -2190,10 +2199,11 @@ th { .editViewContents .fieldBlockContainer, .summaryView { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryView .fieldLabel { padding-left: 0px; @@ -2223,10 +2233,11 @@ th { } .summaryWidgetContainer { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryWidgetContainer .widget_header { margin-bottom: 6px; @@ -2235,8 +2246,7 @@ th { font-size: 16px; } .summaryWidgetContainer .commentTitle { - padding-left: 15px; - padding-right: 15px; + margin-bottom: 25px; } .summaryWidgetContainer .creatorName { color: blue; @@ -2246,7 +2256,7 @@ th { } .summaryWidgetContainer .commentContainer { background: white; - border-color: #F3F3F3; + border-color: #eee; } .summaryWidgetContainer .commentContainertextarea { width: 100%; @@ -2255,6 +2265,7 @@ th { .noCommentsMsgContainer, .quick-preview-modal .noContent { border: 1px solid #eee; + border-width: thin; } .summaryWidgetContainer .recordImage .name { display: table-cell; @@ -5085,6 +5096,7 @@ hr { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -o-box-sizing: border-box; + margin-bottom: 1px; } .row .nav > li > a:hover { border-bottom-color: #555; @@ -6020,6 +6032,8 @@ div.tooltip-inner { background: white; padding: 15px; padding-top: 25px; + border: 1px solid #eee; + border-width: thin; } .detailViewContainer .content-area, .editViewPageDiv .content-area, @@ -6035,13 +6049,15 @@ div.tooltip-inner { padding: 15px; } .detailview-content .details.row .relatedHeader { - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .detailview-content .details.row .relatedContents { background: white; padding: 0; margin-top: 0; - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .related-tabs.row { background: #FFFFFF; @@ -6050,7 +6066,7 @@ div.tooltip-inner { .detailViewContainer .commentContainer .commentTitle.row, .detailViewContainer .commentContainer .showcomments { background: #FFFFFF; - border-color: #F3F3F3; + border-color: #eee; } .detailViewTwitterImage { position: absolute; @@ -6122,7 +6138,8 @@ div.tooltip-inner { display: inline-block; } .input-group-addon { - line-height: 1.4; + line-height: 1.5; + border-width: thin; } .input-group { float: left; @@ -6331,7 +6348,6 @@ div.tooltip-inner { } .dashBoardContainer .tab-pane .dashBoardTabContents ul { position: relative; - height: 960px; width: 1260px; } .nav-tabs > li { @@ -7562,6 +7578,8 @@ body .fc { } .commentcontent { border: 1px solid #ddd; + border-width: thin; + background: #fcfcfc; } .editViewHeader { padding-top: 20px; @@ -7573,6 +7591,18 @@ body .fc { .floatThead-floatContainer { margin-left: 1px; } +.navbar { + border: 1px solid #eee; + border-width: thin; +} +#appnav .navbar { + border: 0; + background: none; +} +.dashBoardContainer, +.loginPageContainer { + min-height: calc(100vh - 110px); +} @media all and (min-width: 0px) and (max-width: 830px) { table.summary-table > tbody > tr > td, table.summary-table > tbody > tr > th, @@ -7649,7 +7679,7 @@ body .fc { font-size: 13px; } .overlay-container-60 { - margin-left: 0px ; + margin-left: 0 ; } .overlayPageContent { padding-bottom: 0; @@ -7682,6 +7712,15 @@ body .fc { margin-left: 1px; padding-top: 1px; } + .listViewPageDiv #table-content { + overflow: scroll !important; + } + #appnavcontent { + border: 1px solid #ccc; + background: #f0f0f0; + border-width: thin; + padding: 30px; + } } .modules-menu ul li.active a { border-left: 3px solid #8E44AD; diff --git a/layouts/v7/skins/sales/style.css b/layouts/v7/skins/sales/style.css index 45fa14a49f02858bc0bdd0f3bb19a802e46a055e..babb20e4e9adccbb6d9079e41438673ba1b7ba29 100644 --- a/layouts/v7/skins/sales/style.css +++ b/layouts/v7/skins/sales/style.css @@ -49,32 +49,31 @@ a:active { /************ Layout **************/ /**********************************/ html { - height: 100%; + margin: 0; + padding: 0; overflow-y: auto; + min-height: 100%; } body { - width: 100%; margin: 0; padding: 0; - height: 100%; + font-family: 'OpenSans-Regular', sans-serif; + font-size: 12px; + font-weight: normal; + font-style: normal; + font-kerning: normal; + height: inherit; } body > .mCSB_inside > .mCSB_container { margin-right: 15px; } #page { - min-height: 100%; padding-top: 84px; + height: inherit; } .select2-container .select2-choice { font-family: 'OpenSans-Regular', sans-serif; } -body { - font-family: 'OpenSans-Regular', sans-serif; - font-size: 12px; - font-weight: normal; - font-style: normal; - font-kerning: normal; -} .app-fixed-navbar { background: #fff; border-bottom: 0; @@ -96,11 +95,12 @@ body { background: #FBFBFB; margin-bottom: 0; padding: 4px 0; - border-top: 1px solid #DDDDDD; + border-top: 1px solid #ccc; + border-width: thin; } .main-container { position: relative; - min-height: 100%; + min-height: calc(100vh - 108px); } .main-container:before, .main-container:after { @@ -108,6 +108,9 @@ body { display: block; clear: both; } +.main-container .row { + min-height: inherit; +} @media (min-width: 992px) { .global-nav .logo-container { display: inline-block; @@ -123,8 +126,6 @@ body { position: absolute; width: 100%; height: 43px; - /* border-top:1px solid #ddd;*/ - border-bottom: 1px solid #eee; } .app-nav .module-action-bar .module-action-content { background: #FBFBFB; @@ -157,14 +158,14 @@ body { min-height: 100%; background: #FFFFFF; border-right: 1px solid #DDDDDD; + overflow: auto; + border-width: thin; } .main-container .content-area { width: 100%; padding-left: 283px; - min-height: 768px; } .main-container .settingsPageDiv { - min-height: 768px; padding-left: 230px; } .main-container .settingsNav { @@ -392,12 +393,10 @@ body { } .app-nav .app-indicator-icon-container { top: 0px; - height: 43px; + height: 42px; text-align: center; - line-height: 43px; - /* background-color: #2c3b49;*/ + line-height: 42px; color: #ffffff; - /*border-bottom: 1px solid #272B46;*/ } .app-nav .app-indicator-icon-container .app-indicator-icon { font-size: 24px; @@ -796,6 +795,9 @@ a.menu-item:hover { /*************************************************/ /******** View styles (List/Edit/Detail..) *******/ /*************************************************/ +.viewContent { + height: inherit; +} .viewContent .content-area { padding-left: 3%; } @@ -1351,6 +1353,7 @@ ul.unstyled { border-radius: 0px; font-weight: 100; cursor: pointer; + border-width: thin; } .btn:hover { cursor: pointer; @@ -1366,6 +1369,7 @@ ul.unstyled { border: 1px solid #ddd; color: #666; background: #fff; + border-width: thin; } .module-buttons:hover, .module-buttons:focus, @@ -1987,18 +1991,23 @@ th { .quickPreviewModuleHeader .recordImage [class^="vicon-"] { font-size: 35px; } +.detailViewContainer { + background: #f9f9f9; + min-height: inherit; +} .detailViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; + border-width: thin; } .detailViewContainer .block hr { margin: 10px 0; } .editViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; } @@ -2190,10 +2199,11 @@ th { .editViewContents .fieldBlockContainer, .summaryView { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryView .fieldLabel { padding-left: 0px; @@ -2223,10 +2233,11 @@ th { } .summaryWidgetContainer { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryWidgetContainer .widget_header { margin-bottom: 6px; @@ -2235,8 +2246,7 @@ th { font-size: 16px; } .summaryWidgetContainer .commentTitle { - padding-left: 15px; - padding-right: 15px; + margin-bottom: 25px; } .summaryWidgetContainer .creatorName { color: blue; @@ -2246,7 +2256,7 @@ th { } .summaryWidgetContainer .commentContainer { background: white; - border-color: #F3F3F3; + border-color: #eee; } .summaryWidgetContainer .commentContainertextarea { width: 100%; @@ -2255,6 +2265,7 @@ th { .noCommentsMsgContainer, .quick-preview-modal .noContent { border: 1px solid #eee; + border-width: thin; } .summaryWidgetContainer .recordImage .name { display: table-cell; @@ -5085,6 +5096,7 @@ hr { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -o-box-sizing: border-box; + margin-bottom: 1px; } .row .nav > li > a:hover { border-bottom-color: #555; @@ -6020,6 +6032,8 @@ div.tooltip-inner { background: white; padding: 15px; padding-top: 25px; + border: 1px solid #eee; + border-width: thin; } .detailViewContainer .content-area, .editViewPageDiv .content-area, @@ -6035,13 +6049,15 @@ div.tooltip-inner { padding: 15px; } .detailview-content .details.row .relatedHeader { - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .detailview-content .details.row .relatedContents { background: white; padding: 0; margin-top: 0; - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .related-tabs.row { background: #FFFFFF; @@ -6050,7 +6066,7 @@ div.tooltip-inner { .detailViewContainer .commentContainer .commentTitle.row, .detailViewContainer .commentContainer .showcomments { background: #FFFFFF; - border-color: #F3F3F3; + border-color: #eee; } .detailViewTwitterImage { position: absolute; @@ -6122,7 +6138,8 @@ div.tooltip-inner { display: inline-block; } .input-group-addon { - line-height: 1.4; + line-height: 1.5; + border-width: thin; } .input-group { float: left; @@ -6331,7 +6348,6 @@ div.tooltip-inner { } .dashBoardContainer .tab-pane .dashBoardTabContents ul { position: relative; - height: 960px; width: 1260px; } .nav-tabs > li { @@ -7562,6 +7578,8 @@ body .fc { } .commentcontent { border: 1px solid #ddd; + border-width: thin; + background: #fcfcfc; } .editViewHeader { padding-top: 20px; @@ -7573,6 +7591,18 @@ body .fc { .floatThead-floatContainer { margin-left: 1px; } +.navbar { + border: 1px solid #eee; + border-width: thin; +} +#appnav .navbar { + border: 0; + background: none; +} +.dashBoardContainer, +.loginPageContainer { + min-height: calc(100vh - 110px); +} @media all and (min-width: 0px) and (max-width: 830px) { table.summary-table > tbody > tr > td, table.summary-table > tbody > tr > th, @@ -7649,7 +7679,7 @@ body .fc { font-size: 13px; } .overlay-container-60 { - margin-left: 0px ; + margin-left: 0 ; } .overlayPageContent { padding-bottom: 0; @@ -7682,6 +7712,15 @@ body .fc { margin-left: 1px; padding-top: 1px; } + .listViewPageDiv #table-content { + overflow: scroll !important; + } + #appnavcontent { + border: 1px solid #ccc; + background: #f0f0f0; + border-width: thin; + padding: 30px; + } } .modules-menu ul li.active a { border-left: 3px solid #3CB878; diff --git a/layouts/v7/skins/support/style.css b/layouts/v7/skins/support/style.css index 76088c69de19cb230c1bd1bbe45efe2202d295d2..9c4841d1079618f49bb5b57b44ba05cfd5ec0828 100644 --- a/layouts/v7/skins/support/style.css +++ b/layouts/v7/skins/support/style.css @@ -49,32 +49,31 @@ a:active { /************ Layout **************/ /**********************************/ html { - height: 100%; + margin: 0; + padding: 0; overflow-y: auto; + min-height: 100%; } body { - width: 100%; margin: 0; padding: 0; - height: 100%; + font-family: 'OpenSans-Regular', sans-serif; + font-size: 12px; + font-weight: normal; + font-style: normal; + font-kerning: normal; + height: inherit; } body > .mCSB_inside > .mCSB_container { margin-right: 15px; } #page { - min-height: 100%; padding-top: 84px; + height: inherit; } .select2-container .select2-choice { font-family: 'OpenSans-Regular', sans-serif; } -body { - font-family: 'OpenSans-Regular', sans-serif; - font-size: 12px; - font-weight: normal; - font-style: normal; - font-kerning: normal; -} .app-fixed-navbar { background: #fff; border-bottom: 0; @@ -96,11 +95,12 @@ body { background: #FBFBFB; margin-bottom: 0; padding: 4px 0; - border-top: 1px solid #DDDDDD; + border-top: 1px solid #ccc; + border-width: thin; } .main-container { position: relative; - min-height: 100%; + min-height: calc(100vh - 108px); } .main-container:before, .main-container:after { @@ -108,6 +108,9 @@ body { display: block; clear: both; } +.main-container .row { + min-height: inherit; +} @media (min-width: 992px) { .global-nav .logo-container { display: inline-block; @@ -123,8 +126,6 @@ body { position: absolute; width: 100%; height: 43px; - /* border-top:1px solid #ddd;*/ - border-bottom: 1px solid #eee; } .app-nav .module-action-bar .module-action-content { background: #FBFBFB; @@ -157,14 +158,14 @@ body { min-height: 100%; background: #FFFFFF; border-right: 1px solid #DDDDDD; + overflow: auto; + border-width: thin; } .main-container .content-area { width: 100%; padding-left: 283px; - min-height: 768px; } .main-container .settingsPageDiv { - min-height: 768px; padding-left: 230px; } .main-container .settingsNav { @@ -392,12 +393,10 @@ body { } .app-nav .app-indicator-icon-container { top: 0px; - height: 43px; + height: 42px; text-align: center; - line-height: 43px; - /* background-color: #2c3b49;*/ + line-height: 42px; color: #ffffff; - /*border-bottom: 1px solid #272B46;*/ } .app-nav .app-indicator-icon-container .app-indicator-icon { font-size: 24px; @@ -796,6 +795,9 @@ a.menu-item:hover { /*************************************************/ /******** View styles (List/Edit/Detail..) *******/ /*************************************************/ +.viewContent { + height: inherit; +} .viewContent .content-area { padding-left: 3%; } @@ -1351,6 +1353,7 @@ ul.unstyled { border-radius: 0px; font-weight: 100; cursor: pointer; + border-width: thin; } .btn:hover { cursor: pointer; @@ -1366,6 +1369,7 @@ ul.unstyled { border: 1px solid #ddd; color: #666; background: #fff; + border-width: thin; } .module-buttons:hover, .module-buttons:focus, @@ -1987,18 +1991,23 @@ th { .quickPreviewModuleHeader .recordImage [class^="vicon-"] { font-size: 35px; } +.detailViewContainer { + background: #f9f9f9; + min-height: inherit; +} .detailViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; + border-width: thin; } .detailViewContainer .block hr { margin: 10px 0; } .editViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; } @@ -2190,10 +2199,11 @@ th { .editViewContents .fieldBlockContainer, .summaryView { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryView .fieldLabel { padding-left: 0px; @@ -2223,10 +2233,11 @@ th { } .summaryWidgetContainer { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryWidgetContainer .widget_header { margin-bottom: 6px; @@ -2235,8 +2246,7 @@ th { font-size: 16px; } .summaryWidgetContainer .commentTitle { - padding-left: 15px; - padding-right: 15px; + margin-bottom: 25px; } .summaryWidgetContainer .creatorName { color: blue; @@ -2246,7 +2256,7 @@ th { } .summaryWidgetContainer .commentContainer { background: white; - border-color: #F3F3F3; + border-color: #eee; } .summaryWidgetContainer .commentContainertextarea { width: 100%; @@ -2255,6 +2265,7 @@ th { .noCommentsMsgContainer, .quick-preview-modal .noContent { border: 1px solid #eee; + border-width: thin; } .summaryWidgetContainer .recordImage .name { display: table-cell; @@ -5085,6 +5096,7 @@ hr { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -o-box-sizing: border-box; + margin-bottom: 1px; } .row .nav > li > a:hover { border-bottom-color: #555; @@ -6020,6 +6032,8 @@ div.tooltip-inner { background: white; padding: 15px; padding-top: 25px; + border: 1px solid #eee; + border-width: thin; } .detailViewContainer .content-area, .editViewPageDiv .content-area, @@ -6035,13 +6049,15 @@ div.tooltip-inner { padding: 15px; } .detailview-content .details.row .relatedHeader { - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .detailview-content .details.row .relatedContents { background: white; padding: 0; margin-top: 0; - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .related-tabs.row { background: #FFFFFF; @@ -6050,7 +6066,7 @@ div.tooltip-inner { .detailViewContainer .commentContainer .commentTitle.row, .detailViewContainer .commentContainer .showcomments { background: #FFFFFF; - border-color: #F3F3F3; + border-color: #eee; } .detailViewTwitterImage { position: absolute; @@ -6122,7 +6138,8 @@ div.tooltip-inner { display: inline-block; } .input-group-addon { - line-height: 1.4; + line-height: 1.5; + border-width: thin; } .input-group { float: left; @@ -6331,7 +6348,6 @@ div.tooltip-inner { } .dashBoardContainer .tab-pane .dashBoardTabContents ul { position: relative; - height: 960px; width: 1260px; } .nav-tabs > li { @@ -7562,6 +7578,8 @@ body .fc { } .commentcontent { border: 1px solid #ddd; + border-width: thin; + background: #fcfcfc; } .editViewHeader { padding-top: 20px; @@ -7573,6 +7591,18 @@ body .fc { .floatThead-floatContainer { margin-left: 1px; } +.navbar { + border: 1px solid #eee; + border-width: thin; +} +#appnav .navbar { + border: 0; + background: none; +} +.dashBoardContainer, +.loginPageContainer { + min-height: calc(100vh - 110px); +} @media all and (min-width: 0px) and (max-width: 830px) { table.summary-table > tbody > tr > td, table.summary-table > tbody > tr > th, @@ -7649,7 +7679,7 @@ body .fc { font-size: 13px; } .overlay-container-60 { - margin-left: 0px ; + margin-left: 0 ; } .overlayPageContent { padding-bottom: 0; @@ -7682,6 +7712,15 @@ body .fc { margin-left: 1px; padding-top: 1px; } + .listViewPageDiv #table-content { + overflow: scroll !important; + } + #appnavcontent { + border: 1px solid #ccc; + background: #f0f0f0; + border-width: thin; + padding: 30px; + } } .modules-menu ul li.active a { border-left: 3px solid #6297C3; diff --git a/layouts/v7/skins/tools/style.css b/layouts/v7/skins/tools/style.css index 9539ba1337b7d4a966c9474395391aa2a7695ff8..599f0299d3b016ecd8542304cca4b3a53f00210d 100644 --- a/layouts/v7/skins/tools/style.css +++ b/layouts/v7/skins/tools/style.css @@ -49,32 +49,31 @@ a:active { /************ Layout **************/ /**********************************/ html { - height: 100%; + margin: 0; + padding: 0; overflow-y: auto; + min-height: 100%; } body { - width: 100%; margin: 0; padding: 0; - height: 100%; + font-family: 'OpenSans-Regular', sans-serif; + font-size: 12px; + font-weight: normal; + font-style: normal; + font-kerning: normal; + height: inherit; } body > .mCSB_inside > .mCSB_container { margin-right: 15px; } #page { - min-height: 100%; padding-top: 84px; + height: inherit; } .select2-container .select2-choice { font-family: 'OpenSans-Regular', sans-serif; } -body { - font-family: 'OpenSans-Regular', sans-serif; - font-size: 12px; - font-weight: normal; - font-style: normal; - font-kerning: normal; -} .app-fixed-navbar { background: #fff; border-bottom: 0; @@ -96,11 +95,12 @@ body { background: #FBFBFB; margin-bottom: 0; padding: 4px 0; - border-top: 1px solid #DDDDDD; + border-top: 1px solid #ccc; + border-width: thin; } .main-container { position: relative; - min-height: 100%; + min-height: calc(100vh - 108px); } .main-container:before, .main-container:after { @@ -108,6 +108,9 @@ body { display: block; clear: both; } +.main-container .row { + min-height: inherit; +} @media (min-width: 992px) { .global-nav .logo-container { display: inline-block; @@ -123,8 +126,6 @@ body { position: absolute; width: 100%; height: 43px; - /* border-top:1px solid #ddd;*/ - border-bottom: 1px solid #eee; } .app-nav .module-action-bar .module-action-content { background: #FBFBFB; @@ -157,14 +158,14 @@ body { min-height: 100%; background: #FFFFFF; border-right: 1px solid #DDDDDD; + overflow: auto; + border-width: thin; } .main-container .content-area { width: 100%; padding-left: 283px; - min-height: 768px; } .main-container .settingsPageDiv { - min-height: 768px; padding-left: 230px; } .main-container .settingsNav { @@ -392,12 +393,10 @@ body { } .app-nav .app-indicator-icon-container { top: 0px; - height: 43px; + height: 42px; text-align: center; - line-height: 43px; - /* background-color: #2c3b49;*/ + line-height: 42px; color: #ffffff; - /*border-bottom: 1px solid #272B46;*/ } .app-nav .app-indicator-icon-container .app-indicator-icon { font-size: 24px; @@ -796,6 +795,9 @@ a.menu-item:hover { /*************************************************/ /******** View styles (List/Edit/Detail..) *******/ /*************************************************/ +.viewContent { + height: inherit; +} .viewContent .content-area { padding-left: 3%; } @@ -1351,6 +1353,7 @@ ul.unstyled { border-radius: 0px; font-weight: 100; cursor: pointer; + border-width: thin; } .btn:hover { cursor: pointer; @@ -1366,6 +1369,7 @@ ul.unstyled { border: 1px solid #ddd; color: #666; background: #fff; + border-width: thin; } .module-buttons:hover, .module-buttons:focus, @@ -1987,18 +1991,23 @@ th { .quickPreviewModuleHeader .recordImage [class^="vicon-"] { font-size: 35px; } +.detailViewContainer { + background: #f9f9f9; + min-height: inherit; +} .detailViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; + border-width: thin; } .detailViewContainer .block hr { margin: 10px 0; } .editViewContainer .block { background: #FFFFFF; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding-left: 15px; padding-right: 15px; } @@ -2190,10 +2199,11 @@ th { .editViewContents .fieldBlockContainer, .summaryView { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryView .fieldLabel { padding-left: 0px; @@ -2223,10 +2233,11 @@ th { } .summaryWidgetContainer { position: relative; - border: 1px solid #F3F3F3; + border: 1px solid #eee; padding: 15px; margin-bottom: 10px; background: #FFFFFF; + border-width: thin; } .summaryWidgetContainer .widget_header { margin-bottom: 6px; @@ -2235,8 +2246,7 @@ th { font-size: 16px; } .summaryWidgetContainer .commentTitle { - padding-left: 15px; - padding-right: 15px; + margin-bottom: 25px; } .summaryWidgetContainer .creatorName { color: blue; @@ -2246,7 +2256,7 @@ th { } .summaryWidgetContainer .commentContainer { background: white; - border-color: #F3F3F3; + border-color: #eee; } .summaryWidgetContainer .commentContainertextarea { width: 100%; @@ -2255,6 +2265,7 @@ th { .noCommentsMsgContainer, .quick-preview-modal .noContent { border: 1px solid #eee; + border-width: thin; } .summaryWidgetContainer .recordImage .name { display: table-cell; @@ -5085,6 +5096,7 @@ hr { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -o-box-sizing: border-box; + margin-bottom: 1px; } .row .nav > li > a:hover { border-bottom-color: #555; @@ -6020,6 +6032,8 @@ div.tooltip-inner { background: white; padding: 15px; padding-top: 25px; + border: 1px solid #eee; + border-width: thin; } .detailViewContainer .content-area, .editViewPageDiv .content-area, @@ -6035,13 +6049,15 @@ div.tooltip-inner { padding: 15px; } .detailview-content .details.row .relatedHeader { - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .detailview-content .details.row .relatedContents { background: white; padding: 0; margin-top: 0; - border: 1px solid #F3F3F3; + border: 1px solid #eee; + border-width: thin; } .related-tabs.row { background: #FFFFFF; @@ -6050,7 +6066,7 @@ div.tooltip-inner { .detailViewContainer .commentContainer .commentTitle.row, .detailViewContainer .commentContainer .showcomments { background: #FFFFFF; - border-color: #F3F3F3; + border-color: #eee; } .detailViewTwitterImage { position: absolute; @@ -6122,7 +6138,8 @@ div.tooltip-inner { display: inline-block; } .input-group-addon { - line-height: 1.4; + line-height: 1.5; + border-width: thin; } .input-group { float: left; @@ -6331,7 +6348,6 @@ div.tooltip-inner { } .dashBoardContainer .tab-pane .dashBoardTabContents ul { position: relative; - height: 960px; width: 1260px; } .nav-tabs > li { @@ -7562,6 +7578,8 @@ body .fc { } .commentcontent { border: 1px solid #ddd; + border-width: thin; + background: #fcfcfc; } .editViewHeader { padding-top: 20px; @@ -7573,6 +7591,18 @@ body .fc { .floatThead-floatContainer { margin-left: 1px; } +.navbar { + border: 1px solid #eee; + border-width: thin; +} +#appnav .navbar { + border: 0; + background: none; +} +.dashBoardContainer, +.loginPageContainer { + min-height: calc(100vh - 110px); +} @media all and (min-width: 0px) and (max-width: 830px) { table.summary-table > tbody > tr > td, table.summary-table > tbody > tr > th, @@ -7649,7 +7679,7 @@ body .fc { font-size: 13px; } .overlay-container-60 { - margin-left: 0px ; + margin-left: 0 ; } .overlayPageContent { padding-bottom: 0; @@ -7682,5 +7712,14 @@ body .fc { margin-left: 1px; padding-top: 1px; } + .listViewPageDiv #table-content { + overflow: scroll !important; + } + #appnavcontent { + border: 1px solid #ccc; + background: #f0f0f0; + border-width: thin; + padding: 30px; + } } /*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less index 75e9b52b2e70274abde3c7d492fef8508be8bfc0..3d71a4bceab0d0388fbd033b788a43319b54b7dc 100644 --- a/layouts/v7/skins/vtiger/style.less +++ b/layouts/v7/skins/vtiger/style.less @@ -60,32 +60,31 @@ a:focus,a:active{ /************ Layout **************/ /**********************************/ html{ - height: 100%; + margin: 0; + padding: 0; overflow-y: auto; + min-height: 100%; } body{ - width: 100%; margin: 0; padding: 0; - height: 100%; + font-family: 'OpenSans-Regular', sans-serif; + font-size : 12px; + font-weight: normal; + font-style: normal; + font-kerning: normal; + height: inherit; } body > .mCSB_inside > .mCSB_container{ margin-right: 15px; } #page{ - min-height:100%; padding-top: 84px; + height: inherit; } .select2-container .select2-choice{ font-family: 'OpenSans-Regular', sans-serif; } -body{ - font-family: 'OpenSans-Regular', sans-serif; - font-size : 12px; - font-weight: normal; - font-style: normal; - font-kerning: normal; -} .app-fixed-navbar{ background: #fff; border-bottom: 0; @@ -107,11 +106,12 @@ body{ background: @blockBackground; margin-bottom: 0; padding: 4px 0; - border-top: 1px solid @lightColorBorder; + border-top: 1px solid #ccc; + border-width: thin; } .main-container{ position: relative; - min-height: 100%; + min-height: calc(100vh - 108px); } .main-container:before, .main-container:after{ @@ -119,7 +119,9 @@ body{ display: block; clear:both; } - +.main-container .row { + min-height: inherit; +} @media (min-width: 992px) { .global-nav .logo-container{ display: inline-block; @@ -135,8 +137,6 @@ body{ position: absolute; width: 100%; height: 43px; -/* border-top:1px solid #ddd;*/ - border-bottom:1px solid #eee } .app-nav .module-action-bar .module-action-content{ background: @blockBackground; @@ -157,7 +157,6 @@ body{ min-height: 100%; background-color: @moduleNav; background: @moduleNav; - } .main-container .sidebar-essentials { display: inline-block; @@ -170,14 +169,14 @@ body{ min-height: 100%; background: @white; border-right: 1px solid @lightColorBorder; + overflow: auto; + border-width: thin; } .main-container .content-area{ width: 100%; padding-left:283px; - min-height: 768px; } .main-container .settingsPageDiv{ - min-height: 768px; padding-left: 230px; } .main-container .settingsNav { @@ -422,12 +421,10 @@ body{ .app-nav .app-indicator-icon-container { top: 0px; - height: 43px; + height: 42px; text-align: center; - line-height: 43px; -/* background-color: #2c3b49;*/ + line-height: 42px; color: #ffffff; - /*border-bottom: 1px solid #272B46;*/ .app-indicator-icon { font-size: 24px; line-height: 40px; @@ -859,10 +856,12 @@ a.menu-item:hover{ /*************************************************/ /******** View styles (List/Edit/Detail..) *******/ /*************************************************/ +.viewContent { + height: inherit; +} .viewContent .content-area{ padding-left : 3%; } - .viewContent .content-area.full-width{ padding-left : 15px; } @@ -1487,6 +1486,7 @@ ul.unstyled{ border-radius: 0px; font-weight: 100; cursor:pointer; + border-width: thin; } .module-buttons#ClearDemoData{ @@ -1501,6 +1501,7 @@ ul.unstyled{ border: 1px solid #ddd; color: #666; background: #fff; + border-width: thin; } .module-buttons:hover, .module-buttons:focus, @@ -2188,6 +2189,10 @@ strong, b, th{ font-size: 35px; } //ends +.detailViewContainer { + background:@detailViewbackground; + min-height: inherit; +} .detailViewContainer .block{ background:@white; border:1px solid @detailViewContainerBorderColor; @@ -2196,6 +2201,7 @@ strong, b, th{ hr{ margin: 10px 0; } + border-width: thin; } .editViewContainer .block{ @@ -2416,6 +2422,7 @@ strong, b, th{ padding : 15px; margin-bottom : 10px; background: @white; + border-width: thin; } .summaryView .fieldLabel{ @@ -2455,6 +2462,7 @@ strong, b, th{ padding : 15px; margin-bottom : 10px; background: @white; + border-width: thin; } .summaryWidgetContainer .widget_header{ @@ -2466,8 +2474,7 @@ strong, b, th{ } .summaryWidgetContainer .commentTitle{ - padding-left: 15px; - padding-right: 15px; + margin-bottom: 25px; } .summaryWidgetContainer .creatorName{ @@ -2491,6 +2498,7 @@ strong, b, th{ .noCommentsMsgContainer, .quick-preview-modal .noContent{ border : 1px solid #eee; + border-width: thin; } .summaryWidgetContainer .recordImage .name{ display: table-cell; @@ -5718,6 +5726,7 @@ hr{ -moz-box-sizing:border-box; -webkit-box-sizing:border-box; -o-box-sizing:border-box; + margin-bottom: 1px; } .row .nav>li>a:hover{ border-bottom-color:@relatedtabsborderbottomcolor; @@ -6767,6 +6776,8 @@ div.tooltip-inner{ background: white; padding: 15px; padding-top: 25px; + border:1px solid @detailViewContainerBorderColor; + border-width: thin; } .detailViewContainer .content-area, @@ -6784,12 +6795,14 @@ div.tooltip-inner{ } .detailview-content .details.row .relatedHeader{ border:1px solid @detailViewContainerBorderColor; + border-width: thin; } .detailview-content .details.row .relatedContents{ background: white; padding: 0; margin-top: 0; border:1px solid @detailViewContainerBorderColor; + border-width: thin; } .related-tabs.row{ background: @white; @@ -6873,7 +6886,8 @@ div.tooltip-inner{ display: inline-block; } .input-group-addon{ - line-height: 1.4; + line-height: 1.5; + border-width: thin; } .input-group{ float:left; @@ -7113,7 +7127,6 @@ margin-right: 5px; min-height:100%; .dashBoardTabContents ul{ position:relative; - height: 960px; width: 1260px; } } @@ -8496,6 +8509,8 @@ body .fc { } .commentcontent { border: 1px solid #ddd; + border-width: thin; + background: #fcfcfc; } .editViewHeader { padding-top: 20px; @@ -8507,6 +8522,17 @@ body .fc { .floatThead-floatContainer { margin-left: 1px; } +.navbar { + border: 1px solid @detailViewContainerBorderColor; + border-width: thin; +} +#appnav .navbar { + border: 0; + background: none; +} +.dashBoardContainer, .loginPageContainer { + min-height: calc(100vh - 110px); +} @media all and (min-width:0px) and (max-width: 830px) { //Responsive Table table.summary-table>tbody>tr>td, @@ -8587,7 +8613,7 @@ body .fc { font-size: 13px; } .overlay-container-60{ - margin-left:0px ; + margin-left:0 ; } .overlayPageContent { padding-bottom: 0; @@ -8620,5 +8646,14 @@ body .fc { margin-left: 1px; padding-top: 1px; } + .listViewPageDiv #table-content { + overflow: scroll !important; + } + #appnavcontent { + border: 1px solid #ccc; + background: #f0f0f0; + border-width: thin; + padding: 30px; + } } diff --git a/layouts/v7/skins/vtiger/variables.less b/layouts/v7/skins/vtiger/variables.less index 44816d2ecd0f29b9eb4c52f21e1553ab61fb8825..bd23650595375ed4fe6a304838220549186a912c 100644 --- a/layouts/v7/skins/vtiger/variables.less +++ b/layouts/v7/skins/vtiger/variables.less @@ -137,8 +137,8 @@ @layoutEditorAddBtnBorder : @blockBorder; //Detail view background color -@detailViewContainerBorderColor: @timeiconbackgroundcolor; -@detailViewbackground: @layoutAddButtonHover; +@detailViewContainerBorderColor: #eee; +@detailViewbackground: #f9f9f9; @referencefieldBackground:@timeiconbackgroundcolor; //relative activities images