lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean indent in theme directory

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-10-26 21:11:36 +02:00
parent c8259ff380
commit 7f3f48be0f
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
3 changed files with 97 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/setup/codesniffer/ruleset.xml
View File

@ -186,7 +186,7 @@
<!-- Check indent are done with spaces and with correct number --> <!-- Check indent are done with spaces and with correct number -->
<!-- Disabled as this does not support tab --> <!-- Disabled as this does not support tab -->
<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> --> <!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
<!-- TODO Enable this
<arg name="tab-width" value="4"/> <arg name="tab-width" value="4"/>
<rule ref="Generic.WhiteSpace.ScopeIndent"> <rule ref="Generic.WhiteSpace.ScopeIndent">
<properties> <properties>
@ -194,7 +194,7 @@
<property name="tabIndent" value="true"/> <property name="tabIndent" value="true"/>
</properties> </properties>
</rule> </rule>
-->
<rule ref="Squiz.WhiteSpace.ScopeClosingBrace.Indent" /> <rule ref="Squiz.WhiteSpace.ScopeClosingBrace.Indent" />

31
htdocs/theme/md/style.css.php
View File

@ -1230,8 +1230,9 @@ td.showDragHandle {
display: block; display: block;
font-family: "RobotoDraft","Roboto",sans-serif; font-family: "RobotoDraft","Roboto",sans-serif;
left: 0; left: 0;
<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> <?php
<?php } else { ?> if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
} else { ?>
position: fixed; position: fixed;
top: 50px; top: 50px;
<?php } ?> <?php } ?>
@ -1259,12 +1260,14 @@ td.showDragHandle {
-moz-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); -moz-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> <?php
<?php } else { ?> if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
} else { ?>
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
<?php } ?> <?php }
<?php } ?> }
?>
} }
/* /*
@ -1315,8 +1318,9 @@ div.login_block {
} }
.side-nav { .side-nav {
<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> <?php
<?php } else { ?> if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
} else { ?>
overflow-x: initial !important; overflow-x: initial !important;
overflow-y: scroll; overflow-y: scroll;
<?php } ?> <?php } ?>
@ -1363,7 +1367,8 @@ div.login_block {
z-index: 91; z-index: 91;
background: rgb(<?php echo $colorbackvmenu1; ?>); background: rgb(<?php echo $colorbackvmenu1; ?>);
border-right: 1px solid rgba(0,0,0,0.3); border-right: 1px solid rgba(0,0,0,0.3);
<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?> <?php
if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
top: 50px ! important; top: 50px ! important;
<?php } else { ?> <?php } else { ?>
top: 60px ! important; top: 60px ! important;
@ -1896,7 +1901,9 @@ $moduletomainmenu=array(
'don'=>'accountancy','tax'=>'accountancy','banque'=>'accountancy','facture'=>'accountancy','compta'=>'accountancy','accounting'=>'accountancy','adherent'=>'members','import'=>'tools','export'=>'tools','mailing'=>'tools', 'don'=>'accountancy','tax'=>'accountancy','banque'=>'accountancy','facture'=>'accountancy','compta'=>'accountancy','accounting'=>'accountancy','adherent'=>'members','import'=>'tools','export'=>'tools','mailing'=>'tools',
'contrat'=>'commercial','ficheinter'=>'commercial','ticket'=>'ticket','deplacement'=>'commercial', 'contrat'=>'commercial','ficheinter'=>'commercial','ticket'=>'ticket','deplacement'=>'commercial',
'fournisseur'=>'companies', 'fournisseur'=>'companies',
'barcode'=>'','fckeditor'=>'','categorie'=>'', 'barcode'=>'',
'fckeditor'=>'',
'categorie'=>'',
); );
$mainmenuused='home'; $mainmenuused='home';
foreach($conf->modules as $val) foreach($conf->modules as $val)
@ -1960,9 +1967,7 @@ foreach($mainmenuusedarray as $val)
} }
} }
// End of part to add more div class css // End of part to add more div class css
?> } // End test if $dol_hide_topmenu ?>
<?php } // End test if $dol_hide_topmenu ?>
.tmenuimage { .tmenuimage {
padding:0 0 0 0 !important; padding:0 0 0 0 !important;