Skip to content

Commit e9d9012

Browse files
author
Paul Jenkins
committed
Merge pull request #28 from shiftkey/NewLayout
New Layout
2 parents 8a63d32 + 060ab79 commit e9d9012

File tree

7 files changed

+155
-221
lines changed

7 files changed

+155
-221
lines changed

‎_includes/latest_project.html

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<div class="latest">
2+
3+
<h3>The latest Code52 project is <a href="http://code52.org/samurai.html">Samurai</a></h3>
4+
5+
<div class="description">Samurai a turn-based combat game running on ASP.NET MVC and XNA, with plans to build clients for other platforms in the future. More details <a href="http://code52.org/samurai.html">here</a>.</div>
6+
7+
<div class="details">
8+
9+
<ul>
10+
<li>Fork and contribute on <a href="https://github.com/Code52/Samurai">GitHub</a></li>
11+
<li>Follow the conversation on <a href="https://jabbr.net/">JabbR</a></li>
12+
<li>Track the progress on <a href="https://trello.com/board/samurai/4f1d3d847a38f6221f1d9354">Trello</a></li>
13+
</ul>
14+
15+
</div>
16+
17+
</div>

‎_layouts/layout.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
1212
<title>{% if page.title != "code52" %}{{ page.title }} - code52{% else %}{{ page.title }}{% endif %}</title>
13-
<link rel="stylesheet" type="text/css" href="/css/style_2.css" />
13+
<link rel="stylesheet" type="text/css" href="/css/style20120128.css" />
1414
<link rel="shortcut icon" href="/img/favicon.ico" />
1515
</head>
1616
<body>

‎_layouts/post.html

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
layout: layout
33
---
4+
45
<div class="entry-container">
56
<div class='entry'>
67
<h1> {{page.title}} </h1>

‎css/style.css ‎css/style20120128.css

