heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expanded page width to 960px

Browse Source 
Conflicts:

	mediagoblin/static/css/base.css
This commit is contained in:
Christopher Allan Webber 2011-05-23 17:39:44 -05:00
parent 76c8e34d5c
commit a7b9c65ed5
2 changed files with 1 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/static/css/base.css
View File

@ -1,6 +1,5 @@
body {
background-color: #272727;
background-image: url('../images/back.png');
color: #f7f7f7;
font-family: sans;
padding:none;
@ -45,7 +44,7 @@ label {
}
.mediagoblin_content {
width: 800px;
width: 960px;
margin-left: auto;
margin-right: auto;
}

85
mediagoblin/static/css/base.css~
View File

@ -1,85 +0,0 @@
body {
background-color: #272727;
background-image: url('back.png');
color: #f7f7f7;
font-family: sans;
padding:none;
margin:0px;
}
/* Carter One font */
@font-face {
font-family: 'Carter One';
font-style: normal;
font-weight: normal;
src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=VjW2qt1pkqVtO22ObxgEBRsxEYwM7FgeyaSgU71cLG0') format('woff');
}
/* text styles */
h1 {
font-family: 'Carter One', arial, serif;
margin-bottom: 20px;
margin-top:50px;
}
.dotted_line {
width:100%;
height:0px;
border-bottom: dotted 1px #5f5f5f;
position:absolute;
left:0px;
margin-top:-20px;
}
a {
color: #d12929;
border-bottom: 1px dotted;
text-decoration: none;
}
label {
font-weight: normal;
}
.mediagoblin_header {
width:100%;
height:60px;
background-image:url('../images/header_back.png');
padding-top:40px;
margin-bottom:80px;
}
.mediagoblin_content {
width: 800px;
margin-left: auto;
margin-right: auto;
}
.button_red, .button_green {
font-family: 'Carter One', arial, serif;
height: 28px;
min-width: 99px;
box-shadow: 0px 0px 5px #000;
border-radius: 5px;
border: none;
color: #272727;
margin: 10px;
font-size: 1em;
float: left;
display: block;
text-align: center;
padding-top: 4px;
padding-left:11px;
padding-right:11px;
}
.button_red {
background-image: url('../images/button_red.png');
}
.button_green {
background-image: url('../images/button_green.png');
}