From ca6fcc4dcae6b340baf3735e869b267f0308d7d4 Mon Sep 17 00:00:00 2001 From: Mariatta Date: Fri, 19 Aug 2016 21:19:54 -0700 Subject: [PATCH 1/3] issue #985 fix issue with role attributes --- pydotorg/settings/pipeline.py | 2 +- static/sass/style.css | 171 ++++++++++-------- static/sass/style.scss | 4 + templates/base.html | 54 +++--- templates/components/success-story.html | 4 +- templates/jobs/base.html | 14 +- templates/minutes/minutes_detail.html | 2 +- templates/sitetree/footer_children.html | 2 +- templates/sitetree/sidebar_menu.html | 2 +- templates/sitetree/submenu_children.html | 2 +- templates/successstories/story_detail.html | 4 +- .../successstories/storycategory_detail.html | 18 +- 12 files changed, 156 insertions(+), 123 deletions(-) diff --git a/pydotorg/settings/pipeline.py b/pydotorg/settings/pipeline.py index bdbcfed49..67609b701 100644 --- a/pydotorg/settings/pipeline.py +++ b/pydotorg/settings/pipeline.py @@ -19,7 +19,7 @@ ), 'output_filename': 'stylesheets/mq.css', 'extra_context': { - 'media': 'not print, braille, embossed, speech, tty', + 'media': 'not print, speech', }, }, 'no-mq': { diff --git a/static/sass/style.css b/static/sass/style.css index ae80def00..097993655 100644 --- a/static/sass/style.css +++ b/static/sass/style.css @@ -187,7 +187,7 @@ color: #4d4d4d !important; font-weight: normal; margin-bottom: 0.4375em; - padding: .4em .75em .35em; + padding: 0.4em 0.75em 0.35em; text-align: left; white-space: nowrap; text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.3); @@ -211,11 +211,11 @@ -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.05), inset 0 0 5px rgba(255, 255, 255, 0.5); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.05), inset 0 0 5px rgba(255, 255, 255, 0.5); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.05), inset 0 0 5px rgba(255, 255, 255, 0.5); } - .search-button:hover, #dive-into-python .flex-control-paging a:hover, .text form button:hover, .text form input[type=submit]:hover, + .header-banner .button:hover, .header-banner a.button:hover, .search-button:hover, #dive-into-python .flex-control-paging a:hover, .text form button:hover, .text form input[type=submit]:hover, .sidebar-widget form button:hover, - .sidebar-widget form input[type=submit]:hover, input[type=submit]:hover, input[type=reset]:hover, button:hover, .button:hover, .search-button:focus, #dive-into-python .flex-control-paging a:focus, .text form button:focus, .text form input[type=submit]:focus, + .sidebar-widget form input[type=submit]:hover, input[type=submit]:hover, input[type=reset]:hover, button:hover, .button:hover, .header-banner .button:focus, .header-banner a.button:focus, .search-button:focus, #dive-into-python .flex-control-paging a:focus, .text form button:focus, .text form input[type=submit]:focus, .sidebar-widget form button:focus, - .sidebar-widget form input[type=submit]:focus, input[type=submit]:focus, input[type=reset]:focus, button:focus, .button:focus, .search-button:active, #dive-into-python .flex-control-paging a:active, .text form button:active, .text form input[type=submit]:active, + .sidebar-widget form input[type=submit]:focus, input[type=submit]:focus, input[type=reset]:focus, button:focus, .button:focus, .header-banner .button:active, .header-banner a.button:active, .search-button:active, #dive-into-python .flex-control-paging a:active, .text form button:active, .text form input[type=submit]:active, .sidebar-widget form button:active, .sidebar-widget form input[type=submit]:active, input[type=submit]:active, input[type=reset]:active, button:active, .button:active { color: #1a1a1a !important; @@ -241,7 +241,7 @@ border-right: 1px solid #dca900; border-bottom: 1px solid #dca900; border-left: 1px solid #dca900; } - .psf-widget .button:hover, .python-needs-you-widget .button:hover, .header-banner .button:hover, .psf-widget .button:active, .python-needs-you-widget .button:active, .header-banner .button:active { + .psf-widget .button:hover, .python-needs-you-widget .button:hover, .header-banner .button:hover, .header-banner a.button:hover, .psf-widget .button:active, .python-needs-you-widget .button:active, .header-banner .button:active, .header-banner a.button:active { background-color: inherit; background-color: #ffd343; *zoom: 1; @@ -314,7 +314,7 @@ button[type=submit], .search-button, #dive-into-python .flex-control-paging a, . /* Used in the pagination UL anchors, and in the Previous Next pattern */ display: block; color: #999999; - padding: .5em .75em .4em; + padding: 0.5em 0.75em 0.4em; border: 1px solid #caccce; background-color: transparent; } @@ -462,8 +462,8 @@ ins { mark { display: inline-block; - padding: 0 .25em; - margin: 0 -.125em; + padding: 0 0.25em; + margin: 0 -0.125em; background-color: #ffb; /* light yellow */ } @@ -562,7 +562,7 @@ sub { bottom: -0.25em; } pre, code, kbd, samp, var { - font-family: Consolas, 'Lucida Console', 'Liberation Mono', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace, sans-serif; } + font-family: Consolas, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace, sans-serif; } pre { /* Get spaces to display for PRE tags but dont let long lines break out of containers */ @@ -997,7 +997,7 @@ h2.not-column { color: #999999; background: transparent; text-align: center; - padding: .5em .75em .4em; + padding: 0.5em 0.75em 0.4em; font-size: 1em; line-height: 1.75em; /* no fallback for .no-generatedcontent. This is a progressive enhancement */ } @@ -1046,10 +1046,10 @@ h2.not-column { /* Used in both the main-header and the header-banner */ .main-header { border-top: 1px solid #191919; - border-bottom: 1px solid #444; } + border-bottom: 1px solid #444444; } .main-header .container { text-align: center; - padding: .75em 1em; } + padding: 0.75em 1em; } /*h1*/ .site-headline { @@ -1135,15 +1135,15 @@ input#s, .menu-icon { display: inline-block; font-size: 1.25em; - margin: -.125em -.125em 0 0; } + margin: -0.125em -0.125em 0 0; } /*form*/ .search-the-site { text-align: left; - padding: .35em .2em .3em; } + padding: 0.35em 0.2em 0.3em; } .search-the-site .icon-search:before { font-size: 1.75em; - margin: 0 .125em 0 .25em; } + margin: 0 0.125em 0 0.25em; } .search-the-site .no-touch { border-left: 0; } @@ -1154,8 +1154,8 @@ input#s, color: #bbbbbb; background-color: transparent; border: none; - margin: .125em 0; - padding: .4em 0 .3em; + margin: 0.125em 0; + padding: 0.4em 0 0.3em; -webkit-border-radius: 0px; -moz-border-radius: 0px; -ms-border-radius: 0px; @@ -1170,7 +1170,7 @@ input#s, .search-field:focus { background-color: white; color: #444444; - padding: .4em .5em .3em; + padding: 0.4em 0.5em 0.3em; /* removed this line because it was making the height fluctuate on focus: @include pe-border( $color-top: darken( $darkerblue, 12% ), $color-bottom: lighten( $darkerblue, 8% ) ); */ } .search-field:blur { @@ -1233,7 +1233,7 @@ input#s, .account-signin .tier-1 > a, .account-signin .tier-2 > a { display: block; - padding: .5em 1.5em .4em 1em; + padding: 0.5em 1.5em 0.4em 1em; position: relative; } .adjust-font-size .tier-1, .winkwink-nudgenudge .tier-1, @@ -1268,15 +1268,25 @@ input#s, .account-signin .sidebar-widget form label + ul, .sidebar-widget form .account-signin label + ul { *zoom: 1; } - .adjust-font-size .menu:after, .adjust-font-size form ul:after, form .adjust-font-size ul:after, .adjust-font-size .errorlist:after, + .adjust-font-size .menu:after, .adjust-font-size form ul:after, form .adjust-font-size ul:after, .adjust-font-size .errorlist:after, .adjust-font-size .text form label + ul:after, .text form .adjust-font-size label + ul:after, + .adjust-font-size .sidebar-widget form label + ul:after, + .sidebar-widget form .adjust-font-size label + ul:after, .winkwink-nudgenudge .menu:after, .winkwink-nudgenudge form ul:after, form .winkwink-nudgenudge ul:after, .winkwink-nudgenudge .errorlist:after, + .winkwink-nudgenudge .text form label + ul:after, + .text form .winkwink-nudgenudge label + ul:after, + .winkwink-nudgenudge .sidebar-widget form label + ul:after, + .sidebar-widget form .winkwink-nudgenudge label + ul:after, .account-signin .menu:after, .account-signin form ul:after, form .account-signin ul:after, - .account-signin .errorlist:after { + .account-signin .errorlist:after, + .account-signin .text form label + ul:after, + .text form .account-signin label + ul:after, + .account-signin .sidebar-widget form label + ul:after, + .sidebar-widget form .account-signin label + ul:after { content: ""; display: table; clear: both; } @@ -1528,7 +1538,7 @@ input#s, .adjust-font-size .tier-1 > a, .winkwink-nudgenudge .tier-1 > a, .account-signin .tier-1 > a { - padding: 1em 1em .875em; } + padding: 1em 1em 0.875em; } /* ! ===== Main navigation – In _layout.scss and _mixins.scss, as we don't display it here ===== */ .main-navigation { @@ -1791,7 +1801,7 @@ input#s, .sidebar-widget form button, .sidebar-widget form input[type=submit] { font-size: 1.125em; - padding: .4em 1em .35em; } + padding: 0.4em 1em 0.35em; } .text a:not(.button), .sidebar-widget a:not(.button) { display: inline; @@ -1803,14 +1813,23 @@ input#s, color: $grey-light; margin-right: .5em; } */ } - .text nav a, .text .menu a, .text form ul a, form .text ul a, .text .errorlist a, .text input[type=submit], .text input[type=reset], .text input[type=button], .text button, .text .prompt, .text .readmore:before, .text .give-me-more a:before, .give-me-more .text a:before, - .text nav a:hover, .text .menu a:hover, .text form ul a:hover, form .text ul a:hover, .text .errorlist a:hover, .text input[type=submit]:hover, .text input[type=reset]:hover, .text input[type=button]:hover, .text .prompt:hover, .text .readmore:hover:before, .text .give-me-more a:hover:before, .give-me-more .text a:hover:before, - .text nav a:focus, .text .menu a:focus, .text form ul a:focus, form .text ul a:focus, .text .errorlist a:focus, .text input[type=submit]:focus, .text input[type=reset]:focus, .text input[type=button]:focus, .text .prompt:focus, .text .readmore:focus:before, .text .give-me-more a:focus:before, .give-me-more .text a:focus:before, + .text nav a, .text .menu a, .text form ul a, form .text ul a, .text .errorlist a, .text form label + ul a, + .text .sidebar-widget form label + ul a, + .sidebar-widget form .text label + ul a, .text input[type=submit], .text input[type=reset], .text input[type=button], .text button, .text .prompt, .text .readmore:before, .text .give-me-more a:before, .give-me-more .text a:before, + .text nav a:hover, .text .menu a:hover, .text form ul a:hover, form .text ul a:hover, .text .errorlist a:hover, .text form label + ul a:hover, + .text .sidebar-widget form label + ul a:hover, + .sidebar-widget form .text label + ul a:hover, .text input[type=submit]:hover, .text input[type=reset]:hover, .text input[type=button]:hover, .text .prompt:hover, .text .readmore:hover:before, .text .give-me-more a:hover:before, .give-me-more .text a:hover:before, + .text nav a:focus, .text .menu a:focus, .text form ul a:focus, form .text ul a:focus, .text .errorlist a:focus, .text form label + ul a:focus, + .text .sidebar-widget form label + ul a:focus, + .sidebar-widget form .text label + ul a:focus, .text input[type=submit]:focus, .text input[type=reset]:focus, .text input[type=button]:focus, .text .prompt:focus, .text .readmore:focus:before, .text .give-me-more a:focus:before, .give-me-more .text a:focus:before, .sidebar-widget nav a, .sidebar-widget .menu a, .sidebar-widget form ul a, form .sidebar-widget ul a, .sidebar-widget .errorlist a, + .sidebar-widget .text form label + ul a, + .text form .sidebar-widget label + ul a, + .sidebar-widget form label + ul a, .sidebar-widget input[type=submit], .sidebar-widget input[type=reset], .sidebar-widget input[type=button], @@ -1824,6 +1843,9 @@ input#s, .sidebar-widget form ul a:hover, form .sidebar-widget ul a:hover, .sidebar-widget .errorlist a:hover, + .sidebar-widget .text form label + ul a:hover, + .text form .sidebar-widget label + ul a:hover, + .sidebar-widget form label + ul a:hover, .sidebar-widget input[type=submit]:hover, .sidebar-widget input[type=reset]:hover, .sidebar-widget input[type=button]:hover, @@ -1836,6 +1858,9 @@ input#s, .sidebar-widget form ul a:focus, form .sidebar-widget ul a:focus, .sidebar-widget .errorlist a:focus, + .sidebar-widget .text form label + ul a:focus, + .text form .sidebar-widget label + ul a:focus, + .sidebar-widget form label + ul a:focus, .sidebar-widget input[type=submit]:focus, .sidebar-widget input[type=reset]:focus, .sidebar-widget input[type=button]:focus, @@ -1876,13 +1901,13 @@ input#s, .sidebar-widget samp { border-bottom: 1px solid #caccce; background-color: #e6e8ea; - padding: .125em .375em 0; - margin: 0 .25em; } + padding: 0.125em 0.375em 0; + margin: 0 0.25em; } .text code, .text kbd, .sidebar-widget code, .sidebar-widget kbd { - padding: .125em .375em 0; - margin: 0 -.0625em; + padding: 0.125em 0.375em 0; + margin: 0 -0.0625em; background: #e6e8ea; background: rgba(230, 232, 234, 0.5); -webkit-box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.1) inset; @@ -1936,7 +1961,7 @@ table tr { table tr:nth-of-type(even), table tr.even { background-color: #f0f0f0; } table th, table td { - padding: .25em .5em .2em; + padding: 0.25em 0.5em 0.2em; border-left: 2px solid white; } table th:first-child, table td:first-child { border-left: none; } @@ -2104,13 +2129,17 @@ table tfoot { color: #666666; } .success-stories-widget blockquote a:hover, .success-stories-widget blockquote a:focus, .success-stories-widget blockquote a:active { color: #3776ab; } -.success-stories-widget .quote-from td { - padding: .5em; - vertical-align: middle; } -.success-stories-widget .quote-from img { - max-height: 5em; } -.success-stories-widget .quote-from p { - font-size: 0.875em; } +.success-stories-widget .quote-from { + border-width: 0; + width: 0; + border-spacing: 0; } + .success-stories-widget .quote-from td { + padding: .5em; + vertical-align: middle; } + .success-stories-widget .quote-from img { + max-height: 5em; } + .success-stories-widget .quote-from p { + font-size: 0.875em; } /*.statistics-widget { padding-left: .75em; @@ -2144,7 +2173,7 @@ table tfoot { .applications-widget ul { border-top: 1px solid #caccce; } .applications-widget li { - padding: .5em 0 .4em; + padding: 0.5em 0 0.4em; border-bottom: 1px solid #caccce; } .shrubbery { @@ -2198,7 +2227,7 @@ table tfoot { color: #3776ab; background-color: #f2f4f6; border-bottom: 1px solid #e6eaee; - padding: .6em .75em .5em; } + padding: 0.6em 0.75em 0.5em; } .pep-list li a:hover, .pep-list li a:focus, .pep-list li a:active { color: #222222; background-color: #fefefe; } @@ -2243,7 +2272,7 @@ table tfoot { color: #222222; } .pep-type, .pep-num, .pep-title, .pep-owner { - padding: .5em .5em .4em; + padding: 0.5em 0.5em 0.4em; border-bottom: 1px solid #e3e7ec; } .footnote .label { @@ -2253,7 +2282,7 @@ table tfoot { .info-key dt, .info-key dd { display: block; float: left; - padding: .5em .5em .4em; } + padding: 0.5em 0.5em 0.4em; } .info-key dt { width: 25%; } .info-key dd { @@ -2271,14 +2300,14 @@ table tfoot { */ .pep-owner-header { - margin: 0 -.5em; + margin: 0 -0.5em; overflow: hidden; *zoom: 1; } .pep-owner-header .label { font-family: SourceSansProBold, Arial, sans-serif; float: left; width: 50%; - padding: .25em .5em .2em; } + padding: 0.25em 0.5em 0.2em; } .pep-owner-list li { background-color: #f2f4f6; @@ -2290,12 +2319,12 @@ table tfoot { .pep-owner-list .owner-name, .pep-owner-list .owner-email { float: left; width: 50%; - padding: .5em .5em .4em; } + padding: 0.5em 0.5em 0.4em; } /* ! ===== Success Stories landing page ===== */ .featured-success-story { padding: 1.3125em 0; - background: center -230px no-repeat url('../img/success-glow2.png?1412817243') transparent; + background: center -230px no-repeat url('../img/success-glow2.png?1471056923') transparent; /*blockquote*/ } .featured-success-story img { padding: 10px 30px; } @@ -2404,7 +2433,7 @@ p.quote-by-organization { /* resets as this is an H3 element and it behaves differently */ margin-top: .75em; margin-bottom: 1.25em; - padding: .5em .75em; } + padding: 0.5em 0.75em; } .event-description { padding: 1.3125em 0; } @@ -2427,7 +2456,7 @@ p.quote-by-organization { -ms-border-radius: 0 0 8px 8px; -o-border-radius: 0 0 8px 8px; border-radius: 0 0 8px 8px; - padding: .75em 1em; } + padding: 0.75em 1em; } /*ul*/ .twitter-stream li { @@ -2458,7 +2487,7 @@ p.quote-by-organization { color: #666666; font-size: 0.875em; vertical-align: baseline; - padding: .2em .4em .1em; + padding: 0.2em 0.4em 0.1em; background-color: #e6e8ea; border-top: 1px solid #f2f4f6; border-bottom: 1px solid #caccce; } @@ -2481,13 +2510,13 @@ p.quote-by-organization { /* ! ===== Stylized lists of items, used on Downloads and others ===== */ .list-row-headings { font-family: SourceSansProBold, Arial, sans-serif; - padding: .5em .5em .4em .75em; + padding: 0.5em 0.5em 0.4em 0.75em; margin-right: 1.25em; } .list-row-container { border: 1px solid #caccce; } .list-row-container li { - padding: .5em .5em .4em .75em; + padding: 0.5em 0.5em 0.4em 0.75em; margin-right: 0; } .list-row-container li:nth-child(odd) { background-color: #f2f4f6; } @@ -2552,7 +2581,7 @@ p.quote-by-organization { .previous-next .prev-button, .previous-next .next-button { display: block; - padding: .5em .75em .4em; + padding: 0.5em 0.75em 0.4em; margin-bottom: 0.875em; } .previous-next .prev-button:not(.disabled):hover, .previous-next .prev-button:not(.disabled):focus, .previous-next .next-button:not(.disabled):hover, @@ -2620,7 +2649,7 @@ p.quote-by-organization {

