You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/11/13 20:32:45 UTC
[1/2] git commit: [#6852] ticket:476 changed style of actions block
to trim text
Updated Branches:
refs/heads/master ff04c8b20 -> 4b1e60d2e
[#6852] ticket:476 changed style of actions block to trim text
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4b1e60d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4b1e60d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4b1e60d2
Branch: refs/heads/master
Commit: 4b1e60d2ea0b8738ccf5bc9b4364abb99f1e0bdc
Parents: bf4195f
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Fri Nov 8 15:45:50 2013 +0200
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Nov 13 19:21:58 2013 +0000
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4b1e60d2/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 3c132ad..4cee523 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2002,9 +2002,14 @@ nav .ico {
.pad h2.dark small {
text-transform: none;
position: absolute;
- right: 5px;
+ right: 0px;
top: 5px;
+ padding-right: 5px;
text-align: center;
+ background-color: #555555;
+ background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #666666), color-stop(100%, #555555));
+ background-image: -moz-linear-gradient(top, #666666 0%, #555555 100%);
+ background-image: linear-gradient(top, #666666 0%, #555555 100%);
}
.pad h2.dark small a {
margin: 0 10px;
@@ -2074,6 +2079,7 @@ nav .ico {
.pad h2.title {
font-weight: normal;
margin-bottom: 1.5em;
+ white-space: nowrap;
}
.pad .paginate {
margin: 0 0 0 20px;
[2/2] git commit: [#6852] ticket:476 added maximize button for
tracker pages
Posted by jo...@apache.org.
[#6852] ticket:476 added maximize button for tracker pages
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/bf4195f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/bf4195f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/bf4195f0
Branch: refs/heads/master
Commit: bf4195f01c7238cbec01f9f0eb13572e5e5c3196
Parents: ff04c8b
Author: Yaroslav Sokolovsky <ya...@gmail.com>
Authored: Thu Nov 7 14:52:02 2013 +0200
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed Nov 13 19:21:58 2013 +0000
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 5 +++++
ForgeTracker/forgetracker/templates/tracker/index.html | 2 ++
ForgeTracker/forgetracker/templates/tracker/milestone.html | 2 ++
ForgeTracker/forgetracker/templates/tracker/search.html | 2 ++
4 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/bf4195f0/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 700b3ac..3c132ad 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3263,6 +3263,11 @@ ul.dropdown ul li a:hover {
width: 100%;
}
+.content-maximized #content_base .ticket-list
+{
+ width: 99%;
+}
+
.content-maximized #content_base .diffbrowser {
width: auto;
}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/bf4195f0/ForgeTracker/forgetracker/templates/tracker/index.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/index.html b/ForgeTracker/forgetracker/templates/tracker/index.html
index 7b3ad36..a9f803e 100644
--- a/ForgeTracker/forgetracker/templates/tracker/index.html
+++ b/ForgeTracker/forgetracker/templates/tracker/index.html
@@ -17,6 +17,7 @@
under the License.
-#}
{% extends g.theme.master %}
+{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
{% do g.register_app_css('css/tracker.css') %}
{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}{% endblock %}
@@ -29,6 +30,7 @@
{% block header %}{{c.app.config.options.mount_label}}{% endblock %}
{% block actions %}
+ {{ lib.maximize_content_button() }}
<a href="{{c.app.url}}feed.rss" title="Follow"><b data-icon="{{g.icons['feed'].char}}" class="ico {{g.icons['feed'].css}}"></b></a>
{% if c.user and c.user != c.user.anonymous() %}
{{c.subscribe_form.display(value=subscribed, action='subscribe', style='icon')}}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/bf4195f0/ForgeTracker/forgetracker/templates/tracker/milestone.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/milestone.html b/ForgeTracker/forgetracker/templates/tracker/milestone.html
index 7c1cd00..e9e6c35 100644
--- a/ForgeTracker/forgetracker/templates/tracker/milestone.html
+++ b/ForgeTracker/forgetracker/templates/tracker/milestone.html
@@ -17,6 +17,7 @@
under the License.
-#}
{% extends g.theme.master %}
+{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
{% do g.register_app_css('css/tracker.css') %}
@@ -25,6 +26,7 @@
{% block header %}{{field.label}} {{milestone.name}}{% endblock %}
{% block actions %}
+{{ lib.maximize_content_button() }}
{% if allow_edit %}
<a href="{{tg.url(c.app.url+'edit/', dict(q=q, limit=limit, sort=url_sort, page=page))}}" title="Bulk Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b></a>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/bf4195f0/ForgeTracker/forgetracker/templates/tracker/search.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/search.html b/ForgeTracker/forgetracker/templates/tracker/search.html
index ba9ece6..c355f47 100644
--- a/ForgeTracker/forgetracker/templates/tracker/search.html
+++ b/ForgeTracker/forgetracker/templates/tracker/search.html
@@ -17,6 +17,7 @@
under the License.
-#}
{% extends g.theme.master %}
+{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
{% do g.register_app_css('css/tracker.css') %}
{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Search{% endblock %}
@@ -29,6 +30,7 @@
{% endblock %}
{% block actions %}
+ {{ lib.maximize_content_button() }}
<a href="{{tg.url(c.app.url+'search_feed/', dict(q=q, limit=limit, sort=sort))}}" title="Feed"><b data-icon="{{g.icons['feed'].char}}" class="ico {{g.icons['feed'].css}}"></b></a>
{% if allow_edit and count != 0 %}
<a href="{{tg.url(c.app.url+'edit/', dict(q=q, limit=limit, sort=sort, page=page))}}" title="Bulk Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b></a>