Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- store:/usr/src/app/store
- logs:/usr/src/app/logs
deploy:
replicas: 8
replicas: 2

db:
extends:
Expand Down
8 changes: 5 additions & 3 deletions src/app/_components/Cms/ArticleSection/RemovePart.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@use "@/styles/ohma";

@use "sass:color";

.RemovePart {
position: relative;
.openBtn {
Expand All @@ -12,7 +14,7 @@
place-items: center;
transition: .3s background-color;
&:hover {
background-color: darken(red, 10%);
background-color: color.adjust(red, $lightness: -10%);
cursor: pointer;
}
}
Expand All @@ -24,13 +26,13 @@
transform: translateX(-50%);
width: 200px;
background-color: ohma.$colors-white;
@include ohma.round;
padding-bottom: 0;
display: grid;
place-items: center;
@include ohma.round;
form{
width: auto;
height: auto;
}
}
}
}
24 changes: 13 additions & 11 deletions src/app/_components/Cms/CmsImage/CmsImageEditor.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@use '@/styles/ohma';

@use "sass:color";

$collectionSize: calc(14vmin + 70px);

.CmsImageEditor {
Expand All @@ -21,8 +23,8 @@ $collectionSize: calc(14vmin + 70px);
}
.linkToImages {
position: absolute;
@include ohma.btn(ohma.$colors-primary);
width: 10em;
@include ohma.btn(ohma.$colors-primary);
@include ohma.screenLg {
top: -2%;
right: -2%;
Expand All @@ -33,11 +35,11 @@ $collectionSize: calc(14vmin + 70px);
}
}
> .currentCmsImage {
grid-column: 1 / 2;
grid-row: 1 / 2;
@include ohma.screenMobile {
display: none;
}
grid-column: 1 / 2;
grid-row: 1 / 2;
> .info {
max-width: 150px;
overflow: hidden;
Expand All @@ -51,31 +53,31 @@ $collectionSize: calc(14vmin + 70px);
}
> .selectImage {
grid-column: 2 / 3;
@include ohma.screenMobile {
grid-column: 1 / 2;
margin: 1em 0;
}
grid-row: 1 / 2;
background-color: lighten(ohma.$colors-secondary, 40%);
@include ohma.round;
background-color: color.adjust(ohma.$colors-secondary, $lightness: 40%);
overflow: scroll;
max-width: 100%;
width: 100%;
@include ohma.round;
@include ohma.screenMobile {
grid-column: 1 / 2;
margin: 1em 0;
}
> * {
isolation: isolate;
}
}
> .selectCollection {
grid-column: 1 / 3;
grid-row: 2 / 3;
background-color: lighten(ohma.$colors-secondary, 50%);
@include ohma.round;
background-color: color.adjust(ohma.$colors-secondary, $lightness: 50%);
display: flex;
max-width: 100%;
overflow: scroll;
min-height: calc($collectionSize + 5vmin);
align-items: center;
padding: 0;
@include ohma.round;
.collection {
position: relative;
margin: 0 .2em;
Expand Down
25 changes: 16 additions & 9 deletions src/app/_components/CommitteeCard/CommitteeCard.module.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
@use "@/styles/ohma";

@use "sass:color";

$padding: 1.5em;
$imageHeight: 175px;
$contentHeight: 50px;
$height: $imageHeight + $contentHeight;

$background: lighten(ohma.$colors-secondary, 15%);
$background: color.adjust(ohma.$colors-secondary, $lightness: 15%);
$textBoxTransparency: 60%;
$textColor: ohma.$colors-gray-900;
$textUnderlineColor: ohma.$colors-secondary;
Expand All @@ -24,40 +26,45 @@ $textBoxBackgroundColor: ohma.$colors-white;
isolation: isolate;
overflow: hidden;
box-shadow: ohma.$colors-gray-800 0 0 10px;

@include ohma.screenMobile {
width: 100%;
}

&:hover {
scale: 1.1;
transition-duration: 0.3s;

@include ohma.screenMobile {
scale: 1;
}
scale: 1.1;
transition-duration: 0.3s;

> .image {
scale: 1.1;
transition: scale 0.3s;

@include ohma.screenMobile {
scale: 1;
}
scale: 1.1;
transition: scale 0.3s;
}

> .content {
background-color: rgba($textBoxBackgroundColor, 0%);
box-shadow: ohma.$colors-secondary 0 0 0px;
padding-top: 10px;

@include ohma.screenMobile {
background-color: rgba($textBoxBackgroundColor, 60%);
box-shadow: ohma.$colors-secondary 0 0 40px;
padding-top: $padding
}
background-color: rgba($textBoxBackgroundColor, 0%);
box-shadow: ohma.$colors-secondary 0 0 0px;
padding-top: 10px;

> h2 {
opacity: 0%;

@include ohma.screenMobile {
opacity: 100%;
}
opacity: 0%;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@use "@/styles/ohma";

$background: lighten(ohma.$colors-secondary, 15%);
@use "sass:color";

$background: color.adjust(ohma.$colors-secondary, $lightness: 15%);

.CommitteeImage {
position: relative;
Expand Down
12 changes: 7 additions & 5 deletions src/app/_components/NavBar/UserNavigation.module.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
@use '@/styles/ohma';

.UserNavigation {
background-color: ohma.$colors-gray-200;
display: flex;
flex-direction: column;
align-items: center;

@include ohma.screenLg {
position: absolute;
bottom: 0;
Expand All @@ -21,14 +26,11 @@
width: 100vw;
height: calc(100vh - 50px);
}
background-color: ohma.$colors-gray-200;
h2 {
color: ohma.$colors-black;
font-size: ohma.$fonts-xl;
}
display: flex;
flex-direction: column;
align-items: center;

.logout {
margin-top: .5em;
width: 100%;
Expand Down Expand Up @@ -81,4 +83,4 @@
&:hover {
cursor: pointer;
}
}
}
8 changes: 4 additions & 4 deletions src/app/_components/User/UserList/UserList.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ $selectionBtnSize: 25px;
display: flex;
flex-flow: row wrap;
margin-bottom: ohma.$gap;
gap: ohma.$gap;
.name {
display: flex;
flex-direction: column;
}
gap: ohma.$gap;
.group {
display: flex;
flex-direction: column;
min-width: 150px;
> * {
display: flex;
flex-direction: column;
Expand All @@ -28,7 +29,6 @@ $selectionBtnSize: 25px;
width: 100%;
}
}
min-width: 150px;
}
}
> .list {
Expand All @@ -53,10 +53,10 @@ $selectionBtnSize: 25px;
display: grid;
place-items: center;
border-radius: ohma.$rounding;
margin-right: 1em;
&.selected {
background-color: ohma.$colors-primary;
}
margin-right: 1em;
}
}
> .head {
Expand Down Expand Up @@ -84,4 +84,4 @@ $selectionBtnSize: 25px;
.adjust {
width: calc(100% - $selectionBtnSize - 1em);
transform: translateX(calc($selectionBtnSize + 1em));
}
}
6 changes: 3 additions & 3 deletions src/app/_components/User/UserList/UserRow.module.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@use '@/styles/ohma';

.UserRow {
border-bottom: 2px solid ohma.$colors-secondary;
margin-top: ohma.$gap;
padding: calc(ohma.$gap / 2) ohma.$gap;
p {
font-weight: ohma.$fonts-weight-s;
}
border-bottom: 2px solid ohma.$colors-secondary;
margin-top: ohma.$gap;
padding: ohma.$gap / 2 ohma.$gap;
}

.clickable {
Expand Down
4 changes: 3 additions & 1 deletion src/app/cabin/book/CabinCalendar.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@use '@/styles/ohma';

@use 'sass:color';

@mixin rangeStyles($color, $width, $border-radius) {

&.start {
Expand Down Expand Up @@ -71,7 +73,7 @@
@include rangeStyles(ohma.$colors-primary, 100%, 10px);

&.inRange {
background-color: lighten(ohma.$colors-primary, 30);
background-color: color.adjust(ohma.$colors-primary, $lightness: 30%);
}

>.dateNumber {
Expand Down
20 changes: 11 additions & 9 deletions src/app/career/page.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@use '@/styles/ohma';

@use "sass:color";

.conactorLink {
width: 170px;
height: 35px;
Expand All @@ -16,21 +18,21 @@
grid-template-rows: 1fr 1fr 1fr;
gap: 1em;
> a {
@include ohma.card;
text-decoration: none;
color: ohma.$colors-gray-800;
display: flex;
flex-flow: row wrap;
align-items: center;
transition: box-shadow 0.3s;
background: linear-gradient(
to top right,
ohma.$colors-secondary,
rgba(red(ohma.$colors-secondary), green(ohma.$colors-secondary), blue(ohma.$colors-secondary), 0.1)
color.change(ohma.$colors-secondary, $alpha: 0.1)
);
transition: box-shadow 0.3s;
@include ohma.card;
&:hover {
@include ohma.boxShadow;
}
text-decoration: none;
color: ohma.$colors-gray-800;
display: flex;
flex-flow: row wrap;
align-items: center;
> h2 {
flex: 1;
text-align: center;
Expand All @@ -42,4 +44,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/app/committees/[shortName]/Nav.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
.Nav {
display: flex;
flex-direction: column;
gap: 1em;
@include ohma.screenMobile {
flex-direction: row;
}
gap: 1em;
a {
@include ohma.roundAdminSvgBtn();
&.selected {
background-color: ohma.$colors-secondary;
}
}
}
}
3 changes: 2 additions & 1 deletion src/app/committees/page.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ $max-width: 1200px;
grid-template-columns: repeat(auto-fill, 225px);
gap: 2em;
justify-content: space-between;
overflow: visible;

@include ohma.screenMobile {
grid-template-columns: repeat(auto-fill, 200px);
}
overflow: visible;
}
Loading