Compare commits

...

12 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
8 changed files with 253 additions and 22 deletions

View File

@@ -52,6 +52,24 @@ 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

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
//

View File

@@ -609,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;
}
@@ -783,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;
}
}

View File

@@ -151,6 +151,11 @@
background-color: $brand-danger;
}
}
div.attachments {
margin: $issue-padding (-$issue-padding) (-$issue-padding);
padding: $issue-padding;
}
}
div.fileover {
@@ -158,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 {

View File

@@ -20,6 +20,26 @@
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

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

@@ -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);
}
}
}

File diff suppressed because one or more lines are too long