From 309478a0e89192ee12de1e1126cfc0603f7397b2 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Mon, 19 Feb 2018 00:25:06 +0100 Subject: [PATCH 01/36] Add withside fixes --- inkscape/templates/cms/withside.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inkscape/templates/cms/withside.html b/inkscape/templates/cms/withside.html index 135c098b5..6b2efba7d 100644 --- a/inkscape/templates/cms/withside.html +++ b/inkscape/templates/cms/withside.html @@ -1,12 +1,13 @@ {% extends "base.html" %} {% load cms_tags %} +{% load i18n %} {% block title %}{% page_attribute "page_title" %}{% endblock %} {% block headerdesc %}{% page_attribute meta_description %}{% endblock %} {% block content %} -
+
{% placeholder header_template_content %}
{% placeholder normal_template_content %} -- GitLab From 6c8102b54ae399d47177254e6ccda5acac274b48 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Tue, 20 Feb 2018 01:26:55 +0100 Subject: [PATCH 02/36] adding gallery styling --- cmstabs/templates/cms/plugins/group-B.html | 2 +- cmstabs/templates/cms/plugins/group-P.html | 2 +- cmstabs/templates/cms/plugins/group.html | 2 +- .../templates/elections/election_detail.html | 4 +- inkscape/context_processors.py | 16 +- inkscape/settings.py | 1 + inkscape/templates/base.html | 6 +- inkscape/templates/cms/withside.html | 3 +- inkscape/templates/pageclasses.html | 1 + person/templates/person/team_list.html | 2 +- resources/static/css/gallery.css | 257 +++++++++++++----- .../templates/resources/gallery_list.html | 2 +- .../templates/resources/resource_icons.html | 2 +- .../templates/resources/resource_rows.html | 2 +- .../resources/resourcegallery_general.html | 2 +- 15 files changed, 222 insertions(+), 82 deletions(-) create mode 100644 inkscape/templates/pageclasses.html diff --git a/cmstabs/templates/cms/plugins/group-B.html b/cmstabs/templates/cms/plugins/group-B.html index 9cefdcb34..2e882986b 100644 --- a/cmstabs/templates/cms/plugins/group-B.html +++ b/cmstabs/templates/cms/plugins/group-B.html @@ -2,7 +2,7 @@ {% addtoblock "css" %}{% endaddtoblock %} -
+
{% for user in users %} diff --git a/cmstabs/templates/cms/plugins/group-P.html b/cmstabs/templates/cms/plugins/group-P.html index ff4dcb716..d11286867 100644 --- a/cmstabs/templates/cms/plugins/group-P.html +++ b/cmstabs/templates/cms/plugins/group-P.html @@ -4,7 +4,7 @@

{{ instance.source }}

-
+
{% for user in users %}
diff --git a/cmstabs/templates/cms/plugins/group.html b/cmstabs/templates/cms/plugins/group.html index dc443fd81..46d17a26e 100644 --- a/cmstabs/templates/cms/plugins/group.html +++ b/cmstabs/templates/cms/plugins/group.html @@ -2,7 +2,7 @@ {% addtoblock "css" %}{% endaddtoblock %} -
+
{% for user in users %}
diff --git a/elections/templates/elections/election_detail.html b/elections/templates/elections/election_detail.html index 86f1c2d98..f40ba1f2a 100644 --- a/elections/templates/elections/election_detail.html +++ b/elections/templates/elections/election_detail.html @@ -221,9 +221,9 @@ {% elif state.code == 'F' %} {% with log=object.get_log %}

{% trans "Results" %}

-
+
{% for user in log.candidates %} -
+

{{ user }}

{% if user.winner %} diff --git a/inkscape/context_processors.py b/inkscape/context_processors.py index 907e05c87..cc3a05728 100644 --- a/inkscape/context_processors.py +++ b/inkscape/context_processors.py @@ -25,7 +25,7 @@ import logging from os.path import isfile, join from collections import OrderedDict - +from menus.utils import DefaultLanguageChanger from django.conf import settings def tracker_data(request): @@ -35,6 +35,20 @@ def tracker_data(request): 'TRACKER_SIDE_ID': getattr(settings, 'PIWIK_SIDE_ID', 1), } +def englishslug(request): + if hasattr(request, "_language_changer"): + try: + url = request._language_changer("en") + except NoReverseMatch: + url = DefaultLanguageChanger(request)("en") + else: + # use the default language changer + url = DefaultLanguageChanger(request)("en") + url_parts = url.split('/') + return { + 'englishslug': url_parts[len(url_parts)-2], + } + PATH = settings.PROJECT_PATH INKSCAPE_VERSION = '' WEBSITE_VERSION = '' diff --git a/inkscape/settings.py b/inkscape/settings.py index a52c6d38f..9c59baa51 100644 --- a/inkscape/settings.py +++ b/inkscape/settings.py @@ -108,6 +108,7 @@ TEMPLATES = [{ 'django.template.loaders.app_directories.Loader', ], 'context_processors': ( + 'inkscape.context_processors.englishslug', 'inkscape.context_processors.version', 'inkscape.context_processors.tracker_data', 'social_django.context_processors.backends', diff --git a/inkscape/templates/base.html b/inkscape/templates/base.html index 39b4a05a6..e46b5f837 100644 --- a/inkscape/templates/base.html +++ b/inkscape/templates/base.html @@ -43,7 +43,7 @@ - + {% cms_toolbar %}
@@ -56,6 +56,7 @@

{% trans "Draw Freely." %}

