From 937c7ea5d90db6678ae08a3524cce872d21d24ad Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 9 Feb 2012 21:46:57 +0100 Subject: Fix for ticket #386 --- mediagoblin/static/css/base.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index efd7b561..73b07384 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -79,6 +79,22 @@ a.highlight { color: #fff; } +em { + font-style: italic; +} + +strong { + font-weight: bold; +} + +ul { + list-style: disc inside; +} + +ol { + list-style: decimal inside; +} + label { font-weight: normal; } -- cgit v1.2.3 From fb1dc4f56b5e6e4338aaf578874e42b9336a8476 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sat, 11 Feb 2012 23:04:02 +0100 Subject: Layout overhaul time! --- mediagoblin/static/css/base.css | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 73b07384..04ab1840 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -109,7 +109,7 @@ input, textarea { .container { margin: auto; width: 96%; - max-width: 940px; + max-width: 820px; } header { @@ -150,12 +150,18 @@ footer { clear: both; } +/* TEMP removal -> permanent removal should also be done in html! .media_pane { width: 640px; margin-left: 0px; margin-right: 10px; float: left; } +*/ + +img.media_image { + width: 100%; +} .media_sidebar { width: 280px; @@ -382,6 +388,11 @@ h2.media_title { margin-bottom: 0px; } +p.context { + display: inline-block; + padding-top: 4px; +} + p.media_specs { font-size: 0.9em; border-top: 1px solid #222; @@ -406,19 +417,21 @@ img.media_icon { /* navigation */ +.navigation { + float: right; +} + .navigation_button { width: 135px; - display: block; - float: left; + display: inline-block; text-align: center; background-color: #1d1d1d; border: 1px solid; border-color: #2c2c2c #232323 #1a1a1a; border-radius: 4px; text-decoration: none; - padding: 12px 0 16px; - font-size: 1.4em; - margin: 0 0 20px + padding: 4px 0 8px; + margin: 0 0 6px } .navigation_left { -- cgit v1.2.3 From b21c9434273484dce04e53d91dc916ecca61bf0a Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 12 Feb 2012 16:18:58 +0100 Subject: Restore sidebar --- mediagoblin/static/css/base.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 04ab1840..2f36ed48 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -150,21 +150,19 @@ footer { clear: both; } -/* TEMP removal -> permanent removal should also be done in html! .media_pane { - width: 640px; + width: 560px; margin-left: 0px; margin-right: 10px; float: left; } -*/ img.media_image { width: 100%; } .media_sidebar { - width: 280px; + width: 240px; margin-left: 10px; margin-right: 0px; float: left; -- cgit v1.2.3 From a1161b84a6bec7025ee446933ca0477b80cbca42 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 12 Feb 2012 18:12:23 +0100 Subject: Fix sidebar margins --- mediagoblin/static/css/base.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 2f36ed48..25a2dc4f 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -163,8 +163,7 @@ img.media_image { .media_sidebar { width: 240px; - margin-left: 10px; - margin-right: 0px; + margin: 20px 0 0 10px; float: left; } -- cgit v1.2.3 From 630dd7941d1b558e8714857ffae14044636d10e4 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 12 Feb 2012 18:23:18 +0100 Subject: Style sidedata h3; revert sidebar margin change --- mediagoblin/static/css/base.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 25a2dc4f..9ddeb404 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -163,7 +163,7 @@ img.media_image { .media_sidebar { width: 240px; - margin: 20px 0 0 10px; + margin-left: 10px; float: left; } @@ -273,6 +273,15 @@ textarea#comment_content { height: 0; } +h3.sidedata { + border: none; + background-color: #212121; + border-radius: 4px 4px 0 0; + padding: 3px 8px; + margin: 20px 0 5px 0; + font-size: 1em; +} + /* forms */ .form_box,.form_box_xl { -- cgit v1.2.3 From be09ed51c8118203c1e69be66d7d947f9fbf5e7b Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 12 Feb 2012 18:39:55 +0100 Subject: Corrections for mobile layout --- mediagoblin/static/css/base.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 9ddeb404..0447d8e5 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -522,21 +522,27 @@ table.media_panel th { } /* Media queries and other responsivisivity */ -@media screen and (max-width: 680px) { + +@media screen and (max-width: 820px) { .media_pane { width: 100%; margin: 0px; } + + .media_sidebar { + width: 100%; + margin: 0px; + } + img.media_image { width: 100%; } -} -@media screen and (max-width: 960px) { .profile_sidebar { width: 100%; margin: 0px; } + .profile_showcase { width: 100%; margin: 0px; -- cgit v1.2.3 From 4944e3c374839d48f5de973db3a037de26df908e Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 12 Feb 2012 19:33:05 +0100 Subject: Make media thumbnail gallery a list instead of a table --- 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 0447d8e5..165fdcf7 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -381,6 +381,7 @@ textarea#comment_content { margin: 0px 4px 10px 4px; text-align: center; font-size: 0.875em; + list-style: none; } .media_thumbnail a { -- cgit v1.2.3 From b0ed64aa126b50863ebc4c9986e876e09ad313a5 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 12 Feb 2012 20:47:25 +0100 Subject: Fix comment input field width/padding; change some text; remove weird #form_comment duplicate rules; move Edit/Delete buttons next to title --- mediagoblin/static/css/base.css | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 165fdcf7..674568f5 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -255,15 +255,6 @@ text-align: center; float: right; } -textarea#comment_content { - resize: vertical; - width: 634px; - height: 90px; - border: none; - background-color: #f1f1f1; - padding: 3px; -} - .clear { clear: both; display: block; @@ -364,13 +355,18 @@ textarea#description, textarea#bio { } textarea#comment_content { - width: 634px; + resize: vertical; + width: 100%; height: 90px; border: none; background-color: #f1f1f1; padding: 3px; } +#form_comment .form_field_input { + padding-right: 6px; +} + /* media galleries */ .media_thumbnail { @@ -393,6 +389,7 @@ textarea#comment_content { h2.media_title { margin-bottom: 0px; + display: inline-block; } p.context { -- cgit v1.2.3 From f2ca3ad6ac945f92c24e50204f4a1122f21437e8 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 12 Feb 2012 21:00:20 +0100 Subject: Add navigation button styles for mobile --- mediagoblin/static/css/base.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 674568f5..f0ee888d 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -545,4 +545,16 @@ table.media_panel th { width: 100%; margin: 0px; } + + .navigation { + float: none; + } + + .navigation_button { + width: 49%; + } + + .navigation_left { + margin-right: 0; + } } -- cgit v1.2.3 From 92e8ca790b1faca9bbcb260b8dcc8c05bdabc8ea Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 12 Feb 2012 21:02:02 +0100 Subject: Wait, scratch that. This commit uses a better way. --- mediagoblin/static/css/base.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index f0ee888d..9c429404 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -552,9 +552,11 @@ table.media_panel th { .navigation_button { width: 49%; + float: right; } .navigation_left { margin-right: 0; + float: left; } } -- cgit v1.2.3 From 38816c66078fe679dc4b51b545d15d331712bcb4 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 13 Feb 2012 21:31:11 -0600 Subject: Revert "Layout overhaul time!" This reverts a whole bunch of commits, fb1dc4f5 thru 92e8ca79, where an experimental new layout was played with. Unfortunately, this layout broke the look and feel of master, even though it was going in the right direction for mobile stuff. Jef said he'll do things in a branch! --- mediagoblin/static/css/base.css | 81 +++++++++++------------------------------ 1 file changed, 22 insertions(+), 59 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 9c429404..73b07384 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -109,7 +109,7 @@ input, textarea { .container { margin: auto; width: 96%; - max-width: 820px; + max-width: 940px; } header { @@ -151,19 +151,16 @@ footer { } .media_pane { - width: 560px; + width: 640px; margin-left: 0px; margin-right: 10px; float: left; } -img.media_image { - width: 100%; -} - .media_sidebar { - width: 240px; + width: 280px; margin-left: 10px; + margin-right: 0px; float: left; } @@ -255,6 +252,15 @@ text-align: center; float: right; } +textarea#comment_content { + resize: vertical; + width: 634px; + height: 90px; + border: none; + background-color: #f1f1f1; + padding: 3px; +} + .clear { clear: both; display: block; @@ -264,15 +270,6 @@ text-align: center; height: 0; } -h3.sidedata { - border: none; - background-color: #212121; - border-radius: 4px 4px 0 0; - padding: 3px 8px; - margin: 20px 0 5px 0; - font-size: 1em; -} - /* forms */ .form_box,.form_box_xl { @@ -355,18 +352,13 @@ textarea#description, textarea#bio { } textarea#comment_content { - resize: vertical; - width: 100%; + width: 634px; height: 90px; border: none; background-color: #f1f1f1; padding: 3px; } -#form_comment .form_field_input { - padding-right: 6px; -} - /* media galleries */ .media_thumbnail { @@ -377,7 +369,6 @@ textarea#comment_content { margin: 0px 4px 10px 4px; text-align: center; font-size: 0.875em; - list-style: none; } .media_thumbnail a { @@ -389,12 +380,6 @@ textarea#comment_content { h2.media_title { margin-bottom: 0px; - display: inline-block; -} - -p.context { - display: inline-block; - padding-top: 4px; } p.media_specs { @@ -421,21 +406,19 @@ img.media_icon { /* navigation */ -.navigation { - float: right; -} - .navigation_button { width: 135px; - display: inline-block; + display: block; + float: left; text-align: center; background-color: #1d1d1d; border: 1px solid; border-color: #2c2c2c #232323 #1a1a1a; border-radius: 4px; text-decoration: none; - padding: 4px 0 8px; - margin: 0 0 6px + padding: 12px 0 16px; + font-size: 1.4em; + margin: 0 0 20px } .navigation_left { @@ -520,43 +503,23 @@ table.media_panel th { } /* Media queries and other responsivisivity */ - -@media screen and (max-width: 820px) { +@media screen and (max-width: 680px) { .media_pane { width: 100%; margin: 0px; } - - .media_sidebar { - width: 100%; - margin: 0px; - } - img.media_image { width: 100%; } +} +@media screen and (max-width: 960px) { .profile_sidebar { width: 100%; margin: 0px; } - .profile_showcase { width: 100%; margin: 0px; } - - .navigation { - float: none; - } - - .navigation_button { - width: 49%; - float: right; - } - - .navigation_left { - margin-right: 0; - float: left; - } } -- cgit v1.2.3