Browse Source

[kitagata_support-13158] 【HP更新依頼】トップページ変更 確認待ち

keyt123 3 years ago
parent
commit
692e928aca
5 changed files with 60 additions and 31 deletions
  1. 19
    14
      .idea/workspace.xml
  2. BIN
      css/img/kawasemi-stools.png
  3. 2
    2
      css/section_190212.css
  4. 32
    14
      index.html
  5. 7
    1
      second/Notices.html

+ 19
- 14
.idea/workspace.xml View File

25
     <select />
25
     <select />
26
   </component>
26
   </component>
27
   <component name="ChangeListManager">
27
   <component name="ChangeListManager">
28
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13149] HP更新依頼">
28
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-13152] HP更新依頼(子ども館)">
29
+      <change afterPath="$PROJECT_DIR$/css/img/kawasemi-stools.png" afterDir="false" />
29
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
30
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
31
+      <change beforePath="$PROJECT_DIR$/css/section_190212.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/section_190212.css" afterDir="false" />
32
+      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
33
+      <change beforePath="$PROJECT_DIR$/second/Notices.html" beforeDir="false" afterPath="$PROJECT_DIR$/second/Notices.html" afterDir="false" />
30
     </list>
34
     </list>
31
     <option name="SHOW_DIALOG" value="false" />
35
     <option name="SHOW_DIALOG" value="false" />
32
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
36
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
46
   <component name="Git.Settings">
50
   <component name="Git.Settings">
47
     <option name="RECENT_BRANCH_BY_REPOSITORY">
51
     <option name="RECENT_BRANCH_BY_REPOSITORY">
48
       <map>
52
       <map>
49
-        <entry key="$PROJECT_DIR$" value="feature/130013" />
53
+        <entry key="$PROJECT_DIR$" value="master" />
50
       </map>
54
       </map>
51
     </option>
55
     </option>
52
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
56
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
99
       <recent name="$PROJECT_DIR$/third/Public_transport" />
103
       <recent name="$PROJECT_DIR$/third/Public_transport" />
100
     </key>
104
     </key>
101
     <key name="MoveFile.RECENT_KEYS">
105
     <key name="MoveFile.RECENT_KEYS">
102
-      <recent name="$PROJECT_DIR$/css/pdf" />
103
       <recent name="$PROJECT_DIR$/css/img" />
106
       <recent name="$PROJECT_DIR$/css/img" />
104
       <recent name="$PROJECT_DIR$/fourth/assembly/pdf" />
107
       <recent name="$PROJECT_DIR$/fourth/assembly/pdf" />
108
+      <recent name="$PROJECT_DIR$/css/pdf" />
105
       <recent name="$PROJECT_DIR$/fourth/lifeguide/water/pdf" />
109
       <recent name="$PROJECT_DIR$/fourth/lifeguide/water/pdf" />
106
       <recent name="$PROJECT_DIR$/third/notices" />
110
       <recent name="$PROJECT_DIR$/third/notices" />
107
     </key>
111
     </key>
224
       <workItem from="1627358773518" duration="21000" />
228
       <workItem from="1627358773518" duration="21000" />
225
       <workItem from="1627435559844" duration="706000" />
229
       <workItem from="1627435559844" duration="706000" />
226
       <workItem from="1627458787353" duration="4411000" />
230
       <workItem from="1627458787353" duration="4411000" />
227
-      <workItem from="1627543350697" duration="312000" />
228
-    </task>
229
-    <task id="LOCAL-00082" summary="[kitagata_support-12869] 修正依頼 Re-  Re-   HP更新依頼(北方町議会>請願陳情)">
230
-      <created>1623824768709</created>
231
-      <option name="number" value="00082" />
232
-      <option name="presentableId" value="LOCAL-00082" />
233
-      <option name="project" value="LOCAL" />
234
-      <updated>1623824768709</updated>
231
+      <workItem from="1627543350697" duration="497000" />
232
+      <workItem from="1627608564292" duration="2912000" />
235
     </task>
233
     </task>
236
     <task id="LOCAL-00083" summary="[kitagata_support-12893] HP更新依頼(物品調達方針)">
234
     <task id="LOCAL-00083" summary="[kitagata_support-12893] HP更新依頼(物品調達方針)">
237
       <created>1624412170783</created>
235
       <created>1624412170783</created>
569
       <option name="project" value="LOCAL" />
567
       <option name="project" value="LOCAL" />
570
       <updated>1627463216787</updated>