{% endblock %}
+
    @@ -64,7 +65,6 @@

    {{ DONATE_NOW|safe }}

    {% endif %} - {% language_chooser "languages.html" %} {% if not request.user.is_authenticated %} @@ -121,10 +121,10 @@ {% block supercontent %} {% block "precontent" %}{% endblock %}
    -
    {% block "breadcrumbs" %} {% include "breadcrumbs.html" %} {% endblock %} +
    {% block content %}{% endblock %} {% block "pagination" %}{% include "pagination.html" %}{% endblock %}
    diff --git a/inkscape/templates/cms/withside.html b/inkscape/templates/cms/withside.html index 6b2efba7d..7801d229a 100644 --- a/inkscape/templates/cms/withside.html +++ b/inkscape/templates/cms/withside.html @@ -1,13 +1,12 @@ {% extends "base.html" %} {% load cms_tags %} -{% load i18n %} {% block title %}{% page_attribute "page_title" %}{% endblock %} {% block headerdesc %}{% page_attribute meta_description %}{% endblock %} {% block content %} -
    +
    {% placeholder header_template_content %}
    {% placeholder normal_template_content %} diff --git a/inkscape/templates/pageclasses.html b/inkscape/templates/pageclasses.html new file mode 100644 index 000000000..1daa9ed6e --- /dev/null +++ b/inkscape/templates/pageclasses.html @@ -0,0 +1 @@ +{% load menu_tags cms_tags i18n %}{{ englishslug }}{% if current_language != 'en' %} {% page_attribute 'slug' %}{% endif %} diff --git a/person/templates/person/team_list.html b/person/templates/person/team_list.html index 70f0778bc..b0fda406e 100644 --- a/person/templates/person/team_list.html +++ b/person/templates/person/team_list.html @@ -11,7 +11,7 @@

    {% trans "The Inkscape community has several teams who meet, discuss and work on different aspects of developing Inkscape, looking after its infrastructure and supporting the community around the project. Here you will find all the current teams and the ability to join them." %}

    -
    +
    {% for team in object_list %} {% if team.icon %}
diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index ddfc5ee34..c514576e0 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -1,71 +1,153 @@ /* License: AGPLv3 or later (http://www.gnu.org/licenses/), Copyright 2013, Martin Owens */ +/* See https://gitlab.com/inkscape/inkscape-web/issues/162#note_57927689 for multicolumn and so on*/ +.page > .imagelist{ + column-width: 180px; + column-gap: 10px; + width: 100%; + margin-top: 10px; +} +.page > .imagelist.max3col{ + column-width: 220px; +} +.page > .imagelist.max2col{ + column-width: 295px; +} +.wrapper{ + position:relative; +} +.gallery.page .wrapper #right-sidebar{ + visibility:hidden !important; + z-index:200; + float:none; + position:absolute; + background-color:rgba(255,255,255,0.9); + padding:20px 45px 20px 20px !important; + width:194px !important; + top:0; + right:0; + z-index:320; + +} +.wrapper #left-column{ + width:93% !important; + margin:0px; +} +.gallery.page .wrapper #right-sidebar:hover, +.gallery.page .wrapper #right-sidebar:focus{ + visibility:visible !important; +} +.gallery.page .wrapper #right-sidebar:before{ + visibility:visible; + display:block; + position:absolute; + content:"+"; + text-align:center !important; + border-radius:5px; + color:#333; + font-size:28px; + padding:4px; + font-weight:bold; + z-index:30; + top:0px; + right:5px; + bottom:0; + cursor:pointer; + line-height:1; + border-width:1px; + border-color:#ccc; + border-style:solid; +} .galleryitem { - display: inline-block; - padding: 4px; - min-width: 150px; - min-height: 150px; - text-align: center; - vertical-align: middle; - margin: 5px 0px 25px 0px; - border: 2px solid transparent; + background: #fff; + border: 0px; + margin: 3px; + padding: 0px; + padding-bottom: 1px; + transition: opacity .4s ease-in-out; + column-break-inside: avoid; + display: inline-block; + position:relative; + width:100%; + } .galleryitem.unavailable { opacity: 0.5; } .galleryitem:hover { - border: 2px solid #cce; - background-color: #eef; } .galleryitem a.link img, a.link .galleryitem img { - max-width: 150px; - max-height: 150px; - vertical-align: middle; - display: inline-block; + width: 100%; + height: auto; + padding-bottom: 0; + margin-bottom: 0; + line-height:1; + border-width:1px 1px 0 1px; + border-style:solid; + border-color:#ccc; + border-radius:6px 6px 0 0 !important; } a.link .galleryitem img { - min-width: 150px; - min-height: 150px; + width: 100% !important; + height: auto; } .galleryitem a.link { - min-width: 150px; - min-height: 150px; display: block; - line-height: 147px; outline: none; -} -.galleryitem > p { - max-width: 150px; -} -.galleryitem .label { - max-width: 150px; - text-align: center; - padding: 0px; - margin: 0px; - overflow: hidden; - background-color: #eef; - display:table-cell; - margin: 2px; - padding: 2px; - height: 4em; - width: 150px; - word-wrap: break-word; - border-radius: 16px; - vertical-align: middle; + line-height:1; + padding:0; + margin-bottom:-2px; } -.galleryitem .label:hover { - border-radius: 0px; +.galleryitem .label, +.galleryitem p { + text-align: center !important; + padding:4%; + margin:0 0 4px 0; + width:92%; + display:inline-block; + border-width:1px 1px 1px 1px; + border-style:dashed solid solid solid; + border-color:#ccc; + border-radius:0 0 6px 6px !important; +} +@media screen and (min-width: 960px) { +.titlehover .galleryitem .label, +.titlehover .galleryitem p { + position:absolute; + z-index:20; + top:0; + border:none; + background-color:rgba(255,255,255,0.6); + border-radius:0 !important; + width:96%; + padding:2%; + margin:0; + color:#333; + display:none; +} +.titlehover .galleryitem a.link img, +.titlehover a.link .galleryitem img { + border:none; + border-radius:6px !important; +} +.wrapper #left-column{ + width:98% !important; +} +.titlehover .galleryitem:hover .label, +.titlehover .galleryitem:hover p { + display:block; + +} +.titlehover .galleryitem .label a{ + font-size:16px; } - -.galleryitem .label a { - color: #035; - display: block; - outline: none; } -.galleryitem .label a:hover { +.galleryitem .label a { text-decoration: none; + color:#333; + font-size:18px; } .galleryitem p.new a { background-color: #efe; @@ -77,14 +159,12 @@ a.link .galleryitem img { width: 130px; } .galleryitem div.link input { - max-width: 150px; - max-height: 150px; + vertical-align: middle; display: inline-block; } .galleryitem div.link { - min-width: 150px; - min-height: 150px; + display: block; line-height: 150px; } @@ -99,7 +179,6 @@ a.link .galleryitem img { padding: 3px; color: #035; height: 4em; - width: 150px; vertical-align: middle; } @@ -149,39 +228,81 @@ a.link .galleryitem img { border-radius: 0px; } .galleryitem .minitabs { - width: 147px; position: absolute; + top:0; + left:0; + right:0; text-align: right; - margin-top: 2px; z-index: -1; } -.galleryitem:hover .minitabs { +@media screen and (min-width: 960px) { +.titlehover .galleryitem .minitabs{ + top:auto; + bottom:0; +} + .galleryitem:hover span.ribbon{ + display:none; + } + .galleryitem .minitabs > img, +.galleryitem .minitabs > a { + visibility: hidden !important; + } + .galleryitem:hover .minitabs > img, +.galleryitem:hover .minitabs > a { + visibility:visible !important; + margin-bottom:5px; + } +} +.galleryitem .minitabs { z-index: unset; + width:100%; } .galleryitem .minitabs > img, .galleryitem .minitabs > a { - visibility: hidden; -} -.galleryitem:hover .minitabs > img, -.galleryitem:hover .minitabs > a { visibility: visible; + top:0px; + width:25px; + height:25px; + margin:3px; + background-color:rgba(255,255,255,0.6); + border-radius:50%; + padding:4px; +} +.galleryitem .minitabs > a , +.galleryitem .minitabs > img +{ + visibility: visible; + +} + + +.galleryitem .minitabs > img:nth-child(2), +.galleryitem .minitabs > a:nth-child(2) { + right:0px; + left:auto; } .galleryitem span.ribbon { visibility: visible; - position: relative; - top: -9px; - left: -7px; -} -.galleryitem:hover span.ribbon { - display: none; + position: absolute; + left:50%; + bottom:-20px; + margin-left:-75px !important; + z-index:300; } + .galleryitem span.ribbon p { position: absolute; - top: -29px; - width: 165px; + top: -6px; text-align: center; color: white; font-weight: bold; + padding: 0%; + margin: 10px 0; + width: 100%; + display: block; + border-width: 0; + background-color:transparent; + } svg.ribbon path.part_a { fill:#7e7e7e; } svg.ribbon path.part_b { fill:#a9a9a9; } @@ -261,3 +382,7 @@ div#category_desc { display: inline-block; } + + + + diff --git a/resources/templates/resources/gallery_list.html b/resources/templates/resources/gallery_list.html index 766d6fb65..eeb917e3c 100644 --- a/resources/templates/resources/gallery_list.html +++ b/resources/templates/resources/gallery_list.html @@ -8,7 +8,7 @@ {% block content %}

