Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit21cf2d3

Browse files
authored
Merge pull requestalexmojaki#125 from alexmojaki/feature/features
Feature/features
2 parentsd0dc6e4 +ba4780b commit21cf2d3

File tree

12 files changed

+280
-69
lines changed

12 files changed

+280
-69
lines changed

‎backend/main/static/css/brochure/base/_helpers.scss‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,18 @@
482482
float:left;
483483
}
484484

485-
.flex{
486-
display:flex;
485+
@media (min-width:640px) {
486+
.flex{
487+
display:flex;
488+
}
487489
}
488490

491+
492+
489493
.center-content{
490494
justify-content:center;
491495
}
496+
497+
.center-text {
498+
text-align:center;
499+
}

‎backend/main/static/css/brochure/components/_buttons.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
padding:16px36px;
1818
text-align:center;
1919
white-space:nowrap;
20+
width:fit-content;
2021

2122
&:active {
2223
outline:0;
Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,52 @@
1-
.feature {
2-
padding-top:12px;
3-
padding-bottom:12px;
4-
}
1+
.feature{
2+
margin-bottom:30px;
3+
4+
.feature-image {
5+
flex:1;
6+
min-width:250px;
7+
z-index:2;// above text when fading in
58

6-
.features-wrap {
7-
&:first-child {
8-
margin-top:-12px;
9+
img {
10+
max-height:300px;
11+
}
912
}
1013

11-
&:last-child {
12-
margin-bottom:-12px;
14+
.feature-text {
15+
flex:1;
16+
min-width:150px;
17+
margin:30px;
18+
19+
.feature-header {
20+
padding:030px;
21+
22+
* {
23+
display:inline-block;
24+
}
25+
26+
.feature-line {
27+
position:fixed;
28+
right:-30px;
29+
margin-top:56px;
30+
height:4px;
31+
background:white;
32+
width:50px;
33+
}
34+
}
35+
1336
}
1437
}
1538

16-
.features-inner {
17-
padding-left:25px;
18-
max-width:400px;
39+
40+
41+
.feature-text:nth-of-type(2n +1){
42+
text-align:right!important;
43+
1944
}
2045

21-
.feature-header {
22-
display:flex;
23-
align-items:center;
46+
.feature:nth-of-type(2n +1).feature-line {
47+
left:-30px!important;
2448
}
2549

26-
.features-inner{
27-
padding-top:32px;
28-
padding-bottom:32px;
29-
}
50+
.feature-image:nth-of-type(2n +1) {
51+
text-align:-webkit-right;
52+
}

‎backend/main/static/css/brochure/layout/_hero.scss‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,36 @@
4343
margin:0auto;
4444
}
4545
}
46+
47+
48+
// BULLETS
49+
50+
.bullet {
51+
padding-top:12px;
52+
padding-bottom:12px;
53+
}
54+
55+
.bullets-wrap {
56+
&:first-child {
57+
margin-top:-12px;
58+
}
59+
60+
&:last-child {
61+
margin-bottom:-12px;
62+
}
63+
}
64+
65+
.bullets-inner {
66+
padding-left:25px;
67+
max-width:400px;
68+
}
69+
70+
.bullet-header {
71+
display:flex;
72+
align-items:center;
73+
}
74+
75+
.bullets-inner{
76+
padding-top:32px;
77+
padding-bottom:32px;
78+
}

‎backend/main/static/css/brochure/layout/_main.scss‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ main {
2525
position:relative;/* To always display inner elements above pseudo decorative stuff*/
2626
}
2727

28-
.container{
29-
display:flex;
30-
}
31-
3228
.container.col{
3329
padding:020px;
3430
flex:1;

‎backend/main/static/css/brochure/style.scss‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
@import"components/buttons";
2020
@import"layout/header";
2121
@import"layout/hero";
22-
@import"layout/features";
2322
@import"layout/main";
2423
@import"layout/footer";
2524
@import"layout/_scroll.scss";
2625
@import"layout/_float.scss";
27-
26+
@import"layout/_features.scss";
43.2 KB
Loading
159 KB
Loading
24.9 KB
Loading
8.28 KB
Loading

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp