Skip to content

スタイルシート修正 #233

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

Merged
merged 3 commits into from
May 22, 2016
Merged

スタイルシート修正 #233

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
638f852
スタイルシート修正
s-nakajima May 22, 2016
3111a13
Merge origin/master
s-nakajima May 22, 2016
46aa646
スタイルシート修正
s-nakajima May 22, 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
23 changes: 8 additions & 15 deletions webroot/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,18 +260,14 @@ ul.nav-pills {
/**
* フレーム枠内
*/
.frame.nc-content-list header,
.frame.nc-content header {
margin-bottom: 16px;
margin-bottom: 8px;
}

/**
* フレーム枠内のh1,h2,h3,h4,h5,h6
*/
.frame .nc-content-list > h1,
.frame .nc-content-list > .h1 {
margin-top: 0px;
margin-bottom: 16px;
}
.frame.nc-content article h1,
.frame.nc-content article .h1 {
margin-top: 0px;
Expand All @@ -280,6 +276,12 @@ ul.nav-pills {

.frame.nc-content-list article h1,
.frame.nc-content-list article .h1,
.frame .nc-content-list > h1,
.frame .nc-content-list > .h1 {
margin-top: 0px;
margin-bottom: 16px;
}

.frame.nc-content-list article h2,
.frame.nc-content-list article .h2,
.frame.nc-content-list article h3,
Expand Down Expand Up @@ -397,12 +399,3 @@ ul.nav-pills {
.frame.nc-content article .h6 {
font-size: 9px;
}

/**
* サイト閉鎖
*/
.site-close.jumbotron h1 {
font-size: 2.8em;
margin-top: 0px;
margin-bottom: 20px;
}