{% trans "Resources" %}

-
diff --git a/resources/templates/resources/resourcegallery_general.html b/resources/templates/resources/resourcegallery_general.html index 9125c7272..94d6bf7d8 100644 --- a/resources/templates/resources/resourcegallery_general.html +++ b/resources/templates/resources/resourcegallery_general.html @@ -2,8 +2,8 @@ {% block supercontent %}
-
{% include "breadcrumbs.html" %} +
{% include 'resources/resourcegallery_contents.html' %} {% include "pagination.html" %}
-- GitLab From 2afe94ad4aa560d42c471397e2e3f7e58c11ee9e Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Tue, 20 Feb 2018 20:45:37 +0100 Subject: [PATCH 03/36] Fixing styles --- inkscape/static/css/main.css | 5 +- resources/static/css/gallery.css | 184 +++++++++--------- .../templates/resources/resource_icons.html | 2 +- .../resources/resourcegallery_general.html | 2 +- 4 files changed, 102 insertions(+), 91 deletions(-) diff --git a/inkscape/static/css/main.css b/inkscape/static/css/main.css index eeddeb849..7d810addf 100644 --- a/inkscape/static/css/main.css +++ b/inkscape/static/css/main.css @@ -798,8 +798,8 @@ div.toc ol, margin-bottom: 10px; } #content > div.wrapper { - margin: -20px; - padding: 20px; + margin: 0 -20px -20px -20px; + padding: 0 20px 20px 20px; min-height: 500px; } @@ -1724,3 +1724,4 @@ li#tab_hackfest p a:hover { text-decoration: none; background-image: linear-gradient(to bottom, #ff4646, #cc1d1d); } + diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index c514576e0..06ee72d9d 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -1,15 +1,15 @@ /* License: AGPLv3 or later (http://www.gnu.org/licenses/), Copyright 2013, Martin Owens */ /* See https://gitlab.com/inkscape/inkscape-web/issues/162#note_57927689 for multicolumn and so on*/ -.page > .imagelist{ +.page .imagelist{ column-width: 180px; column-gap: 10px; width: 100%; margin-top: 10px; } -.page > .imagelist.max3col{ - column-width: 220px; +.page .imagelist.max3col{ + column-width: 260px; } -.page > .imagelist.max2col{ +.page .imagelist.max2col{ column-width: 295px; } .wrapper{ @@ -37,16 +37,24 @@ .gallery.page .wrapper #right-sidebar:focus{ visibility:visible !important; } +.gallery.page .wrapper #right-sidebar, +.gallery.page .wrapper #right-sidebar{ + margin-top:-35px; + margin-right:-30px; + padding-top:5px !important; + +} .gallery.page .wrapper #right-sidebar:before{ visibility:visible; display:block; - position:absolute; + position:sticky; content:"+"; text-align:center !important; border-radius:5px; color:#333; + background-color:rgba(255,255,255,0.8); font-size:28px; - padding:4px; + padding:2px 4px 4px 4px; font-weight:bold; z-index:30; top:0px; @@ -76,8 +84,8 @@ } .galleryitem:hover { } -.galleryitem a.link img, -a.link .galleryitem img { +.galleryitem > a.link img, +a.link .galleryitem > img { width: 100%; height: auto; padding-bottom: 0; @@ -88,11 +96,11 @@ a.link .galleryitem img { border-color:#ccc; border-radius:6px 6px 0 0 !important; } -a.link .galleryitem img { +a.link .galleryitem > img { width: 100% !important; height: auto; } -.galleryitem a.link { +.galleryitem > a.link { display: block; outline: none; line-height:1; @@ -100,8 +108,8 @@ a.link .galleryitem img { margin-bottom:-2px; } -.galleryitem .label, -.galleryitem p { +.galleryitem > .label, +.galleryitem > p { text-align: center !important; padding:4%; margin:0 0 4px 0; @@ -112,58 +120,26 @@ a.link .galleryitem img { border-color:#ccc; border-radius:0 0 6px 6px !important; } -@media screen and (min-width: 960px) { -.titlehover .galleryitem .label, -.titlehover .galleryitem p { - position:absolute; - z-index:20; - top:0; - border:none; - background-color:rgba(255,255,255,0.6); - border-radius:0 !important; - width:96%; - padding:2%; - margin:0; - color:#333; - display:none; -} -.titlehover .galleryitem a.link img, -.titlehover a.link .galleryitem img { - border:none; - border-radius:6px !important; -} -.wrapper #left-column{ - width:98% !important; -} -.titlehover .galleryitem:hover .label, -.titlehover .galleryitem:hover p { - display:block; - -} -.titlehover .galleryitem .label a{ - font-size:16px; -} -} -.galleryitem .label a { +.galleryitem > .label a { text-decoration: none; color:#333; font-size:18px; } -.galleryitem p.new a { +.galleryitem > p.new a { background-color: #efe; outline: none; } -.galleryitem progress { +.galleryitem > progress { height: 15px; margin: 23px 0px; width: 130px; } -.galleryitem div.link input { +.galleryitem > div.link input { vertical-align: middle; display: inline-block; } -.galleryitem div.link { +.galleryitem > div.link { display: block; line-height: 150px; @@ -172,7 +148,7 @@ a.link .galleryitem img { max-width: 140px; text-align: center; } -.galleryitem div.input { +.galleryitem > adiv.input { background-color: #EEF; display: table-cell; margin: 2px; @@ -192,7 +168,7 @@ a.link .galleryitem img { border: 2px solid white; background-color: transparent; } -.galleryitem.empty a.link > img { +.galleryitem.empty a.link img { opacity: 0.5; } .galleryitem.removed { @@ -227,7 +203,7 @@ a.link .galleryitem img { background-color: #cce; border-radius: 0px; } -.galleryitem .minitabs { +.galleryitem > .minitabs { position: absolute; top:0; left:0; @@ -235,53 +211,36 @@ a.link .galleryitem img { text-align: right; z-index: -1; } -@media screen and (min-width: 960px) { -.titlehover .galleryitem .minitabs{ - top:auto; - bottom:0; -} - .galleryitem:hover span.ribbon{ - display:none; - } - .galleryitem .minitabs > img, -.galleryitem .minitabs > a { - visibility: hidden !important; - } - .galleryitem:hover .minitabs > img, -.galleryitem:hover .minitabs > a { - visibility:visible !important; - margin-bottom:5px; - } -} -.galleryitem .minitabs { + +.galleryitem > .minitabs { z-index: unset; width:100%; } -.galleryitem .minitabs > img, -.galleryitem .minitabs > a { - visibility: visible; - top:0px; +.galleryitem > .minitabs > img, +.galleryitem .minitabs > a > img{ + visibility: visible ; width:25px; height:25px; margin:3px; background-color:rgba(255,255,255,0.6); + display:inline-block; border-radius:50%; padding:4px; } -.galleryitem .minitabs > a , -.galleryitem .minitabs > img +.galleryitem > .minitabs > a , +.galleryitem > .minitabs > img { visibility: visible; } -.galleryitem .minitabs > img:nth-child(2), -.galleryitem .minitabs > a:nth-child(2) { +.galleryitem > .minitabs > img:nth-child(2), +.galleryitem > .minitabs > a:nth-child(2) { right:0px; left:auto; } -.galleryitem span.ribbon { +.galleryitem > span.ribbon { visibility: visible; position: absolute; left:50%; @@ -290,7 +249,7 @@ a.link .galleryitem img { z-index:300; } -.galleryitem span.ribbon p { +.galleryitem > span.ribbon p { position: absolute; top: -6px; text-align: center; @@ -342,19 +301,19 @@ svg.ribbon path.part_c { fill:#494949; } .galleryitem .blank .votebox.add:hover { color: #8ccaff; } .galleryitem .blank .votebox.remove { color: #8ccaff; } .galleryitem .blank .votebox.remove:hover { color: red; } -.galleryitem .minitabs img, -.galleryitem .minitabs .blank { +.galleryitem > .minitabs > img, +.galleryitem > .minitabs > .blank { position: relative; right: -4px; float: left; } -.galleryitem .minitabs > img:last-child, -.galleryitem .minitabs > a:last-child img, -.galleryitem .minitabs .blank:last-child { +.galleryitem > .minitabs img:last-child, +.galleryitem > .minitabs a:last-child img, +.galleryitem > .minitabs blank:last-child { float: right; left: -4px; } -.galleryitem .minitabs a:hover { +.galleryitem > .minitabs > a:hover { text-decoration: none; font-weight: bold; } @@ -383,6 +342,57 @@ div#category_desc { } +@media screen and (min-width: 960px) { +.titlehover .galleryitem .label, +.titlehover .galleryitem p { + position:absolute; + z-index:20; + top:0; + border:none; + background-color:rgba(255,255,255,0.6); + border-radius:0 !important; + width:96%; + padding:2%; + margin:0; + color:#333; + display:none; +} +.titlehover .galleryitem > a.link > img, +.titlehover > a.link > .galleryitem > img { + border:none; + border-radius:6px !important; +} +.wrapper #left-column{ + width:100% !important; +} +.titlehover > .galleryitem:hover > .label, +.titlehover > .galleryitem:hover > p { + display:block; + +} +.titlehover > .galleryitem >.label a{ + font-size:16px; +} +.titlehover > .galleryitem > .minitabs{ + top:auto; + bottom:0; +} + .galleryitem:hover > span.ribbon{ + display:none; + } + .galleryitem > .minitabs > img, +.galleryitem .minitabs > a { + visibility: hidden !important; + } + .galleryitem:hover > .minitabs > img, +.galleryitem:hover > .minitabs > a { + visibility:visible !important; + margin-bottom:5px; + } + +} + + diff --git a/resources/templates/resources/resource_icons.html b/resources/templates/resources/resource_icons.html index 874899008..f40308b47 100644 --- a/resources/templates/resources/resource_icons.html +++ b/resources/templates/resources/resource_icons.html @@ -1,5 +1,5 @@ {% load i18n static %} -
diff --git a/cmstabs/templates/cms/plugins/group.html b/cmstabs/templates/cms/plugins/group.html index 46d17a26e..dc443fd81 100644 --- a/cmstabs/templates/cms/plugins/group.html +++ b/cmstabs/templates/cms/plugins/group.html @@ -2,7 +2,7 @@ {% addtoblock "css" %}{% endaddtoblock %} -
+
{% for user in users %}
diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index dbdd195f0..efb39e4cf 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -32,7 +32,7 @@ z-index:0; } -.wrapper #left-column{ +.wrapper .gallerycontent{ width:93% !important; margin:0px; } @@ -112,7 +112,7 @@ a.link .galleryitem > img { margin-bottom:-2px; } -.galleryitem .label, +.galleryitem .label, .galleryitem p { text-align: center !important; padding:4%; @@ -158,6 +158,33 @@ a.link .galleryitem > img { } } .galleryitem > .label a { +.galleryitem.nothing { + width:500px !important; + min-height:300px; + +} +.galleryitem.nothing img{ + + width:100px;% !important; + float:left; + vertical-align:middle; + border-width:0 !important; + margin-top:-40px; + +} + + +.galleryitem.nothing p{ + display:inline !important; + float:left; + text-align:left !important; + border-width:0; + width:200px; + font-size:20px; + margin-top:-30px; +} + +.galleryitem .label a { text-decoration: none; color:#333; font-size:18px; @@ -207,14 +234,11 @@ a.link .galleryitem > img { .galleryitem.nothing { color: #798488; - width: 50%; + width: 100%; text-align: left; } -.galleryitem.nothing:hover { - border: 2px solid white; - background-color: transparent; -} + .galleryitem.empty a.link img { opacity: 0.5; } @@ -492,7 +516,7 @@ div#category_desc { border:none; border-radius:6px !important; } -.wrapper #left-column{ +.wrapper .gallerycontent{ width:100% !important; } .page.gallery .galleryitem:hover .label, @@ -563,3 +587,4 @@ div#category_desc { margin-bottom:5px; } + diff --git a/resources/templates/resources/resource_icons.html b/resources/templates/resources/resource_icons.html index 874899008..a35bfe388 100644 --- a/resources/templates/resources/resource_icons.html +++ b/resources/templates/resources/resource_icons.html @@ -3,7 +3,7 @@ {% for item in resources %} {% include "resources/resource_item.html" %} {% empty %} -
+
{% if object.contest_submit %}

