Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

frontend/#167-RWD #175

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

frontend/#167-RWD #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edb1c9f
fix: styles for tablets added
paula0403 Apr 14, 2021
0be0b2d
fix:styles changed
paula0403 Apr 20, 2021
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
8 changes: 8 additions & 0 deletions client/src/components/App/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,11 @@ ul {
font-size: 32px;
}
}
@media screen and (max-width: 800px) {
.button--submit {
width: 100px;
margin-top: 10px;
padding: 0;
font-size: 0.7rem;
}
}
7 changes: 7 additions & 0 deletions client/src/components/CinemaHall/Seat/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,10 @@
.selected {
background: #cc6600;
}
@media screen and (max-width: 800px) {
.hall__seat {
min-height: 10px;
padding: 4px;
margin: 0 2px;
}
}
21 changes: 21 additions & 0 deletions client/src/components/CinemaHall/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,24 @@
}
}
}
@media screen and (max-width: 800px) {
.cinema__hall {
&__name {
padding: 16px 0;
font-size: 0.7rem;
}
&__arrangement {
width: 50%;
padding: 16px;
&__seats {
padding-top: 20px;
}

&__screen {
width: 60%;
margin: 0 auto 8px auto;
font-size: 0.7rem;
}
}
}
}
29 changes: 29 additions & 0 deletions client/src/components/Footer/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,32 @@
color: #f1f1f1;
letter-spacing: 2px;
}
@media screen and (max-width: 800px) {
.footer {
&__header {
letter-spacing: 6px;
font-size: 0.7rem;
}
&__list {
margin: 0 16px;
padding: 10px 0;
font-size: 7px;
}
&__item {
line-height: 1.5;
&:hover {
transition: none;
}
& span {
padding-right: 8px;
}
}
&-header {
font-size: 0.7rem;
letter-spacing: 3px;
}

font-size: 0.7rem;
letter-spacing: 1px;
}
}
14 changes: 14 additions & 0 deletions client/src/components/Navbar/CinemaForm/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,17 @@
border: thin solid gray;
}
}
@media screen and (max-width: 800px) {
.cinema-city__form {
font-size: 0.7rem;
margin: 5px;
&__select {
width: 200px;
margin-left: 8px;
border: none;
padding: 7px;
font-size: 0.7rem;
border: thin solid gray;
}
}
}
6 changes: 6 additions & 0 deletions client/src/components/Navbar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,9 @@
display: flex;
align-items: flex-start;
}
@media screen and (max-width: 800px) {
.navbar {
padding: 8px 16px;
font-size: 0.6rem;
}
}
22 changes: 21 additions & 1 deletion client/src/components/Ticket/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
&__heading {
text-align: center;
}
width: 432px;
max-width: 432px;
border: 2px #6e093a solid;
border-radius: 4px;
background: $color-primary;
Expand Down Expand Up @@ -68,3 +68,23 @@
width: 75%;
margin: 0 auto;
}
@media screen and (max-width: 800px) {
.ticket {
max-width: 150px;
padding: 6px;
margin: 0 8px 16px;
&__heading {
font-size: 0.6rem;
margin: 0 auto;
}
&__type {
font-size: 0.5rem;
}
&__price {
font-size: 0.5rem;
}
& label {
padding: 5px;
}
}
}
29 changes: 29 additions & 0 deletions client/src/domain/MovieInfoBar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,32 @@
cursor: pointer;
}
}
@media screen and (max-width: 800px) {
.movie {
&__image {
&-container {
width: 150px;
}
}
&__info {
font-size: 0.7rem;
padding-left: 20px;
line-height: 1.5;
&-title {
font-size: 0.7rem;
}
&-bar {
padding: 16px;
}
&-details {
font-size: 0.7rem;
}
}
}
.button--submit {
width: 100px;
margin-top: 10px;
padding: 0;
font-size: 0.7rem;
}
}
18 changes: 18 additions & 0 deletions client/src/domain/MovieSlider/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,21 @@
padding: 0 32px;
}
}
@media screen and (max-width: 800px) {
.slick {
&-slider {
height: 40vh;
Comment on lines +36 to +38
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is unsafe better make it px/rem based

margin-bottom: 30px;
}
}
.slider {
&_container {
height: 40vh;
padding: 20px;
}
& h2 {
padding: 0 16px;
font-size: 0.7rem;
}
}
}
21 changes: 21 additions & 0 deletions client/src/domain/MovieView/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,24 @@
padding-top: 16px;
}
}
@media screen and (max-width: 800px) {
.movie {
&__view {
&__container {
width: 40%;
}
& h3 {
font-size: 20px;
}
}

&-container {
padding: 20px;
}
}

&__header {
font-size: 16px;
padding-top: 8px;
}
}
2 changes: 1 addition & 1 deletion client/src/domain/Repertoire/RepertoireNav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import './style.scss';
import DatePicker from 'react-date-picker';
import 'react-date-picker/dist/DatePicker.css';
import CinemaForm from '../../../components/Navbar/CinemaForm';
import './style.scss';

function RepertoireNav({ selectedDate, setSelectedDate }) {
const handleDate = (date) => {
Expand Down
79 changes: 79 additions & 0 deletions client/src/domain/Repertoire/RepertoireNav/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,82 @@
padding: 10px;
}
}
@media screen and (max-width: 800px) {
.repertoire {
&__nav {
flex-direction: column;
align-items: center;
font-size: 0.7rem;
&__title {
font-size: 1rem;
margin: 5px;
}
&__picker {
background-color: #fff;
margin: 5px;
}
}
}
.react-date-picker {
&__button {
&__icon {
height: 12px;
}
}
&__wrapper {
padding: 5px;
}
}
.react-calendar {
max-width: 200px;
&__navigation {
&__label {
font-size: 0.6rem;
}
button {
min-width: 20px;
}
}
&__month {
&-view {
&__weekdays {
&__weekday {
font-size: 0.5rem;
}
}
&__days {
&__day {
font-size: 0.5rem;
}
}
}
}
&__year {
&-view {
&__months {
&__month {
font-size: 0.5rem;
}
}
}
}
&__decade {
&-view {
&__years {
&__year {
font-size: 0.5rem;
}
}
}
}
&__century {
&-view {
&__decades {
&__decade {
font-size: 0.5rem;
}
}
}
}
Comment on lines +56 to +96
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be an utility class like f-size1/2

}
}
22 changes: 22 additions & 0 deletions client/src/domain/ReservationView/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,25 @@
}
}
}
@media screen and (max-width: 800px) {
.reservation {
& h4 {
font-size: 20px;
margin-bottom: 20px;
}
& h5 {
font-size: 20px;
margin-bottom: 16px;
}
&__form {
& input {
font-size: 0.7rem;
max-width: 200px;
}
& h5 {
margin-bottom: 20px;
font-size: 16px;
}
Comment on lines +44 to +51
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't mix rem and px values (if possible). If mb is 20px it equals to 1.25rem etc

}
}
}