568
       <updated>1627463216787</updated>
571
     </task>
569
     </task>
572
-    <option name="localTasksCounter" value="131" />
570
+    <task id="LOCAL-00131" summary="[kitagata_support-13152] HP更新依頼(子ども館)">
571
+      <created>1627543822409</created>
572
+      <option name="number" value="00131" />
573
+      <option name="presentableId" value="LOCAL-00131" />
574
+      <option name="project" value="LOCAL" />
575
+      <updated>1627543822409</updated>
576
+    </task>
577
+    <option name="localTasksCounter" value="132" />
573
     <servers />
578
     <servers />
574
   </component>
579
   </component>
575
   <component name="TypeScriptGeneratedFilesManager">
580
   <component name="TypeScriptGeneratedFilesManager">
616
   </component>
621
   </component>
617
   <component name="VcsManagerConfiguration">
622
   <component name="VcsManagerConfiguration">
618
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
623
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
619
-    <MESSAGE value="[kitagata_support-13009] HP更新依頼(プレミアム商品券販売)" />
620
     <MESSAGE value="[kitagata_support-13010] HP更新依頼(プレミアム商品券取扱店募集)" />
624
     <MESSAGE value="[kitagata_support-13010] HP更新依頼(プレミアム商品券取扱店募集)" />
621
     <MESSAGE value="[WIP] 12931 ファイルを一部追加" />
625
     <MESSAGE value="[WIP] 12931 ファイルを一部追加" />
622
     <MESSAGE value="[kitagata_support-13014] Re- HP更新依頼【削除依頼】(小規模事業者持続化補助金)" />
626
     <MESSAGE value="[kitagata_support-13014] Re- HP更新依頼【削除依頼】(小規模事業者持続化補助金)" />
641
     <MESSAGE value="[kitagata_support-13141] 【HP更新依頼】町長のつぶやき" />
645
     <MESSAGE value="[kitagata_support-13141] 【HP更新依頼】町長のつぶやき" />
642
     <MESSAGE value="[kitagata_support-13148] HP更新依頼" />
646
     <MESSAGE value="[kitagata_support-13148] HP更新依頼" />
643
     <MESSAGE value="[kitagata_support-13149] HP更新依頼" />
647
     <MESSAGE value="[kitagata_support-13149] HP更新依頼" />
644
-    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13149] HP更新依頼" />
648
+    <MESSAGE value="[kitagata_support-13152] HP更新依頼(子ども館)" />
649
+    <option name="LAST_COMMIT_MESSAGE" value="[kitagata_support-13152] HP更新依頼(子ども館)" />
645
   </component>
650
   </component>
646
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
651
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
647
     <SUITE FILE_PATH="coverage/kitagata$.dat" NAME="更新用 Coverage Results" MODIFIED="1569418362637" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="WipCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
652
     <SUITE FILE_PATH="coverage/kitagata$.dat" NAME="更新用 Coverage Results" MODIFIED="1569418362637" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="WipCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />

BIN
css/img/kawasemi-stools.png View File


+ 2
- 2
css/section_190212.css View File

458
 span#kawasemi_text {
458
 span#kawasemi_text {
459
   position: absolute;
459
   position: absolute;
460
   display: block;
460
   display: block;
461
-  top: 384px;
461
+  top: 264px;
462
   left: 20px;
462
   left: 20px;
463
   color: #888888;
463
   color: #888888;
464
   font-size: 12px;
464
   font-size: 12px;
1295
   text-align: right;
1295
   text-align: right;
1296
 }
1296
 }
1297
 
1297
 
1298
-/* 各コンテンツブロック配置 */
1298
+/* 各コンテンツブロック配置 */

+ 32
- 14
index.html View File

292
               </span>
292
               </span>
293
             </span>
293
             </span>
294
 
294
 
295
+            <span class="block_line">
296
+              <span class="block_line_date2">2021.08.01</span>
297
+              <span class="block_line_char2">
298
+                <a href="third/living/Kwasemi_mail.html">きたがた情報メール「カワセミ便」を開始します</a>
299
+              </span>
300
+            </span>
301
+
295
             <span class="block_line">
302
             <span class="block_line">
296
               <span class="block_line_date2">2021.08.01</span>
303
               <span class="block_line_date2">2021.08.01</span>
297
               <span class="block_line_char2">
304
               <span class="block_line_char2">
1698
         </article>
1705
         </article>
1699
       </section>
1706
       </section>
1700
 
