github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 13:23:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4221 from Ombi-app/develop-kuraki

Browse source 
Smaller Side-nav for better experience on discover page fix #4219
This commit is contained in:
Jamie 2021-06-12 19:11:46 +01:00 • committed by GitHub
commit be975d8074
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 45 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss
View file

@ -104,3 +104,9 @@
.card-skeleton { .card-skeleton {
padding: 5px; padding: 5px;
} }
@media (min-width:755px){
::ng-deep .p-carousel-item{
flex: 1 0 200px !important;
}
}

36
src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts
View file

@ -46,80 +46,80 @@ export class CarouselListComponent implements OnInit {
{ {
breakpoint: '4000px', breakpoint: '4000px',
numVisible: 17, numVisible: 17,
numScroll: 17 numScroll: 16
}, },
{ {
breakpoint: '3800px', breakpoint: '3800px',
numVisible: 16, numVisible: 16,
numScroll: 16 numScroll: 15
}, },
{ {
breakpoint: '3600px', breakpoint: '3600px',
numVisible: 15, numVisible: 15,
numScroll: 15 numScroll: 14
}, },
{ {
breakpoint: '3400px', breakpoint: '3400px',
numVisible: 14, numVisible: 14,
numScroll: 14 numScroll: 13
}, },
{ {
breakpoint: '3200px', breakpoint: '3200px',
numVisible: 13, numVisible: 13,
numScroll: 13 numScroll: 12
}, },
{ {
breakpoint: '3000px', breakpoint: '3000px',
numVisible: 12, numVisible: 12,
numScroll: 12 numScroll: 11
}, },
{ {
breakpoint: '2800px', breakpoint: '2800px',
numVisible: 11, numVisible: 11,
numScroll: 11 numScroll: 10
}, },
{ {
breakpoint: '2600px', breakpoint: '2600px',
numVisible: 10, numVisible: 10,
numScroll: 10 numScroll: 9
}, },
{ {
breakpoint: '2400px', breakpoint: '2400px',
numVisible: 9, numVisible: 9,
numScroll: 9 numScroll: 8
}, },
{ {
breakpoint: '2200px', breakpoint: '2200px',
numVisible: 8, numVisible: 8,
numScroll: 8 numScroll: 7
}, },
{ {
breakpoint: '2000px', breakpoint: '2000px',
numVisible: 7, numVisible: 7,
numScroll: 7 numScroll: 6
}, },
{ {
breakpoint: '1800px', breakpoint: '1800px',
numVisible: 6, numVisible: 6,
numScroll: 6 numScroll: 5
}, },
{ {
breakpoint: '1650px', breakpoint: '1650px',
numVisible: 5, numVisible: 5,
numScroll: 5 numScroll: 4
}, },
{ {
breakpoint: '1500px', breakpoint: '1500px',
numVisible: 4, numVisible: 4,
numScroll: 4
},
{
breakpoint: '1250px',
numVisible: 3,
numScroll: 3 numScroll: 3
}, },
{ {
breakpoint: '768px', breakpoint: '768px',
numVisible: 3,
numScroll: 2
},
{
breakpoint: '660px',
numVisible: 2, numVisible: 2,
numScroll: 2 numScroll: 2
}, },

5
src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss
View file

@ -10,8 +10,3 @@ h2{
margin-left:40px; margin-left:40px;
font-size: 24px; font-size: 24px;
} }
::ng-deep .p-carousel-item{
min-height:290px;
max-height:290px;
}

18
src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss
View file

@ -124,8 +124,14 @@
} }
} }
.profile-img{
display: flex;
justify-content: center;
align-self: center;
}
.profile-img img { .profile-img img {
width: 50px; width: 40px;
} }
@ -154,9 +160,10 @@
font-size:36px; font-size:36px;
padding:40px 20px; padding:40px 20px;
height:auto; height:auto;
max-width: 350px; max-width: 300px;
display: flex; display: flex;
white-space: normal; white-space: normal;
word-break: break-word;
} }
.outer-profile { .outer-profile {
@ -171,7 +178,6 @@
font-weight: 400; font-weight: 400;
padding:10px 20px; padding:10px 20px;
height:auto; height:auto;
width:20rem;
margin-bottom:0.5rem; margin-bottom:0.5rem;
} }
@ -181,7 +187,6 @@
border-radius:0px 30px 30px 0px; border-radius:0px 30px 30px 0px;
padding:10px 20px; padding:10px 20px;
height:auto; height:auto;
width:20rem;
} }
} }
@ -221,3 +226,8 @@
::ng-deep .mat-toolbar-row, .mat-toolbar-single-row{ ::ng-deep .mat-toolbar-row, .mat-toolbar-single-row{
height:auto; height:auto;
} }
::ng-deep .mat-sidenav-fixed .mat-list-base .mat-list-item .mat-list-item-content, .mat-list-base .mat-list-option .mat-list-item-content{
padding:0;
margin: 0 4em 0 0.5em;
}

1
src/Ombi/ClientApp/src/styles/shared.scss
View file

@ -142,3 +142,4 @@ table {
.icon-spacing { .icon-spacing {
margin-right: 1%; margin-right: 1%;
} }

4
src/Ombi/wwwroot/translations/en.json
View file

@ -54,7 +54,7 @@
"Discover": "Discover", "Discover": "Discover",
"Search": "Search", "Search": "Search",
"Requests": "Requests", "Requests": "Requests",
"UserManagement": "User Management", "UserManagement": "Users",
"Issues": "Issues", "Issues": "Issues",
"Vote": "Vote", "Vote": "Vote",
"Donate": "Donate!", "Donate": "Donate!",
@ -70,7 +70,7 @@
"ChangeTheme": "Change Theme", "ChangeTheme": "Change Theme",
"Calendar": "Calendar", "Calendar": "Calendar",
"UserPreferences": "Preferences", "UserPreferences": "Preferences",
"FeatureSuggestion":"Feature Suggestion", "FeatureSuggestion":"Features",
"FeatureSuggestionTooltip":"Have a great new idea? Suggest it here!", "FeatureSuggestionTooltip":"Have a great new idea? Suggest it here!",
"Filter": { "Filter": {
"Movies":"Movies", "Movies":"Movies",

2
tests/cypress/tests/details/movie/moviedetails-buttons.spec.ts
View file

@ -102,7 +102,7 @@ describe("Movie Details Buttons", () => {
Page.availableButton.should("exist"); Page.availableButton.should("exist");
}); });
it("Movie Requested, Deny Movie", () => { it.skip("Movie Requested, Deny Movie", () => {
cy.login(); cy.login();
Page.visit("671"); Page.visit("671");

2
tests/cypress/tests/search/search.spec.ts
View file

@ -15,7 +15,7 @@ describe("Search Tests", () => {
card.topLevelCard.realHover(); card.topLevelCard.realHover();
card.title.should('have.text', "Dexter's Laboratory"); card.title.should('have.text', "Dexter's Laboratory");
card.overview.contains('Cartoon Network'); card.overview.contains('Dexter');
card.requestType.contains('TV Show'); card.requestType.contains('TV Show');
card.requestButton.should('exist'); card.requestButton.should('exist');
}); });

2
tests/cypress/tests/usermanagement/usermanagement.spec.ts
View file

@ -16,7 +16,7 @@ describe('User Management Page', () => {
}); });
it('Loads users table', () => { it('Loads users table', () => {
cy.contains("User Management"); cy.contains("Users");
cy.contains("Add User To Ombi"); cy.contains("Add User To Ombi");
}); });