{% trans "No Submissions Yet" %}

diff --git a/resources/templates/resources/resourcegallery_contents.html b/resources/templates/resources/resourcegallery_contents.html index 2befc9604..cbdeb3044 100644 --- a/resources/templates/resources/resourcegallery_contents.html +++ b/resources/templates/resources/resourcegallery_contents.html @@ -1,6 +1,6 @@ {% load i18n %} -
+
{% if limit > 0 %} {% include "resources/resource_icons.html" with resources=object_list %} {% else %} -- GitLab From 17c5102ada85d127161f89509039fcc4f92bba26 Mon Sep 17 00:00:00 2001 From: Jabiertxo Arraiza Cenoz Date: Wed, 7 Mar 2018 20:05:42 +0100 Subject: [PATCH 21/36] Fix css sidebar --- person/templates/person/team_list.html | 2 +- resources/templates/resources/resource_rows.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/person/templates/person/team_list.html b/person/templates/person/team_list.html index b0fda406e..70f0778bc 100644 --- a/person/templates/person/team_list.html +++ b/person/templates/person/team_list.html @@ -11,7 +11,7 @@

{% trans "The Inkscape community has several teams who meet, discuss and work on different aspects of developing Inkscape, looking after its infrastructure and supporting the community around the project. Here you will find all the current teams and the ability to join them." %}

