Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

1 files changed, 31 insertions, 35 deletions

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 59c2f49d..83f5357c 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -14,23 +14,13 @@ form {
   padding: 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: 15px;
   margin-top: 15px;
   color: #fff;
-  font-size: 30px;
+  font-size: 1.875em;
 }
 
 h2{
@@ -39,12 +29,12 @@ h2{
 }
 
 h3{
-  border-bottom: 1px solid #222;
-  font-size: 18px;
+  border-bottom: 1px solid #333;
+  font-size: 1.125em;
 }
 
 a {
-  color: #999;
+  color: #86D4B1;
 }
 
 a.highlight {
@@ -66,7 +56,12 @@ label {
   height: 36px;
   padding-top: 14px;
   margin-bottom: 20px;
-  border-bottom: 1px solid #222222;
+  border-bottom: 1px solid #333;
+}
+
+a.mediagoblin_logo{
+  color: #fff;
+  font-weight: bold;
 }
 
 .header_submit{
@@ -79,21 +74,21 @@ label {
   background-image:      -o-linear-gradient(top, #D2D2D2, #aaa); 
   background-image:         linear-gradient(top, #D2D2D2, #aaa);
   box-shadow: 0px 0px 4px #000;
-  border-radius: 5px 5px 5px 5px;
+  border-radius: 3px;
   margin: 8px;
   padding: 3px 8px;
   text-decoration: none;
   border: medium none;
-  font-family: 'Carter One',arial,serif;
+  font-style: normal;
 }
 
 .mediagoblin_footer {
   height: 30px;
-  border-top: 1px solid #222222;
+  border-top: 1px solid #333;
   bottom: 0px;
   padding-top: 8px;
   text-align: center;
-  font-size: 14px;
+  font-size: 0.8125em;
   color: #999;
 }
 
@@ -108,7 +103,6 @@ label {
 /* common website elements */
 
 .button {
-  font-family: 'Carter One', arial, serif;
   height: 32px;
   min-width: 99px;
   background-color: #86d4b1;
@@ -119,11 +113,10 @@ label {
   background-image:      -o-linear-gradient(top, #86d4b1, #62caa2); 
   background-image:         linear-gradient(top, #86d4b1, #62caa2);
   box-shadow: 0px 0px 4px #000;
-  border-radius: 5px;
+  border-radius: 3px;
   border: none;
   color: #272727;
   margin: 10px 0px 10px 15px;
-  font-size: 1em;
   text-align: center;
   padding-left: 11px;
   padding-right: 11px;
@@ -138,13 +131,20 @@ text-align: center;
   margin: 5px;
 }
 
+.empty_space{
+  background-color: #222;
+  font-style: italic;
+  text-align: center;
+  height: 160px;
+  padding-top: 70px;
+}
+
 /* forms */
 
 .form_box {
   background-color: #222;
   background-image: url("../images/background_lines.png");
   background-repeat: repeat-x;
-  font-size: 18px;
   padding-bottom: 30px;
   padding-top: 30px;
   margin-left: auto;
@@ -157,13 +157,8 @@ text-align: center;
   background-image: url("../images/background_edit.png");
 }
 
-.form_box h1 {
-  font-size: 28px;
-}
-
 .form_field_input input, .form_field_input textarea {
   width: 100%;
-  font-size: 18px;
 }
 
 .form_field_box {
@@ -178,7 +173,6 @@ text-align: center;
   background-color: #87453b;
   color: #fff;
   border: none;
-  font-size: 16px;
   padding: 9px;
   margin-top: 8px;
   margin-bottom: 8px;
@@ -193,7 +187,7 @@ text-align: center;
 .comment_author {
   margin-bottom: 40px;
   padding-top: 4px;
-  font-size: 14px;
+  font-size: 0.9em;
 }
 
 .comment_content p {
@@ -205,7 +199,6 @@ text-align: center;
 .media_thumbnail {
   padding: 0px;
   width: 180px;
-  height: 180px;
   overflow: hidden;
   float: left;
   margin: 0px 4px 10px 4px;
@@ -214,8 +207,12 @@ text-align: center;
 
 /* media detail */
 
-.media_image_container {
-  text-align: center;
+h2.media_title{
+  margin-bottom: 0px;
+}
+
+p.media_uploader{
+  font-size: 0.9em;
 }
 
 /* icons */
@@ -232,10 +229,9 @@ img.media_icon{
   display: block;
   float: left;
   text-align: center;
-  background-color: #222;
+  background-color: #333;
   text-decoration: none;
   padding: 12px 0pt;
-  font-family: 'Carter One', arial, serif;
   font-size: 2em;
   margin: 0 0 20px
 }