[Xfce4-commits] [www/bugzilla.xfce.org] 01/01: Some cleanup (CSS duplication removal) in anticipation of moving to the CDN.
noreply at xfce.org
noreply at xfce.org
Wed Jun 21 15:04:18 CEST 2017
This is an automated email from the git hooks/post-receive script.
k n o m e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository www/bugzilla.xfce.org.
commit c2780cdf8e80920fde3361030a34ba71815d8d3b
Author: Pasi Lallinaho <pasi at shimmerproject.org>
Date: Wed Jun 21 16:03:52 2017 +0300
Some cleanup (CSS duplication removal) in anticipation of moving to the CDN.
---
skins/contrib/Xfce/bug.css | 10 +-
skins/contrib/Xfce/global.css | 119 +++------
template/en/custom/global/footer_XFCE.html.tmpl | 4 +-
template/en/custom/global/header.html.tmpl | 288 +--------------------
.../{header.html.tmpl => header_GENERIC.html.tmpl} | 59 ++---
.../{header.html.tmpl => header_XFCE.html.tmpl} | 72 +++---
6 files changed, 120 insertions(+), 432 deletions(-)
diff --git a/skins/contrib/Xfce/bug.css b/skins/contrib/Xfce/bug.css
index fe53455..798f12d 100644
--- a/skins/contrib/Xfce/bug.css
+++ b/skins/contrib/Xfce/bug.css
@@ -5,7 +5,7 @@
#bug-header {
display: flex;
- padding: 1em 0 0.4em 0;
+ padding: 0 0 0.4em 0;
font-weight: normal;
border-bottom: 1px solid rgba( 0, 0, 0, 0.4 );
@@ -163,6 +163,14 @@ body #comments pre.bz_comment_text * {
#add_comment #comment {
width: 100%;
}
+ #add_comment table,
+ #add_comment table tr,
+ #add_comment table td,
+ #add_comment table th {
+ border: none !important;
+ padding: 0;
+ }
+
/* Commit buttons */
#commit_top,
diff --git a/skins/contrib/Xfce/global.css b/skins/contrib/Xfce/global.css
index 6c15d16..a810cd4 100644
--- a/skins/contrib/Xfce/global.css
+++ b/skins/contrib/Xfce/global.css
@@ -1,58 +1,25 @@
+/*
+ * Additional styles for bugzilla.xfce.org
+ *
+ */
+
#bugzilla-body * {
font-family: 'Noto Sans', sans-serif !important;
box-sizing: border-box;
}
-.group:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
- visibility: hidden;
- font-size: 0;
-}
-
-a, a:link, a:visited,
-a:hover, a:active, a:focus {
- color: #06c;
- text-decoration: none;
+a.no-color:link, a.no-color:visited {
+ color: #000;
}
- a.no-color:link, a.no-color:visited {
- color: #000;
- }
a.no-color:hover, a.no-color:active, a.no-color:focus {
color: #06c;
}
-body pre,
-body pre * {
- font-family: 'Noto Mono', monospace !important;
- font-size: 100%;
-}
+/* Links dressed as buttons */
-hr {
- clear: both;
- display: block;
- border: none;
- border-bottom: 1px solid rgba( 0, 0, 0, 0.3 );
- margin: 2em 0;
-}
- hr + * {
- margin-top: 0;
- }
-
-/*
- * Form stuff and links dressed as buttons
- *
- */
-
-/*.yui-skin-sam .yui-button a, */
.action-link,
.comment_tab,
-input[type="submit"],
-.bz_query_buttons #xml,
-button,
-select {
+.bz_query_buttons #xml {
border-radius: 0.2em;
border: 1px solid rgba( 0, 0, 0, 0.2 );
background: #f7f7f7 linear-gradient( to bottom, rgba( 255, 255, 255, 0.5 ), rgba( 0, 0, 0, 0.02 ) 1px, rgba( 0, 0, 0, 0.05 ) ) repeat-x;
@@ -61,61 +28,52 @@ select {
outline: none !important;
transition: 150ms all;
}
- .yui-skin-sam .yui-button a:hover,
a.action-link:hover,
- .comment_tab:hover,
- input[type="submit"]:hover,
- button:hover,
- select:hover {
+ .comment_tab:hover {
background-color: #fff;
}
- .yui-skin-sam .yui-button a,
a.action-link {
font-size: 85%;
line-height: 1em;
color: #000;
}
- .yui-skin-sam .yui-button a:hover, .yui-skin-sam .yui-button a:active, .yui-skin-sam .yui-button a:focus,
.action-link:hover, .action-link:active, .action-link:focus,
.comment_tab:hover, .comment_tab:active, .comment_tab:focus {
color: #06c;
}
- select {
- -moz-appearance: none;
- -webkit-appearance: none;
- appearance: none;
- }
-input,
-input[type="text"],
-textarea {
- background-color: #f7f7f7;
- color: #000;
- border-radius: 0.2em;
- border: 1px solid rgba( 0, 0, 0, 0.2 );
- padding: 0.2em 0.5em;
+/*
+ * Move to main stylesheets?
+ *
+ */
+
+#main * {
+ font-family: 'Noto Sans', sans-serif !important;
+ box-sizing: border-box; /* do we want this? */
}
- input[type="file"] { border: none; }
- textarea {
- font-size: 90%;
- }
-input[type="checkbox"] {
- float: left;
+#main pre,
+#main pre * {
+ font-family: 'Noto Mono', monospace !important;
+ font-size: 100%;
+}
+
+/*
+ * Not checked
+ *
+ */
+
+hr {
+ clear: both;
display: block;
- opacity: 0.75;
- margin-top: 0.15em;
- margin-right: 0.5em;
- transition: 150ms all;
+ border: none;
+ border-bottom: 1px solid rgba( 0, 0, 0, 0.3 );
+ margin: 2em 0;
}
- input[type="checkbox"]:checked {
- opacity: 1;
- }
- #header input[type="checkbox"] {
- float: none;
+ hr + * {
+ margin-top: 0;
}
-
/*
* Header
*
@@ -226,11 +184,6 @@ input[type="checkbox"] {
color: #000;
}
- at media screen and (max-width:800px)�{
-}
-
-
-
#header .links {
padding: 0.25em 1em;
border: none;
diff --git a/template/en/custom/global/footer_XFCE.html.tmpl b/template/en/custom/global/footer_XFCE.html.tmpl
index 3d05a21..bddd695 100644
--- a/template/en/custom/global/footer_XFCE.html.tmpl
+++ b/template/en/custom/global/footer_XFCE.html.tmpl
@@ -4,8 +4,8 @@
#%]
[% Hook.process('main-end') %]
- </div>
-
+ </div></div></div><!-- end #main -->
+ </div><!-- end #bugzilla-body -->
[% Hook.process("end") %]
</body>
</html>
diff --git a/template/en/custom/global/header.html.tmpl b/template/en/custom/global/header.html.tmpl
index 6dd036f..60417d6 100644
--- a/template/en/custom/global/header.html.tmpl
+++ b/template/en/custom/global/header.html.tmpl
@@ -1,285 +1,5 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- #
- # This Source Code Form is "Incompatible With Secondary Licenses", as
- # defined by the Mozilla Public License, v. 2.0.
- #%]
-
-[%# INTERFACE:
- # (All the below interface elements are optional.)
- # title: string. Page title.
- # header: string. Main page header.
- # subheader: string. Page subheader.
- # header_addl_info: string. Additional header information.
- # bodyclasses: array of extra CSS classes for the <body>
- # onload: string. JavaScript code to run when the page finishes loading.
- # javascript: string. Javascript to go in the header.
- # javascript_urls: list. List of URLs to Javascript.
- # style: string. CSS style.
- # style_urls: list. List of URLs to CSS style sheets.
- # message: string. A message to display to the user. May contain HTML.
- # atomlink: Atom link URL, May contain HTML
- # generate_api_token: generate a token which can be used to make authenticated webservice calls
- #%]
-
-[% IF message %]
- [% PROCESS global/messages.html.tmpl %]
-[% END %]
-
-[% DEFAULT
- subheader = ""
- header_addl_info = ""
- onload = ""
- style_urls = []
- javascript_urls = []
- yui = []
- generate_api_token = 0
- favicon_url = "skins/contrib/Xfce/favicon.ico"
-%]
-
-[% SET yui_css = {
- autocomplete => 1,
- calendar => 1,
- datatable => 1,
- button => 1,
-} %]
-
-[%# Note: This is simple dependency resolution--you can't have dependencies
- # that depend on each other. You have to specify all of a module's deps,
- # if that module is going to be specified in "yui".
- #%]
-[% SET yui_deps = {
- autocomplete => ['json', 'connection', 'datasource'],
- datatable => ['json', 'connection', 'datasource', 'element'],
-} %]
-
-[%# When using certain YUI modules, we need to process certain
- # extra JS templates.
- #%]
-[% SET yui_templates = {
- datatable => ['global/value-descs.js.tmpl'],
-} %]
-
-[%# These are JS URLs that are *always* on the page and come before
- # every other JS URL.
- #%]
-[% SET starting_js_urls = [
- "js/yui/yahoo-dom-event/yahoo-dom-event.js",
- "js/yui/cookie/cookie-min.js",
-] %]
-
-
-[%# We should be able to set the default value of the header variable
- # to the value of the title variable using the DEFAULT directive,
- # but that doesn't work if a caller sets header to the empty string
- # to avoid header inheriting the value of title, since DEFAULT
- # mistakenly treats empty strings as undefined and gives header the
- # value of title anyway. To get around that problem we explicitly
- # set header's default value here only if it is undefined. %]
-[% IF !header.defined %][% header = title %][% END %]
-
-<!DOCTYPE html>
-<html lang="en">
- <head>
- [% Hook.process("start") %]
- <title>[% title %]</title>
-
- <meta name="viewport" content="width=device-width, maximum-scale=1.0, minimum-scale=1.0, initial-scale=1" />
-
- [% IF Param('utf8') %]
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- [% END %]
-
- [% SET yui = yui_resolve_deps(yui, yui_deps) %]
-
- [% SET css_sets = css_files(style_urls, yui, yui_css) %]
- [% IF constants.CONCATENATE_ASSETS %]
- [% PROCESS format_css_link asset_url = css_sets.unified_standard_skin %]
- [% ELSE %]
- [% FOREACH asset_url = css_sets.standard %]
- [% PROCESS format_css_link %]
- [% END %]
- [% FOREACH asset_url = css_sets.skin %]
- [% PROCESS format_css_link %]
- [% END %]
- [% END %]
-
- [% IF style %]
- <style type="text/css">
- [% style %]
- </style>
- [% END %]
-
- [% IF css_sets.unified_custom %]
- [% IF constants.CONCATENATE_ASSETS %]
- [% PROCESS format_css_link asset_url = css_sets.unified_custom %]
- [% ELSE %]
- [% FOREACH asset_url = css_sets.custom %]
- [% PROCESS format_css_link %]
- [% END %]
- [% END %]
- [% END %]
-
- [%# YUI Scripts %]
- [% FOREACH yui_name = yui %]
- [% starting_js_urls.push("js/yui/$yui_name/${yui_name}-min.js") %]
- [% END %]
- [% starting_js_urls.push('js/global.js') %]
-
- [% FOREACH asset_url = concatenate_js(starting_js_urls) %]
- [% PROCESS format_js_link %]
- [% END %]
-
- <link rel="stylesheet" media="screen" type="text/css" href="/skins/header.css" />
- <link rel="stylesheet" media="screen" type="text/css" href="/skins/xfce.css" />
- [% IF user.settings.skin.value == 'Xfce' %]
- <script type="text/javascript" src="/skins/contrib/Xfce/scripts.js"></script>
- [% END %]
-
- <script type="text/javascript">
- <!--
- YAHOO.namespace('bugzilla');
- YAHOO.util.Event.addListener = function (el, sType, fn, obj, overrideContext) {
- if ( ("onpagehide" in window || YAHOO.env.ua.gecko) && sType === "unload") { sType = "pagehide"; };
- var capture = ((sType == "focusin" || sType == "focusout") && !YAHOO.env.ua.ie) ? true : false;
- return this._addListener(el, this._getType(sType), fn, obj, overrideContext, capture);
- };
- if ( "onpagehide" in window || YAHOO.env.ua.gecko) {
- YAHOO.util.Event._simpleRemove(window, "unload",
- YAHOO.util.Event._unload);
- }
- [%# The language selector needs javascript to set its cookie,
- # so it is hidden in HTML/CSS by the "bz_default_hidden" class.
- # If the browser can run javascript, it will then "unhide"
- # the language selector using the following code.
- #%]
- function unhide_language_selector() {
- YAHOO.util.Dom.removeClass(
- 'lang_links_container', 'bz_default_hidden'
- );
- }
- YAHOO.util.Event.onDOMReady(unhide_language_selector);
-
- [%# Make some Bugzilla information available to all scripts.
- # We don't import every parameter and constant because we
- # don't want to add a lot of uncached JS to every page.
- #%]
- var BUGZILLA = {
- param: {
- cookiepath: '[% Param('cookiepath') FILTER js %]',
- maxusermatches: [% Param('maxusermatches') FILTER js %]
- },
- constant: {
- COMMENT_COLS: [% constants.COMMENT_COLS FILTER js %]
- },
- string: {
- [%# Please keep these in alphabetical order. %]
-
- attach_desc_required:
- "You must enter a Description for this attachment.",
- component_required:
- "You must select a Component for this [% terms.bug %].",
- description_required:
- "You must enter a Description for this [% terms.bug %].",
- short_desc_required:
- "You must enter a Summary for this [% terms.bug %].",
- version_required:
- "You must select a Version for this [% terms.bug %]."
- }
- [% IF generate_api_token %]
- , api_token: '[% get_api_token FILTER js FILTER html %]'
- [% END %]
- };
-
- [% FOREACH yui_name = yui %]
- [% FOREACH yui_template = yui_templates.$yui_name %]
- [% INCLUDE $yui_template %]
- [% END %]
- [% END %]
- [% IF javascript %]
- [% javascript %]
- [% END %]
- // -->
- </script>
-
- [% FOREACH asset_url = concatenate_js(javascript_urls) %]
- [% PROCESS format_js_link %]
- [% END %]
-
- [%# this puts the live bookmark up on firefox for the Atom feed %]
- [% IF atomlink %]
- <link rel="alternate"
- type="application/atom+xml" title="Atom feed"
- href="[% atomlink FILTER html %]">
- [% END %]
-
- [%# Required for the 'Autodiscovery' feature in Firefox 2 and IE 7. %]
- <link rel="search" type="application/opensearchdescription+xml"
- title="[% terms.Bugzilla %]" href="./search_plugin.cgi">
- <link rel="shortcut icon" href="[% favicon_url FILTER html %]">
- [% Hook.process("additional_header") %]
- </head>
-
- <body [% IF onload %] onload="[% onload %]"[% END %]
- class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') FILTER css_class_quote %]
- [% FOREACH class = bodyclasses %]
- [%+ class FILTER css_class_quote %]
- [% END %] yui-skin-sam">
-
- [% INCLUDE global/banner.html.tmpl %]
-
- <div id="header">
-
- <div id="titles">
- <span id="title">Xfce [% terms.Bugzilla %][% " – $header" IF header %]</span>
-
- [% IF subheader %]
- <span id="subtitle" class="subheader">[% subheader %]</span>
- [% END %]
-
- [% IF header_addl_info %]
- <span id="information" class="header_addl_info">[% header_addl_info %]</span>
- [% END %]
- </div>
-
- [% USE Bugzilla %]
- [% IF Bugzilla.languages.size > 1 %]
- <div id="lang_links_container" class="bz_default_hidden">
- <ul class="links">
- [% FOREACH lang = Bugzilla.languages.sort %]
- <li>
- [% IF NOT loop.first %]<span class="separator"> | </span>[% END %]
- [% IF lang == current_language %]
- <span class="lang_current">[% lang FILTER html FILTER upper %]</span>
- [% ELSE %]
- <a href="#" onclick="set_language('[% lang FILTER none %]');">
- [%- lang FILTER html FILTER upper %]</a>
- [% END %]
- </li>
- [% END %]
- </ul>
- </div>
- [% END %]
-
- <div id="common_links">
- [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
- </div>
- </div>
-
- <div id="bugzilla-body">
- [% IF Param('announcehtml') %]
- [% Param('announcehtml') FILTER none %]
- [% END %]
-
- [% IF message %]
- <div id="message">[% message %]</div>
- [% END %]
-
-[% BLOCK format_css_link %]
- <link href="[% asset_url FILTER html %]" rel="stylesheet" type="text/css">
-[% END %]
-
-[% BLOCK format_js_link %]
- <script type="text/javascript" src="[% asset_url FILTER mtime FILTER html %]"></script>
+[% IF user.settings.skin.value == 'Xfce' %]
+ [% PROCESS 'global/header_XFCE.html.tmpl' %]
+[% ELSE %]
+ [% PROCESS 'global/header_GENERIC.html.tmpl' %]
[% END %]
diff --git a/template/en/custom/global/header.html.tmpl b/template/en/custom/global/header_GENERIC.html.tmpl
similarity index 87%
copy from template/en/custom/global/header.html.tmpl
copy to template/en/custom/global/header_GENERIC.html.tmpl
index 6dd036f..6f9a008 100644
--- a/template/en/custom/global/header.html.tmpl
+++ b/template/en/custom/global/header_GENERIC.html.tmpl
@@ -229,41 +229,42 @@
[% INCLUDE global/banner.html.tmpl %]
- <div id="header">
+ <div id="header-wrap">
+ <div id="header">
+ <div id="titles">
+ <span id="title">Xfce [% terms.Bugzilla %][% " – $header" IF header %]</span>
- <div id="titles">
- <span id="title">Xfce [% terms.Bugzilla %][% " – $header" IF header %]</span>
+ [% IF subheader %]
+ <span id="subtitle" class="subheader">[% subheader %]</span>
+ [% END %]
- [% IF subheader %]
- <span id="subtitle" class="subheader">[% subheader %]</span>
- [% END %]
+ [% IF header_addl_info %]
+ <span id="information" class="header_addl_info">[% header_addl_info %]</span>
+ [% END %]
+ </div>
- [% IF header_addl_info %]
- <span id="information" class="header_addl_info">[% header_addl_info %]</span>
+ [% USE Bugzilla %]
+ [% IF Bugzilla.languages.size > 1 %]
+ <div id="lang_links_container" class="bz_default_hidden">
+ <ul class="links">
+ [% FOREACH lang = Bugzilla.languages.sort %]
+ <li>
+ [% IF NOT loop.first %]<span class="separator"> | </span>[% END %]
+ [% IF lang == current_language %]
+ <span class="lang_current">[% lang FILTER html FILTER upper %]</span>
+ [% ELSE %]
+ <a href="#" onclick="set_language('[% lang FILTER none %]');">
+ [%- lang FILTER html FILTER upper %]</a>
+ [% END %]
+ </li>
+ [% END %]
+ </ul>
+ </div>
[% END %]
- </div>
- [% USE Bugzilla %]
- [% IF Bugzilla.languages.size > 1 %]
- <div id="lang_links_container" class="bz_default_hidden">
- <ul class="links">
- [% FOREACH lang = Bugzilla.languages.sort %]
- <li>
- [% IF NOT loop.first %]<span class="separator"> | </span>[% END %]
- [% IF lang == current_language %]
- <span class="lang_current">[% lang FILTER html FILTER upper %]</span>
- [% ELSE %]
- <a href="#" onclick="set_language('[% lang FILTER none %]');">
- [%- lang FILTER html FILTER upper %]</a>
- [% END %]
- </li>
- [% END %]
- </ul>
+ <div id="common_links">
+ [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
</div>
- [% END %]
-
- <div id="common_links">
- [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
</div>
</div>
diff --git a/template/en/custom/global/header.html.tmpl b/template/en/custom/global/header_XFCE.html.tmpl
similarity index 85%
copy from template/en/custom/global/header.html.tmpl
copy to template/en/custom/global/header_XFCE.html.tmpl
index 6dd036f..cc7e107 100644
--- a/template/en/custom/global/header.html.tmpl
+++ b/template/en/custom/global/header_XFCE.html.tmpl
@@ -42,7 +42,7 @@
autocomplete => 1,
calendar => 1,
datatable => 1,
- button => 1,
+ button => 0,
} %]
[%# Note: This is simple dependency resolution--you can't have dependencies
@@ -133,9 +133,10 @@
<link rel="stylesheet" media="screen" type="text/css" href="/skins/header.css" />
<link rel="stylesheet" media="screen" type="text/css" href="/skins/xfce.css" />
- [% IF user.settings.skin.value == 'Xfce' %]
- <script type="text/javascript" src="/skins/contrib/Xfce/scripts.js"></script>
- [% END %]
+
+ <link rel="stylesheet" media="screen" type="text/css" href="https://xfce.org/style/css.php?site=bugzilla" />
+
+ <script type="text/javascript" src="/skins/contrib/Xfce/scripts.js"></script>
<script type="text/javascript">
<!--
@@ -229,41 +230,42 @@
[% INCLUDE global/banner.html.tmpl %]
- <div id="header">
+ <div id="header-wrap">
+ <div id="header">
+ <div id="titles">
+ <span id="title">Xfce [% terms.Bugzilla %][% " – $header" IF header %]</span>
- <div id="titles">
- <span id="title">Xfce [% terms.Bugzilla %][% " – $header" IF header %]</span>
+ [% IF subheader %]
+ <span id="subtitle" class="subheader">[% subheader %]</span>
+ [% END %]
- [% IF subheader %]
- <span id="subtitle" class="subheader">[% subheader %]</span>
- [% END %]
+ [% IF header_addl_info %]
+ <span id="information" class="header_addl_info">[% header_addl_info %]</span>
+ [% END %]
+ </div>
- [% IF header_addl_info %]
- <span id="information" class="header_addl_info">[% header_addl_info %]</span>
+ [% USE Bugzilla %]
+ [% IF Bugzilla.languages.size > 1 %]
+ <div id="lang_links_container" class="bz_default_hidden">
+ <ul class="links">
+ [% FOREACH lang = Bugzilla.languages.sort %]
+ <li>
+ [% IF NOT loop.first %]<span class="separator"> | </span>[% END %]
+ [% IF lang == current_language %]
+ <span class="lang_current">[% lang FILTER html FILTER upper %]</span>
+ [% ELSE %]
+ <a href="#" onclick="set_language('[% lang FILTER none %]');">
+ [%- lang FILTER html FILTER upper %]</a>
+ [% END %]
+ </li>
+ [% END %]
+ </ul>
+ </div>
[% END %]
- </div>
- [% USE Bugzilla %]
- [% IF Bugzilla.languages.size > 1 %]
- <div id="lang_links_container" class="bz_default_hidden">
- <ul class="links">
- [% FOREACH lang = Bugzilla.languages.sort %]
- <li>
- [% IF NOT loop.first %]<span class="separator"> | </span>[% END %]
- [% IF lang == current_language %]
- <span class="lang_current">[% lang FILTER html FILTER upper %]</span>
- [% ELSE %]
- <a href="#" onclick="set_language('[% lang FILTER none %]');">
- [%- lang FILTER html FILTER upper %]</a>
- [% END %]
- </li>
- [% END %]
- </ul>
+ <div id="common_links">
+ [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
</div>
- [% END %]
-
- <div id="common_links">
- [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
</div>
</div>
@@ -283,3 +285,7 @@
[% BLOCK format_js_link %]
<script type="text/javascript" src="[% asset_url FILTER mtime FILTER html %]"></script>
[% END %]
+
+<div id="main">
+<div id="content">
+<div id="article">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list