-
+
{% for team in object_list %} {% if team.icon %}
diff --git a/resources/templates/resources/resource_rows.html b/resources/templates/resources/resource_rows.html index 6d2cf3069..c99c660a7 100644 --- a/resources/templates/resources/resource_rows.html +++ b/resources/templates/resources/resource_rows.html @@ -8,6 +8,7 @@
{% for item in object_list %} + {% if item.is_visible %}
-- GitLab From 22a51a00e7668c644dcbfef1f3adb62d120e0b5f Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 02:16:05 +0100 Subject: [PATCH 22/36] Fixin a tyny css bug --- resources/static/css/gallery.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index efb39e4cf..d0eccaca4 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -165,7 +165,7 @@ a.link .galleryitem > img { } .galleryitem.nothing img{ - width:100px;% !important; + width:100px !important; float:left; vertical-align:middle; border-width:0 !important; -- GitLab From e029f7b772db54023cb37bc3bd4b40efc95065cd Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 03:18:13 +0100 Subject: [PATCH 23/36] Fixing button categories --- resources/static/css/gallery.css | 9 ++++++++- resources/static/js/gallery.js | 5 +++++ resources/templates/resources/resource_leftbar.html | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index d0eccaca4..c3ee3e019 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -48,7 +48,13 @@ padding-top:5px !important; } -.gallerysidebar:before{ +/*.gallerysidebar #sidetoggle:before{*/ +/* content:"+";*/ +/*}*/ +/*.gallerysidebar:hover #sidetoggle:before{*/ +/* content:"-";*/ +/*}*/ +.gallerysidebar #sidetoggle{ visibility:visible; display:block; position:sticky; @@ -70,6 +76,7 @@ border-color:#ccc; border-style:solid; } + .galleryitem { background: #fff; border: 0px; diff --git a/resources/static/js/gallery.js b/resources/static/js/gallery.js index 69be88e33..9190555d9 100644 --- a/resources/static/js/gallery.js +++ b/resources/static/js/gallery.js @@ -465,6 +465,11 @@ $(document).ready(function(){ galleryitems=null; result=null; }) + $('#sidetoggle').click(function(){ + if ($('.gallerysidebar').css("visibility") == "visible") { + $('.gallerysidebar').css("visibility", "hidden"); + } + }) }); /* Guides sometimes show a status saying "your browser doesn't support this" diff --git a/resources/templates/resources/resource_leftbar.html b/resources/templates/resources/resource_leftbar.html index da67c02f1..97ee795b5 100644 --- a/resources/templates/resources/resource_leftbar.html +++ b/resources/templates/resources/resource_leftbar.html @@ -1,5 +1,5 @@ {% load i18n static timers %} - + {% if object.contest_submit and object.category %}
{% if object.is_pending %} -- GitLab From 303d614ecea1c9ad27b42b12b16ba2f1fac4b420 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 03:20:48 +0100 Subject: [PATCH 24/36] Add +/- signs on mobile to right panel on galleries --- resources/static/css/gallery.css | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index c3ee3e019..6af44183e 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -48,12 +48,7 @@ padding-top:5px !important; } -/*.gallerysidebar #sidetoggle:before{*/ -/* content:"+";*/ -/*}*/ -/*.gallerysidebar:hover #sidetoggle:before{*/ -/* content:"-";*/ -/*}*/ + .gallerysidebar #sidetoggle{ visibility:visible; display:block; @@ -518,6 +513,12 @@ div#category_desc { color:#333; display:none; } +.gallerysidebar #sidetoggle:before{ + content:"+"; +} +.gallerysidebar:hover #sidetoggle:before{ + content:"-"; +} .page.gallery .galleryitem a.link > img, .page.gallery a.link > .galleryitem > img { border:none; -- GitLab From c82f5483a366d041da4239755eab1f7683b8bd14 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 03:25:43 +0100 Subject: [PATCH 25/36] Fix inversed media queryes on add +/- signs on mobile to right panel on galleries --- resources/static/css/gallery.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index 6af44183e..16659ef25 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -48,7 +48,12 @@ padding-top:5px !important; } - +.gallerysidebar #sidetoggle:before{ + content:"+"; +} +.gallerysidebar:hover #sidetoggle:before{ + content:"-"; +} .gallerysidebar #sidetoggle{ visibility:visible; display:block; @@ -517,7 +522,7 @@ div#category_desc { content:"+"; } .gallerysidebar:hover #sidetoggle:before{ - content:"-"; + content:"+"; } .page.gallery .galleryitem a.link > img, .page.gallery a.link > .galleryitem > img { -- GitLab From cdb396db3ce63181de93e6fe8b819925814abec7 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 03:31:52 +0100 Subject: [PATCH 26/36] Fix event on touch +/- signs on mobile to right panel on galleries --- resources/static/js/gallery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/static/js/gallery.js b/resources/static/js/gallery.js index 9190555d9..4521b9e7d 100644 --- a/resources/static/js/gallery.js +++ b/resources/static/js/gallery.js @@ -465,7 +465,7 @@ $(document).ready(function(){ galleryitems=null; result=null; }) - $('#sidetoggle').click(function(){ + $('#sidetoggle').touchend(function(){ if ($('.gallerysidebar').css("visibility") == "visible") { $('.gallerysidebar').css("visibility", "hidden"); } -- GitLab From 37c5b8555973153bd198bee73d51dd01680dba5a Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 03:39:08 +0100 Subject: [PATCH 27/36] Fix event on touch 2 try +/- signs on mobile to right panel on galleries --- resources/static/js/gallery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/static/js/gallery.js b/resources/static/js/gallery.js index 4521b9e7d..321668478 100644 --- a/resources/static/js/gallery.js +++ b/resources/static/js/gallery.js @@ -465,7 +465,7 @@ $(document).ready(function(){ galleryitems=null; result=null; }) - $('#sidetoggle').touchend(function(){ + $('#sidetoggle').mouseup(function(){ if ($('.gallerysidebar').css("visibility") == "visible") { $('.gallerysidebar').css("visibility", "hidden"); } -- GitLab From 3b4eddd64be9067cc0f54454661ce083ea5eca41 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 04:17:41 +0100 Subject: [PATCH 28/36] Fix event on touch 3 try +/- signs on mobile to right panel on galleries --- resources/static/css/gallery.css | 21 +++++++++++++-------- resources/static/js/gallery.js | 24 +++++++++++++++++++++--- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index 16659ef25..66c0b6163 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -46,7 +46,6 @@ margin-top:-42px; margin-right:-30px; padding-top:5px !important; - } .gallerysidebar #sidetoggle:before{ content:"+"; @@ -54,6 +53,12 @@ .gallerysidebar:hover #sidetoggle:before{ content:"-"; } +.gallerysidebar.hideside #sidetoggle:before{ + content:"+"; +} +.gallerysidebar.showside #sidetoggle:before{ + content:"-"; +} .gallerysidebar #sidetoggle{ visibility:visible; display:block; @@ -76,7 +81,12 @@ border-color:#ccc; border-style:solid; } - +.gallerysidebar.hideside{ + visibility:hidden !important; +} +.gallerysidebar.showside{ + visibility:visible !important; +} .galleryitem { background: #fff; border: 0px; @@ -518,12 +528,7 @@ div#category_desc { color:#333; display:none; } -.gallerysidebar #sidetoggle:before{ - content:"+"; -} -.gallerysidebar:hover #sidetoggle:before{ - content:"+"; -} + .page.gallery .galleryitem a.link > img, .page.gallery a.link > .galleryitem > img { border:none; diff --git a/resources/static/js/gallery.js b/resources/static/js/gallery.js index 321668478..a7eac745e 100644 --- a/resources/static/js/gallery.js +++ b/resources/static/js/gallery.js @@ -465,10 +465,28 @@ $(document).ready(function(){ galleryitems=null; result=null; }) - $('#sidetoggle').mouseup(function(){ - if ($('.gallerysidebar').css("visibility") == "visible") { - $('.gallerysidebar').css("visibility", "hidden"); + $('#sidetoggle').click(function(){ + var ss = $('.gallerysidebar').hasClass("showside"); + var hs = $('.gallerysidebar').hasClass("hideside"); + var closed = $('.gallerysidebar').css("visivility") == "hidden"; + if (!ss && !hs) { + if (closed) { + $('.gallerysidebar').addClass("showside"); + } else { + $('.gallerysidebar').addClass("hideside"); + } } + if ($('.gallerysidebar').hasClass("showside")) { + $('.gallerysidebar').removeClass("showside"); + $('.gallerysidebar').addClass("hideside"); + } else { + $('.gallerysidebar').removeClass("hideside"); + $('.gallerysidebar').addClass("showside"); + } + }) + $('#sidetoggle').mouseleave(function(){ + $('.gallerysidebar').removeClass("showside"); + $('.gallerysidebar').removeClass("hideside"); }) }); -- GitLab From f27ed4b99fe5d30814e0113b5e4e5a0021f91d06 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 05:46:02 +0100 Subject: [PATCH 29/36] CSS minor stylings --- resources/static/css/gallery.css | 33 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index 66c0b6163..6ce4a378d 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -41,11 +41,11 @@ .gallery.page .wrapper #right-sidebar:focus{ visibility:visible !important; } -.gallerysidebar, .gallerysidebar{ - margin-top:-42px; + margin-top:-18px !important; margin-right:-30px; padding-top:5px !important; + height:96%; } .gallerysidebar #sidetoggle:before{ content:"+"; @@ -53,15 +53,11 @@ .gallerysidebar:hover #sidetoggle:before{ content:"-"; } -.gallerysidebar.hideside #sidetoggle:before{ - content:"+"; -} -.gallerysidebar.showside #sidetoggle:before{ - content:"-"; -} + .gallerysidebar #sidetoggle{ visibility:visible; display:block; + width:100px; position:sticky; content:"+"; text-align:center !important; @@ -72,21 +68,15 @@ padding:2px 4px 4px 4px; font-weight:bold; z-index:0; - top:0px; - right:5px; - bottom:0; + margin-left:20px; cursor:pointer; line-height:1; border-width:1px; border-color:#ccc; border-style:solid; + top:20px; } -.gallerysidebar.hideside{ - visibility:hidden !important; -} -.gallerysidebar.showside{ - visibility:visible !important; -} + .galleryitem { background: #fff; border: 0px; @@ -410,7 +400,7 @@ a.link .galleryitem > img { background-color:transparent !important;; } .gallery.page .galleryitem span.ribbon p{ - top:0px !important; + top:-7px !important; } .galleryitem:hover span.ribbon{ opacity:1; @@ -528,7 +518,12 @@ div#category_desc { color:#333; display:none; } - +.gallerysidebar #sidetoggle:before{ + content:"+"; +} +.gallerysidebar:hover #sidetoggle:before{ + content:"+"; +} .page.gallery .galleryitem a.link > img, .page.gallery a.link > .galleryitem > img { border:none; -- GitLab From f1baed697574ea40a353e1a5960c64722e6b10d8 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 06:07:49 +0100 Subject: [PATCH 30/36] Fix hackfest banner on mobile devices --- inkscape/static/css/mobile-device.css | 18 ++++++++++++++---- resources/static/css/gallery.css | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/inkscape/static/css/mobile-device.css b/inkscape/static/css/mobile-device.css index d09a38775..6c629a5e3 100644 --- a/inkscape/static/css/mobile-device.css +++ b/inkscape/static/css/mobile-device.css @@ -42,6 +42,8 @@ div.cms .cms-toolbar-trigger { position: absolute; top: 30px; margin: 0; + display:block; + margin-left:-58px; right: 0; opacity: .8; } @@ -152,7 +154,7 @@ ol { #content { margin-bottom: 0; - padding: 20px 12px; + padding: 0px 12px; background: transparent; word-wrap: break-word; } @@ -309,12 +311,13 @@ div.toc, position: relative; height: 172px; text-align: center; + } #logo { display: inline-block; float: none; margin: 0; - padding-top: 44px; + padding-top: 58px; white-space: nowrap; text-align: left; } @@ -335,8 +338,14 @@ div.toc, } #tabs > #tab_hackfest { white-space: normal; - left: 4px; - right: 4px; + left: 0px; + right: 0px; + display:block; + width:100%; + border-radius:0 !important;; + } + #tab_hackfest p { + border-radius:0 !important;; } #tabs > #tab_languages > div { left: 0; @@ -443,3 +452,4 @@ div.toc, border-radius: 0 0 5px 5px; } } + diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index 6ce4a378d..2accdbff8 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -45,7 +45,6 @@ margin-top:-18px !important; margin-right:-30px; padding-top:5px !important; - height:96%; } .gallerysidebar #sidetoggle:before{ content:"+"; @@ -601,3 +600,4 @@ div#category_desc { } + -- GitLab From 1026f7c9e14f9f44f8294fd9eebbfb81ee6797d6 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Mar 2018 06:26:22 +0100 Subject: [PATCH 31/36] Fix hackfest banner on mobile devices --- inkscape/static/css/mobile-device.css | 13 +++++++++---- resources/static/css/gallery.css | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/inkscape/static/css/mobile-device.css b/inkscape/static/css/mobile-device.css index 6c629a5e3..ecd39d855 100644 --- a/inkscape/static/css/mobile-device.css +++ b/inkscape/static/css/mobile-device.css @@ -43,7 +43,6 @@ div.cms .cms-toolbar-trigger { top: 30px; margin: 0; display:block; - margin-left:-58px; right: 0; opacity: .8; } @@ -332,16 +331,22 @@ div.toc, position: static; float: none; margin-left: -5px; + /*HACKFEST*/ + margin-top:26px; + /*HACKFEST*/ } #tabs > li.dropdown > div { text-align: left; + } - #tabs > #tab_hackfest { + #tab_hackfest { + position:absolute !important; + white-space: normal; + top:0; left: 0px; - right: 0px; + right: -10px; display:block; - width:100%; border-radius:0 !important;; } #tab_hackfest p { diff --git a/resources/static/css/gallery.css b/resources/static/css/gallery.css index 2accdbff8..837caaa7a 100644 --- a/resources/static/css/gallery.css +++ b/resources/static/css/gallery.css @@ -33,7 +33,7 @@ } .wrapper .gallerycontent{ - width:93% !important; + width:100% !important; margin:0px; } @@ -43,7 +43,7 @@ } .gallerysidebar{ margin-top:-18px !important; - margin-right:-30px; + margin-right:0px; padding-top:5px !important; } .gallerysidebar #sidetoggle:before{ @@ -67,7 +67,7 @@ padding:2px 4px 4px 4px; font-weight:bold; z-index:0; - margin-left:20px; + margin-left:112px; cursor:pointer; line-height:1; border-width:1px; -- GitLab From 18ce8fa3125301ccd1ef7484d380c0c6a37dcb31 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 10 Mar 2018 22:13:12 -0500 Subject: [PATCH 32/36] Deploy staging script --- utils/deploy-staging | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 utils/deploy-staging diff --git a/utils/deploy-staging b/utils/deploy-staging new file mode 100644 index 000000000..9d6f53765 --- /dev/null +++ b/utils/deploy-staging @@ -0,0 +1,39 @@ +#!/bin/bash +# +# Copyright 2018, Martin Owens +# +# This file is part of the software inkscape-web, consisting of custom +# code for the Inkscape project's django-based website. +# +# inkscape-web is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# inkscape-web is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with inkscape-web. If not, see . +# + +echo "Content-type:text/plain" +echo "" +echo "" + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd $DIR/../ + +date > data/staging-update + +BRANCH=`git branch -vv | grep ^* | cut -d "[" -f2 | cut -d "]" -f1` + +git fetch +git reset --hard $BRANCH + +./utils/update + +touch ./data/wsgi.conf + -- GitLab From dbfb966a5bc264059bdf9cd4dd1fc34d813a9a7c Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 10 Mar 2018 22:14:20 -0500 Subject: [PATCH 33/36] Set execute bit --- utils/deploy-staging | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 utils/deploy-staging diff --git a/utils/deploy-staging b/utils/deploy-staging old mode 100644 new mode 100755 -- GitLab From 3d0f07c2d4c1c0c380c5221013d9a1bd6ce72ec9 Mon Sep 17 00:00:00 2001 From: prkos Date: Sun, 11 Mar 2018 20:28:28 +0100 Subject: [PATCH 34/36] Less rounded corners and slightly larger space between buttons on mobile --- inkscape/static/css/main.css | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/inkscape/static/css/main.css b/inkscape/static/css/main.css index 7d810addf..66ba79eef 100644 --- a/inkscape/static/css/main.css +++ b/inkscape/static/css/main.css @@ -695,13 +695,13 @@ div.toc ol, #menu > li > a { background: #4d4d4d; background-image: linear-gradient(to bottom, #4d4d4d 0%, #1a1a1a 100%); - border-radius: 10px; + border-radius: 4px; padding: 17px 8px; white-space: nowrap; border-left: 1px solid #5a5a5a; border-right: 1px solid #333333; font-size: 14px; - margin: 0 3px 3px 0; + margin: 0 4px 4px 0; text-transform: uppercase; text-align: center; } @@ -721,11 +721,9 @@ div.toc ol, } #menu > li:last-child > a { border-right: 0; - border-top-right-radius: 10px; } #menu > li:first-child > a { border-left: 0; - border-top-left-radius: 10px; } #menu li ul { display: none; @@ -778,6 +776,12 @@ div.toc ol, background: #333333; background-image: linear-gradient(to bottom, #333, #444, #333); } + #menu > li:first-child > a { + border-top-left-radius: 10px; + } + #menu > li:last-child > a { + border-top-right-radius: 10px; + } } /* Content wrappers */ -- GitLab From 297246470232a6694ae6ecfa6498b144a946beb2 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sun, 11 Mar 2018 21:34:35 +0100 Subject: [PATCH 35/36] Fix lang menu on max-width 459 --- inkscape/static/css/mobile-device.css | 1 + 1 file changed, 1 insertion(+) diff --git a/inkscape/static/css/mobile-device.css b/inkscape/static/css/mobile-device.css index ecd39d855..e21f4697c 100644 --- a/inkscape/static/css/mobile-device.css +++ b/inkscape/static/css/mobile-device.css @@ -458,3 +458,4 @@ div.toc, } } + -- GitLab From cdf1c423e96584f7a5d73ac254e48a04ffb5d902 Mon Sep 17 00:00:00 2001 From: prkos Date: Sun, 11 Mar 2018 22:53:14 +0100 Subject: [PATCH 36/36] Support item shouldn't be squared corners on mobiles devices, there shouldn't be any drop-down menu gap on mobiles --- inkscape/static/css/main.css | 8 ++++---- inkscape/static/css/mobile-device.css | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/inkscape/static/css/main.css b/inkscape/static/css/main.css index 66ba79eef..5c45f65d3 100644 --- a/inkscape/static/css/main.css +++ b/inkscape/static/css/main.css @@ -667,9 +667,6 @@ div.toc ol, list-style: none; text-align: left; } -#menu > li { - margin: 0 -3px 0 0; -} #menu :link, #menu :link:hover, #menu :link:active, @@ -728,7 +725,7 @@ div.toc ol, #menu li ul { display: none; position: absolute; - top: 52px; + top: 100%; left: 0; z-index: 1; margin: 0; @@ -766,6 +763,9 @@ div.toc ol, border-radius: 10px 10px 0 0; border-bottom: 1px solid #262626; } + #menu > li { + margin: 0 -3px 0 0; + } #menu > li > a { border-radius: 0; margin: 0; diff --git a/inkscape/static/css/mobile-device.css b/inkscape/static/css/mobile-device.css index e21f4697c..8b3163ff6 100644 --- a/inkscape/static/css/mobile-device.css +++ b/inkscape/static/css/mobile-device.css @@ -75,9 +75,6 @@ div.cms .cms-toolbar-trigger { padding: 9px 14px; border: 1px solid #5a5a5a; } -#menu > li:last-child > a { - border-radius: 0; -} #menu li li.main { display: list-item; } -- GitLab