tonyair/silverstripe-simple
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-simple synced 2024-10-22 11:05:50 +02:00
Code Issues Projects Releases Wiki Activity

BUG: Simple has base typography defined in layout ( trac #7803)

Browse Source 
Moved some style declarations from layout to typography so that the cms
would pick them up.
Moved typography tag to the page.ss before layout is included
Changed typography elements to be wrapped in .typography, rather than a
layout tag within the Layout page templates. This will mean that a
bunch of modules have access to the correct type styling
This commit is contained in:
Naomi Guyer 2012-08-22 17:11:19 +12:00 committed by Sam Minnee
parent 917c322cb7
commit df15cd8920
5 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
css/layout.css
View File

@ -35,53 +35,6 @@ a:link {
-webkit-tap-highlight-color: #b80000 -webkit-tap-highlight-color: #b80000
} }
.content img.left, .content img.right {
border: 5px solid #d7d7d7;
max-width: 60%;
height: auto;
}
.content img.left {
float: left;
margin: 6px 20px 10px 0;
}
content img.right {
float: right;
margin: 6px 0 10px 20px;
}
.content ul {
margin: 20px 0 20px 30px
}
.content li {
line-height: 22px;
margin-bottom: 5px;
list-style-type: disc;
}
.content-container h1 {
font-size: 36px;
border-bottom: 1px solid #e5e5e5;
padding-bottom: 6px;
margin: 0 0 23px 0;
line-height: 45px;
}
.content-container h1 span.amp {
font-family: Baskerville,"Goudy Old Style","Palatino","Book Antiqua",Georgia;
font-style: italic;
}
.content-container h2 {
font-size: 24px;
margin-bottom: 15px;
padding-top: 15px;
line-height: 32px;
}
.content-container h3 {
font-size: 21px;
margin-bottom: 10px;
padding-top: 10px;
}
.content a {
border-bottom: 1px dashed #b80000
}
.brand { .brand {
float: left; float: left;
display: inline-block; display: inline-block;
@ -612,13 +565,13 @@ aside {
aside { aside {
width: 100% width: 100%
} }
.content-container h1 { .typography h1 {
font-size: 30px; font-size: 30px;
line-height:35px; line-height:35px;
margin-bottom: 15px; margin-bottom: 15px;
padding-bottom: 10px; padding-bottom: 10px;
} }
.content-container p { .typography p {
font-size: 14px; font-size: 14px;
line-height: 23px; line-height: 23px;
} }

65
css/typography.css
View File

@ -42,6 +42,46 @@ a {
a:hover { a:hover {
color: #d80000 color: #d80000
} }
.typography h1 a{
border:none;
}
.typography ul {
margin: 20px 0 20px 30px
}
.typography li {
line-height: 22px;
margin-bottom: 5px;
list-style-type: disc;
}
.typography h1 {
font-size: 36px;
border-bottom: 1px solid #e5e5e5;
padding-bottom: 6px;
margin: 0 0 23px 0;
line-height: 45px;
}
.typography h1 span.amp {
font-family: Baskerville,"Goudy Old Style","Palatino","Book Antiqua",Georgia;
font-style: italic;
}
.typography h2 {
font-size: 24px;
margin-bottom: 15px;
padding-top: 15px;
line-height: 32px;
}
.typography h3 {
font-size: 21px;
margin-bottom: 10px;
padding-top: 10px;
}
.typography a {
border-bottom: 1px dashed #b80000
}
table { table {
border-collapse: collapse; border-collapse: collapse;
border: 1px solid #d4d4d4; border: 1px solid #d4d4d4;
@ -87,15 +127,26 @@ p.intro {
/* IMAGES /* IMAGES
-------------------------------------------- */ -------------------------------------------- */
.typography img { .typography img {
border: none border: 5px solid #d7d7d7;
max-width: 60%;
height: auto;
float: left;
margin: 6px 20px 10px 0;
}
.typography img.left, .typography img.right {
border: 5px solid #d7d7d7;
max-width: 60%;
height: auto;
}
.typography img.left {
float: left;
margin: 6px 20px 10px 0;
} }
.typography img.right { .typography img.right {
float: right; float: right;
margin-left: 20px; margin: 6px 0 10px 20px;
}
.typography img.left {
float: left
} }
.typography img.leftAlone { .typography img.leftAlone {
float: left; float: left;
margin-right: 100%; margin-right: 100%;
@ -105,4 +156,6 @@ p.intro {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
display: block; display: block;
} }

2
templates/Layout/Page.ss
View File

@ -1,4 +1,4 @@
<div class="content-container typography"> <div class="content-container">
<article> <article>
<h1>$Title</h1> <h1>$Title</h1>
<div class="content">$Content</div> <div class="content">$Content</div>

2
templates/Layout/Page_results.ss
View File

@ -1,4 +1,4 @@
<div id="Content" class="searchResults typography"> <div id="Content" class="searchResults">
<h1>$Title</h1> <h1>$Title</h1>
<% if Query %> <% if Query %>

2
templates/Page.ss
View File

@ -31,7 +31,7 @@ Change it, enhance it and most importantly enjoy it!
<body class="$ClassName<% if Menu(2) %><% else %> no-sidebar<% end_if %>"> <body class="$ClassName<% if Menu(2) %><% else %> no-sidebar<% end_if %>">
<% include Header %> <% include Header %>
<div class="main" role="main"> <div class="main" role="main">
<div class="inner"> <div class="inner typography">
$Layout $Layout
</div> </div>
</div> </div>