Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/272' into 'sprint/272_tsj_theme'

Browse Source 
# Conflicts:
#   module/block/view/visionswitch.html.php
This commit is contained in:
孙广明
2022-12-21 07:59:41 +00:00
parent a2fa75e05b 9edf73ff68
commit dac9acb115
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/visionswitch.html.php
+9 -8
View File
@@ -1,20 +1,15 @@
<style>
.vision-switch {padding: 14px;}
.vision-switch-container {display: flex;}
#vision-lite {background: url('/theme/default/images/guide/vision_lite.png') no-repeat;}
.vision {width: 47%; border: none; background-color: rgba(230, 240 , 255, 0.4); cursor:pointer; border-radius: 2px; padding: 10px 10px 0 10px;}
.vision + .vision {margin-left: 10px;}
.vision:hover {box-shadow: 0 0 14px rgba(0, 0, 0, 0.12);}
<<<<<<< module/block/view/visionswitch.html.php
.vision.active {box-shadow: 0 0 0 2px #2E7FFF;}
.vision-img {height: 118px; width: 100%; background-size: 100% !important;}
.vision-title {font-size: 14px; color: #0B0F18; padding: 0 8px;}
.vision-title {font-size: 14px; color: #0B0F18; padding: 0 8px; margin-top: 10px;}
.vision-text {font-size: 12px; color: #5E626D; padding: 8px;}
</style>
<?php if(common::checkNotCN()):?>
<style>#vision-rnd {background: url('/theme/default/images/guide/vision_rnd_en.png') no-repeat;}</style>
<?php else:?>
<style>#vision-rnd {background: url('/theme/default/images/guide/vision_rnd_cn.png') no-repeat;}</style>
<?php endif;?>
<?php js::set('vision', $this->config->vision);?>
<div class='vision-switch'>
<p><?php echo $lang->block->visionTitle;?></p>
@@ -22,7 +17,13 @@
<?php foreach($lang->block->visions as $vision):?>
<?php $active = $this->config->vision == $vision->key ? 'active' : '';?>
<a href="<?php echo $this->createLink('my', 'ajaxSwitchVision', "vision=$vision->key");?>" data-type="ajax" class='vision <?php echo $active;?>' data-value="<?php echo $vision->key;?>">
<div class='vision-img' id="<?php echo 'vision-' . $vision->key;?>"></div>
<div class='vision-img'>
<?php if(common::checkNotCN() and $vision->key == 'rnd'):?>
<?php echo html::image($config->webRoot . "theme/default/images/guide/vision_{$vision->key}_en.png");?>
<?php else:?>
<?php echo html::image($config->webRoot . "theme/default/images/guide/vision_{$vision->key}.png");?>
<?php endif;?>
</div>
<div class='vision-title'><?php echo $vision->title;?></div>
<div class='vision-text'><?php echo $vision->text;?></div>
</a>