1707
 
1708
+<!--      カワセミ便バナー-->
1709
+      <section id="aichat">
1710
+        <article id="aichat">
1711
+          <div id="aichat">
1712
+            <a href="third/living/Kwasemi_mail.html">
1713
+              <img src="./css/img/kawasemi-stools.png" height="60px" width="160px">
1714
+            </a>
1715
+          </div>
1716
+        </article>
1717
+      </section>
1718
+
1701
       <!--セクション 北方町AIchat-->
1719
       <!--セクション 北方町AIchat-->
1702
       <section id="aichat">
1720
       <section id="aichat">
1703
         <article id="aichat">
1721
         <article id="aichat">
1720
           <div class="intro_population_img">
1738
           <div class="intro_population_img">
1721
             <img src="css/img/080.png" alt="人口密度県内1位" />
1739
             <img src="css/img/080.png" alt="人口密度県内1位" />
1722
           </div>
1740
           </div>
1723
-          <div class="population">
1724
-            <canvas id="Maletofemaleratio" width="180" height="120"></canvas>
1725
-            <span id="PopMan_text">男性</span>
1726
-            <span id="PopWoman_text">女性</span>
1727
-            <span id="PerPopMan_text"></span>
1728
-            <span id="PerPopWoman_text"></span>
1729
-          </div>
1741
+<!--          <div class="population">-->
1742
+<!--            <canvas id="Maletofemaleratio" width="180" height="120"></canvas>-->
1743
+<!--            <span id="PopMan_text">男性</span>-->
1744
+<!--            <span id="PopWoman_text">女性</span>-->
1745
+<!--            <span id="PerPopMan_text"></span>-->
1746
+<!--            <span id="PerPopWoman_text"></span>-->
1747
+<!--          </div>-->
1730
           <img src="css/img/kawasemi_01.png" name="kawasemi" id="kawasemi_img" alt="まちの鳥・カワセミ" />
1748
           <img src="css/img/kawasemi_01.png" name="kawasemi" id="kawasemi_img" alt="まちの鳥・カワセミ" />
1731
           <span id="kawasemi_text">まちの鳥・カワセミ</span>
1749
           <span id="kawasemi_text">まちの鳥・カワセミ</span>
1732
           <div id="intro_text" style="margin-bottom:0;">
1750
           <div id="intro_text" style="margin-bottom:0;">
2032
       </section>
2050
       </section>
2033
 
2051
 
2034
       <!--セクション 今、住居を建てるなら北方町で-->
2052
       <!--セクション 今、住居を建てるなら北方町で-->
2035
-      <section id="incentives">
2036
-        <a class="i_link" href="third/living/Settlement_incentive.html">
2037
-          <img src="css/img/banner_Settlement.png" width="170px" style="text-align: center;padding-top: 10px;"
2038
-            alt="今、住居を建てるなら北方町で" />
2039
-        </a>
2040
-      </section>
2053
+<!--      <section id="incentives">-->
2054
+<!--        <a class="i_link" href="third/living/Settlement_incentive.html">-->
2055
+<!--          <img src="css/img/banner_Settlement.png" width="170px" style="text-align: center;padding-top: 10px;"-->
2056
+<!--            alt="今、住居を建てるなら北方町で" />-->
2057
+<!--        </a>-->
2058
+<!--      </section>-->
2041
 
2059
 
2042
       <section id="comcen1">
2060
       <section id="comcen1">
2043
         <article id="comcen1">
2061
         <article id="comcen1">
2632
   </div>
2650
   </div>
2633
 </body>
2651
 </body>
2634
 
2652
 
2635
-</html>
2653
+</html>

+ 7
- 1
second/Notices.html View File

154
               </span>
154
               </span>
155
             </div>
155
             </div>
156
 
156
 
157
+            <div class="list_notices">
158
+              <span class="list_notices_date">2021.08.01</span>
159
+              <span class="list_notices_text">
160
+                <a href="../third/living/Kwasemi_mail.html">きたがた情報メール「カワセミ便」を開始します</a>
161
+              </span>
162
+            </div>
157
 
163
 
158
             <div class="list_notices">
164
             <div class="list_notices">
159
               <span class="list_notices_date">2021.08.01</span>
165
               <span class="list_notices_date">2021.08.01</span>
1571
     width="1" />
1577
     width="1" />
1572
 </body>
1578
 </body>
1573
 
1579
 
1574
-</html>
1580
+</html>

Loading…
Cancel
Save