Merge remote-tracking branch 'origin/ivan' into ivan

CineSync/static/css/home/homepage.css

@@ -11,4 +11,10 @@
 }
 .carousel_title {
     margin-top: 3vw;
+}
+.film_preview_image {
+    object-fit: cover;
+    height: 35vw !important;
+    width: 25vw !important;
+    border-radius: 3vw;
 }

CineSync/static/css/style.css

@@ -1,45 +1,3 @@
-.film_preview_image {
-    object-fit: cover;
-    height: 35vw !important;
-    width: 25vw !important;
-    border-radius: 3vw;
-}
-.film_session_image {
-    margin-top: 40px;
-    object-fit: cover;
-    height: 20vw !important;
-    width: 50% !important;
-    border-radius: 3vw;
-}
-.line {
-    width: 30%;
-    height: 5px;
-    background-color: black;
-    position: absolute;
-    top: 70%;
-    border-radius: 3vw;
-    margin-left: 5%;
-    margin-top: 150px;
-}
-h6 {
-    text-align: center;
-    margin-top: 4px;
-}
-.seat_number {
-    width: 20px;
-    height: 18px;
-    text-align: center;
-}
-.buy_btn {
-    float: bottom;
-    margin-top: 40px;
-}
-.ticket_film_image {
-    object-fit: cover;
-    height: 20vw !important;
-    width: 25% !important;
-    border-radius: 3vw;
-}
 .caption_block {
     background-color: rgba(13, 39, 58, 0.8);
     border-radius: 2vw;
@@ -73,30 +31,6 @@ h6 {
     padding-bottom: 2vw;
     flex-direction: column;
 }
-.seats_card {
-    width: 100%;
-    background-color: #eaeaea;
-    margin-top: 1vw;
-    margin-bottom: 1vw;
-    border-radius: 3vw;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    align-items: center;
-    justify-content: flex-start;
-
-    width: 50%;
-    margin: 0 auto;
-    margin-top: 20px;
-}
-.card_body {
-    width: 80%;
-    margin-top: 180px;
-    margin: 0 auto;
-}
-.rows {
-    margin-top: 30%;
-}
 .film_card {
     width: 100%;
     background-color: #eaeaea;

CineSync/static/css/timetable/session.css

@@ -0,0 +1,60 @@
+.seats_card {
+    width: 100%;
+    background-color: #eaeaea;
+    margin-top: 1vw;
+    margin-bottom: 1vw;
+    border-radius: 3vw;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: flex-start;
+
+    width: 50%;
+    margin: 0 auto;
+    margin-top: 2vw;
+}
+.card_body {
+    width: 80%;
+    margin-top: 18vw;
+    margin: 0 auto;
+}
+.rows {
+    margin-top: 7vw;
+}
+.line {
+    width: 30%;
+    height: 0.5vw;
+    background-color: black;
+    position: absolute;
+    top: 70%;
+    border-radius: 3vw;
+    margin-left: 5%;
+    margin-top: 8vw;
+}
+h6 {
+    text-align: center;
+    margin-top: 0.4vw;
+}
+.seat_number {
+    width: 1vw;
+    height: 1.1vw;
+    text-align: center;
+}
+.buy_btn {
+    float: bottom;
+    margin-top: 1.5vw;
+}
+.ticket_film_image {
+    object-fit: cover;
+    height: 20vw !important;
+    width: 25% !important;
+    border-radius: 3vw;
+}
+.film_session_image {
+    margin-top: 4vw;
+    object-fit: cover;
+    height: 20vw !important;
+    width: 50% !important;
+    border-radius: 3vw;
+}

CineSync/templates/timetable/session.html

@@ -6,11 +6,12 @@
 {% endblock %}
 {% block content %}
 <link href="{% static 'css/style.css' %}" rel="stylesheet">
+<link href="{% static 'css/timetable/session.css' %}" rel="stylesheet">
 <div style="text-align: center;">
   <img src="{{ session.film.image.url }}" class="film_session_image"
                    alt="Фотография фильма не найдена">
 </div>
-<div class="seats_card" style="height: {{ height }}px;">
+<div class="seats_card" style="height: {{ height }}vw;">
   <div class="card_body">
     <h1>{{ session.film.name }}</h1>
     {{ session.auditorium.number }}<br>

CineSync/timetable/views.py

@@ -45,7 +45,7 @@ def session_view(request, sess_id):
         FilmSession.objects.all(),
         id=sess_id,
     )
-    height = session.auditorium.row_count * 80 + 300
+    height = session.auditorium.row_count * 6
     context = {
         'session': session,
         'seats': Row.objects.filter(auditorium_id=session.auditorium.id),