Feature/gar 515 #118

Pulik89 · 2022-05-24T06:21:31Z

Заменил карусель и новости делового мира на новые

mdss-single · 2022-06-15T13:31:38Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -136,7 +136,7 @@ strong {

    &__title {
      font-family: "Roboto", sans-serif;


удалить

mdss-single · 2022-06-15T13:31:49Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      font-size: 6rem;
+      font-size: 96px;
      font-weight: 700;
      color: #2c2c2c;


переменная

mdss-single · 2022-06-15T13:31:54Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -163,7 +163,7 @@ strong {

    &__subtitle {
      font-family: "Roboto", sans-serif;


удалить

mdss-single · 2022-06-15T13:32:02Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      font-size: 4rem;
+      font-size: 64px;
      font-weight: 700;
      color: #2c2c2c;


переменная

mdss-single · 2022-06-15T13:32:09Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

      font-family: "Roboto", sans-serif;
-      font-size: 6rem;
+      font-size: 96px;
      font-weight: 700;


mdss-single · 2022-06-15T13:32:17Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

    &__subtitle {
      font-family: "Roboto", sans-serif;
-      font-size: 4rem;
+      font-size: 64px;


mdss-single · 2022-06-15T13:32:25Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -188,7 +188,7 @@ strong {

    &__text {
      font-family: "Roboto", sans-serif;


mdss-single · 2022-06-15T13:32:30Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

    &__text {
      font-family: "Roboto", sans-serif;
-      font-size: 1.5rem;
+      font-size: 1.4rem;


mdss-single · 2022-06-15T13:32:37Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      font-size: 1.5rem;
+      font-size: 1.4rem;
      font-weight: 400;
      color: #7a7a7a;


mdss-single · 2022-06-15T13:32:43Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -215,15 +215,15 @@ strong {
      justify-content: center;
      align-items: center;
      font-family: "Roboto", sans-serif;


mdss-single · 2022-06-15T13:32:48Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

      align-items: center;
      font-family: "Roboto", sans-serif;
-      font-size: 1.5rem;
+      font-size: 1.4rem;


mdss-single · 2022-06-15T13:32:55Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      font-size: 1.5rem;
+      font-size: 1.4rem;
      font-weight: 500;
      color: #ffffff;


mdss-single · 2022-06-15T13:33:01Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      height: 76px;
+      // height: 76px;
      border: none;
      border-radius: 4px;


mdss-single · 2022-06-15T13:33:17Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

      border: none;
      border-radius: 4px;
-      padding: 24px 32px;
+      padding: 24px 10px;


gridGap плюс откругление до кратного 8

mdss-single · 2022-06-15T13:33:26Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      padding: 24px 32px;
+      padding: 24px 10px;
      margin: 0;
      background-color: #1f75fe;


mdss-single · 2022-06-15T13:33:31Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -342,7 +342,7 @@ strong {
      justify-content: center;
      align-items: center;
      font-family: "Roboto", sans-serif;


mdss-single · 2022-06-15T13:33:38Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

      align-items: center;
      font-family: "Roboto", sans-serif;
-      font-size: 6rem;
+      font-size: 4.8rem;


mdss-single · 2022-06-15T13:33:44Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      font-size: 6rem;
+      font-size: 4.8rem;
      font-weight: 700;
      color: #2c2c2c;


mdss-single · 2022-06-15T13:33:58Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

+      font-size: 4.8rem;
      font-weight: 700;
      color: #2c2c2c;
      height: 113px;


что за магическое число? Что будет при переполнении?

mdss-single · 2022-06-15T13:34:08Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      align-items: center;
-      font-family: "Roboto", sans-serif;
-      font-size: 1.5rem;
+      font-family: "Roboto";


mdss-single · 2022-06-15T13:34:14Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      font-family: "Roboto", sans-serif;
-      font-size: 1.5rem;
+      font-family: "Roboto";
+      font-size: 1rem;


mdss-single · 2022-06-15T13:34:21Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

+      font-family: "Roboto";
+      font-size: 1rem;
      font-weight: 400;
      color: #7a7a7a;


mdss-single · 2022-06-15T13:34:27Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

+      width: 67%;

      @include md {
        font-size: 1rem;


mdss-single · 2022-06-15T13:35:44Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      font-size: 4rem;
+      font-size: 3rem;
      font-weight: 700;
      color: #ffffff;


mdss-single · 2022-06-15T13:35:49Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

+      font-size: 3rem;
      font-weight: 700;
      color: #ffffff;
      width: 864px;


mdss-single · 2022-06-15T13:36:03Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1335,10 +1331,10 @@ strong {
        font-weight: 400;


mdss-single · 2022-06-15T13:36:09Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1335,10 +1331,10 @@ strong {
        font-weight: 400;
        color: #7a7a7a;


mdss-single · 2022-06-15T13:36:16Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-        height: 69px;
+        // height: 69px;
        border: 1.5px solid #dadada;
        border-radius: 8px;


mdss-single · 2022-06-15T13:36:24Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

        width: 291px;
-        height: 69px;
+        // height: 69px;
        border: 1.5px solid #dadada;


variable for color

mdss-single · 2022-06-15T13:36:39Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

        border: 1.5px solid #dadada;
        border-radius: 8px;
-        padding: 24px 40px 24px 24px;
+        padding: 20px 9px;


gridGap + round

mdss-single · 2022-06-15T13:36:47Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1357,7 +1353,7 @@ strong {
      line-height: 14px;
      font-weight: 400;
      color: #dadada;


mdss-single · 2022-06-15T13:36:52Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1357,7 +1353,7 @@ strong {
      line-height: 14px;
      font-weight: 400;


mdss-single · 2022-06-15T13:36:57Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1357,7 +1353,7 @@ strong {
      line-height: 14px;
      font-weight: 400;
      color: #dadada;


mdss-single · 2022-06-15T13:37:17Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1378,7 +1374,8 @@ strong {
      height: 69px;


mdss-single · 2022-06-15T13:37:26Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1378,7 +1374,8 @@ strong {
      height: 69px;
      border: 1.5px solid #dadada;
      border-radius: 8px;


mdss-single · 2022-06-15T13:37:32Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1378,7 +1374,8 @@ strong {
      height: 69px;
      border: 1.5px solid #dadada;


variable for color

mdss-single · 2022-06-15T13:37:40Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

      border: 1.5px solid #dadada;
      border-radius: 8px;
-      padding: 24px 40px 24px 24px;
+      padding: 24px 10px;


gridGap + round

mdss-single · 2022-06-15T13:37:47Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1395,15 +1392,15 @@ strong {
      justify-content: center;
      align-items: center;
      font-family: "Roboto", sans-serif;


mdss-single · 2022-06-15T13:37:53Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

      align-items: center;
      font-family: "Roboto", sans-serif;
-      font-size: 1.5rem;
+      font-size: 1.3rem;


mdss-single · 2022-06-15T13:37:59Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      font-size: 1.5rem;
+      font-size: 1.3rem;
      font-weight: 500;
      color: #1f75fe;


mdss-single · 2022-06-15T13:38:06Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      height: 76px;
+      // height: 76px;
      border: none;
      border-radius: 4px;


mdss-single · 2022-06-15T13:38:14Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

      border: none;
      border-radius: 4px;
-      padding: 24px 29.5px;
+      padding: 24px 10px;


gridGap + round

mdss-single · 2022-06-15T13:38:19Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

-      padding: 24px 29.5px;
+      padding: 24px 10px;
      margin: 0;
      background-color: #ffffff;


mdss-single · 2022-06-15T13:38:25Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1917,3 +1914,4 @@ strong {
  font-weight: 400;


mdss-single · 2022-06-15T13:38:31Z

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1917,3 +1914,4 @@ strong {
  font-weight: 400;
  color: #2c2c2c;


mdss-single · 2022-06-15T13:39:01Z

src/app/modules/landing/franchise-landing/franchise-landing.component.html

  <div class="header-image">
    <img
+      class="header-image__deck"
      src="../../../../assets/images/franchise-landing/desk.png"


путь можно указывать от корня /assets

mdss-single · 2022-06-15T13:39:12Z

src/app/modules/landing/franchise-landing/franchise-landing.component.html

+
  <div class="header-image1">
    <img
      src="../../../../assets/images/franchise-landing/desk1.png"


см выше про путь

mdss-single

см комментарии

misslick

….Frontend into feature/GAR-515

Pulik89 added 2 commits May 24, 2022 09:37

заменил блок новости делового мира на новый

712527a

добавил карусель и новости делового в разделы

07fa1e2

Pulik89 requested a review from mdss-single May 24, 2022 06:21

Pulik89 added 4 commits May 25, 2022 12:46

заменил костыльную на блок gar-card promo

6f39ab6

убрал мусор (большие блоки под коментами)

98250fc

упаковка франшиз с адаптивом

91fbef7

слегка подправил положение азамата

9f0e605

mdss-single reviewed Jun 15, 2022

View reviewed changes

src/app/modules/landing/deal-landing/deal-landing.component.scss

width: 67%;

@include md {

font-size: 1rem;

Copy link

Collaborator

mdss-single Jun 15, 2022

Choose a reason for hiding this comment

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

typo

mdss-single reviewed Jun 15, 2022

View reviewed changes

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1335,10 +1331,10 @@ strong {

font-weight: 400;

Copy link

Collaborator

mdss-single Jun 15, 2022

Choose a reason for hiding this comment

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

typo

mdss-single reviewed Jun 15, 2022

View reviewed changes

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1378,7 +1374,8 @@ strong {

height: 69px;

Copy link

Collaborator

mdss-single Jun 15, 2022

Choose a reason for hiding this comment

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

???

mdss-single reviewed Jun 15, 2022

View reviewed changes

src/app/modules/landing/deal-landing/deal-landing.component.scss

@@ -1917,3 +1914,4 @@ strong {

font-weight: 400;

Copy link

Collaborator

mdss-single Jun 15, 2022

Choose a reason for hiding this comment

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

typo

mdss-single reviewed Jun 15, 2022

View reviewed changes

mdss-single previously approved these changes Jun 15, 2022

View reviewed changes

mdss-single self-requested a review June 15, 2022 13:43

mdss-single reviewed Jun 15, 2022

View reviewed changes

Pulik89 added 2 commits June 15, 2022 19:05

Merge branch 'develop' of https://github.com/Sierra93/Garant.Platform…

d8a45fd

….Frontend into feature/GAR-515

убрал робото

fca0182

		@@ -136,7 +136,7 @@ strong {

		&__title {
		font-family: "Roboto", sans-serif;

		@@ -163,7 +163,7 @@ strong {

		&__subtitle {
		font-family: "Roboto", sans-serif;

		@@ -188,7 +188,7 @@ strong {

		&__text {
		font-family: "Roboto", sans-serif;

		@@ -1335,10 +1331,10 @@ strong {
		font-weight: 400;
		color: #7a7a7a;

		@@ -1357,7 +1353,7 @@ strong {
		line-height: 14px;
		font-weight: 400;

		@@ -1378,7 +1374,8 @@ strong {
		height: 69px;
		border: 1.5px solid #dadada;

		@@ -1917,3 +1914,4 @@ strong {
		font-weight: 400;
		color: #2c2c2c;

Feature/gar 515 #118

Are you sure you want to change the base?

Feature/gar 515 #118

Uh oh!

Conversation

Pulik89 commented May 24, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment