Compare commits

...

48 Commits

Author SHA1 Message Date
mrliptontea
fbae203298 more appreciable strike through line on closed tasks 2015-04-14 11:46:45 +02:00
mrliptontea
0d97c6c930 release 1.4.0 2015-04-10 10:05:03 +02:00
mrliptontea
8b0631eb31 fix attachments layout for other uses than in issue's details 2015-04-09 17:20:30 +02:00
mrliptontea
115d7109ec prevent adding background image to .sort if Font Awesome icons are enabled, fixes #2 2015-04-09 17:08:54 +02:00
mrliptontea
1cb53dc85e fix blockquote's first and last child's margins in div.wiki 2015-04-08 10:39:45 +02:00
mrliptontea
9f701b0d05 add class toc-active-prev for highlighting TOC as active 2015-04-08 10:30:09 +02:00
mrliptontea
352e170786 introduce text-normal class for resetting font-weight 2015-04-07 14:35:28 +02:00
mrliptontea
f6a80dddb4 align images to the middle in headers 2015-04-07 14:00:05 +02:00
mrliptontea
f326d62550 squeeze .jstElements a little bit on smaller screens 2015-04-02 12:31:13 +02:00
mrliptontea
a13ae91b5f add Bootstrap helper classes 2015-04-02 12:21:18 +02:00
mrliptontea
51484c2e7e apply correct margin to <pre> 2015-04-02 11:15:25 +02:00
mrliptontea
5b370b2233 introduce option $wiki-page-more-vertical-space to improve wiki pages' readability even more 2015-04-02 11:14:43 +02:00
mrliptontea
3e9c05bd8f release 1.3.0 2015-04-01 11:27:58 +02:00
mrliptontea
fac8b8e5e2 fix minimum height of collapsible fieldset 2015-03-23 14:21:38 +01:00
mrliptontea
126181756f correct property order 2015-03-23 14:17:15 +01:00
mrliptontea
201e176587 embed custom image icons as base64 data 2015-03-23 14:12:51 +01:00
mrliptontea
fabbfc36e6 animate collapsible fieldsets 2015-03-23 13:39:48 +01:00
mrliptontea
6d8d876bf7 make column project aligned to center 2015-03-19 11:09:55 +01:00
mrliptontea
c22c8d9fda custom field default value will self adjust to needed width 2015-03-19 10:47:23 +01:00
mrliptontea
41578b8dd0 improve issue list text alignment in columns 2015-03-19 10:40:55 +01:00
mrliptontea
ee472a0187 make 'Associated revisions' look consistent with journal notes 2015-03-19 10:15:50 +01:00
mrliptontea
26ba4e1701 setTimeout is not needed to override drawRevisionGraph function 2015-03-19 09:53:21 +01:00
mrliptontea
7f03565012 override revision graph function on document ready 2015-03-18 10:30:48 +01:00
mrliptontea
4d099338e9 override Redmine's revision graph function to make it look better with this theme 2015-03-18 10:24:51 +01:00
mrliptontea
882aab73c5 update changelog 2015-03-16 10:28:08 +01:00
mrliptontea
e270c3a6a3 fix look of collapsible arrow in Firefox 2015-03-16 10:27:40 +01:00
mrliptontea
b5361cb864 adjust collapsed header height 2015-03-16 10:21:44 +01:00
mrliptontea
92a62fa7da better looking ui-dialog content padding 2015-03-16 10:15:11 +01:00
mrliptontea
b51db13a24 regular buttons (e.g. Cancel) in ui-dialogs looking like links 2015-03-16 10:14:36 +01:00
mrliptontea
8f94175851 prettier button for redmine_codebutton plugin 2015-03-16 10:03:07 +01:00
mrliptontea
d78c2fccc6 corrections for activities list 2015-03-14 00:11:02 +01:00
mrliptontea
eea1ee7412 fix the progress bar height on the issue page regression 2015-03-14 00:05:54 +01:00
mrliptontea
7470981f41 improve activities list look 2015-03-14 00:01:42 +01:00
mrliptontea
0d1f9e3744 add missing !default in variables 2015-03-13 23:19:29 +01:00
mrliptontea
4962216a09 separate diff colors from journal old and new value colors 2015-03-13 23:18:51 +01:00
mrliptontea
f6ba903f5d fix wiki editor 'help' icon and add Font Awesome icon for 'cut' action 2015-03-13 14:23:11 +01:00
mrliptontea
9a8eadc310 introduce styles for Redmine People plugin
- enhance styles for activities list
- reorganize styles for issue page
2015-03-13 14:13:13 +01:00
mrliptontea
160b457355 more plugin proof way of setting Font Awesome icons, fixes #1 2015-03-13 11:33:06 +01:00
mrliptontea
ccc9108bfb small vertical alignment correction and linting 2015-03-12 09:43:42 +01:00
mrliptontea
7e76a0b1c8 remove unnecessary padding from td.hours 2015-03-11 16:51:06 +01:00
mrliptontea
516fba06da adjusted hours column width and alignment to look better in some views 2015-03-11 16:11:07 +01:00
mrliptontea
1e906b2d73 improve file content view 2015-03-11 15:48:14 +01:00
mrliptontea
ae19f7a657 improve revision page layout
- introduce link-variant mixin
- introduce $changeset-{type}-color variables
- all forms in .contextual should be display: inline
2015-03-11 14:50:30 +01:00
mrliptontea
88c4f7172d change change sets look to similar to journal 2015-03-11 13:13:38 +01:00
mrliptontea
502fe435fb correct issue form columns widths so they will be equal in all fieldsets 2015-03-11 12:10:11 +01:00
mrliptontea
ac70bf5af5 correct border radius change set div 2015-03-11 12:01:16 +01:00
mrliptontea
06932c7903 improve columns width in issue details 2015-03-09 10:37:37 +01:00
mrliptontea
71100e5f52 make it possible to click on empty field in master backlog view 2015-03-03 20:39:42 +01:00
35 changed files with 1410 additions and 379 deletions

View File

@@ -28,7 +28,7 @@ Then go to Redmine > Administration > Settings > Display and select PurpleMine2
This theme also features a new look for [Redmine Backlogs][redmine_backlogs] plugin. To install it, simply copy stylesheets from `PurpleMine2/plugins/redmine_backlogs` and overwrite files in `{redmine}/plugins/redmine_backlogs/assets/stylesheets` and restart Redmine.
Also, [Redmine Time Tracker][redmine_time_tracker] plugin should look nice with PurpleMine.
Also, [Redmine Time Tracker][redmine_time_tracker] and [Redmine People][redmine_crm_people] plugins should look nice with PurpleMine.
## How to customize it
@@ -52,6 +52,40 @@ Regrettably, optional file include is not possible in SASS, so I would recommend
## Changelog
v1.4.1 (2015-04-14):
* Fixed #3: Closed tasks will be more appreciable.
v1.4.0 (2015-04-10):
+ Introduced option `$wiki-page-more-vertical-space` (by default `true`) to improve wiki pages' readability even more
* Fixed bottom margin of `pre` tag
+ Added a few helper classes from Bootstrap
* WYSIWYG's icons will squeeze a little bit on smaller screens
* Images in headers will be aligned to the middle vertically
+ Introduced `text-normal` class for resetting font's weight
+ Added class `toc-active-prev` that will "highlight" TOC as "active".
* Fixed #2: Make sure that `.sort` with Font Awesome icons won't have background image
* Fixed attachments div's layout for wiki pages
For more details, see [release v1.4.0](https://github.com/HolonGlobe/PurpleMine2/releases/tag/v1.4.0)
v1.3.0 (2015-04-01):
* Backlogs: make it possible to click on empty field
* Corrected issue form columns widths so they will be equal in all fieldsets
* Changesets will look similar to issue's journal
+ Improved revision page layout and added Font Awesome icons
+ Improved file content view
* Fixed #1: Font Awesome icons will no longer break plugins' icons
+ Introduced styles for [People][redmine_crm_people] plugin
* Enhanced styles for activities list
* Regular buttons (e.g. `Cancel`) will look like links in dialog windows
* Fixed look of collapsible arrow in Firefox
+ Overrode Redmine's revision graph function to make it look better
+ Animated collapsible fieldsets
+ Custom image based icons changed to base64 embedded data
v1.2.0 (2015-03-03):
* Fixed .warning style
@@ -94,4 +128,5 @@ Initial version
[normalize.css]: https://github.com/necolas/normalize.css
[bootstrap-sass]: https://github.com/twbs/bootstrap-sass
[redmine_backlogs]: https://github.com/backlogs/redmine_backlogs
[redmine_time_tracker]: https://github.com/hicknhack-software/redmine_time_tracker
[redmine_time_tracker]: https://github.com/hicknhack-software/redmine_time_tracker
[redmine_crm_people]: http://www.redminecrm.com/projects/people/

Binary file not shown.

Before

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 B

View File

@@ -1 +1 @@
var PurpleMine=PurpleMine||{};PurpleMine.HistoryTabs=function(){"use strict";function a(){b=this,this.$tabsContainer=null,this.$tabs=null,this.$history=$("#history"),this.lang=document.documentElement.lang,"undefined"===c[this.lang]&&(this.lang="en"),this._=c[this.lang],this.$history.length>0&&(this.buildTabs(),this.markFirstOfTypes())}var b,c={en:{all:"All",notes:"Notes",details:"Changes"},pl:{all:"Wszystko",notes:"Notatki",details:"Zmiany"}};return a.prototype.buildTabs=function(){var a="",b='<li><a href="javascript:;" class="',c='history-tab" data-tab="',d="</a></li>";a+='<div class="tabs"><ul>',a+=b+"selected "+c+'all">'+this._.all+d,a+=b+c+'notes">'+this._.notes+d,a+=b+c+'details">'+this._.details+d,a+="</ul></div>",this.$tabsContainer=$(a),$("#history > h3").after(this.$tabsContainer),this.$tabs=this.$tabsContainer.find(".history-tab"),this.$tabs.on("click",this.tabClick)},a.prototype.markFirstOfTypes=function(){this.$history.find(".has-notes:first").addClass("first-of-notes"),this.$history.find(".has-details:first").addClass("first-of-details")},a.prototype.tabClick=function(){var a=$(this),c=a.attr("data-tab");b.$tabs.removeClass("selected"),a.addClass("selected"),b.$history.removeClass("hide-details").removeClass("hide-notes"),"notes"===c?b.$history.addClass("hide-details"):"details"===c&&b.$history.addClass("hide-notes")},a}();var PurpleMine=PurpleMine||{};PurpleMine.SidebarToggler=function(){"use strict";function a(){b=this,this.sidebarVisible=!0,this.sidebarHiding=null,this.$toggler=null,this.$main=$("#main"),this.$sidebar=$("#sidebar"),"relative"===this.$main.css("position")&&$("#context-menu").appendTo("#wrapper3"),window.localStorage&&(this.sidebarVisible=null===localStorage.getItem("PurpleMine:sidebarHidden")),this.$sidebar.length>0&&!1===this.$main.hasClass("nosidebar")&&(this.buildButton(),this.bindKeyHandler(),!1===this.sidebarVisible&&this.hideSidebar(!0))}var b;return a.prototype.bindKeyHandler=function(){var a=document.getElementsByTagName("body")[0];window.onkeydown=function(c){a===c.target&&83===c.keyCode&&!1===c.ctrlKey&&!1===c.altKey&&!1===c.shiftKey&&b.toggleSidebar()}},a.prototype.buildButton=function(){var a,b="pl"===document.documentElement.lang?"Pokaż/ukryj panel boczny":"Toggle sidebar",c="sidebar-toggler";a='<a href="javascript:;" class="'+c+'" title="'+b+'"></a>',this.$toggler=$(a),this.$main.append(this.$toggler),this.$toggler.on("click",this.toggleSidebar)},a.prototype.toggleSidebar=function(){b.sidebarVisible?b.hideSidebar():b.showSidebar()},a.prototype.hideSidebar=function(a){!0===a?this.$sidebar.addClass("sidebar-hiding sidebar-hidden"):(this.$sidebar.addClass("sidebar-hiding"),this.sidebarHiding=setTimeout(function(){b.$sidebar.addClass("sidebar-hidden")},500)),this.$toggler.addClass("sidebar-hidden"),this.sidebarVisible=!1,window.localStorage&&localStorage.setItem("PurpleMine:sidebarHidden","x")},a.prototype.showSidebar=function(){clearTimeout(this.sidebarHiding),this.$sidebar.removeClass("sidebar-hidden",0).removeClass("sidebar-hiding"),this.$toggler.removeClass("sidebar-hidden"),this.sidebarVisible=!0,window.localStorage&&localStorage.removeItem("PurpleMine:sidebarHidden")},a}(),$(function(){"use strict";new PurpleMine.SidebarToggler,new PurpleMine.HistoryTabs});
var PurpleMine=PurpleMine||{};PurpleMine.HistoryTabs=function(){"use strict";function a(){b=this,this.$tabsContainer=null,this.$tabs=null,this.$history=$("#history"),this.lang=document.documentElement.lang,"undefined"===c[this.lang]&&(this.lang="en"),this._=c[this.lang],this.$history.length>0&&(this.buildTabs(),this.markFirstOfTypes())}var b,c={en:{all:"All",notes:"Notes",details:"Changes"},pl:{all:"Wszystko",notes:"Notatki",details:"Zmiany"}};return a.prototype.buildTabs=function(){var a="",b='<li><a href="javascript:;" class="',c='history-tab" data-tab="',d="</a></li>";a+='<div class="tabs"><ul>',a+=b+"selected "+c+'all">'+this._.all+d,a+=b+c+'notes">'+this._.notes+d,a+=b+c+'details">'+this._.details+d,a+="</ul></div>",this.$tabsContainer=$(a),$("#history > h3").after(this.$tabsContainer),this.$tabs=this.$tabsContainer.find(".history-tab"),this.$tabs.on("click",this.tabClick)},a.prototype.markFirstOfTypes=function(){this.$history.find(".has-notes:first").addClass("first-of-notes"),this.$history.find(".has-details:first").addClass("first-of-details")},a.prototype.tabClick=function(){var a=$(this),c=a.attr("data-tab");b.$tabs.removeClass("selected"),a.addClass("selected"),b.$history.removeClass("hide-details").removeClass("hide-notes"),"notes"===c?b.$history.addClass("hide-details"):"details"===c&&b.$history.addClass("hide-notes")},a}();var PurpleMine=PurpleMine||{};PurpleMine.RevisionGraph=function(a,b,c){"use strict";var d=20,e=17,f=b,g=$.map(f,function(a){return a}),h=g.length-1,i=$("table.changesets tr.changeset");null!==revisionGraph?revisionGraph.clear():revisionGraph=new Raphael(a);var j=revisionGraph.set(),k=i.first().find("td").first().position().left-$(a).position().left,l=$(a).position().top,m=k+(c+1)*d,n=i.last().position().top+i.last().height()-l;revisionGraph.setSize(m,n);var o=["#e74c3c","#584492","#019851","#ed820c","#4183c4"];if(c>=o.length){Raphael.getColor.reset();for(var p=0;c>=p;p++)o.push(Raphael.getColor(.9))}var q,r,s,t,u,v,w,x;$.each(g,function(a,b){b.hasOwnProperty("space")||(b.space=0),s=i.eq(h-b.rdmid).position().top-l+e,r=k+d/2+d*b.space,revisionGraph.circle(r,s,3.5).attr({fill:o[b.space],stroke:"none"}).toFront(),$.each(b.parent_scmids,function(a,c){q=f[c],q?(q.hasOwnProperty("space")||(q.space=0),u=i.eq(h-q.rdmid).position().top-l+e,t=k+d/2+d*q.space,v=revisionGraph.path(q.space===b.space?["M",r,s,"V",u]:["M",r,s,"C",r,s,r,s+(u-s)/2,r+(t-r)/2,s+(u-s)/2,"C",r+(t-r)/2,s+(u-s)/2,t,u-(u-s)/2,t,u])):v=revisionGraph.path(["M",r,s,"V",n]),v.attr({stroke:o[b.space],"stroke-width":1.5}).toBack()}),x=revisionGraph.circle(r,s,10),x.attr({fill:"#000",opacity:0,cursor:"pointer",href:b.href}),null!==b.refs&&b.refs.length>0&&(w=document.createElementNS(revisionGraph.canvas.namespaceURI,"title"),w.appendChild(document.createTextNode(b.refs)),x.node.appendChild(w)),j.push(x)}),j.toFront()},$(function(){"use strict";window.drawRevisionGraph&&(window.drawRevisionGraph=PurpleMine.RevisionGraph,$(window).resize())});var PurpleMine=PurpleMine||{};PurpleMine.SidebarToggler=function(){"use strict";function a(){b=this,this.sidebarVisible=!0,this.sidebarHiding=null,this.$toggler=null,this.$main=$("#main"),this.$sidebar=$("#sidebar"),"relative"===this.$main.css("position")&&$("#context-menu").appendTo("#wrapper3"),window.localStorage&&(this.sidebarVisible=null===localStorage.getItem("PurpleMine:sidebarHidden")),this.$sidebar.length>0&&!1===this.$main.hasClass("nosidebar")&&(this.buildButton(),this.bindKeyHandler(),!1===this.sidebarVisible&&this.hideSidebar(!0))}var b;return a.prototype.bindKeyHandler=function(){var a=document.getElementsByTagName("body")[0];window.onkeydown=function(c){a===c.target&&83===c.keyCode&&!1===c.ctrlKey&&!1===c.altKey&&!1===c.shiftKey&&b.toggleSidebar()}},a.prototype.buildButton=function(){var a,b="pl"===document.documentElement.lang?"Pokaż/ukryj panel boczny":"Toggle sidebar",c="sidebar-toggler";a='<a href="javascript:;" class="'+c+'" title="'+b+'"></a>',this.$toggler=$(a),this.$main.append(this.$toggler),this.$toggler.on("click",this.toggleSidebar)},a.prototype.toggleSidebar=function(){b.sidebarVisible?b.hideSidebar():b.showSidebar()},a.prototype.hideSidebar=function(a){!0===a?this.$sidebar.addClass("sidebar-hiding sidebar-hidden"):(this.$sidebar.addClass("sidebar-hiding"),this.sidebarHiding=setTimeout(function(){b.$sidebar.addClass("sidebar-hidden")},500)),this.$toggler.addClass("sidebar-hidden"),this.sidebarVisible=!1,window.localStorage&&localStorage.setItem("PurpleMine:sidebarHidden","x")},a.prototype.showSidebar=function(){clearTimeout(this.sidebarHiding),this.$sidebar.removeClass("sidebar-hidden",0).removeClass("sidebar-hiding"),this.$toggler.removeClass("sidebar-hidden"),this.sidebarVisible=!0,window.localStorage&&localStorage.removeItem("PurpleMine:sidebarHidden")},a}(),$(function(){"use strict";new PurpleMine.SidebarToggler,new PurpleMine.HistoryTabs});

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,157 @@
var PurpleMine = PurpleMine || {};
/* global Raphael: false, revisionGraph: true */
/* jshint camelcase: false */
/* jshint maxstatements: false */
/* jshint maxlen: 160 */
PurpleMine.RevisionGraph = function(holder, commits_hash, graph_space)
{
"use strict";
var XSTEP = 20,
CIRCLE_INROW_OFFSET = 17;
var commits_by_scmid = commits_hash,
commits = $.map(commits_by_scmid, function(val){return val;});
var max_rdmid = commits.length - 1;
var commit_table_rows = $("table.changesets tr.changeset");
// create graph
if (revisionGraph !== null)
{
revisionGraph.clear();
}
else
{
revisionGraph = new Raphael(holder);
}
var top = revisionGraph.set();
// init dimensions
var graph_x_offset = commit_table_rows.first().find("td").first().position().left - $(holder).position().left,
graph_y_offset = $(holder).position().top,
graph_right_side = graph_x_offset + (graph_space + 1) * XSTEP,
graph_bottom = commit_table_rows.last().position().top + commit_table_rows.last().height() - graph_y_offset;
revisionGraph.setSize(graph_right_side, graph_bottom);
// init colors
var colors = [
"#e74c3c",
"#584492",
"#019851",
"#ed820c",
"#4183c4"
];
// get more colors if needed
if (graph_space >= colors.length)
{
Raphael.getColor.reset();
for (var k = 0; k <= graph_space; k++)
{
colors.push(Raphael.getColor(0.9));
}
}
var parent_commit;
var x, y, parent_x, parent_y;
var path, title;
var revision_dot_overlay;
$.each(commits, function(index, commit)
{
if (!commit.hasOwnProperty("space"))
{
commit.space = 0;
}
y = commit_table_rows.eq(max_rdmid - commit.rdmid).position().top - graph_y_offset + CIRCLE_INROW_OFFSET;
x = graph_x_offset + XSTEP / 2 + XSTEP * commit.space;
revisionGraph.circle(x, y, 3.5)
.attr({
fill: colors[commit.space],
stroke: "none"
}).toFront();
// paths to parents
$.each(commit.parent_scmids, function(index, parent_scmid)
{
parent_commit = commits_by_scmid[parent_scmid];
if (parent_commit)
{
if (!parent_commit.hasOwnProperty("space"))
{
parent_commit.space = 0;
}
parent_y = commit_table_rows.eq(max_rdmid - parent_commit.rdmid).position().top - graph_y_offset + CIRCLE_INROW_OFFSET;
parent_x = graph_x_offset + XSTEP / 2 + XSTEP * parent_commit.space;
if (parent_commit.space === commit.space)
{
// vertical path
path = revisionGraph.path([
"M", x, y,
"V", parent_y]);
}
else
{
// path to a commit in a different branch (Bezier curve)
path = revisionGraph.path([
"M", x, y,
"C", x, y, x, y + (parent_y - y) / 2, x + (parent_x - x) / 2, y + (parent_y - y) / 2,
"C", x + (parent_x - x) / 2, y + (parent_y - y) / 2, parent_x, parent_y-(parent_y-y)/2, parent_x, parent_y
]);
}
}
else
{
// vertical path ending at the bottom of the revisionGraph
path = revisionGraph.path([
"M", x, y,
"V", graph_bottom
]);
}
path.attr({stroke: colors[commit.space], "stroke-width": 1.5}).toBack();
});
revision_dot_overlay = revisionGraph.circle(x, y, 10);
revision_dot_overlay
.attr({
fill : "#000",
opacity: 0,
cursor : "pointer",
href : commit.href
});
if (commit.refs !== null && commit.refs.length > 0)
{
title = document.createElementNS(revisionGraph.canvas.namespaceURI, "title");
title.appendChild(document.createTextNode(commit.refs));
revision_dot_overlay.node.appendChild(title);
}
top.push(revision_dot_overlay);
});
top.toFront();
};
$(function()
{
"use strict";
if (window.drawRevisionGraph)
{
// override Redmine's function
window.drawRevisionGraph = PurpleMine.RevisionGraph;
// make graph redraw itself
$(window).resize();
}
});

View File

@@ -11,3 +11,4 @@
@import "mixins/vendor-prefixes";
@import "mixins/issues";
@import "mixins/link-variant";

View File

@@ -16,6 +16,7 @@ $use-gravatars: true !default;
$use-font-awesome: true !default;
$issue-subject-large: true !default;
$enable-sidebar-toggler: true !default;
$wiki-page-more-vertical-space: true !default;
//== Colors
@@ -96,6 +97,10 @@ $wiki-text: #333 !default;
$wiki-font-size: 16px !default;
$wiki-line-height: 1.6 !default;
$toc-active-link: darken($link-color, 10%) !default;
$toc-active-link-hover: darken($toc-active-link, 10%) !default;
$toc-active-border: $link-color !default;
//== Components
//
@@ -129,6 +134,8 @@ $component-active-border: $brand-primary !default;
$font-size-list: .92em !default;
$collapsible-animation-time: .3s !default;
//== Tables
//
@@ -199,19 +206,42 @@ $tracker-7-text: $brand-text !default;
//== Diffs
//
$diff-out-color: #430;
$diff-out-bg: #ffeaaa;
$diff-out-bg-light: #ffefbf;
$diff-out-color: #511 !default;
$diff-out-bg: #fbb !default;
$diff-out-bg-light: rgba($diff-out-bg, .3) !default;
$diff-in-color: #350 !default;
$diff-in-bg: #afa !default;
$diff-in-bg-light: rgba($diff-in-bg, .3) !default;
//== Journal changes
//
$journal-old-value-color: #430 !default;
$journal-old-value-bg: rgba(#ffeaaa, .3) !default;
$journal-new-value-color: #350 !default;
$journal-new-value-bg: rgba(#bffbbf, .3) !default;
//== Changesets
//
$changeset-add-color: $brand-success !default;
$changeset-modified-color: $brand-warning !default;
$changeset-copied-color: $brand-info !default;
$changeset-renamed-color: $brand-primary !default;
$changeset-deleted-color: $brand-danger !default;
$diff-in-color: #350;
$diff-in-bg: #bffbbf;
$diff-in-bg-light: #d8fcd8;
//== Buttons
//
$btn-font-weight: normal !default;
$btn-link-color: $link-color !default;
$btn-link-bg: $body-bg !default;
$btn-link-border: $body-bg !default;
$btn-default-color: $gray-darkest !default;
$btn-default-bg: $gray-lightest !default;
$btn-default-border: $gray-lighter !default;
@@ -249,14 +279,14 @@ $input-border-radius-large: $border-radius-large !default;
$input-border-focus: #51a7e8 !default;
$input-color-placeholder: #999 !default;
$input-padding-vertical: 3px;
$input-padding-horizontal: 8px;
$input-padding-vertical: 3px !default;
$input-padding-horizontal: 8px !default;
$input-height-base: ($line-height-computed + ($input-padding-vertical * 2) + 2) !default;
$label-width: 160px;
$label-wide-width: 280px;
$label-space: 10px;
$label-width: 160px !default;
$label-wide-width: 280px !default;
$label-space: 10px !default;
$legend-color: $gray-dark !default;
$legend-border-color: #e5e5e5 !default;
@@ -391,16 +421,16 @@ $issue-padding: 15px !default;
$issue-gravatar-size: 50px !default;
$issue-heading-size: 1.5 !default;
$issue-attribute-padding-v: 3px;
$issue-attribute-padding-h: 5px;
$issue-attribute-padding-v: 3px !default;
$issue-attribute-padding-h: 5px !default;
//== Speech "bubbles"
//
$bubble-gravatar-size: 24px;
$bubble-gravatar-space: 12px;
$bubble-padding-vertical: 8px;
$bubble-padding-horizontal: 15px;
$bubble-gravatar-size: 24px !default;
$bubble-gravatar-space: 12px !default;
$bubble-padding-vertical: 8px !default;
$bubble-padding-horizontal: 15px !default;
//== Media queries breakpoints
@@ -425,6 +455,6 @@ $screen-md-max: ($screen-lg-min - 1) !default;
//== Content widths
//
$width-sm: $screen-sm - ($padding-side * 2);
$width-md: $screen-md - ($padding-side * 2);
$width-lg: $screen-lg - ($padding-side * 2);
$width-sm: $screen-sm - ($padding-side * 2) !default;
$width-md: $screen-md - ($padding-side * 2) !default;
$width-lg: $screen-lg - ($padding-side * 2) !default;

View File

@@ -29,6 +29,7 @@
@import "components/icons";
@import "components/jstoolbar";
@import "components/flash";
@import "components/image-base64";
@import "components/print";

View File

@@ -15,7 +15,7 @@
a {
display: inline-block;
padding-left: 8 + 16px;
padding-left: 5px + 20px;
background-position: 0 center;
}
}
@@ -24,7 +24,7 @@
list-style-type: none;
> a {
padding-left: $sidebar-padding-horizontal + 8 + 16px;
padding-left: $sidebar-padding-horizontal + 5px + 20px;
background-repeat: no-repeat;
background-position: $sidebar-padding-horizontal center;
}

View File

@@ -169,7 +169,7 @@ a[data-expands],
padding: 2px 8px;
border: 1px solid;
border-radius: $border-radius-base;
background-image: url("../images/bullet_toggle_plus.png");
@extend %image-toggle-plus;
background-repeat: no-repeat;
background-position: 2px 2px;
cursor: pointer;

View File

@@ -48,13 +48,16 @@ a.collapsible,
width: 0;
height: 0;
margin-right: 3px;
border-top: 5px solid;
border-right: 5px solid transparent;
border-left: 5px solid transparent;
border-top: 6px solid;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
vertical-align: middle;
@include rotate(0);
@include transition-transform(.1s);
@if $collapsible-animation-time > 0 {
@include transition-transform($collapsible-animation-time);
}
}
}
@@ -65,6 +68,33 @@ a.collapsible.collapsed,
}
}
@if $collapsible-animation-time > 0 {
fieldset.collapsible {
min-height: $line-height-computed;
max-height: 2500px; // should be enough with all the possible filters
overflow: hidden;
@include transition(max-height $collapsible-animation-time ease-out);
> div {
display: block !important;
opacity: 1;
visibility: visible;
@include transition(visibility 0s 0s, opacity $collapsible-animation-time);
}
&.collapsed {
max-height: 0;
@include transition(max-height $collapsible-animation-time);
> div {
opacity: 0;
visibility: hidden;
@include transition(visibility 0s $collapsible-animation-time, opacity $collapsible-animation-time);
}
}
}
}
/**
* Elements with context menus (doesn't really work on Windows)
@@ -316,17 +346,58 @@ a.close-icon {
*/
#content table.filecontent {
width: 100%;
background: $body-bg;
th.filename {
border-color: $brand-primary;
border-bottom-color: darken($body-bg, 10%);
background-color: $brand-primary;
color: $brand-text;
}
tbody {
font-size: $font-size-list;
}
tbody,
td.line-code pre {
font-family: $font-family-monospace;
}
td.line-code {
padding: 2px 5px;
th.line-num {
border-color: darken($body-bg, 10%);
background-color: darken($body-bg, 5%);
color: $gray;
}
pre {
font-size: 13px;
th.line-num,
td.line-code {
padding: .15em .4em;
}
th.line-num,
td.line-code,
td.line-code pre {
font-size: 1em;
}
tr:hover {
background-color: darken($body-bg, 2%);
th.line-num {
background-color: darken($body-bg, 10%);
}
}
tr:target {
th.line-num {
border-color: darken(adjust-hue($highlight-bg, -8deg), 15%);
background-color: darken(adjust-hue($highlight-bg, -8deg), 7%);
color: $highlight-text;
}
td.line-code {
background-color: $highlight-bg;
}
}
}
@@ -405,11 +476,7 @@ ul.projects {
* Time report
*/
table#time-report {
td.hours {
text-align: right;
}
#time-report {
th {
&.period,
&.total {
@@ -434,8 +501,8 @@ table#time-report {
}
}
.hours-dec {
font-size: .9em;
td.hours {
text-align: right;
}
}
@@ -755,13 +822,30 @@ table.boards {
* Repository view
*/
#revision_selector {
display: inline;
.revision-info {
margin-bottom: $line-height-computed;
tbody > tr > td {
padding-right: $table-cell-padding;
padding-bottom: $table-condensed-cell-padding;
+ td {
font-family: $font-family-monospace;
}
}
}
#related-issues {
li img {
vertical-align: middle;
margin: $line-height-computed 0;
li > a {
margin-left: .5em;
@if $use-font-awesome == false {
img {
vertical-align: middle;
}
}
}
}
@@ -785,6 +869,10 @@ tr.changeset {
background-color: #fffffb;
}
td.id {
font-family: $font-family-monospace;
}
td.author,
td.committed_on {
width: 15%;
@@ -803,3 +891,58 @@ tr.changeset {
margin-bottom: 0;
}
}
.revision-graph {
circle {
// @include translate(0, $table-cell-padding - 1px);
}
}
#content #changes-legend {
font-size: 1em;
.change {
background-position: 5px center;
}
.change-A { color: $changeset-add-color; }
.change-M { color: $changeset-modified-color; }
.change-C { color: $changeset-copied-color; }
.change-R { color: $changeset-renamed-color; }
.change-D { color: $changeset-deleted-color; }
}
.changeset-changes {
.change {
padding-top: $table-condensed-cell-padding;
color: $gray-dark;
a {
@include link-variant($gray-dark);
}
}
.change-A {
&:before { color: $changeset-add-color; }
a { @include link-variant($changeset-add-color); }
}
.change-M {
&:before { color: $changeset-modified-color; }
a { @include link-variant($changeset-modified-color); }
}
.change-C {
&:before { color: $changeset-copied-color; }
a { @include link-variant($changeset-copied-color); }
}
.change-R {
&:before { color: $changeset-renamed-color; }
a { @include link-variant($changeset-renamed-color); }
}
.change-D {
color: $changeset-deleted-color;
}
}

View File

@@ -3,11 +3,13 @@
// --------------------------------------------------
form {
// display: inline;
td {
padding: $table-condensed-cell-padding;
}
.contextual > & {
display: inline;
}
}
button,
@@ -86,7 +88,7 @@ input[type="range"] {
input.autocomplete {
padding-right: 30px;
background-image: url("../images/aci.png"); /* autocomplete indicator */
@extend %image-aci;
background-repeat: no-repeat;
background-position: right center;
@@ -342,8 +344,7 @@ label[for=closed] {
#my_account_form select,
#user_form select,
#user_identity_url,
#custom_field_possible_values,
#custom_field_default_value {
#custom_field_possible_values {
width: 100%;
}
@@ -452,7 +453,7 @@ select.bool_cf {
}
}
#all_attributes {
#issue-form {
.splitcontentleft,
.splitcontentright {
width: 100%;
@@ -486,24 +487,25 @@ select.bool_cf {
padding-left: .2em;
text-align: right;
}
}
/**
* Hack: first <p> in issue form ("private" option) is moved to the right with
* inline styles. Don't allow it break the layout
*/
> p[style] {
margin-right: 0 !important;
margin-bottom: 0;
/**
* Hack: first <p> in issue form ("private" option) is moved to the right with
* inline styles. Don't allow it break the layout
*/
#all_attributes > p[style] {
margin-right: 0 !important;
margin-bottom: 0;
padding-left: 0;
input {
top: 2px;
}
label {
margin-right: 0;
padding-left: 0;
input {
top: 2px;
}
label {
margin-right: 0;
padding-left: 0;
}
}
}

View File

@@ -52,7 +52,7 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
}
ul li a.submenu {
background-image: url("../images/bullet_arrow_right.png");
@extend %image-arrow-right;
}
}
@@ -64,6 +64,13 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
{
.icon {
@extend %fa-icon;
padding-left: 20px;
background-repeat: no-repeat;
background-position: 0% 50%;
&:before {
margin-left: -20px;
}
.contextual & {
margin-left: .5em;
@@ -111,6 +118,12 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
.icon-zoom-out:before { content: $fa-var-search-minus; }
.icon-passwd:before { content: $fa-var-key; }
.icon-test:before { content: $fa-var-arrow-circle-right; }
.icon-phone:before { content: $fa-var-phone; }
.icon-email:before { content: $fa-var-envelope; }
.icon-skype:before { content: $fa-var-skype; }
.icon-facebook:before { content: $fa-var-facebook-square; }
.icon-linkedin:before { content: $fa-var-linkedin-square; }
.icon-twitter:before { content: $fa-var-twitter-square; }
}
@else
{
@@ -169,21 +182,11 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
.icon-add,
.icon-edit,
.icon-save {
color: $icon-success-color;
&:hover,
&:focus {
color: $icon-success-color;
}
@include link-variant($icon-success-color, $icon-success-hover-color);
}
.icon-del {
color: $icon-danger-color;
&:hover,
&:focus {
color: $icon-danger-hover-color;
}
@include link-variant($icon-danger-color, $icon-danger-hover-color);
}
@@ -278,48 +281,115 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
*/
@if $use-font-awesome
{
%admin-icon {
@extend %fa-icon;
&:before {
width: 20px;
margin-left: -(5px + 20px);
color: $gray;
text-align: center;
}
&:hover:before {
color: $gray-darker;
}
&.selected:before {
color: $gray-darkest;
}
}
#admin-menu {
#admin-index > & {
a {
padding-left: 0;
padding-left: 5px + 20px;
}
}
li {
> a {
@extend %fa-icon;
padding-left: $sidebar-padding-horizontal;
&:before {
width: 1em;
margin-right: .5em;
color: $gray;
text-align: center;
}
&:hover:before {
color: $gray-darker;
}
&.selected:before {
color: $gray-darkest;
}
padding-left: $sidebar-padding-horizontal + 5px + 20px;
}
}
.projects:before { content: $fa-var-cubes; }
.users:before { content: $fa-var-user; }
.groups:before { content: $fa-var-group; }
.roles:before { content: $fa-var-eye; }
.trackers:before { content: $fa-var-ticket; }
.issue_statuses:before { content: $fa-var-pencil-square; }
.workflows:before { content: $fa-var-sitemap; }
.custom_fields:before { content: $fa-var-edit; }
.enumerations:before { content: $fa-var-list; }
.settings:before { content: $fa-var-gear; }
.plugins:before { content: $fa-var-puzzle-piece; }
.info:before { content: $fa-var-info-circle; }
.server_authentication:before { content: $fa-var-key; }
.projects {
@extend %admin-icon;
&:before { content: $fa-var-cubes; }
}
.users {
@extend %admin-icon;
&:before { content: $fa-var-user; }
}
.groups {
@extend %admin-icon;
&:before { content: $fa-var-group; }
}
.roles {
@extend %admin-icon;
&:before { content: $fa-var-eye; }
}
.trackers {
@extend %admin-icon;
&:before { content: $fa-var-ticket; }
}
.issue_statuses {
@extend %admin-icon;
&:before { content: $fa-var-pencil-square; }
}
.workflows {
@extend %admin-icon;
&:before { content: $fa-var-sitemap; }
}
.custom_fields {
@extend %admin-icon;
&:before { content: $fa-var-edit; }
}
.enumerations {
@extend %admin-icon;
&:before { content: $fa-var-list; }
}
.settings {
@extend %admin-icon;
&:before { content: $fa-var-gear; }
}
.plugins {
@extend %admin-icon;
&:before { content: $fa-var-puzzle-piece; }
}
.info {
@extend %admin-icon;
&:before { content: $fa-var-info-circle; }
}
.server_authentication {
@extend %admin-icon;
&:before { content: $fa-var-key; }
}
}
}
@else
@@ -490,7 +560,8 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
}
}
.issues .buttons a {
.issues .buttons a,
#related-issues li > a {
&[data-method="delete"] {
@extend %fa-icon;
@@ -538,6 +609,11 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
margin-left: .2em;
}
&.asc,
&.desc {
background-image: none;
}
&.asc:after {
content: $fa-var-sort-amount-asc;
}
@@ -604,12 +680,7 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
}
&:nth-child(2) {
color: $icon-success-color;
&:hover,
&:focus {
color: $icon-success-hover-color;
}
@include link-variant($icon-success-color, $icon-success-hover-color);
&:before {
content: $fa-var-pencil;
@@ -617,12 +688,7 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
}
&:nth-child(3) {
color: $icon-danger-color;
&:hover,
&:focus {
color: $icon-danger-hover-color;
}
@include link-variant($icon-danger-color, $icon-danger-hover-color);
&:before {
content: $fa-var-trash;
@@ -704,13 +770,8 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
.contextual [href*="edit"] {
@extend %fa-icon;
color: $icon-success-color;
font-size: $font-size-base;
&:hover,
&:focus {
color: $icon-success-color;
}
@include link-variant($icon-success-color, $icon-success-hover-color);
&:before {
content: $fa-var-pencil;
@@ -727,7 +788,13 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
&:before {
margin-right: .3em;
content: $fa-var-paperclip;
color: $icon-success-color;
content: $fa-var-plus;
}
&:hover:before,
&:focus:before {
color: $icon-success-hover-color;
}
}
@@ -772,6 +839,41 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
}
}
}
#changes-legend > li.change,
.changeset-changes ul > li.change {
@extend %fa-icon;
background: transparent;
&:before {
position: relative;
top: -.12em;
font-size: .7143em;
content: $fa-var-circle;
}
&.folder:before { top: 0; font-size: 1em; content: $fa-var-folder; }
&.folder.change-A:before { content: $fa-var-folder-open; }
&.folder.change-M:before { content: $fa-var-folder-open; }
&.change-A:before { content: $fa-var-plus-circle; }
&.change-M:before { content: $fa-var-circle; }
&.change-C:before { content: $fa-var-arrow-circle-right; }
&.change-R:before { content: $fa-var-check-circle; }
&.change-D:before { content: $fa-var-minus-circle; }
}
.changeset-changes ul > li.change {
&.folder:before {
top: $table-condensed-cell-padding - 2px;
margin-left: -20px;
}
&:before {
top: $table-condensed-cell-padding;
margin-left: -(20px - $table-condensed-cell-padding);
float: left;
}
}
}
@else
{
@@ -996,7 +1098,8 @@ $icon-danger-hover-color: darken($brand-danger, 10%);
height: 14px;
padding-left: 14px;
box-sizing: border-box;
background: url("../images/calendar_555555_14.png") no-repeat;
@extend %image-calendar;
background-repeat: no-repeat;
}

View File

@@ -0,0 +1,28 @@
//
// Base64 encoded images
// --------------------------------------------------
/* ACI = AutoComplete Indicator */
%image-aci {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAKBAMAAAAnY0GXAAAAD1BMVEUAAACzs7Ozs7Ozs7Ozs7NJvZFvAAAABHRSTlMA5kpJG2qUMwAAABtJREFUCNdjIBMYCkMRDIg4QhBuAUUhKCIPAAAlaQNk5qF21gAAAABJRU5ErkJggg==);
}
%image-arrow-left {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAGFBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABWNxwqAAAACHRSTlMAgF1mUUUMBtml7EIAAAAjSURBVAjXYyAAWGEMRyhdJAih2QyhDCZBhAhcDVwXwhziAACuywJHmKAVPgAAAABJRU5ErkJggg==);
}
%image-arrow-right {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAG1BMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACUUeIgAAAACXRSTlMAgF1mUUUMBwa6cf6pAAAAIklEQVQI12PADwJgDBEYQ1ADxhBOgDIEFdBF1GG6EOYQCQC/wwKE7b2bNAAAAABJRU5ErkJggg==);
}
%image-calendar {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOBAMAAADtZjDiAAAAIVBMVEUAAABVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVUMftYpAAAACnRSTlMArIDn/dahwzIKIC4f+wAAADxJREFUCNdjYEhJACEGBk8HEGIQXrDYeMFiAYZVK1YB0QKGVSAApBcwMQgwMSDohaKChqKCxItXgc0pAADUBx5bh1ZBCgAAAABJRU5ErkJggg==);
}
%image-toggle-minus {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMAgJsrThgAAAAQSURBVAjXY8AK+D+AEDYAAC8fAf+FxiPoAAAAAElFTkSuQmCC);
}
%image-toggle-plus {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMAgJsrThgAAAAVSURBVAjXY0AGjA1QxP8BiBBcJAAAdjIFBZTfDZQAAAAASUVORK5CYII=);
}

View File

@@ -2,82 +2,159 @@
// Issue page
// --------------------------------------------------
.issue.details {
margin-bottom: $line-height-computed;
padding: $issue-padding;
border: 1px solid $issue-border;
border-radius: $border-radius-base;
background-color: $issue-bg;
color: $issue-text;
word-wrap: break-word;
@if $use-gravatars
{
> img.gravatar {
width: $issue-gravatar-size;
height: $issue-gravatar-size;
margin-right: 10px;
margin-bottom: $line-height-computed / 2;
float: left;
}
table img.gravatar {
position: relative;
top: -3px;
margin-right: 5px;
}
> .subject,
> .author {
padding-left: $issue-gravatar-size + 10px;
}
}
&.assigned-to-me {
.assigned-to .user {
font-weight: bold;
}
}
> .subject {
h3 {
margin-bottom: .3em;
color: $gray-darkest;
font-size: $issue-heading-size * 1em;
font-weight: bold;
line-height: 1.2;
}
p {
margin-bottom: 5px;
font-size: $font-size-small;
}
}
> .author {
.issue {
&.details {
margin-bottom: $line-height-computed;
}
padding: $issue-padding;
border: 1px solid $issue-border;
border-radius: $border-radius-base;
background-color: $issue-bg;
color: $issue-text;
word-wrap: break-word;
> hr {
margin: $issue-padding (-$issue-padding);
border-top-color: $issue-border;
}
@if $use-gravatars
{
> img.gravatar {
width: $issue-gravatar-size;
height: $issue-gravatar-size;
margin-right: 10px;
margin-bottom: $line-height-computed / 2;
float: left;
}
> .description {
> p {
margin-bottom: $issue-padding;
table img.gravatar {
position: relative;
top: -3px;
margin-right: 5px;
}
> .subject,
> .author {
padding-left: $issue-gravatar-size + 10px;
}
}
> .wiki {
margin: 0 (-$issue-padding) (-$issue-padding);
padding: $padding-wiki;
border-top: 1px solid $issue-border;
background: $body-bg;
&.assigned-to-me {
.assigned-to .user {
font-weight: bold;
}
}
> .subject {
h3 {
margin-bottom: .3em;
color: $gray-darkest;
font-size: $issue-heading-size * 1em;
font-weight: bold;
line-height: 1.2;
}
p {
margin-bottom: 5px;
font-size: $font-size-small;
}
}
> .author {
margin-bottom: $line-height-computed;
}
> hr {
margin: $issue-padding (-$issue-padding);
border-top-color: $issue-border;
}
> .description {
> p {
margin-bottom: $issue-padding;
}
> .wiki {
margin: 0 (-$issue-padding) (-$issue-padding);
padding: $padding-wiki;
border-top: 1px solid $issue-border;
background: $body-bg;
}
}
.next-prev-links {
color: $gray-light;
}
}
.next-prev-links {
color: $gray-light;
.attributes {
width: 100%;
th,
td {
padding: $issue-attribute-padding-v $issue-attribute-padding-h $issue-attribute-padding-v 0;
text-align: left;
vertical-align: top;
}
> tbody > tr {
th {
font-weight: normal;
}
td {
color: $gray-darkest;
}
}
@media screen and (min-width: $screen-md-min) {
> tbody > tr {
> th,
> td {
width: 25%;
}
}
}
@media screen and (min-width: $screen-lg-min) {
width: auto;
> tbody > tr {
> th {
width: 14em;
}
> td {
width: auto;
min-width: 16em;
}
}
}
}
@if $color-status {
.attributes td.status {
display: inline-block;
width: auto;
min-width: 1em;
margin-top: $issue-attribute-padding-v;
padding: 1px $table-cell-padding;
border-radius: $border-radius-base;
background-color: $brand-primary;
color: $brand-text;
font-size: $font-size-small;
font-weight: bold;
text-align: center;
text-transform: uppercase;
}
&.status-1 .attributes td.status {
background-color: $brand-info;
}
&.closed .attributes td.status {
background-color: $brand-danger;
}
}
div.attachments {
margin: $issue-padding (-$issue-padding) (-$issue-padding);
padding: $issue-padding;
}
}
@@ -86,8 +163,7 @@ div.fileover {
}
div.attachments {
margin: $issue-padding (-$issue-padding) (-$issue-padding);
padding: $issue-padding;
padding: $line-height-computed 0;
border-top: 1px solid $issue-border;
p {
@@ -181,74 +257,6 @@ div.thumbnails {
}
}
table.attributes {
width: 100%;
th,
td {
padding: $issue-attribute-padding-v $issue-attribute-padding-h $issue-attribute-padding-v 0;
text-align: left;
vertical-align: top;
}
> tbody > tr {
th {
font-weight: normal;
}
td {
color: $gray-darkest;
}
}
@media screen and (min-width: $screen-md-min) {
> tbody > tr {
> th,
> td {
width: 25%;
}
}
}
@media screen and (min-width: $screen-lg-min) {
width: auto;
min-width: $screen-sm-min;
> tbody > tr {
> th {
width: 14em;
}
> td {
width: auto;
}
}
}
}
@if $color-status {
.attributes td.status {
display: inline-block;
width: auto;
margin-top: $issue-attribute-padding-v;
padding: 1px $table-cell-padding;
border-radius: $border-radius-base;
background-color: $brand-primary;
color: $brand-text;
font-size: $font-size-small;
font-weight: bold;
text-transform: uppercase;
.status-1 & {
background-color: $brand-info;
}
.closed & {
background-color: $brand-danger;
}
}
}
#new-relation-form {
text-align: right;
@@ -463,13 +471,13 @@ table.attributes {
del > i:first-of-type,
i:first-of-type {
background-color: mix($body-bg, $diff-out-bg, 64%);
color: $diff-out-color;
background-color: $journal-old-value-bg;
color: $journal-old-value-color;
}
i:last-of-type {
background-color: mix($body-bg, $diff-in-bg, 64%);
color: $diff-in-color;
background-color: $journal-new-value-bg;
color: $journal-new-value-color;
}
}
@@ -513,31 +521,51 @@ span.private {
@media screen and (min-width: $screen-lg-min) {
width: 33%;
}
.odd {
background-color: $issue-bg;
min-width: 28em;
}
div.changeset {
padding: $bubble-padding-vertical $bubble-padding-horizontal;
margin-top: $line-height-computed / 2 + 2px * 2;
border: 1px solid $issue-border;
border-radius: $panel-border-radius;
background-color: $issue-bg;
font-size: $font-size-list;
overflow: hidden;
&:first-of-type {
border-radius: $panel-border-radius $panel-border-radius 0 0;
}
&:last-of-type {
border-radius: 0 0 $panel-border-radius $panel-border-radius;
margin-top: 0;
}
> p {
font-size: $font-size-list;
margin: 0;
padding: $padding-base-vertical $padding-base-horizontal;
color: $gray;
@include clearfix;
> a {
margin-left: .5em;
float: right;
font-family: $font-family-monospace;
font-weight: bold;
}
.author a {
color: $gray-darker;
&.user {
font-weight: bold;
}
}
> br {
display: none;
}
}
+ div.changeset {
border-top: 0 none;
> .wiki {
padding: $padding-base-vertical $padding-base-horizontal;
border-top: 1px solid mix($body-bg, $issue-border, 50%);
background-color: $body-bg;
}
}
}

View File

@@ -170,9 +170,17 @@
box-shadow: $panel-shadow;
}
.ui-dialog-content {
padding: 1em;
}
.ui-dialog-titlebar-close {
right: .5em;
}
input[type="button"] {
@include button-variant($btn-link-color, $btn-link-bg, $btn-link-border);
}
}
.ui-widget-overlay {

View File

@@ -20,12 +20,32 @@
margin-left: -6px;
float: right;
}
.box & {
button {
margin-right: 2px;
}
.jstSpacer {
margin-right: 4px;
}
@media (min-width: $screen-lg) {
button {
margin-right: 4px;
}
.jstSpacer {
margin-right: 6px;
}
}
}
}
@if $use-font-awesome
{
.jstElements {
button[type="button"] {
%jstb-icon {
padding: 0;
background: $body-bg;
background-image: none;
@@ -37,32 +57,119 @@
}
}
.jstb_strong:before { content: $fa-var-bold; }
.jstb_em:before { content: $fa-var-italic; }
.jstb_ins:before { content: $fa-var-underline; }
.jstb_del:before { content: $fa-var-strikethrough; }
.jstb_code:before { content: $fa-var-code; }
.jstb_h1:before { content: $fa-var-header; }
.jstb_h2:before { content: $fa-var-header; font-size: 11px; }
.jstb_h3:before { content: $fa-var-header; font-size: 9px; }
.jstb_ul:before { content: $fa-var-list-ul; }
.jstb_ol:before { content: $fa-var-list-ol; }
.jstb_bq:before { content: $fa-var-indent; }
.jstb_unbq:before { content: $fa-var-outdent; }
.jstb_pre:before { content: $fa-var-terminal; }
.jstb_link:before { content: $fa-var-link; }
.jstb_img:before { content: $fa-var-image; }
.jstb_strong {
@extend %jstb-icon;
&:before { content: $fa-var-bold; }
}
.jstb_em {
@extend %jstb-icon;
&:before { content: $fa-var-italic; }
}
.jstb_ins {
@extend %jstb-icon;
&:before { content: $fa-var-underline; }
}
.jstb_del {
@extend %jstb-icon;
&:before { content: $fa-var-strikethrough; }
}
.jstb_code {
@extend %jstb-icon;
&:before { content: $fa-var-code; }
}
.jstb_h1 {
@extend %jstb-icon;
&:before { content: $fa-var-header; }
}
.jstb_h2 {
@extend %jstb-icon;
&:before { font-size: .7857em; content: $fa-var-header; }
}
.jstb_h3 {
@extend %jstb-icon;
&:before { font-size: .6429em; content: $fa-var-header; }
}
.jstb_ul {
@extend %jstb-icon;
&:before { content: $fa-var-list-ul; }
}
.jstb_ol {
@extend %jstb-icon;
&:before { content: $fa-var-list-ol; }
}
.jstb_bq {
@extend %jstb-icon;
&:before { content: $fa-var-indent; }
}
.jstb_unbq {
@extend %jstb-icon;
&:before { content: $fa-var-outdent; }
}
.jstb_pre {
@extend %jstb-icon;
&:before { content: $fa-var-terminal; }
}
.jstb_link {
@extend %jstb-icon;
&:before { content: $fa-var-link; }
}
.jstb_img {
@extend %jstb-icon;
&:before { content: $fa-var-image; }
}
.jstb_cut {
@extend %jstb-icon;
&:before { content: $fa-var-scissors; }
}
// For plugin https://github.com/mediatainment/redmine_codebutton
.jstb_codehighlight {
@extend %jstb-icon;
color: $brand-danger;
&:before { content: $fa-var-code; }
}
button.jstb_help {
@extend %jstb-icon;
color: $link-color;
&:hover {
color: $link-hover-color;
}
&:before {
content: $fa-var-question-circle;
}
&:before { content: $fa-var-question-circle; }
}
}
}

View File

@@ -25,12 +25,13 @@ table.list {
td {
padding: $table-cell-padding;
border-bottom: 1px solid $table-border-color;
text-align: center;
text-align: left;
vertical-align: top;
&.checkbox {
width: 15px;
padding: $table-cell-padding 0 0;
text-align: center;
input {
margin: 2px 0 0;
@@ -38,11 +39,10 @@ table.list {
}
&.id,
&.tracker,
&.parent,
&.relations {
&.relations,
&.tracker {
width: 2%;
text-align: center;
}
&.id {
@@ -50,21 +50,12 @@ table.list {
text-align: right;
}
&.name,
&.description,
&.subject,
&.comments,
&.roles,
&.author,
&.assigned_to,
&.string {
text-align: left;
}
&.estimated_hours,
&.remaining_hours,
&.spent_hours,
&.story_points {
&.story_points,
&.int,
&.float {
text-align: right;
}
@@ -77,8 +68,19 @@ table.list {
}
}
&.reorder {
&.project,
&.created_on,
&.updated_on,
&.start_date,
&.due_date,
&.is_private,
&.reorder,
&.bool,
&.date {
text-align: center;
}
&.reorder {
white-space: nowrap;
}
}
@@ -103,7 +105,9 @@ tr.project {
&.idnt .name span {
padding-left: 16px;
background: url("../images/bullet_arrow_right.png") no-repeat -5px 50%;
@extend %image-arrow-right;
background-repeat: no-repeat;
background-position: -5px 50%;
}
@for $i from 1 through 9 {
@@ -146,7 +150,7 @@ tr.issue {
&.idnt .subject a {
padding-left: 16px;
background-image: url("../images/bullet_arrow_right.png");
@extend %image-arrow-right;
background-repeat: no-repeat;
@if $color-trackers {
@@ -197,13 +201,15 @@ tr {
span.expander {
margin-left: 0;
padding-left: 8px;
background: url("../images/bullet_toggle_plus.png") no-repeat center center;
@extend %image-toggle-plus;
background-repeat: no-repeat;
background-position: center center;
cursor: pointer;
@include user-select(none);
}
&.open span.expander {
background-image: url("../images/bullet_toggle_minus.png");
@extend %image-toggle-minus;
}
}
@@ -355,10 +361,16 @@ tr.time-entry {
}
td.hours {
width: 5em;
padding-right: .5em;
font-weight: bold;
}
}
.time-entries,
tr.time-entry {
td.hours {
width: 1%;
text-align: right;
white-space: nowrap;
.hours-dec {
font-size: .9em;
@@ -366,6 +378,19 @@ tr.time-entry {
}
}
.mypage-box {
td.hours {
font-weight: bold;
em {
font-style: normal;
}
}
tr.time-entry td.hours {
font-weight: normal;
}
}
/**
* Wiki page history entry

View File

@@ -1,5 +1,7 @@
//
// Redmine Backlogs
// https://github.com/HolonGlobe/redmine_backlogs
// Forked from: https://github.com/backlogs/redmine_backlogs
// --------------------------------------------------
#backlogs_view_issues_sidebar {
@@ -32,6 +34,7 @@
//
// Redmine Time Tracker
// https://github.com/fernandokosh/redmine_time_tracker
// --------------------------------------------------
@if $use-font-awesome {
@@ -70,3 +73,147 @@
display: none;
}
}
//
// Redmine CRM People
// http://www.redminecrm.com/projects/people/
// --------------------------------------------------
#content {
.person.details {
margin-bottom: $line-height-computed;
padding: $issue-padding;
border: 1px solid $issue-border;
border-radius: $border-radius-base;
background-color: $issue-bg;
.avatar {
width: 64px;
max-width: 64px;
overflow: hidden;
}
.name,
.subject_info {
padding: 0 0 0 $issue-padding;
}
.name {
> h1 {
margin-bottom: 5px;
}
> p {
margin-bottom: 0;
}
}
.subject_info {
border-left: 1px solid $issue-border;
> ul {
margin: 0;
}
}
@if $use-font-awesome {
.icon {
background-image: none;
}
}
}
.department.issue.details {
> p {
clear: both;
}
> .author {
margin-bottom: 0;
clear: none;
}
}
}
#sidebar {
.person.attributes {
font-size: $font-size-list;
th,
td {
padding: $table-condensed-cell-padding;
text-align: left;
vertical-align: top;
}
.icon {
padding-left: $table-condensed-cell-padding + 20px;
background-position: $table-condensed-cell-padding $table-condensed-cell-padding;
}
@if $use-font-awesome {
.icon {
background-image: none;
> a {
@extend %fa-icon;
}
}
}
.email {
td a {
display: block;
max-width: floor($sidebar-width / 3);
text-overflow: ellipsis;
overflow: hidden;
&:hover {
position: absolute;
max-width: 100%;
margin: -$table-condensed-cell-padding;
padding: $table-condensed-cell-padding;
background: $body-bg;
box-shadow: $panel-shadow;
}
}
}
}
.person_data {
td.avatar,
td.name {
padding: 0 0 $table-cell-padding;
}
td.avatar {
width: 40px;
}
td.name {
h4 {
margin: 0;
letter-spacing: 0;
}
}
}
}
//
// Redmine codebutton
// https://github.com/mediatainment/redmine_codebutton
// --------------------------------------------------
#toolbar-code-options {
select {
width: 100%;
}
.buttons {
> input {
margin-left: .5em;
}
}
}

View File

@@ -10,9 +10,9 @@ table.progress {
empty-cells: show;
td.done_ratio & {
float: none;
margin-right: auto;
margin-left: auto;
float: none;
}
td {
@@ -32,6 +32,10 @@ table.progress {
background-color: $progress-bg;
}
}
.issue & td {
padding: 0;
}
}
p {

View File

@@ -2,21 +2,19 @@
// Activity and search results list
// --------------------------------------------------
#search-results,
div#activity dl {
#activity dl,
#search-results {
margin-left: $padding-side;
}
div#activity,
#activity,
#search-results {
dd {
margin-bottom: $line-height-computed;
padding-left: $padding-side;
padding-top: .1em;
}
dt {
margin-bottom: 2px;
padding-left: $padding-side;
background-repeat: no-repeat;
background-position: 0 center;
@@ -33,8 +31,29 @@ div#activity,
}
}
div#activity {
#activity {
$activity-avatar: 24px;
$activity-avatar-space: 5px;
$activity-indent: 20px;
@if $use-gravatars {
$activity-indent: $activity-indent + $activity-avatar + $activity-avatar-space;
}
h3,
h4 {
margin: 0 0 $line-height-computed;
padding-bottom: .2em;
border-bottom: 1px dotted $gray-light;
font-size: $font-size-h4;
font-weight: normal;
}
dt {
&.grouped {
margin-left: $activity-indent;
}
&.me .time {
border-bottom: 1px solid $gray-lighter;
}
@@ -42,19 +61,27 @@ div#activity {
.time {
color: $gray;
}
@if $use-gravatars {
.gravatar {
margin-top: -2px;
margin-right: $activity-avatar-space;
float: left;
}
}
}
dd {
font-size: $font-size-small;
}
overflow: hidden;
dt.grouped,
dd.grouped {
margin-left: $padding-side;
&.grouped {
margin-left: $activity-indent;
}
}
}
div#search-results-counts {
#search-results-counts {
float: right;
ul {

View File

@@ -80,11 +80,11 @@
}
.tab-left {
background-image: url("../images/bullet_arrow_left.png");
@extend %image-arrow-left;
}
.tab-right {
background-image: url("../images/bullet_arrow_right.png");
@extend %image-arrow-right;
}
}
}

View File

@@ -1,6 +1,37 @@
.wiki.wiki-page {
margin-bottom: $line-height-computed;
font-size: $wiki-font-size;
@if $wiki-page-more-vertical-space {
/**
* Anchors will make headers more separated,
* and it will look better when you open page with hash in URL
*/
a[name]:empty {
display: block;
overflow: hidden;
}
/**
* Add some space between list items
*/
ul,
ol {
li {
margin-top: .25em;
}
ul,
ol {
margin-top: .25em;
margin-bottom: .25em;
li {
margin-top: .125em;
}
}
}
}
}
.controller-wiki .wiki > .preview {
@@ -11,35 +42,40 @@ div.wiki {
color: $wiki-text;
line-height: $wiki-line-height;
h1,
h2,
h3,
h4,
h5,
h6 {
//scss-lint:disable SingleLinePerSelector
h1, .h1,
h2, .h2,
h3, .h3,
h4, .h4,
h5, .h5,
h6, .h6 {
margin-top: 1em;
margin-bottom: $wiki-font-size;
font-weight: $headings-font-weight;
line-height: $headings-line-height;
}
h1 { font-size: $font-size-h1; line-height: 1.2; }
h2 { font-size: $font-size-h2; line-height: 1.225; }
h3 { font-size: $font-size-h3; line-height: 1.43; }
h4 { font-size: $font-size-h4; }
h5 { font-size: $font-size-h5; }
h6 { font-size: $font-size-h6; }
h1, .h1 { font-size: $font-size-h1; line-height: 1.2; }
h2, .h2 { font-size: $font-size-h2; line-height: 1.225; }
h3, .h3 { font-size: $font-size-h3; line-height: 1.43; }
h4, .h4 { font-size: $font-size-h4; }
h5, .h5 { font-size: $font-size-h5; }
h6, .h6 { font-size: $font-size-h6; }
h1,
h2 {
h1, .h1,
h2, .h2 {
padding-bottom: .3em;
border-bottom: 1px solid $gray-lighter;
}
h6 {
h6, .h6 {
color: $gray;
}
.text-normal {
font-weight: normal;
}
> a:first-child {
+ h1,
+ h2,
@@ -55,6 +91,16 @@ div.wiki {
margin-bottom: 0;
}
blockquote {
>:first-child {
margin-top: 0;
}
>:last-child {
margin-bottom: 0;
}
}
.contextual {
a {
opacity: .4;
@@ -130,6 +176,7 @@ div.wiki {
pre {
// scss-lint:disable DuplicateProperty
width: auto;
margin-bottom: 1.15em;
padding: 4px 8px;
border: 1px solid #e7e7e7;
border-radius: $border-radius-base;
@@ -221,6 +268,20 @@ div.wiki {
vertical-align: middle;
}
}
.toc-active-prev + .toc {
padding-left: $padding-large-horizontal;
border-left: 4px solid $toc-active-border;
a {
color: $toc-active-link;
&:focus,
&:hover {
color: $toc-active-link-hover;
}
}
}
}
h1,
@@ -244,6 +305,12 @@ h6 {
display: inline;
}
}
img {
display: inline-block;
max-width: 100%;
vertical-align: middle;
}
}
p.footnote {
@@ -294,3 +361,102 @@ p.footnote {
float: right;
}
}
//
// Custom classes for Bootstrap-like features
// --------------------------------------------------
/**
* Pager
* see: http://getbootstrap.com/components/#pagination-pager
*/
.wiki-pager {
> a {
display: inline-block;
padding: $padding-base-vertical $padding-base-horizontal;
border: 1px solid $btn-default-border;
border-radius: ceil($font-size-base + ($padding-base-vertical + 1px) * 2) / 2;
background-color: $body-bg;
line-height: 1;
white-space: nowrap;
&:hover,
&:focus,
&:active {
background-color: $btn-default-bg;
text-decoration: none;
}
}
&.wiki-pager--aligned {
overflow: hidden;
> a:first-child {
float: left;
}
> a:last-child {
float: right;
}
}
}
/**
* Typographic helper classes
*/
// Lead body copy
// see: http://getbootstrap.com/css/#lead-body-copy
.lead {
margin-bottom: $line-height-computed;
font-size: floor(($font-size-base * 1.15));
font-weight: 300;
line-height: 1.4;
@media (min-width: $screen-sm-min) {
font-size: ($font-size-base * 1.5);
}
}
// Alignment
// see: http://getbootstrap.com/css/#type-alignment
.text-left { text-align: left; }
.text-right { text-align: right; }
.text-center { text-align: center; }
.text-justify { text-align: justify; }
.text-nowrap { white-space: nowrap; }
// Transformation
// see: http://getbootstrap.com/css/#type-transformation
.text-lowercase { text-transform: lowercase; }
.text-uppercase { text-transform: uppercase; }
.text-capitalize { text-transform: capitalize; }
/**
* Other helper classes
* see: http://getbootstrap.com/css/#helper-classes
*/
.text-muted { color: $gray-light; }
.text-primary { color: $brand-primary; }
.text-success { color: $brand-success; }
.text-info { color: $brand-info; }
.text-warning { color: $brand-warning; }
.text-danger { color: $brand-danger; }
.bg-primary { background-color: $brand-primary; color: $brand-text; }
.bg-success { background-color: $state-success; }
.bg-info { background-color: $state-info; }
.bg-warning { background-color: $state-warning; }
.bg-danger { background-color: $state-danger; }
p {
&.bg-primary,
&.bg-success,
&.bg-info,
&.bg-warning,
&.bg-danger {
padding: $panel-body-padding;
}
}

View File

@@ -1,13 +1,8 @@
@if $enable-sidebar-toggler {
$toggler-position-v: 1px;
$toggler-position-h: 1px;
$arrow-right: "../images/bullet_arrow_right.png";
$arrow-left: "../images/bullet_arrow_left.png";
@if $use-font-awesome {
$arrow-right: $fa-var-caret-square-o-right;
$arrow-left: $fa-var-caret-square-o-left;
}
$arrow-right: $fa-var-caret-square-o-right;
$arrow-left: $fa-var-caret-square-o-left;
#main {
position: relative;
@@ -80,7 +75,7 @@
content: $arrow-left;
}
} @else {
background-image: url($arrow-left);
@extend %image-arrow-left;
}
} @else {
right: $toggler-position-h;
@@ -90,7 +85,7 @@
content: $arrow-right;
}
} @else {
background-image: url($arrow-right);
@extend %image-arrow-right;
}
}
@@ -101,7 +96,7 @@
content: $arrow-right;
}
} @else {
background-image: url($arrow-right);
@extend %image-arrow-right;
}
} @else {
@if $use-font-awesome {
@@ -109,7 +104,7 @@
content: $arrow-left;
}
} @else {
background-image: url($arrow-left);
@extend %image-arrow-left;
}
}
}

View File

@@ -144,11 +144,18 @@
&:after {
display: block;
position: absolute;
top: 50%;
right: 5px;
bottom: 0;
left: 5px;
border-top: 1px solid rgba($color, .35);
height: calc(50% - 2px/2);
border-top: 2px solid rgba($color, .95);
content: "";
@include rotate(-4deg);
@include transition(border-color .1s);
}
&:hover:after {
border-top-color: rgba($color, .25);
}
}
}

View File

@@ -0,0 +1,10 @@
// Link variant
@mixin link-variant($default-color, $hover-color: darken($default-color, 10%)) {
color: $default-color;
&:focus,
&:hover {
color: $hover-color;
}
}

View File

@@ -304,7 +304,7 @@ ul.ui-sortable {
}
.w-rb-header-collapsed {
height: 18px;
height: 27px; // 14px * .86 * 1.42857 + 2 * 5px
overflow: hidden;
}

View File

@@ -511,6 +511,13 @@ $story-sp-input-width: 50px;
}
}
.fff-left > .project,
.fff-wrapmiddle > .subject,
.fff-right > .status_id,
.fff-right > .story_points {
min-height: floor(.92 * $font-size-base * $line-height-base);
}
.project {
display: block;
position: relative;

File diff suppressed because one or more lines are too long