Skip to content

Commit 76fb70b

Browse files
alexmerlinalexmerlin
committed
Fixed line endings
Signed-off-by: alexmerlin <alex.merlin.1985@gmail.com>
1 parent b6fb146 commit 76fb70b

2 files changed

Lines changed: 450 additions & 450 deletions

File tree

‎src/App/assets/scss/components/_general.scss‎

Lines changed: 178 additions & 178 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,178 @@
1-
html,
2-
body {
3-
height: 100%;
4-
}
5-
6-
body {
7-
font-family: 'Source Sans Pro', sans-serif;
8-
font-size: 16px;
9-
line-height: 1.3em;
10-
font-weight: 300;
11-
}
12-
13-
h1,
14-
.h1 {
15-
font-size: 40px;
16-
font-family: 'Montserrat', sans-serif;
17-
font-weight: 200;
18-
color: #2C2C2C;
19-
}
20-
21-
h2,
22-
.h2 {
23-
font-size: 32px;
24-
font-family: 'Montserrat', sans-serif;
25-
font-weight: 200;
26-
color: #2C2C2C;
27-
}
28-
29-
h3,
30-
.h3 {
31-
font-size: 24px;
32-
font-family: 'Montserrat', sans-serif;
33-
font-weight: 200;
34-
color: #2C2C2C;
35-
}
36-
37-
h4,
38-
.h4 {
39-
font-size: 20px;
40-
font-family: 'Montserrat', sans-serif;
41-
font-weight: 200;
42-
color: #2C2C2C;
43-
}
44-
45-
h5,
46-
.h5 {
47-
font-size: 18px;
48-
font-family: 'Montserrat', sans-serif;
49-
font-weight: 200;
50-
color: #2C2C2C;
51-
}
52-
53-
h6,
54-
.h6 {
55-
font-size: 16px;
56-
font-family: 'Montserrat', sans-serif;
57-
font-weight: 200;
58-
color: #2C2C2C;
59-
}
60-
61-
a {
62-
color: #555ec4;
63-
font-family: 'Source Sans Pro', sans-serif;
64-
font-weight: 300;
65-
}
66-
67-
a:hover {
68-
color: #C60B31;
69-
}
70-
71-
p {
72-
color: #B1B1B1;
73-
font-family: 'Source Sans Pro', sans-serif;
74-
font-weight: 300;
75-
}
76-
77-
label {
78-
color: #B1B1B1;
79-
}
80-
81-
#wrapper {
82-
min-height: 100%;
83-
height: auto !important;
84-
height: 100%;
85-
margin: 0 auto -115px;
86-
background: #F5F5F5;
87-
}
88-
89-
.navbar {
90-
margin-bottom: 0;
91-
border-radius: 0;
92-
background-color: #FFFFFF;
93-
border: 0;
94-
border-bottom: 1px solid #F6F6F6;
95-
96-
.navbar-brand {
97-
img {
98-
display: block;
99-
width: 170px;
100-
height: 29px;
101-
}
102-
}
103-
}
104-
105-
@media (max-width: 767px){
106-
.navbar {
107-
.navbar-collapse {
108-
margin-top: 10px;
109-
110-
.dropdown-menu {
111-
border: none;
112-
background-color: transparent;
113-
}
114-
}
115-
}
116-
}
117-
118-
.content-header {
119-
}
120-
121-
.user-form {
122-
.content {
123-
padding-top: 80px;
124-
padding-bottom: 50px;
125-
}
126-
}
127-
128-
#push,
129-
.app-footer {
130-
height: 115px;
131-
}
132-
133-
.app-footer {
134-
padding: 30px 50px;
135-
background: #F9F9F9;
136-
137-
p {
138-
margin-bottom: 0;
139-
font-size: 14px;
140-
}
141-
142-
.enjoy {
143-
margin-bottom: 5px;
144-
font-size: 20px;
145-
color: #3B3B3B;
146-
font-family: 'Montserrat', sans-serif;
147-
font-weight: 200;
148-
}
149-
}
150-
151-
.alert {
152-
ul {
153-
display: block;
154-
margin: 0;
155-
padding-left: 15px;
156-
}
157-
}
158-
159-
input {
160-
padding: 15px 15px;
161-
background: #FFFFFF;
162-
border-radius: 2px;
163-
border: 1px solid #E7E7E7;
164-
font-size: 16px;
165-
line-height: 50px;
166-
height: 50px;
167-
width: 100%;
168-
}
169-
170-
input[type="submit"] {
171-
padding-top: 0;
172-
padding-bottom: 0;
173-
height: 50px;
174-
border-radius: 2px;
175-
background: #C60B31;
176-
border-color: #C60B31;
177-
color: #FFFFFF;
178-
}
1+
html,
2+
body {
3+
height: 100%;
4+
}
5+
6+
body {
7+
font-family: 'Source Sans Pro', sans-serif;
8+
font-size: 16px;
9+
line-height: 1.3em;
10+
font-weight: 300;
11+
}
12+
13+
h1,
14+
.h1 {
15+
font-size: 40px;
16+
font-family: 'Montserrat', sans-serif;
17+
font-weight: 200;
18+
color: #2C2C2C;
19+
}
20+
21+
h2,
22+
.h2 {
23+
font-size: 32px;
24+
font-family: 'Montserrat', sans-serif;
25+
font-weight: 200;
26+
color: #2C2C2C;
27+
}
28+
29+
h3,
30+
.h3 {
31+
font-size: 24px;
32+
font-family: 'Montserrat', sans-serif;
33+
font-weight: 200;
34+
color: #2C2C2C;
35+
}
36+
37+
h4,
38+
.h4 {
39+
font-size: 20px;
40+
font-family: 'Montserrat', sans-serif;
41+
font-weight: 200;
42+
color: #2C2C2C;
43+
}
44+
45+
h5,
46+
.h5 {
47+
font-size: 18px;
48+
font-family: 'Montserrat', sans-serif;
49+
font-weight: 200;
50+
color: #2C2C2C;
51+
}
52+
53+
h6,
54+
.h6 {
55+
font-size: 16px;
56+
font-family: 'Montserrat', sans-serif;
57+
font-weight: 200;
58+
color: #2C2C2C;
59+
}
60+
61+
a {
62+
color: #555ec4;
63+
font-family: 'Source Sans Pro', sans-serif;
64+
font-weight: 300;
65+
}
66+
67+
a:hover {
68+
color: #C60B31;
69+
}
70+
71+
p {
72+
color: #B1B1B1;
73+
font-family: 'Source Sans Pro', sans-serif;
74+
font-weight: 300;
75+
}
76+
77+
label {
78+
color: #B1B1B1;
79+
}
80+
81+
#wrapper {
82+
min-height: 100%;
83+
height: auto !important;
84+
height: 100%;
85+
margin: 0 auto -115px;
86+
background: #F5F5F5;
87+
}
88+
89+
.navbar {
90+
margin-bottom: 0;
91+
border-radius: 0;
92+
background-color: #FFFFFF;
93+
border: 0;
94+
border-bottom: 1px solid #F6F6F6;
95+
96+
.navbar-brand {
97+
img {
98+
display: block;
99+
width: 170px;
100+
height: 29px;
101+
}
102+
}
103+
}
104+
105+
@media (max-width: 767px){
106+
.navbar {
107+
.navbar-collapse {
108+
margin-top: 10px;
109+
110+
.dropdown-menu {
111+
border: none;
112+
background-color: transparent;
113+
}
114+
}
115+
}
116+
}
117+
118+
.content-header {
119+
}
120+
121+
.user-form {
122+
.content {
123+
padding-top: 80px;
124+
padding-bottom: 50px;
125+
}
126+
}
127+
128+
#push,
129+
.app-footer {
130+
height: 115px;
131+
}
132+
133+
.app-footer {
134+
padding: 30px 50px;
135+
background: #F9F9F9;
136+
137+
p {
138+
margin-bottom: 0;
139+
font-size: 14px;
140+
}
141+
142+
.enjoy {
143+
margin-bottom: 5px;
144+
font-size: 20px;
145+
color: #3B3B3B;
146+
font-family: 'Montserrat', sans-serif;
147+
font-weight: 200;
148+
}
149+
}
150+
151+
.alert {
152+
ul {
153+
display: block;
154+
margin: 0;
155+
padding-left: 15px;
156+
}
157+
}
158+
159+
input {
160+
padding: 15px 15px;
161+
background: #FFFFFF;
162+
border-radius: 2px;
163+
border: 1px solid #E7E7E7;
164+
font-size: 16px;
165+
line-height: 50px;
166+
height: 50px;
167+
width: 100%;
168+
}
169+
170+
input[type="submit"] {
171+
padding-top: 0;
172+
padding-bottom: 0;
173+
height: 50px;
174+
border-radius: 2px;
175+
background: #C60B31;
176+
border-color: #C60B31;
177+
color: #FFFFFF;
178+
}

0 commit comments

Comments
 (0)