Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion records/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Migration(migrations.Migration):
name='Record',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('weather', models.CharField(choices=[('sunny', '해'), ('cloudy', '구름'), ('rainy', '비'), ('thunder', '천둥'), ('dust', '황사'), ('snowy', '눈')], max_length=10)),
('weather', models.CharField(choices=[('sunny', '해'), ('cloudy', '구름'), ('rainy', '비'), ('thunder', '천둥'), ('dust', '미세먼지'), ('snowy', '눈')], max_length=10)),
('content', models.TextField(max_length=500)),
('image', models.ImageField(blank=True, upload_to='records/%Y/%m/%d/')),
('emotions', models.JSONField(default=list)),
Expand Down
2 changes: 1 addition & 1 deletion records/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Weather(models.TextChoices):
CLOUDY = "cloudy", "구름"
RAINY = "rainy", "비"
THUNDER = "thunder", "천둥"
DUST = "dust", "황사"
DUST = "dust", "미세먼지"
SNOWY = "snowy", "눈"

user = models.ForeignKey(
Expand Down
30 changes: 19 additions & 11 deletions records/static/records/css/records.css
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,21 @@
height: 38px;
padding: 0;
place-items: center;
border: 1.5px solid var(--record-ink);
border: 0;
border-radius: 10px 8px 11px 7px;
color: var(--record-ink);
background: rgba(255, 249, 235, 0.92);
font-size: 1.65rem;
font-size: 0;
line-height: 1;
cursor: pointer;
background-image: url("../images/fullscreen.svg");
background-position: center;
background-repeat: no-repeat;
background-size: 20px 20px;
}

.record-modal--fullscreen .record-icon-button {
background-image: url("../images/minimize.svg");
}

.record-paper {
Expand Down Expand Up @@ -910,14 +918,14 @@ body.record-modal-open {

.record-detail-shell {
min-height: calc(100vh - 90px);
padding: 48px 24px;
padding: 24px 24px 32px;
background: transparent;
}

.record-detail-card {
width: min(1180px, calc(100vw - 48px));
width: min(1120px, calc(100vw - 48px));
max-width: 100%;
padding: clamp(28px, 4vw, 56px);
padding: clamp(22px, 3vw, 34px);
margin: 0 auto;
border: 1.5px solid var(--record-ink);
border-radius: 30px;
Expand Down Expand Up @@ -986,8 +994,8 @@ body.record-delete-modal-open {

.record-detail-header {
justify-content: space-between;
padding-bottom: 18px;
margin-bottom: 28px;
padding-bottom: 12px;
margin-bottom: 18px;
border-bottom: 1px dashed rgba(141, 121, 106, 0.38);
}

Expand Down Expand Up @@ -1030,8 +1038,8 @@ body.record-delete-modal-open {

.record-detail-layout {
display: grid;
grid-template-columns: minmax(260px, 0.8fr) minmax(360px, 1.4fr);
gap: clamp(38px, 5vw, 70px);
grid-template-columns: minmax(230px, 0.7fr) minmax(360px, 1.5fr);
gap: clamp(28px, 4vw, 48px);
align-items: stretch;
}

Expand Down Expand Up @@ -1151,8 +1159,8 @@ body.record-delete-modal-open {
align-items: center;
justify-content: space-between;
gap: 28px;
padding-top: 24px;
margin-top: 26px;
padding-top: 16px;
margin-top: 18px;
border-top: 1px dashed rgba(141, 121, 106, 0.38);
}

Expand Down
7 changes: 7 additions & 0 deletions records/static/records/images/fullscreen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions records/static/records/images/minimize.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions records/templates/records/partials/record_modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ <h1 class="sr-only" id="record-modal-title">오늘의 기록 작성</h1>
<span class="weather-icon weather-icon--thunder"></span>
<span class="sr-only">천둥</span>
</label>
<label class="weather-option" title="황사">
<label class="weather-option" title="미세먼지">
<input type="radio" name="weather" value="dust">
<span class="weather-icon weather-icon--dust"></span>
<span class="sr-only">황사</span>
<span class="sr-only">미세먼지</span>
</label>
<label class="weather-option" title="눈">
<input type="radio" name="weather" value="snowy">
Expand All @@ -143,7 +143,7 @@ <h1 class="sr-only" id="record-modal-title">오늘의 기록 작성</h1>
type="text"
name="title"
maxlength="40"
placeholder="오늘의 한 줄 제목을 적어 주세요"
placeholder="제목을 입력해주세요"
>
</label>
<label class="diary-field">
Expand Down
2 changes: 1 addition & 1 deletion records/templates/records/record_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
name="title"
maxlength="40"
value="{{ form.title.value|default_if_none:'' }}"
placeholder="오늘의 한 줄 제목을 적어 주세요"
placeholder="제목을 입력해주세요"
>
</label>
<label class="record-edit-diary">
Expand Down