Can’t find what you’re looking for? Try our comprehensive Help section

*/ .user-feedback { - padding: .75em 1em .65em; + padding: 0.75em 1em 0.65em; margin-bottom: 1.3125em; -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -2685,7 +2714,7 @@ p.quote-by-organization { font-size: 0.58333em; text-transform: uppercase; letter-spacing: .0625em; - padding: .45em .5em 0; + padding: 0.45em 0.5em 0; margin-right: .25em; } .listing-company .listing-location a { color: #999999; } @@ -2714,7 +2743,7 @@ p.quote-by-organization { /* ! ===== Inner pages ===== */ .breadcrumbs { - padding: .5em 0; + padding: 0.5em 0; border-bottom: 1px solid #caccce; white-space: nowrap; } .breadcrumbs li { @@ -2739,7 +2768,7 @@ p.quote-by-organization { .section-nav a { display: block; - padding: .3em 0 .2em; } + padding: 0.3em 0 0.2em; } .psf-sidebar-widget { color: #f2f4f6; @@ -2793,7 +2822,7 @@ p.quote-by-organization { .psf-codeofconduct { font-size: 0.875em; - padding: .5em 1em; + padding: 0.5em 1em; margin-bottom: 1em; background-color: white; -webkit-box-shadow: 0.25em 0.25em 0.75em rgba(0, 0, 0, 0.15); @@ -2820,7 +2849,7 @@ p.quote-by-organization { .main-footer .jump-link, .sitemap a, .footer-links a { display: block; text-align: center; - padding: .5em .75em .4em; } + padding: 0.5em 0.75em 0.4em; } .main-footer { clear: both; @@ -2828,7 +2857,7 @@ p.quote-by-organization { background-color: #e6e8ea; border-top: 1px solid #d8dbde; } .main-footer .container { - padding: 0 .75em .75em; } + padding: 0 0.75em 0.75em; } .main-footer a { color: #666666; } .main-footer a:hover, .main-footer a:focus { @@ -2836,7 +2865,7 @@ p.quote-by-organization { .main-footer .jump-link { background-color: #e0e3e5; } .main-footer a.jump-link { - margin: .75em 0; + margin: 0.75em 0; border-top: 1px solid #e6e8ea; border-bottom: 1px solid #dbdee1; } .main-footer a.jump-link:hover, .main-footer a.jump-link:focus { @@ -2850,7 +2879,7 @@ p.quote-by-organization { margin-bottom: 1.3125em; } .sitemap .tier-1 > a { color: #3776ab; - padding: .4em .5em .3em; + padding: 0.4em 0.5em 0.3em; font-family: Flux-Bold, SourceSansProBold, Arial, sans-serif; font-size: 1.25em; margin-top: 0.875em; @@ -2869,7 +2898,7 @@ p.quote-by-organization { background-color: #ecedef; } .site-base { - border-top: 1px solid #111; } + border-top: 1px solid #111111; } .site-base .container { padding: 1em; } @@ -2994,7 +3023,7 @@ p.quote-by-organization { background-color: white; } .touch .flex-control-nav a { /* Larger touch target */ - padding: .5em .75em; } + padding: 0.5em 0.75em; } /*