From c8b48cfb73ffcac286c5f39bf88c921cdca08ca9 Mon Sep 17 00:00:00 2001 From: Máirín Duffy Date: Jul 21 2016 15:10:28 +0000 Subject: [PATCH 1/3] removing img-wrap from team hubs header (will be plain grey to match fedora bootstrap) --- diff --git a/hubs/templates/hubs.html b/hubs/templates/hubs.html index c4e6b92..49c9a15 100644 --- a/hubs/templates/hubs.html +++ b/hubs/templates/hubs.html @@ -11,9 +11,6 @@
{% else %} -
- -

{{ hub.name }}

{% endif %} From 6b7051db9c5d660313b98b76bfb9b6d2d3a44f5a Mon Sep 17 00:00:00 2001 From: Máirín Duffy Date: Jul 21 2016 15:22:23 +0000 Subject: [PATCH 2/3] more work to remove img-wrap from team hubs header (will be plain grey to match fedora bootstrap) --- diff --git a/hubs/static/css/style.css b/hubs/static/css/style.css index 2e0f42d..dcedcdf 100644 --- a/hubs/static/css/style.css +++ b/hubs/static/css/style.css @@ -57,16 +57,18 @@ .header .dropdown.edit { top: 140px !important; } - .header h3.team { + .header h2.team { top: 170px !important; } } .header { - color: #ffffff; - background-color: #3c6eb4; + color: #373a3c; + background: #f3f3f3 none repeat scroll 0 0; width: 100%; font-family: 'Open Sans', sans-serif; + min-height: 100px; + border-bottom: 1px solid #ddd; } /*.header .dropdown.edit { @@ -76,23 +78,6 @@ z-index: 2; }*/ - .header .img-wrap { - max-height: 100px; - overflow: hidden; - position: relative; - } - - .header .img-wrap img { - width: 100%; - text-align: center; - } - - .header h3.team { - position: absolute; - top: 120px; - left: 45%; - } - .header img.avatar { width: 70px; float: left; @@ -101,7 +86,7 @@ border: 5px solid #fff; } - .header h3 { + .header h2 { font-weight: 700; } diff --git a/hubs/templates/hubs.html b/hubs/templates/hubs.html index 49c9a15..d9592ef 100644 --- a/hubs/templates/hubs.html +++ b/hubs/templates/hubs.html @@ -6,12 +6,12 @@ {% if hub.user_hub %}
-

{{ hub.name }}

+

{{ hub.name }}

{{ hub.summary }}
{% else %} -

{{ hub.name }}

+

{{ hub.name }}

{% endif %} From fcc15bc6226e2c56ed6f9ad42957efad86c57894 Mon Sep 17 00:00:00 2001 From: Máirín Duffy Date: Jul 21 2016 15:40:43 +0000 Subject: [PATCH 3/3] wrangling header for user/team hubs to better match Fedora bootstrap --- diff --git a/hubs/static/css/style.css b/hubs/static/css/style.css index dcedcdf..d3dbec3 100644 --- a/hubs/static/css/style.css +++ b/hubs/static/css/style.css @@ -62,7 +62,7 @@ } } - .header { + header { color: #373a3c; background: #f3f3f3 none repeat scroll 0 0; width: 100%; @@ -78,7 +78,7 @@ z-index: 2; }*/ - .header img.avatar { + header img.avatar { width: 70px; float: left; margin: 0 15px; @@ -86,15 +86,15 @@ border: 5px solid #fff; } - .header h2 { - font-weight: 700; + header h2 { + font-weight: 500; } - .header a, .header a:hover, .header a:focus { + header a, header a:hover, .header a:focus { color: #ffffff; } - .header span.edit { + header span.edit { margin: 5px 5px 0 0; } .row { diff --git a/hubs/templates/hubs.html b/hubs/templates/hubs.html index d9592ef..c7106fc 100644 --- a/hubs/templates/hubs.html +++ b/hubs/templates/hubs.html @@ -2,18 +2,21 @@ {% block title %}{{ hub.name }}{% endblock %} {% block content %} -
- {% if hub.user_hub %} -
- -

{{ hub.name }}

-
{{ hub.summary }}
-
-
- {% else %} -

{{ hub.name }}

- {% endif %} -
+ +
+
+ {% if hub.user_hub %} + +

{{ hub.name }}

+
{{ hub.summary }}
+
+ {% else %} +

{{ hub.name }}

+
{{ hub.summary }}
+ {% endif %} +
+
+ {%- with messages = get_flashed_messages(with_categories=true) -%} {%- if category, messages -%}