aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/static/css/base.css3
-rw-r--r--mediagoblin/static/css/base.css~85
2 files changed, 1 insertions, 87 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 3a8d3cdc..c66b4526 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -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;
}
diff --git a/mediagoblin/static/css/base.css~ b/mediagoblin/static/css/base.css~
deleted file mode 100644
index 4c5ae9ab..00000000
--- a/mediagoblin/static/css/base.css~
+++ /dev/null
@@ -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');
-}
-