Browse Source

[kitagata_support-14535] HP更新依頼(北方町公共施設) 途中

keyt123 2 years ago
parent
commit
924b19c75f

+ 4
- 0
.idea/shelf/2022_01_06_18_13_____Default_Changelist_.xml View File

@@ -0,0 +1,4 @@
1
+<changelist name="2022_01_06_18_13_の_チェックアウト_前の未コミットの変更_[Default_Changelist]" date="1641460407108" recycled="true" deleted="true">
2
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/2022_01_06_18_13_の_チェックアウト_前の未コミットの変更_[Default_Changelist]/shelved.patch" />
3
+  <option name="DESCRIPTION" value="2022/01/06 18:13 の チェックアウト 前の未コミットの変更 [Default Changelist]" />
4
+</changelist>

+ 71
- 0
.idea/shelf/2022_01_06_18_13_の_チェックアウト_前の未コミットの変更_[Default_Changelist]/shelved.patch
File diff suppressed because it is too large
View File


+ 3
- 4
.idea/workspace.xml View File

@@ -25,10 +25,9 @@
25 25
     <select />
26 26
   </component>
27 27
   <component name="ChangeListManager">
28
-    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support-14502] 【平川】HP更新依頼(子ども館)">
28
+    <list default="true" id="ab062a69-921d-4f1f-adc3-51aef1a89d97" name="Default Changelist" comment="[kitagata_support/14536] HP更新依頼(セーフティネット5号)">
29 29
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
30
-      <change beforePath="$PROJECT_DIR$/fourth/business/Safety_net_5.html" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/business/Safety_net_5.html" afterDir="false" />
31
-      <change beforePath="$PROJECT_DIR$/fourth/business/safety_net_5_industry_table.pdf" beforeDir="false" afterPath="$PROJECT_DIR$/fourth/business/safety_net_5_industry_table.pdf" afterDir="false" />
30
+      <change beforePath="$PROJECT_DIR$/css/section_190212.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/section_190212.css" afterDir="false" />
32 31
     </list>
33 32
     <option name="SHOW_DIALOG" value="false" />
34 33
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -43,7 +42,7 @@
43 42
     </option>
44 43
   </component>
45 44
   <component name="Git.Merge.Settings">
46
-    <option name="BRANCH" value="feature/kitagata-14058" />
45
+    <option name="BRANCH" value="master" />
47 46
   </component>
48 47
   <component name="Git.Settings">
49 48
     <option name="RECENT_BRANCH_BY_REPOSITORY">

+ 2
- 2
css/section_190212.css View File

@@ -403,7 +403,7 @@ section#intro {
403 403
     top: 0px;
404 404
     left: 0px;
405 405
     width: 200px;
406
-    height: 437px;
406
+    height: 347px;
407 407
     margin: 10px 10px 10px 0px;
408 408
     background-color: #ffffff;
409 409
     /*background-image: url(img/kitagata_background.png);*/
@@ -415,7 +415,7 @@ article#intro {
415 415
     width: 180px;
416 416
     height: 530px;
417 417
     margin: 0px 0px 0px 0px;
418
-    padding: 10px 10px 10px 10px;
418
+    padding: 5px 10px 10px 10px;
419 419
 }
420 420
 
421 421
 div#intro_title {

Loading…
Cancel
Save