2601ed5b
Alex Savenko
vetalik2
|
1
|
<<<<<<< HEAD
|
336cad3d
Alex Savenko
vitalya
|
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
$mainTextColor: #545454;;
$mainColor: #4285f4;
$mainColor-active: #3d62c4;
$link-color:#039be5;
$link-color-active: #037bc4;
$borderMainMenu: #e5e5e5;
$MainMenuBg-hover: #eee;
$footerBg:#585858;
$footerTextColor:#999999;
$footerTitleColor:#eeeeee;
$footerLinkColor:$footerTextColor;
$backgroundMainMenuBlock:#fff;
@import "default";
@import "custom";
.style {
width: 100%;
float: left;
|
2601ed5b
Alex Savenko
vetalik2
|
31
|
=======
|
38a9a9a6
Виталий
q
|
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
$mainTextColor: #545454;;
$mainColor: #4285f4;
$mainColor-active: #3d62c4;
$link-color:#039be5;
$link-color-active: #037bc4;
$borderMainMenu: #e5e5e5;
$MainMenuBg-hover: #eee;
$footerBg:#585858;
$footerTextColor:#999999;
$footerTitleColor:#eeeeee;
$footerLinkColor:$footerTextColor;
$backgroundMainMenuBlock:#fff;
$checkboxColor: #ccc;
$checkboxColorActive: $link-color;
$breadcrumb-color: #ccc;
$borderRadius:5px;
@import "mixin";
@import "default";
@import "menu-mob";
|
535b9a3c
Виталий
q2
|
62
|
@import "menu-catalog";
|
38a9a9a6
Виталий
q
|
63
64
65
66
67
68
69
70
|
@import "custom";
.style {
width: 100%;
float: left;
|
2601ed5b
Alex Savenko
vetalik2
|
71
|
>>>>>>> 783eb6592414578ef89358f667fc9a8f2540d10f
|
336cad3d
Alex Savenko
vitalya
|
72
|
}
|