Skip to content
Snippets Groups Projects
Commit 2fe6766c authored by gabriel's avatar gabriel
Browse files

next commit

parent 758c0dca
Branches
No related tags found
No related merge requests found
......@@ -4,24 +4,16 @@ import { BrowserModule } from '@angular/platform-browser';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
<<<<<<< src/app/app.module.ts
=======
import { ActivityCardsComponent } from './activity-cards/activity-cards.component';
import { ActivityContextDirective } from './activity-context.directive';
import { ChangePageComponent } from './change-page/change-page.component';
>>>>>>> src/app/app.module.ts
@NgModule({
declarations: [
AppComponent,
<<<<<<< src/app/app.module.ts
=======
ActivityCardsComponent,
ActivityContextDirective
ActivityContextDirective,
ChangePageComponent
>>>>>>> src/app/app.module.ts
],
imports: [
BrowserModule,
......
.background{
display: flex;
flex-wrap: nowrap;
width: 180vw;
}
.border{
background-color: brown;
height: 100vh;
width: 92vw;
width: 10vw;
padding: 0px;
margin: 0px;
transition-property: width;
......@@ -15,9 +16,9 @@
border: 0px !important;
}
.border2{
background-image: linear-gradient(red, yellow);
color: black;
height: 100vh;
width: 800vw;
width: 90vw;
padding: 0px;
margin: 0px;
transition-property: width;
......@@ -29,7 +30,7 @@
.border:hover {
background-color: brown;
height: 100vh;
width: 112vw;
width: 15vw;
padding: 0px;
margin: 0px;
transition-property: width;
......@@ -39,7 +40,7 @@
.bordertest{
background-color:brown;
height: 100vh;
width: 800vw;
width: 90vw;
padding: 0px;
margin: 0px;
transition-property: width;
......@@ -48,21 +49,17 @@
border: 0px;
}
.bordertest2{
background-image: linear-gradient(red, yellow);
height: 100vh;
width: 92vw;
padding: 0px;
width: 90vw;
margin: 0px;
border: 0px;
}
.bordertest2:hover{
background-image: linear-gradient(red, yellow);
height: 100vh;
width: 112vw;
margin-right: 5vw;
padding: 0px;
margin: 0px;
transition-property: width;
transition-property: margin;
transition-duration: 0.3s;
border: 0px;
}
\ No newline at end of file
<div class="background">
<div class="border" id="border" (click)="changeclass()"></div>
<div class="border2" id="border2" (click)="changeclass()"></div>
<app-activity-cards class="border2" id="border2" (click)="changeclass()"></app-activity-cards>
</div>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Slider</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
</head>
<body style="background-color: bisque; margin: 0px;">
<body style="background-color: bisque; margin: 0px; overflow: hidden;">
<app-root></app-root>
</body>
</html>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment