Skip to content

Commit

Permalink
chore: prettier scss
Browse files Browse the repository at this point in the history
  • Loading branch information
mistic100 committed Sep 16, 2023
1 parent be4292d commit d281ee2
Show file tree
Hide file tree
Showing 18 changed files with 156 additions and 146 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ root = true
[*]
charset = utf-8
indent_style = space
indent_size = 2
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start": "ng serve --watch",
"start:mock": "ng serve --watch --configuration=mock",
"build": "ng build --configuration production",
"lint": "ng lint --fix"
"lint": "ng lint --fix && prettier src/**/*.scss --write"
},
"dependencies": {
"@angular/animations": "^16.2.5",
Expand Down
62 changes: 31 additions & 31 deletions src/app/components/map/info/map-info.component.scss
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
.couleur {
height: 1rem;
width: 100%;
border: 1px solid transparent;
margin-top: 0.25rem;
height: 1rem;
width: 100%;
border: 1px solid transparent;
margin-top: 0.25rem;
}

.panneau {
background: #555;
position: relative;
height: 15px;
background: #555;
position: relative;
height: 15px;

&:before {
display: none;
content: '';
position: absolute;
height: 100%;
width: 50%;
background: #DA9A14;
}
&:before {
display: none;
content: '';
position: absolute;
height: 100%;
width: 50%;
background: #da9a14;
}

&:after {
display: none;
content: '';
position: absolute;
height: 100%;
width: 50%;
right: 0;
background: #4E84A2;
}
&:after {
display: none;
content: '';
position: absolute;
height: 100%;
width: 50%;
right: 0;
background: #4e84a2;
}

&--JAUNE:before {
display: block;
}
&--JAUNE:before {
display: block;
}

&--BLEU:after {
display: block;
}
}
&--BLEU:after {
display: block;
}
}
2 changes: 1 addition & 1 deletion src/app/components/map/input/game-status.manager.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Point } from 'app/models/Point';
import Konva from 'konva';
import { TABLE } from '../../../constants/constants';
import { DistribPot, GameStatus, PlanteEnPot, TypePlante } from '../../../models/ageOfBots/GameStatus';
import { DistribPot, GameStatus, PlanteEnPot, TypePlante } from '../../../models/farmingMars/GameStatus';

function mapLinear(x: number, a1: number, a2: number, b1: number, b2: number): number {
return b1 + ((x - a1) * (b2 - b1)) / (a2 - a1);
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/map/input/map-input.component.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.map-container {
cursor: none;
cursor: none;
}
14 changes: 7 additions & 7 deletions src/app/components/misc/app-navbar/app-navbar.component.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.robot-status-badge {
width: 80px;
height: 20px;
border-radius: 10px;
cursor: pointer;
width: 80px;
height: 20px;
border-radius: 10px;
cursor: pointer;

&--active {
outline: 2px solid currentColor;
}
&--active {
outline: 2px solid currentColor;
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
@import 'src/styles/variables';

.mouvement-icon {
flex: none;
width: 3.5rem;
height: 3.5rem;
background: $secondary;
border-radius: 50%;
font-size: 2rem;
line-height: 1;
color: white;
display: flex;
align-items: center;
justify-content: center;
flex: none;
width: 3.5rem;
height: 3.5rem;
background: $secondary;
border-radius: 50%;
font-size: 2rem;
line-height: 1;
color: white;
display: flex;
align-items: center;
justify-content: center;
}
3 changes: 0 additions & 3 deletions src/app/components/sidebars/bras/bras.component.scss

This file was deleted.

1 change: 0 additions & 1 deletion src/app/components/sidebars/bras/bras.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const RATIO = 1.5;
@Component({
selector: 'arig-sidebar-bras',
templateUrl: 'bras.component.html',
styleUrls: ['bras.component.scss'],
})
export class SidebarBrasComponent extends AbstractSidebarContainer implements OnInit, AfterViewInit {
@ViewChild('container', { static: true }) container: ElementRef;
Expand Down
58 changes: 29 additions & 29 deletions src/app/modals/logs-modal/logs-modal.component.scss
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
@import 'src/styles/variables';

.logs-container {
max-height: calc(100vh - 115px);
overflow-y: scroll;
font-family: monospace;
font-size: $font-size-sm;
list-style: none;
padding: 0;
max-height: calc(100vh - 115px);
overflow-y: scroll;
font-family: monospace;
font-size: $font-size-sm;
list-style: none;
padding: 0;
}

.log-item > * {
margin-right: 1ch;
margin-right: 1ch;
}

.log-date {
display: inline-block;
color: $light;
display: inline-block;
color: $light;
}

.log-level {
display: inline-block;
width: 5ch;
font-weight: bold;

&--DEBUG,
&--INFO {
color: $info;
}

&--WARN {
color: $warning;
}

&--ERROR,
&--FATAL {
color: $danger;
}
display: inline-block;
width: 5ch;
font-weight: bold;

&--DEBUG,
&--INFO {
color: $info;
}

&--WARN {
color: $warning;
}

&--ERROR,
&--FATAL {
color: $danger;
}
}

.log-clazz {
display: inline-block;
font-size: $font-size-sm;
color: $light;
display: inline-block;
font-size: $font-size-sm;
color: $light;
}
14 changes: 7 additions & 7 deletions src/app/modals/paths-modal/paths-modal.component.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.path-image-wrapper {
display: flex;
justify-content: center;
display: flex;
justify-content: center;

img {
image-rendering: pixelated;
}
img {
image-rendering: pixelated;
}
}

.carousel-caption {
padding: 0;
bottom: 0;
padding: 0;
bottom: 0;
}
2 changes: 1 addition & 1 deletion src/app/models/Position.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Action } from './Action';
import { Cercle } from './Cercle';
import { Point } from './Point';
import { Rect } from './Rect';
import { GameStatus } from './ageOfBots/GameStatus';
import { GameStatus } from './farmingMars/GameStatus';

export interface MouvementPath {
type: 'PATH';
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/app/services/mock/mouvements.mock-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Observable, of } from 'rxjs';
import { MapPosition } from '../../models/MapPosition';
import { Position } from '../../models/Position';
import { Robot } from '../../models/Robot';
import { TypePlante } from '../../models/ageOfBots/GameStatus';
import { TypePlante } from '../../models/farmingMars/GameStatus';
import { MouvementsService } from '../mouvements.service';
import { MockData } from './mock.utils';

Expand Down
4 changes: 2 additions & 2 deletions src/app/views/map/map.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.data-list {
height: calc(100vh - 56px);
overflow: auto;
height: calc(100vh - 56px);
overflow: auto;
}
48 changes: 25 additions & 23 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,36 @@
@import 'styles/floating-labels';

.btn-round {
border-radius: 50%;
padding: 0.5rem 0;
width: 2.5rem;
height: 2.5rem;
text-align: center;
border-radius: 50%;
padding: 0.5rem 0;
width: 2.5rem;
height: 2.5rem;
text-align: center;

&.btn-sm {
width: 1.7rem;
height: 1.7rem;
padding: 0.2rem 0;
}
&.btn-sm {
width: 1.7rem;
height: 1.7rem;
padding: 0.2rem 0;
}
}

.badge-big {
font-size: $font-size-sm;
padding: 0.25rem 0.35rem;
break-inside: avoid-column;
font-size: $font-size-sm;
padding: 0.25rem 0.35rem;
break-inside: avoid-column;
}

.offcanvas {
& > * {
display: block;
height: 100%;
}
&-full {
--bs-offcanvas-width: 100%;
}
&-half {
--bs-offcanvas-width: 50%;
}
& > * {
display: block;
height: 100%;
}

&-full {
--bs-offcanvas-width: 100%;
}

&-half {
--bs-offcanvas-width: 50%;
}
}
34 changes: 17 additions & 17 deletions src/styles/_floating-labels.scss
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
.form-label-group {
position: relative;
position: relative;
}

.form-label-group label {
padding: $input-btn-padding-y-sm $input-btn-padding-x-sm;
padding: $input-btn-padding-y-sm $input-btn-padding-x-sm;
}

.form-label-group label {
position: absolute;
top: -1.4rem;
left: 0;
display: block;
width: 100%;
margin-bottom: 0; /* Override default `<label>` margin */
font-size: $font-size-sm;
line-height: $line-height-sm;
color: $body-color;
pointer-events: none;
cursor: text; /* Match the input under the label */
border: 1px solid transparent;
border-radius: $input-border-radius;
transition: all .1s ease-in-out;
position: absolute;
top: -1.4rem;
left: 0;
display: block;
width: 100%;
margin-bottom: 0; /* Override default `<label>` margin */
font-size: $font-size-sm;
line-height: $line-height-sm;
color: $body-color;
pointer-events: none;
cursor: text; /* Match the input under the label */
border: 1px solid transparent;
border-radius: $input-border-radius;
transition: all 0.1s ease-in-out;
}

.form-label-group input::placeholder {
color: transparent;
color: transparent;
}
Loading

0 comments on commit d281ee2

Please sign in to comment.