Skip to content

Commit c5c90d8

Browse files
Tikud11Tikud11
committed
Успешное разрешение конфликтов и перенос кода в 11 модуль
2 parents 4110eb3 + 9613bb2 commit c5c90d8

11 files changed

Lines changed: 751 additions & 432 deletions

File tree

‎css/style.css‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33

44
@font-face {
55
font-family: "Open Sans";
6+
<<<<<<< HEAD
67
src: url("../fonts/OpenSansCondensed-Bold.woff2") format("woff2"),
8+
=======
9+
src:
10+
url("../fonts/OpenSansCondensed-Bold.woff2") format("woff2"),
11+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
712
url("../fonts/OpenSansCondensed-Bold.woff") format("woff");
813
font-weight: 700;
914
font-style: normal;
@@ -12,7 +17,12 @@
1217

1318
@font-face {
1419
font-family: "Open Sans";
20+
<<<<<<< HEAD
1521
src: url("../fonts/OpenSans-Regular.woff2") format("woff2"),
22+
=======
23+
src:
24+
url("../fonts/OpenSans-Regular.woff2") format("woff2"),
25+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
1626
url("../fonts/OpenSans-Regular.woff") format("woff");
1727
font-weight: 400;
1828
font-style: normal;
@@ -966,7 +976,12 @@ main {
966976
@keyframes spinner {
967977
0%,
968978
100% {
979+
<<<<<<< HEAD
969980
box-shadow: 0em -2.6em 0em 0em #3b77c0,
981+
=======
982+
box-shadow:
983+
0em -2.6em 0em 0em #3b77c0,
984+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
970985
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2),
971986
2.5em 0em 0 0em rgba(51, 102, 204, 0.2),
972987
1.75em 1.75em 0 0em rgba(51, 102, 204, 0.2),
@@ -976,67 +991,128 @@ main {
976991
-1.8em -1.8em 0 0em rgba(51, 102, 204, 0.7);
977992
}
978993
12.5% {
994+
<<<<<<< HEAD
979995
box-shadow: 0em -2.6em 0em 0em rgba(51, 102, 204, 0.7),
980996
1.8em -1.8em 0 0em #3b77c0, 2.5em 0em 0 0em rgba(51, 102, 204, 0.2),
997+
=======
998+
box-shadow:
999+
0em -2.6em 0em 0em rgba(51, 102, 204, 0.7),
1000+
1.8em -1.8em 0 0em #3b77c0,
1001+
2.5em 0em 0 0em rgba(51, 102, 204, 0.2),
1002+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
9811003
1.75em 1.75em 0 0em rgba(51, 102, 204, 0.2),
9821004
0em 2.5em 0 0em rgba(51, 102, 204, 0.2),
9831005
-1.8em 1.8em 0 0em rgba(51, 102, 204, 0.2),
9841006
-2.6em 0em 0 0em rgba(51, 102, 204, 0.2),
9851007
-1.8em -1.8em 0 0em rgba(51, 102, 204, 0.5);
9861008
}
9871009
25% {
1010+
<<<<<<< HEAD
9881011
box-shadow: 0em -2.6em 0em 0em rgba(51, 102, 204, 0.5),
9891012
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.7), 2.5em 0em 0 0em #3b77c0,
1013+
=======
1014+
box-shadow:
1015+
0em -2.6em 0em 0em rgba(51, 102, 204, 0.5),
1016+
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.7),
1017+
2.5em 0em 0 0em #3b77c0,
1018+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
9901019
1.75em 1.75em 0 0em rgba(51, 102, 204, 0.2),
9911020
0em 2.5em 0 0em rgba(51, 102, 204, 0.2),
9921021
-1.8em 1.8em 0 0em rgba(51, 102, 204, 0.2),
9931022
-2.6em 0em 0 0em rgba(51, 102, 204, 0.2),
9941023
-1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2);
9951024
}
9961025
37.5% {
1026+
<<<<<<< HEAD
9971027
box-shadow: 0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
9981028
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.5),
9991029
2.5em 0em 0 0em rgba(51, 102, 204, 0.7), 1.75em 1.75em 0 0em #3b77c0,
1030+
=======
1031+
box-shadow:
1032+
0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
1033+
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.5),
1034+
2.5em 0em 0 0em rgba(51, 102, 204, 0.7),
1035+
1.75em 1.75em 0 0em #3b77c0,
1036+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
10001037
0em 2.5em 0 0em rgba(51, 102, 204, 0.2),
10011038
-1.8em 1.8em 0 0em rgba(51, 102, 204, 0.2),
10021039
-2.6em 0em 0 0em rgba(51, 102, 204, 0.2),
10031040
-1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2);
10041041
}
10051042
50% {
1043+
<<<<<<< HEAD
10061044
box-shadow: 0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
10071045
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2),
10081046
2.5em 0em 0 0em rgba(51, 102, 204, 0.5),
10091047
1.75em 1.75em 0 0em rgba(51, 102, 204, 0.7), 0em 2.5em 0 0em #3b77c0,
1048+
=======
1049+
box-shadow:
1050+
0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
1051+
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2),
1052+
2.5em 0em 0 0em rgba(51, 102, 204, 0.5),
1053+
1.75em 1.75em 0 0em rgba(51, 102, 204, 0.7),
1054+
0em 2.5em 0 0em #3b77c0,
1055+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
10101056
-1.8em 1.8em 0 0em rgba(51, 102, 204, 0.2),
10111057
-2.6em 0em 0 0em rgba(51, 102, 204, 0.2),
10121058
-1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2);
10131059
}
10141060
62.5% {
1061+
<<<<<<< HEAD
10151062
box-shadow: 0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
10161063
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2),
10171064
2.5em 0em 0 0em rgba(51, 102, 204, 0.2),
10181065
1.75em 1.75em 0 0em rgba(51, 102, 204, 0.5),
10191066
0em 2.5em 0 0em rgba(51, 102, 204, 0.7), -1.8em 1.8em 0 0em #3b77c0,
1067+
=======
1068+
box-shadow:
1069+
0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
1070+
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2),
1071+
2.5em 0em 0 0em rgba(51, 102, 204, 0.2),
1072+
1.75em 1.75em 0 0em rgba(51, 102, 204, 0.5),
1073+
0em 2.5em 0 0em rgba(51, 102, 204, 0.7),
1074+
-1.8em 1.8em 0 0em #3b77c0,
1075+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
10201076
-2.6em 0em 0 0em rgba(51, 102, 204, 0.2),
10211077
-1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2);
10221078
}
10231079
75% {
1080+
<<<<<<< HEAD
10241081
box-shadow: 0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
1082+
=======
1083+
box-shadow:
1084+
0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
1085+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
10251086
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2),
10261087
2.5em 0em 0 0em rgba(51, 102, 204, 0.2),
10271088
1.75em 1.75em 0 0em rgba(51, 102, 204, 0.2),
10281089
0em 2.5em 0 0em rgba(51, 102, 204, 0.5),
1090+
<<<<<<< HEAD
10291091
-1.8em 1.8em 0 0em rgba(51, 102, 204, 0.7), -2.6em 0em 0 0em #3b77c0,
10301092
-1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2);
10311093
}
10321094
87.5% {
10331095
box-shadow: 0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
1096+
=======
1097+
-1.8em 1.8em 0 0em rgba(51, 102, 204, 0.7),
1098+
-2.6em 0em 0 0em #3b77c0,
1099+
-1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2);
1100+
}
1101+
87.5% {
1102+
box-shadow:
1103+
0em -2.6em 0em 0em rgba(51, 102, 204, 0.2),
1104+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
10341105
1.8em -1.8em 0 0em rgba(51, 102, 204, 0.2),
10351106
2.5em 0em 0 0em rgba(51, 102, 204, 0.2),
10361107
1.75em 1.75em 0 0em rgba(51, 102, 204, 0.2),
10371108
0em 2.5em 0 0em rgba(51, 102, 204, 0.2),
10381109
-1.8em 1.8em 0 0em rgba(51, 102, 204, 0.5),
1110+
<<<<<<< HEAD
10391111
-2.6em 0em 0 0em rgba(51, 102, 204, 0.7), -1.8em -1.8em 0 0em #3b77c0;
1112+
=======
1113+
-2.6em 0em 0 0em rgba(51, 102, 204, 0.7),
1114+
-1.8em -1.8em 0 0em #3b77c0;
1115+
>>>>>>> 9613bb2b03e4cd30c2ddf754a2cf86155b979f4a
10401116
}
10411117
}
10421118

0 commit comments

Comments
 (0)