Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #160 タイムライン見出し改行調整 #190

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Fixed #160 タイムライン見出し改行調整 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b8bfb70
タイムラインのスピーカーアイコン border修正 #178
mignonstyle Dec 31, 2015
54241dd
スピーカーアイコンのborderみんなつけてみた #178
mignonstyle Jan 3, 2016
e5f4820
タイムライン見出し改行調整 #160
mignonstyle Jan 3, 2016
52727d4
テキスト左揃え中揃え about修正 #152
mignonstyle Jan 3, 2016
a96f006
テキスト左揃え修正 SP about、content #152
mignonstyle Jan 3, 2016
461cb2c
テキストフォントサイズ修正 LOCATION #152
mignonstyle Jan 3, 2016
ef07878
about改行修正 #152
mignonstyle Jan 3, 2016
b557f3f
CONTENT 改行修正 #152
mignonstyle Jan 3, 2016
685eebe
Merge pull request #191 from mignonstyle/isseus/#152
torounit Jan 3, 2016
443fddc
Merge pull request #181 from mignonstyle/issues/#178
torounit Jan 3, 2016
06d623c
Merge pull request #192 from mignonstyle/issues/#158
torounit Jan 4, 2016
8ad63fd
index.html コンフリクト修正 #160
mignonstyle Jan 9, 2016
46f019f
コンフリクト修正 #160
mignonstyle Jan 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions assets/src/scss/foundation/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ img {
p {
margin-top: 0;
margin-bottom: 1.5em;

&.margin-none {
margin-bottom: 0;
}
}

.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
Expand Down
11 changes: 9 additions & 2 deletions assets/src/scss/objects/_about.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
font-size: 2.4rem;
font-weight: normal;
margin: 0 0 1em;
text-align: center;

@include bp-min($screen-sm-min) {
font-size: 3.2rem;
text-align: center;
}
}

Expand All @@ -30,8 +30,15 @@
font-size: 2.1rem;
}

.h3 {
.comment {
font-size: 2.1rem;
margin: 0.5em 0;
line-height: 1.3;
text-align: center;
}

@include bp-min($screen-sm-min) {
text-align: center;
}
}
}
10 changes: 2 additions & 8 deletions assets/src/scss/objects/_content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,17 @@
font-size: 1.8rem;
font-weight: bold;
margin: 0 0 1rem;
text-align: center;

@include bp-min($screen-sm-min) {
font-size: 2.1rem;
text-align: center;
}
}

&__body {
font-size: 1.6rem;

@include bp-max($screen-md-max) {
br {
display: none;
}
}

@include bp-min($screen-lg-min) {
@include bp-min($screen-sm-min) {
text-align: center;
}

Expand Down
2 changes: 2 additions & 0 deletions assets/src/scss/objects/_person.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
width: 35px;
overflow: hidden;
border-radius: 100%;
border: solid 1px #ccc;


&--conti {
background-image: url( 'https://www.gravatar.com/avatar/bbfc276088051356a5967389b705148e?s=340' );
Expand Down
3 changes: 3 additions & 0 deletions assets/src/scss/objects/_points.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@

}

&__body {
text-align: center;
}
}
1 change: 1 addition & 0 deletions assets/src/scss/objects/_speakers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
.person {
height: 170px;
width: 170px;
border: none;
}
}

Expand Down
14 changes: 9 additions & 5 deletions assets/src/scss/objects/_timeline.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,30 @@

&--left {
float: left;
padding-right: 60px;
padding-right: 30px;
}

&--right {
float: left;
margin-left: 50%;
padding-left: 60px;
padding-left: 30px;
}

}

.session {
border: 1px solid #ccc;
border-radius: 5px;
font-size: 1.8rem;
line-height: 1.3;
padding: 20px;
font-size: 2.2rem;
padding: 20px 10px;
text-align: center;
position: relative;

@include bp-min($screen-sm-min) {
padding-left: 20px;
padding-right: 20px;
}

&__division {
margin: 0 0 1em;
text-align: left;
Expand Down
79 changes: 40 additions & 39 deletions index.html
View file
Open in desktop

Large diffs are not rendered by default.