瀏覽代碼

[add]

デザインを修正
poohr 3 週之前
父節點
當前提交
5e8cbe1dc9

+ 11
- 24
src/app/pages/danka-list/danka-list.scss 查看文件

43
 
43
 
44
 .search-area {
44
 .search-area {
45
   display: grid;
45
   display: grid;
46
-  grid-template-columns: 1fr 140px 190px 110px;
46
+  grid-template-columns: 1fr 140px 140px;
47
   gap: 18px;
47
   gap: 18px;
48
   align-items: center;
48
   align-items: center;
49
   margin-bottom: 18px;
49
   margin-bottom: 18px;
90
 .new-button,
90
 .new-button,
91
 .condition-button {
91
 .condition-button {
92
   height: 58px;
92
   height: 58px;
93
-  border: 2px solid #d8caba;
93
+  border: 2px solid #8a6543;
94
   border-radius: 8px;
94
   border-radius: 8px;
95
-  color: #2f2720;
95
+  background: #ffffff;
96
+  color: #8a6543;
96
   font-size: 18px;
97
   font-size: 18px;
97
   font-weight: 800;
98
   font-weight: 800;
98
   cursor: pointer;
99
   cursor: pointer;
99
   box-sizing: border-box;
100
   box-sizing: border-box;
100
 }
101
 }
101
 
102
 
102
-.search-button {
103
-  background: #8a6543;
104
-  border-color: #8a6543;
105
-  color: #ffffff;
106
-}
107
-
108
-.new-button {
109
-  background: #e6d8c4;
110
-}
111
-
112
 .condition-button {
103
 .condition-button {
113
   background: #ffffff;
104
   background: #ffffff;
114
 }
105
 }
115
 
106
 
116
-.search-button:hover {
117
-  background: #765639;
118
-}
119
-
107
+.search-button:hover,
120
 .new-button:hover,
108
 .new-button:hover,
121
 .condition-button:hover {
109
 .condition-button:hover {
122
   background: #f6efe6;
110
   background: #f6efe6;
178
 
166
 
179
 .list-content {
167
 .list-content {
180
   position: relative;
168
   position: relative;
181
-  padding-right: 172px;
182
 }
169
 }
183
 
170
 
184
 .danka-table {
171
 .danka-table {
194
 }
181
 }
195
 
182
 
196
 .danka-table-header {
183
 .danka-table-header {
197
-  min-height: 40px;
198
-  padding: 0 12px;
184
+  min-height: 36px;
185
+  padding: 0 10px;
199
   background: #eadfce;
186
   background: #eadfce;
200
   border: 2px solid #d8caba;
187
   border: 2px solid #d8caba;
201
   border-radius: 6px;
188
   border-radius: 6px;
202
   box-sizing: border-box;
189
   box-sizing: border-box;
203
   color: #5a4a3c;
190
   color: #5a4a3c;
204
-  font-size: 15px;
191
+  font-size: 14px;
205
   font-weight: 700;
192
   font-weight: 700;
206
 }
193
 }
207
 
194
 
208
 .danka-table-row {
195
 .danka-table-row {
209
-  min-height: 66px;
196
+  min-height: 54px;
210
   margin-top: 4px;
197
   margin-top: 4px;
211
-  padding: 0 12px;
198
+  padding: 0 10px;
212
   background: #fbf7f1;
199
   background: #fbf7f1;
213
   border: 2px solid #d8caba;
200
   border: 2px solid #d8caba;
214
   border-radius: 8px;
201
   border-radius: 8px;
215
   box-sizing: border-box;
202
   box-sizing: border-box;
216
   color: #2f2720;
203
   color: #2f2720;
217
-  font-size: 16px;
204
+  font-size: 15px;
218
   text-decoration: none;
205
   text-decoration: none;
219
 }
206
 }
220
 
207
 

+ 19
- 8
src/app/pages/memorial-list/memorial-list.scss 查看文件

38
 
38
 
39
 .title-filter-area {
39
 .title-filter-area {
40
   display: grid;
40
   display: grid;
41
-  gap: 4px;
41
+  gap: 12px;
42
+  min-width: 0;
42
 }
43
 }
43
 
44
 
44
 .page-title-row h1 {
45
 .page-title-row h1 {
52
 
53
 
53
 .filter-row {
54
 .filter-row {
54
   display: flex;
55
   display: flex;
55
-  align-items: center;
56
-  gap: 28px;
56
+  align-items: flex-start;
57
+  gap: 16px 28px;
57
   flex-wrap: wrap;
58
   flex-wrap: wrap;
58
 }
59
 }
59
 
60
 
85
 
86
 
86
 .memorial-filter {
87
 .memorial-filter {
87
   display: flex;
88
   display: flex;
88
-  align-items: center;
89
+  align-items: flex-start;
90
+  flex-wrap: wrap;
89
   gap: 8px;
91
   gap: 8px;
90
 }
92
 }
91
 
93
 
94
+.memorial-filter span {
95
+  min-height: 36px;
96
+  display: flex;
97
+  align-items: center;
98
+}
99
+
92
 .filter-button {
100
 .filter-button {
93
-  width: 108px;
94
-  height: 40px;
101
+  min-width: 86px;
102
+  height: 36px;
103
+  padding: 0 12px;
95
   border: 2px solid #d8caba;
104
   border: 2px solid #d8caba;
96
   border-radius: 6px;
105
   border-radius: 6px;
97
   background: #f1e7d8;
106
   background: #f1e7d8;
98
   color: #2f2720;
107
   color: #2f2720;
99
-  font-size: 15px;
108
+  font-size: 14px;
100
   font-weight: 700;
109
   font-weight: 700;
110
+  white-space: nowrap;
101
   cursor: pointer;
111
   cursor: pointer;
102
   box-sizing: border-box;
112
   box-sizing: border-box;
103
 }
113
 }
113
 }
123
 }
114
 
124
 
115
 .reload-button {
125
 .reload-button {
126
+  flex: 0 0 auto;
116
   width: 120px;
127
   width: 120px;
117
   height: 48px;
128
   height: 48px;
118
-  margin-top: 30px;
129
+  margin-top: 34px;
119
   border: 2px solid #8a6543;
130
   border: 2px solid #8a6543;
120
   border-radius: 6px;
131
   border-radius: 6px;
121
   background: #8a6543;
132
   background: #8a6543;

+ 24
- 0
src/app/pages/memorial-list/memorial-list.ts 查看文件

25
     { label: '十三回忌', value: '十三回忌' },
25
     { label: '十三回忌', value: '十三回忌' },
26
     { label: '十七回忌', value: '十七回忌' },
26
     { label: '十七回忌', value: '十七回忌' },
27
     { label: '二十三回忌', value: '二十三回忌' },
27
     { label: '二十三回忌', value: '二十三回忌' },
28
+    { label: '二十五回忌', value: '二十五回忌' },
29
+    { label: '二十七回忌', value: '二十七回忌' },
30
+    { label: '三十三回忌', value: '三十三回忌' },
31
+    { label: '三十七回忌', value: '三十七回忌' },
32
+    { label: '四十三回忌', value: '四十三回忌' },
33
+    { label: '四十七回忌', value: '四十七回忌' },
34
+    { label: '五十回忌', value: '五十回忌' },
35
+    { label: '百回忌', value: '百回忌' },
28
   ];
36
   ];
29
 
37
 
30
   constructor(
38
   constructor(
98
         return '十七回忌';
106
         return '十七回忌';
99
       case 22:
107
       case 22:
100
         return '二十三回忌';
108
         return '二十三回忌';
109
+      case 24:
110
+        return '二十五回忌';
111
+      case 26:
112
+        return '二十七回忌';
113
+      case 32:
114
+        return '三十三回忌';
115
+      case 36:
116
+        return '三十七回忌';
117
+      case 42:
118
+        return '四十三回忌';
119
+      case 46:
120
+        return '四十七回忌';
121
+      case 49:
122
+        return '五十回忌';
123
+      case 99:
124
+        return '百回忌';
101
       default:
125
       default:
102
         return '';
126
         return '';
103
     }
127
     }

Loading…
取消
儲存