From 42d4763c7a4cb049ed8ab30935a6a6394abdd8f4 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 19 Oct 2012 21:01:44 +0200 Subject: Thumbnail styling edits to base theme and Airy theme --- 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 6bc85674..c6152a1c 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -408,10 +408,10 @@ textarea#comment_content { .media_thumbnail { float: left; padding: 0px; - width: 180px; + width: 212px; height: 156px; overflow: hidden; - margin: 0px 4px 10px; + margin: 0px 28px 24px 0px; text-align: center; font-size: 0.875em; background-color: #222; @@ -431,6 +431,10 @@ textarea#comment_content { max-height: 135px; } +.thumb_entry_last { + margin-right: 0px; +} + /* collection media */ .collection_thumbnail { -- cgit v1.2.3 From 1c66750a4a0611d2399e6e60eec5ea6915b458f6 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Fri, 19 Oct 2012 21:13:40 +0200 Subject: Thumbnail styling edits plus edits to the object_gallery (4 columns instead of 5 by default) --- mediagoblin/static/css/base.css | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index c6152a1c..312edc49 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -409,9 +409,8 @@ textarea#comment_content { float: left; padding: 0px; width: 212px; - height: 156px; overflow: hidden; - margin: 0px 28px 24px 0px; + margin: 0px 28px 26px 0px; text-align: center; font-size: 0.875em; background-color: #222; @@ -425,10 +424,16 @@ textarea#comment_content { .media_thumbnail a { color: #eee; text-decoration: none; + display: block; +} + +a.thumb_entry_title { + padding: 8px; } .media_thumbnail img { - max-height: 135px; + width: 212px; + max-height: 159px; } .thumb_entry_last { -- cgit v1.2.3 From e3f1fddf872caae45d6f4fdc81c2f4f9e8e19022 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sat, 20 Oct 2012 15:19:11 +0200 Subject: Fix thumbnail aspect ratios --- 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 312edc49..b37da026 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -432,7 +432,7 @@ a.thumb_entry_title { } .media_thumbnail img { - width: 212px; + width: auto; max-height: 159px; } -- cgit v1.2.3 From 294979824c2eb651168c66f58e1d759a2ff56ada Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 21 Oct 2012 21:49:39 +0200 Subject: Replace dropdown in top right with regular links --- mediagoblin/static/css/base.css | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index b37da026..cd16a7c0 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -138,37 +138,6 @@ header { list-style: none; } -.dropdown { - display: inline-block; - color: #c3c3c3; - background-color: #424242; - border: 1px solid; - border-color: #464646 #2B2B2B #252525; - border-radius: 4px; - padding: 3px 8px; - font-size: 16px; - text-decoration: none; - font-style: normal; - font-weight: bold; - cursor: pointer; - position: relative; -} - -.dropdown_items { - position: absolute; - right: 0px; - top: 25px; - background-color: #424242; - padding: 10px; - width: 160px; - border-radius: 5px 0 5px 5px; - box-shadow: 0 2px 1px black; -} - -.dropdown_items a { - display: block; -} - a.logo { color: #fff; font-weight: bold; -- cgit v1.2.3 From 8567c0479fba75602b3e64b4688a20a8d1bf971e Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Tue, 23 Oct 2012 15:41:46 +0200 Subject: Don't show zoom in cursor if there is no larger version --- 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 cd16a7c0..9a203f3a 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -464,7 +464,7 @@ p.media_specs { padding: 130px 10px 20px 10px; } -img.media_image { +a img.media_image { cursor: -webkit-zoom-in; cursor: -moz-zoom-in; cursor: zoom-in; -- cgit v1.2.3 From 4232c52fab2c6ab939b994b5699809a74b5fdef0 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 1 Nov 2012 16:59:27 +0100 Subject: Change thumbnail width to 212px --- 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 9a203f3a..6cda47fc 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -401,7 +401,7 @@ a.thumb_entry_title { } .media_thumbnail img { - width: auto; + width: 212px; max-height: 159px; } -- cgit v1.2.3 From 52aef5b445710dbe800ebba7f44ca0cc0e06ea54 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 1 Nov 2012 17:10:16 +0100 Subject: Revert thumbnail styling and sizing; allows for 5 thumbnails per row --- mediagoblin/static/css/base.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 6cda47fc..4120f965 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -377,9 +377,10 @@ textarea#comment_content { .media_thumbnail { float: left; padding: 0px; - width: 212px; + width: 180px; + height: 156px; overflow: hidden; - margin: 0px 28px 26px 0px; + margin: 0px 4px 10px; text-align: center; font-size: 0.875em; background-color: #222; @@ -401,8 +402,7 @@ a.thumb_entry_title { } .media_thumbnail img { - width: 212px; - max-height: 159px; + max-height: 135px; } .thumb_entry_last { -- cgit v1.2.3 From fd79d33a877c97a26706931bdf0988469ad37504 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 14 Nov 2012 10:12:58 +0100 Subject: Pop up OpenStreetMap license on demand (#410) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only a short blurb "see map license" in the small map which will pop up the full license text via jquery when clicked. Adapt the license text as recommended by OpenStreetMap http://www.openstreetmap.org/copyright and link there. The disadvantage is that this only works when Javascript is enabled, but as the map only works when Javascript is enabled in the first place, this should not be too much of a limitation. TODO: Our esteemed web designer needs to have a look at the desired color style for this. Right now, I simply placed it in the message_warning class. This might want fine-tuning. Signed-off-by: Sebastian Spaeth --- 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 4120f965..f8a9e014 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -259,6 +259,10 @@ text-align: center; height: 0; } +.hidden { + display: none; +} + .media_sidebar h3 { font-size: 1em; margin: 0 0 5px; -- cgit v1.2.3 From d2fad5c9c3d6795cd5fccc0664207810bd0cfc7e Mon Sep 17 00:00:00 2001 From: Elrond Date: Thu, 13 Dec 2012 21:07:16 +0100 Subject: Make "add media to collection" a normal This button used to be a css style (note: No contents for the ). Using this approach has various drawbacks. Most notably: - Not clickable in text mode browsers - Possibly getting marked as a hidden (spam) link - No alt attribute So replaced with a real . I have no idea what to put in the alt attribute. --- mediagoblin/static/css/base.css | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index f8a9e014..ac53f580 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -219,17 +219,6 @@ footer { font-family: 'Lato', sans-serif; } -.button_collect { - background-image: url("../images/icon_collect.png"); - background-repeat: no-repeat; - background-position:top center; - height: 30px; - width: 30px; - margin: 0px; - padding: 3px 3px 2px 3px; - position: relative; -} - .pagination { text-align: center; } -- cgit v1.2.3 From a04cd2e596887e8d8f59534ffc3a3795fc9d4be9 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Thu, 13 Dec 2012 23:39:19 +0100 Subject: Small styling edits to thumbnails --- mediagoblin/static/css/base.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index ac53f580..a8184f57 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -371,9 +371,8 @@ textarea#comment_content { float: left; padding: 0px; width: 180px; - height: 156px; overflow: hidden; - margin: 0px 4px 10px; + margin: 0px 3px 10px; text-align: center; font-size: 0.875em; background-color: #222; @@ -382,6 +381,9 @@ textarea#comment_content { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + border-color: #0D0D0D; + border-style: solid; + border-width: 1px 1px 2px; } .media_thumbnail a { -- cgit v1.2.3 From 98b927250ecdce4bc96ece2908ce2c9b49b21f76 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Sun, 16 Dec 2012 21:57:19 +0100 Subject: Remove collection_thumbnail styling, so collection thumbnails are styled the same as other thumbnails --- mediagoblin/static/css/base.css | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) (limited to 'mediagoblin/static/css') diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index a8184f57..f06b0af7 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -392,6 +392,11 @@ textarea#comment_content { display: block; } +.media_thumbnail a.remove { + color: #86D4B1; + text-decoration: underline; +} + a.thumb_entry_title { padding: 8px; } @@ -404,34 +409,6 @@ a.thumb_entry_title { margin-right: 0px; } -/* collection media */ - -.collection_thumbnail { - float: left; - padding: 0px; - width: 180px; - margin: 0px 4px 10px; - text-align: left; - font-size: 0.875em; - background-color: #222; - border-radius: 0 0 5px 5px; - padding: 0 0 6px; - text-overflow: ellipsis; -} - -.collection_thumbnail a { - color: #eee; - text-decoration: none; -} - -.collection_thumbnail a.remove { - color: #86D4B1; -} - -.collection_thumbnail img { - max-height: 135px; -} - /* media detail */ h2.media_title { -- cgit v1.2.3