+134-110
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,134 @@
1-
body
2-
{
3-
font-family: Segoe UI, sans-serif;
4-
margin-left:auto;
5-
margin-right: auto;
6-
width:1100px;
7-
}
8-
h1,h2,h3,h4,h5,h6
9-
{
10-
font-family: Segoe UI Light, Segoe WP Light, Segoe UI, Helvetica, sans-serif;
11-
font-weight: lighter;
12-
margin-bottom:0px;
13-
}
14-
h1
15-
{
16-
font-size: 4em;
17-
}
18-
h2
19-
{
20-
font-size: 2.5em;
21-
}
22-
a, a:visited
23-
{
24-
text-decoration: none;
25-
color:#13678b;
26-
}
27-
a:hover
28-
{
29-
color:white;
30-
background: #13678b
31-
}
32-
ul
33-
{
34-
margin:0;
35-
padding:0;
36-
}
37-
li
38-
{
39-
margin:0;
40-
padding:0;
41-
list-style-type:none;
42-
}
43-
.entry ul, .idea ul
44-
{
45-
margin-left:10px;
46-
}
47-
.entry li, .idea li
48-
{
49-
margin-left:10px;
50-
list-style-type:circle;
51-
}
52-
#hometext a { font-size: 2em; margin-left: 5px; margin-right:10px; display: none; color: #41B1E1; font-weight: normal; }
53-
#home:hover
54-
{
55-
background:none;
56-
}
57-
#side
58-
{
59-
float:right;
60-
color: #41b1e1;
61-
margin-left:50px;
62-
}
63-
#side .section
64-
{
65-
margin-top:50px;
66-
margin-bottom: 50px;
67-
padding:0;
68-
}
69-
#side .section ul
70-
{
71-
font-size:2em;
72-
}
73-
#content
74-
{
75-
width:auto;
76-
}
77-
img
78-
{
79-
width: auto !important;
80-
height: auto !important;
81-
max-width: 100%;
82-
border: none;
83-
}
84-
.postdate
85-
{
86-
font-size: 0.8em;
87-
font-weight: bold;
88-
}
89-
.idea h1, .entry h1
90-
{
91-
margin-bottom: 5px;
92-
}
93-
94-
/* min-device-width: 800px instead? */
95-
@media screen and (max-width:900px)
96-
{
97-
body { width:auto; margin:10px; }
98-
#content { width : 100%; }
99-
#side { float:none; width:100%; margin-left:0px; }
100-
#side .section { margin-top:0; margin-right: 30px; }
101-
#side .section ul { font-size:1.2em; padding:0px; margin:5px; }
102-
#side li { display: inline; margin-left:3px; margin-right: 3px; font-weight: normal; }
103-
#home { display: none; }
104-
#hometext a { display: inline; }
105-
h1 { margin-top: -0px;}
106-
}
107-
108-
#suggest { color: orange; }
109-
#suggest:hover { color:white;
110-
background: orange }
1+
body
2+
{
3+
font-family: Segoe UI, sans-serif;
4+
margin-left:auto;
5+
margin-right: auto;
6+
width:1100px;
7+
}
8+
h1,h2,h3,h4,h5,h6
9+
{
10+
font-family: Segoe UI Light, Segoe WP Light, Segoe UI, Helvetica, sans-serif;
11+
font-weight: lighter;
12+
margin-bottom:0px;
13+
}
14+
h1
15+
{
16+
font-size: 4em;
17+
}
18+
h2
19+
{
20+
font-size: 2.5em;
21+
}
22+
a, a:visited
23+
{
24+
text-decoration: none;
25+
color:#13678b;
26+
}
27+
a:hover
28+
{
29+
color:white;
30+
background: #13678b
31+
}
32+
ul
33+
{
34+
margin:0;
35+
padding:0;
36+
}
37+
li
38+
{
39+
margin:0;
40+
padding:0;
41+
list-style-type:none;
42+
}
43+
.entry ul, .idea ul
44+
{
45+
margin-left:10px;
46+
}
47+
.entry li, .idea li , .latest li
48+
{
49+
margin-left:10px;
50+
list-style-type:circle;
51+
}
52+
#hometext a { font-size: 2em; margin-left: 5px; margin-right:10px; display: none; color: #41B1E1; font-weight: normal; }
53+
#home:hover
54+
{
55+
background:none;
56+
}
57+
#side
58+
{
59+
float:right;
60+
color: #41b1e1;
61+
margin-left:50px;
62+
}
63+
#side .section
64+
{
65+
margin-top:50px;
66+
margin-bottom: 50px;
67+
padding:0;
68+
}
69+
#side .section ul
70+
{
71+
font-size:2em;
72+
}
73+
#content
74+
{
75+
width:auto;
76+
}
77+
img
78+
{
79+
width: auto !important;
80+
height: auto !important;
81+
max-width: 100%;
82+
border: none;
83+
}
84+
.postdate
85+
{
86+
font-size: 0.8em;
87+
font-weight: bold;
88+
}
89+
.idea h1, .entry h1
90+
{
91+
margin-bottom: 5px;
92+
}
93+
94+
.latest
95+
{
96+
border-bottom: 1px solid #13678B;
97+
padding: 10px;
98+
padding-left: 20px;
99+
padding-bottom: 20px;
100+
margin-right: 330px; /*hack*/
101+
margin-top: 10px;
102+
}
103+
104+
.latest h3 { margin-top: 5px; font-size: 1.8em; color: #13678B;}
105+
106+
.latest .description
107+
{
108+
font-family: Segoe UI Light, Segoe WP Light, Segoe UI, Helvetica, sans-serif;
109+
font-weight: bold;
110+
margin-top: 10px;
111+
margin-bottom: 10px;
112+
}
113+
114+
.latest .details { margin: 10px;}
115+
116+
/* min-device-width: 800px instead? */
117+
@media screen and (max-width:900px)
118+
{
119+
body { width:auto; margin:10px; }
120+
#content { width : 100%; }
121+
#side { float:none; width:100%; margin-left:0px; }
122+
#side .section { margin-top:0; margin-right: 30px; }
123+
#side .section ul { font-size:1.2em; padding:0px; margin:5px; }
124+
#side li { display: inline; margin-left:3px; margin-right: 3px; font-weight: normal; }
125+
#home { display: none; }
126+
#hometext a { display: inline; }
127+
h1 { margin-top: -0px;}
128+
.latest { margin-right:0px; border-top: 1px solid #13678B; margin-top: -20px; margin-bottom: 20px; }
129+
}
130+
131+
#suggest { color: orange; }
132+
#suggest:hover { color:white; background: orange }
133+
134+

‎css/style_2.css

-110
This file was deleted.

‎img/logo.png

6.52 KB
Loading

0 commit comments

Comments
 (0)