From 270dca58af07aaa7548f341e166b56493d9eae30 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 1 Jul 2011 15:41:44 +0200 Subject: Style comments (first draft only) --- mediagoblin/static/css/base.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 31573820..537cc35c 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -223,6 +223,20 @@ a.mediagoblin_logo:hover { width:280px; } +/* comments */ + +.comment_author { + margin-bottom:40px; + font-size:14px; + text-align:right; + border-top:1px solid #393939; + padding-top:4px; +} + +.comment_content p { + margin-bottom:4px; +} + /* media galleries */ ul.media_thumbnail { -- cgit v1.2.3 From 6ef36a15f2e0dcab276f8ac0a97d2890d0d1c050 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 1 Jul 2011 17:20:22 +0200 Subject: Add delete and edit icons --- mediagoblin/static/css/base.css | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 537cc35c..0d594169 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -254,3 +254,29 @@ li.media_thumbnail { zoom:1; . *display:inline; } + +/* icons */ + +.iconFeed{ + width:16px; + height:16px; + background-image:url('../images/iconFeed.png'); + float:left; + margin-right:5px; +} + +.iconEdit{ + width:16px; + height:16px; + background-image:url('../images/iconEdit.png'); + float:left; + margin-right:5px; +} + +.iconDelete{ + width:16px; + height:16px; + background-image:url('../images/iconDelete.png'); + float:left; + margin-right:5px; +} -- cgit v1.2.3 From 13b4cbf01436ba2b734358743ad82c466a9110b8 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 1 Jul 2011 17:25:15 +0200 Subject: Put comment author/date on the left --- mediagoblin/static/css/base.css | 3 --- 1 file changed, 3 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 0d594169..924d68b2 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -227,9 +227,6 @@ a.mediagoblin_logo:hover { .comment_author { margin-bottom:40px; - font-size:14px; - text-align:right; - border-top:1px solid #393939; padding-top:4px; } -- cgit v1.2.3 From b611476c94c8a44d93a4488152fe729793e6b594 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 1 Jul 2011 18:59:07 +0200 Subject: Reorder media.html (comments, icons, links, layout) --- mediagoblin/static/css/base.css | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 924d68b2..2dd276b0 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -254,26 +254,7 @@ li.media_thumbnail { /* icons */ -.iconFeed{ - width:16px; - height:16px; - background-image:url('../images/iconFeed.png'); - float:left; - margin-right:5px; -} - -.iconEdit{ - width:16px; - height:16px; - background-image:url('../images/iconEdit.png'); - float:left; - margin-right:5px; -} - -.iconDelete{ - width:16px; - height:16px; - background-image:url('../images/iconDelete.png'); - float:left; - margin-right:5px; +img.media_icon{ + margin:0 4px; + vertical-align:sub; } -- cgit v1.2.3 From c26601a8a6f5d136127b95639ea076c6806d3ee8 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 1 Jul 2011 20:09:51 +0200 Subject: Remove dotted_line style from css --- mediagoblin/static/css/base.css | 9 --------- 1 file changed, 9 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 2dd276b0..18febd9c 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -133,15 +133,6 @@ a.mediagoblin_logo:hover { /* common website elements */ -.dotted_line { - width:100%; - height:0px; - border-bottom: dotted 1px #5f5f5f; - position:absolute; - left:0px; - margin-top:-20px; -} - .button { font-family:'Carter One', arial, serif; height:32px; -- cgit v1.2.3 From bf332e827ef4df843aa8c936fabdff430130919c Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 1 Jul 2011 20:14:38 +0200 Subject: Tiny pagination style changes --- mediagoblin/static/css/base.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 18febd9c..3b2a9a50 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -155,6 +155,10 @@ a.mediagoblin_logo:hover { padding-right:11px; } +.pagination{ +text-align:center; +} + /* forms */ .form_box { -- cgit v1.2.3 From 1344821daf935c348eaa46c27e17fc3186c59b19 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 3 Jul 2011 21:20:09 +0200 Subject: Added reset.css and text.css from 960.gs. This might shake up a few styles! --- mediagoblin/static/css/contrib/reset.css | 1 + mediagoblin/static/css/contrib/text.css | 1 + 2 files changed, 2 insertions(+) create mode 120000 mediagoblin/static/css/contrib/reset.css create mode 120000 mediagoblin/static/css/contrib/text.css (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/contrib/reset.css b/mediagoblin/static/css/contrib/reset.css new file mode 120000 index 00000000..e6796fdc --- /dev/null +++ b/mediagoblin/static/css/contrib/reset.css @@ -0,0 +1 @@ +/home/jef/env/mediagoblin/src/schendjes-mediagoblin/mediagoblin/contrib/reset.css \ No newline at end of file diff --git a/mediagoblin/static/css/contrib/text.css b/mediagoblin/static/css/contrib/text.css new file mode 120000 index 00000000..f54ea50c --- /dev/null +++ b/mediagoblin/static/css/contrib/text.css @@ -0,0 +1 @@ +/home/jef/env/mediagoblin/src/schendjes-mediagoblin/mediagoblin/contrib/text.css \ No newline at end of file -- cgit v1.2.3 From 18d9287aa9e396e253abf1f8c86a2804c3c64de3 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 3 Jul 2011 21:37:21 +0200 Subject: Switched over to 960_16_col. This may break a bunch of stuff. If you find something that is broken, slap me. --- mediagoblin/static/css/base.css | 10 ---------- mediagoblin/static/css/contrib/960_12_col.css | 1 - mediagoblin/static/css/contrib/960_16_col.css | 1 + 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 120000 mediagoblin/static/css/contrib/960_12_col.css create mode 120000 mediagoblin/static/css/contrib/960_16_col.css (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 3b2a9a50..2574683e 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -208,16 +208,6 @@ text-align:center; text-align:right; } -/* media pages */ - -.media_image{ - width:640px; -} - -.media_sidebar{ - width:280px; -} - /* comments */ .comment_author { diff --git a/mediagoblin/static/css/contrib/960_12_col.css b/mediagoblin/static/css/contrib/960_12_col.css deleted file mode 120000 index 15c360e4..00000000 --- a/mediagoblin/static/css/contrib/960_12_col.css +++ /dev/null @@ -1 +0,0 @@ -../../../contrib/960_12_col.css \ No newline at end of file diff --git a/mediagoblin/static/css/contrib/960_16_col.css b/mediagoblin/static/css/contrib/960_16_col.css new file mode 120000 index 00000000..a8e89d29 --- /dev/null +++ b/mediagoblin/static/css/contrib/960_16_col.css @@ -0,0 +1 @@ +/home/jef/env/mediagoblin/src/schendjes-mediagoblin/mediagoblin/contrib/960_16_col.css \ No newline at end of file -- cgit v1.2.3 From e854a1285c7a522398dea3c1a99dbb25afca7e56 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 3 Jul 2011 22:29:36 +0200 Subject: First push with 180px wide thumbnails --- mediagoblin/static/css/base.css | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 2574683e..997d25c7 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -221,20 +221,14 @@ text-align:center; /* media galleries */ -ul.media_thumbnail { +.media_thumbnail { padding:0px; -} - -li.media_thumbnail { - width:200px; - height:200px; - display:-moz-inline-stack; - display:inline-block; - vertical-align:top; + width:180px; + height:135px; + overflow:hidden; + float:left; margin:0px 10px 10px 0px; text-align:center; - zoom:1; -. *display:inline; } /* icons */ -- cgit v1.2.3 From 8dc4381032ad754397a1ef5415e664fffee40c37 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 3 Jul 2011 23:04:09 +0200 Subject: Style navigation buttons --- mediagoblin/static/css/base.css | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 997d25c7..74f283a6 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -237,3 +237,26 @@ img.media_icon{ margin:0 4px; vertical-align:sub; } + +/* navigation */ + +.navigation_button{ + width: 139px; + display:block; + float:left; + text-align: center; + background-color: #393939; + text-decoration: none; + padding: 6px 0pt; + font-family: 'Carter One', arial, serif; + font-size:2em; + margin:0; +} + +p.navigation_button{ + color:#272727; +} + +.navigation_left{ + margin-right:2px; +} -- cgit v1.2.3 From 38f71d47925eea76c34cd36a82600add6a7d0c7a Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 3 Jul 2011 23:13:54 +0200 Subject: Tiny margin changes --- mediagoblin/static/css/base.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 74f283a6..70b568ba 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -23,12 +23,16 @@ form { /* text styles */ -h1 { +h1{ font-family: 'Carter One', arial, serif; margin-bottom: 20px; margin-top:40px; } +h2{ + margin-top:20px; +} + p { font-family: sans-serif; font-size:16px; @@ -250,7 +254,7 @@ img.media_icon{ padding: 6px 0pt; font-family: 'Carter One', arial, serif; font-size:2em; - margin:0; + margin:0 0 20px } p.navigation_button{ -- cgit v1.2.3 From 62e2f458fbaf9b85a9939fe475338de955c85a87 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 3 Jul 2011 23:32:39 +0200 Subject: Style changes to messages. Tell me if I changed too much... --- mediagoblin/static/css/base.css | 74 ++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 41 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 70b568ba..b23bc3cb 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -77,47 +77,6 @@ label { padding-bottom:74px; } -ul.mediagoblin_messages { - list-style:none inside; - color:#393932; - margin:2px; - padding:2px; -} - -ul.mediagoblin_messages li { - background-color:#d4d4d4; - border-style:solid; - border-width:3px; - border-color:#959595; - margin:5px; - padding:8px; -} - -ul.mediagoblin_messages li.message_success { - background-color: #88d486; - border-color: #5bba59; -} - -ul.mediagoblin_messages li.message_warning { - background-color: #d4c686; - border-color: #baa959; -} - -ul.mediagoblin_messages li.message_error { - background-color: #d48686; - border-color: #ba5959; -} - -ul.mediagoblin_messages li.message_info { - background-color: #86b9d4; - border-color: #5998ba; -} - -ul.mediagoblin_messages li.message_debug { - background-color: #aa86d4; - border-color: #8659ba; -} - a.mediagoblin_logo { width:34px; height:25px; @@ -264,3 +223,36 @@ p.navigation_button{ .navigation_left{ margin-right:2px; } + +/* messages */ + +ul.mediagoblin_messages { + list-style:none inside; + color:#f7f7f7; +} + +.mediagoblin_messages li { + margin:5px 0; + padding:8px; + text-align:center; +} + +.message_success { + background-color: #378566; +} + +.message_warning { + background-color: #87453b; +} + +.message_error { + background-color: #87453b; +} + +.message_info { + background-color: #378566; + +.message_debug { + background-color: #f7f7f7; + color:#272727; +} -- cgit v1.2.3 From 9fedf30b3548ae58f091248c1ad318c16427b4c5 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 3 Jul 2011 17:38:28 -0500 Subject: Fixing the symlinks for these CSS files Not everyone runs mediagoblin out of /home/jef/env/mediagoblin/src/schendjes-mediagoblin/ ;) --- mediagoblin/static/css/contrib/960_16_col.css | 2 +- mediagoblin/static/css/contrib/reset.css | 2 +- mediagoblin/static/css/contrib/text.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/contrib/960_16_col.css b/mediagoblin/static/css/contrib/960_16_col.css index a8e89d29..bc1a430c 120000 --- a/mediagoblin/static/css/contrib/960_16_col.css +++ b/mediagoblin/static/css/contrib/960_16_col.css @@ -1 +1 @@ -/home/jef/env/mediagoblin/src/schendjes-mediagoblin/mediagoblin/contrib/960_16_col.css \ No newline at end of file +../../../contrib/960_16_col.css \ No newline at end of file diff --git a/mediagoblin/static/css/contrib/reset.css b/mediagoblin/static/css/contrib/reset.css index e6796fdc..87ae5592 120000 --- a/mediagoblin/static/css/contrib/reset.css +++ b/mediagoblin/static/css/contrib/reset.css @@ -1 +1 @@ -/home/jef/env/mediagoblin/src/schendjes-mediagoblin/mediagoblin/contrib/reset.css \ No newline at end of file +../../../contrib/reset.css \ No newline at end of file diff --git a/mediagoblin/static/css/contrib/text.css b/mediagoblin/static/css/contrib/text.css index f54ea50c..d75ce48b 120000 --- a/mediagoblin/static/css/contrib/text.css +++ b/mediagoblin/static/css/contrib/text.css @@ -1 +1 @@ -/home/jef/env/mediagoblin/src/schendjes-mediagoblin/mediagoblin/contrib/text.css \ No newline at end of file +../../../contrib/text.css \ No newline at end of file -- cgit v1.2.3 From b51c574188af117f557c8e871bd53fdcbd9d7692 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 4 Jul 2011 09:08:57 -0500 Subject: .message_info was missing closing } --- mediagoblin/static/css/base.css | 1 + 1 file changed, 1 insertion(+) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index b23bc3cb..5073c3b4 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -251,6 +251,7 @@ ul.mediagoblin_messages { .message_info { background-color: #378566; +} .message_debug { background-color: #f7f7f7; -- cgit v1.2.3 From 5c72d31d36bad3aee04e2ec46259ba797a352c2b Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 4 Jul 2011 09:11:13 -0500 Subject: Put the profile stuff in p's instead of
    's --- mediagoblin/static/css/base.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 5073c3b4..da04e1c4 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -257,3 +257,10 @@ ul.mediagoblin_messages { background-color: #f7f7f7; color:#272727; } + +/* profile stuff */ + +.profile_content p, .profile_bio { + padding: 6px; + background-color: #393939; +} -- cgit v1.2.3 From 24eaf0fd6bd6529ac59bc3963e0013e34c2c01a4 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 4 Jul 2011 09:41:57 -0500 Subject: Not happy with 180x135, switching back to 180x180 --- mediagoblin/static/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index da04e1c4..10dbc98b 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -187,7 +187,7 @@ text-align:center; .media_thumbnail { padding:0px; width:180px; - height:135px; + height:180px; overflow:hidden; float:left; margin:0px 10px 10px 0px; -- cgit v1.2.3 From 0b6c3ef14a98f567dd1c29004e58833a5418501b Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 4 Jul 2011 16:58:07 -0500 Subject: A few media thumbnail changes pre-release - adjust padding so 5 media thumbs can appear per row - lowering the h1 margins - adding a profile content bottom margin --- mediagoblin/static/css/base.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 10dbc98b..53e019f6 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -25,8 +25,8 @@ form { h1{ font-family: 'Carter One', arial, serif; - margin-bottom: 20px; - margin-top:40px; + margin-bottom: 15px; + margin-top:15px; } h2{ @@ -190,7 +190,7 @@ text-align:center; height:180px; overflow:hidden; float:left; - margin:0px 10px 10px 0px; + margin:0px 4px 10px 4px; text-align:center; } @@ -260,7 +260,8 @@ ul.mediagoblin_messages { /* profile stuff */ -.profile_content p, .profile_bio { +.profile_content { padding: 6px; background-color: #393939; + margin-bottom: 10px; } -- cgit v1.2.3