リビジョン f4745fee
| app/View/Programs/index.ctp | ||
|---|---|---|
| 22 | 22 |
</ul> |
| 23 | 23 |
</section> |
| 24 | 24 |
<?php endforeach; ?> |
| 25 |
<<<<<<< HEAD |
|
| 26 | 25 |
|
| 27 | 26 |
<!-- Blank Area --> |
| 28 | 27 |
|
| ... | ... | |
| 51 | 50 |
</section> |
| 52 | 51 |
</section> |
| 53 | 52 |
'; |
| 54 |
======= |
|
| 55 |
<?php var_dump($countprograms); ?> |
|
| 56 |
<?php |
|
| 57 |
if($countprograms < 9){
|
|
| 58 |
for($i=0 ; $i<(10-$countprograms) ; $i++){
|
|
| 59 |
echo '<section class="blank_data"> |
|
| 60 |
<a name="#save_data10"> |
|
| 61 |
<img src="/img/img_save_sample02.png" alt="タイトル"> |
|
| 62 |
</a> |
|
| 63 |
<span class="blank"><a href="">あたらしく作る</a></span> |
|
| 64 |
</section>'; |
|
| 65 |
} |
|
| 66 |
>>>>>>> 22fd3a57332c6aa77b895d52fe3fbc4a06169e05 |
|
| 67 | 53 |
} |
| 68 | 54 |
} |
| 69 | 55 |
?> |
| app/View/top/login_top.ctp | ||
|---|---|---|
| 15 | 15 |
<section class="howto"> |
| 16 | 16 |
<p class="howto_btn"><a href="/top/howto"><img src="/img/img_arrow_top04.png">PictCodeの使い方</a></p> |
| 17 | 17 |
</section> |
| 18 |
<section> |
|
| 19 |
<p class="withdraw">退会は<a href="#">コチラ</a></p> |
|
| 20 |
</section> |
|
| 18 | 21 |
</article> |
| 19 | 22 |
</main> |
| 20 | 23 |
|
| app/webroot/css/main.css | ||
|---|---|---|
| 860 | 860 |
box-shadow:none; |
| 861 | 861 |
} |
| 862 | 862 |
|
| 863 |
section p.withdraw {
|
|
| 864 |
display: block; |
|
| 865 |
float: right; |
|
| 866 |
margin:-60px 0 0; |
|
| 867 |
font-weight: bold; |
|
| 868 |
font-size: 14px !important; |
|
| 869 |
} |
|
| 870 |
|
|
| 871 |
section p.withdraw a {
|
|
| 872 |
color: red !important; |
|
| 873 |
font-size: 14px; |
|
| 874 |
} |
|
| 875 |
|
|
| 876 |
|
|
| 877 |
|
|
| 863 | 878 |
/* Program Delete */ |
| 864 | 879 |
|
| 865 | 880 |
section.delete img {
|
他の形式にエクスポート: Unified diff