Pārlūkot izejas kodu

[add]

デザインを修正
poohr 3 nedēļas atpakaļ
vecāks
revīzija
5e8cbe1dc9

+ 11
- 24
src/app/pages/danka-list/danka-list.scss Parādīt failu

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

+ 19
- 8
src/app/pages/memorial-list/memorial-list.scss Parādīt failu

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

+ 24
- 0
src/app/pages/memorial-list/memorial-list.ts Parādīt failu

@@ -25,6 +25,14 @@ export class MemorialList {
25 25
     { label: '十三回忌', value: '十三回忌' },
26 26
     { label: '十七回忌', value: '十七回忌' },
27 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 38
   constructor(
@@ -98,6 +106,22 @@ export class MemorialList {
98 106
         return '十七回忌';
99 107
       case 22:
100 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 125
       default:
102 126
         return '';
103 127
     }

Notiek ielāde…
Atcelt
Saglabāt