- Update scss_lint rules
- Fix linter errors
- Add .editorconfig file
This commit is contained in:
mrliptontea
2016-11-20 20:19:51 +00:00
parent 53d1c6dcec
commit d0e6246e99
33 changed files with 776 additions and 874 deletions

9
.editorconfig Normal file
View File

@@ -0,0 +1,9 @@
root = true
[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4

View File

@@ -18,7 +18,7 @@ linters:
enabled: false enabled: false
Comment: Comment:
enabled: false enabled: true
DebugStatement: DebugStatement:
enabled: true enabled: true
@@ -30,8 +30,7 @@ linters:
enabled: true enabled: true
ElsePlacement: ElsePlacement:
enabled: false enabled: true
style: same_line
EmptyLineBetweenBlocks: EmptyLineBetweenBlocks:
enabled: true enabled: true
@@ -94,6 +93,9 @@ linters:
enabled: true enabled: true
extra_properties: [] extra_properties: []
PseudoElement:
enabled: true
QualifyingElement: QualifyingElement:
enabled: false enabled: false
@@ -124,6 +126,12 @@ linters:
SpaceAfterPropertyName: SpaceAfterPropertyName:
enabled: true enabled: true
SpaceAfterVariableName:
enabled: true
SpaceAroundOperator:
enabled: true
SpaceBeforeBrace: SpaceBeforeBrace:
enabled: true enabled: true
style: space style: space
@@ -140,8 +148,14 @@ linters:
TrailingSemicolon: TrailingSemicolon:
enabled: true enabled: true
TrailingWhitespace:
enabled: true
TrailingZero: TrailingZero:
enabled: false enabled: true
TransitionAll:
enabled: true
UnnecessaryMantissa: UnnecessaryMantissa:
enabled: true enabled: true
@@ -154,3 +168,6 @@ linters:
UrlQuotes: UrlQuotes:
enabled: true enabled: true
ZeroUnit:
enabled: true

View File

@@ -248,6 +248,7 @@ $diff-in-bg-light: rgba($diff-in-bg, .3) !default;
//== Journal changes //== Journal changes
// //
$journal-old-value-color: #430 !default; $journal-old-value-color: #430 !default;
$journal-old-value-bg: rgba(#ffeaaa, .3) !default; $journal-old-value-bg: rgba(#ffeaaa, .3) !default;
$journal-new-value-color: #350 !default; $journal-new-value-color: #350 !default;
@@ -481,6 +482,7 @@ $issue-attribute-padding-h: 5px !default;
//== Speech "bubbles" //== Speech "bubbles"
// //
$bubble-gravatar-size: 24px !default; $bubble-gravatar-size: 24px !default;
$bubble-gravatar-space: 12px !default; $bubble-gravatar-space: 12px !default;
$bubble-padding-vertical: 8px !default; $bubble-padding-vertical: 8px !default;

View File

@@ -4,6 +4,7 @@
@import "lib/normalize"; @import "lib/normalize";
@import "lib/font-awesome"; @import "lib/font-awesome";
//== Redmine's core elements //== Redmine's core elements
// //

View File

@@ -32,9 +32,8 @@
} }
/** //== Groups
* Groups //
*/
table.members, table.members,
table.memberships { table.memberships {
@@ -44,9 +43,8 @@ table.memberships {
} }
/** //== Permissions
* Permissions //
*/
table.permissions { table.permissions {
td.role { td.role {
@@ -58,9 +56,8 @@ table.permissions {
} }
/** //== Workflows
* Workflows //
*/
table.transitions { table.transitions {
td.enabled { td.enabled {
@@ -88,9 +85,8 @@ table.fields_permissions {
} }
/** //== Enumerations
* Enumerations //
*/
.controller-enumerations.action-index { .controller-enumerations.action-index {
#content { #content {
@@ -106,18 +102,16 @@ table.fields_permissions {
} }
/** //== Settings labels
* Settings labels //
*/
fieldset.settings label { fieldset.settings label {
display: block; display: block;
} }
/** //== Settings -> Notifications
* Settings -> Notifications //
*/
fieldset#notified_events { fieldset#notified_events {
.parent { .parent {
@@ -126,9 +120,8 @@ fieldset#notified_events {
} }
/** //== Settings -> Repositories
* Settings -> Repositories //
*/
.settings.enabled_scm { .settings.enabled_scm {
table { table {

View File

@@ -37,9 +37,8 @@ button {
} }
/** //== Form buttons layout
* Form buttons layout //
*/
form { form {
input[type="submit"] { input[type="submit"] {
@@ -51,26 +50,25 @@ form {
+ a { + a {
margin-right: 5px; margin-right: 5px;
}
+ a + a { + a {
margin-left: 5px; margin-left: 5px;
}
} }
} }
} }
/** //== Repository's 'View differences' button
* Repository's 'View differences' button //
*/
form[action*="repository/diff"] { form[action*="repository/diff"] {
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed / 2;
} }
/** //== Forum and news message form buttons layout
* Forum and news message form buttons layout //
*/
#message-form, #message-form,
#news-form { #news-form {
@@ -83,9 +81,8 @@ form[action*="repository/diff"] {
} }
/** //== Button links
* Button links //
*/
p.buttons, p.buttons,
.other-formats > span, .other-formats > span,
@@ -126,18 +123,16 @@ p.buttons,
} }
/** //== Action buttons group
* Action buttons group //
*/
p.buttons { p.buttons {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
} }
/** //== Export actions
* Export actions //
*/
.other-formats { .other-formats {
margin: $line-height-computed 0 0; margin: $line-height-computed 0 0;
@@ -151,9 +146,8 @@ p.buttons {
} }
/** //== Query builder buttons
* Query builder buttons //
*/
.query-columns { .query-columns {
select { select {
@@ -175,9 +169,8 @@ p.buttons {
} }
/** //== Button for toggling multiselect (in filters)
* Button for toggling multiselect (in filters) //
*/
a[data-expands], a[data-expands],
.toggle-multiselect { .toggle-multiselect {

View File

@@ -302,36 +302,13 @@
.insert { .insert {
background: hsla(120, 100%, 50%, .12); background: hsla(120, 100%, 50%, .12);
}
.delete { .insert {
background: hsla(0, 100%, 50%, .12); background: transparent;
} color: #0c0;
font-weight: $font-weight-bold;
.change {
background: #007;
color: #bbf;
}
.head {
background: #505;
color: #f8f;
.filename {
color: #fff;
} }
}
.delete .eyecatcher {
margin: -1px;
border: 1px solid hsla(0, 100%, 45%, .5);
border-bottom: 0 none;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
background-color: hsla(0, 100%, 50%, .2);
}
.insert {
.eyecatcher { .eyecatcher {
margin: -1px; margin: -1px;
border: 1px solid hsla(120, 100%, 25%, .5); border: 1px solid hsla(120, 100%, 25%, .5);
@@ -340,25 +317,46 @@
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
background-color: hsla(120, 100%, 50%, .2); background-color: hsla(120, 100%, 50%, .2);
} }
}
.insert { .delete {
background: hsla(0, 100%, 50%, .12);
.delete {
background: transparent; background: transparent;
color: #0c0; color: #c00;
font-weight: $font-weight-bold; font-weight: $font-weight-bold;
} }
.eyecatcher {
margin: -1px;
border: 1px solid hsla(0, 100%, 45%, .5);
border-bottom: 0 none;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
background-color: hsla(0, 100%, 50%, .2);
}
} }
.delete .delete { .change {
background: transparent; background: #007;
color: #c00; color: #bbf;
font-weight: $font-weight-bold;
.change {
color: #88f;
}
} }
.change .change { .head {
color: #88f; background: #505;
} color: #f8f;
.head .head { .head {
color: #f4f; color: #f4f;
}
.filename {
color: #fff;
}
} }
} }

View File

@@ -20,10 +20,10 @@
@if $flexbox-layout { @if $flexbox-layout {
// scss-lint:disable VendorPrefix // scss-lint:disable VendorPrefix
$side-space: $sidebar-width + $padding-side * 2; $side-space: $sidebar-width + $padding-side * 2;
width: calc(100% - #{$side-space});
-webkit-flex: 1 1 auto; -webkit-flex: 1 1 auto;
-ms-flex: 1 1 auto; -ms-flex: 1 1 auto;
flex: 1 1 auto; flex: 1 1 auto;
width: calc(100% - #{$side-space});
} @else { } @else {
overflow: hidden; overflow: hidden;
} }

View File

@@ -3,9 +3,8 @@
// -------------------------------------------------- // --------------------------------------------------
/** //== Collapsible
* Collapsible //
*/
a.collapsible, a.collapsible,
.collapsible > legend { .collapsible > legend {
@@ -17,7 +16,7 @@ a.collapsible,
color: $link-hover-color; color: $link-hover-color;
} }
&:before { &::before {
display: inline-block; display: inline-block;
position: relative; position: relative;
top: -1px; top: -1px;
@@ -39,7 +38,7 @@ a.collapsible,
a.collapsible.collapsed, a.collapsible.collapsed,
.collapsible.collapsed > legend { .collapsible.collapsed > legend {
&:before { &::before {
@include rotate(-90deg); @include rotate(-90deg);
} }
} }
@@ -73,18 +72,16 @@ a.collapsible.collapsed,
} }
/** //== Elements with context menus (doesn't really work on Windows)
* Elements with context menus (doesn't really work on Windows) //
*/
.hascontextmenu { .hascontextmenu {
cursor: context-menu; cursor: context-menu;
} }
/** //== Actions for block
* Actions for block //
*/
.contextual { .contextual {
padding-left: $padding-base-vertical; padding-left: $padding-base-vertical;
@@ -106,9 +103,8 @@ a.collapsible.collapsed,
} }
/** //== Accessibility specific styles
* Accessibility specific styles //
*/
.hidden-for-sighted { .hidden-for-sighted {
position: absolute; position: absolute;
@@ -120,9 +116,8 @@ a.collapsible.collapsed,
} }
/** //== Responsive autoscroll
* Responsive autoscroll //
*/
.autoscroll { .autoscroll {
overflow-x: auto; overflow-x: auto;
@@ -130,9 +125,8 @@ a.collapsible.collapsed,
} }
/** //== Container
* Container //
*/
.box { .box {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
@@ -161,9 +155,8 @@ a.collapsible.collapsed,
} }
/** //== Column form layout
* Column form layout //
*/
.splitcontent { .splitcontent {
@extend %clearfix; @extend %clearfix;
@@ -186,9 +179,8 @@ a.collapsible.collapsed,
} }
/** //== Watchers selection list
* Watchers selection list //
*/
#users_for_watcher { #users_for_watcher {
height: 200px; height: 200px;
@@ -201,9 +193,8 @@ a.collapsible.collapsed,
} }
/** //== Watchers list
* Watchers list //
*/
#watchers { #watchers {
select { select {
@@ -250,9 +241,8 @@ a.collapsible.collapsed,
} }
/** //== Subtitle paragraph (can be seen on activity list)
* Subtitle paragraph (can be seen on activity list) //
*/
p.subtitle { p.subtitle {
margin-top: ($line-height-computed / -2); margin-top: ($line-height-computed / -2);
@@ -261,18 +251,8 @@ p.subtitle {
} }
/** //== My page layout
* Breadcrumbs (can be seen in time entries report) //
* No need to style them, but let this selector be here.
*/
// p.breadcrumb {
// }
/**
* My page layout
*/
#block-form { #block-form {
display: inline; display: inline;
@@ -335,9 +315,9 @@ a.close-icon {
} }
/** //== Resetting font for SCM (repository files)
* Resetting font for SCM (repository files) //
*/
#content table.filecontent { #content table.filecontent {
width: 100%; width: 100%;
background: $body-bg; background: $body-bg;
@@ -410,9 +390,8 @@ a.close-icon {
} }
/** //== Projects list
* Projects list //
*/
ul.projects { ul.projects {
padding-left: $padding-side; padding-left: $padding-side;
@@ -466,9 +445,8 @@ ul.projects {
} }
/** //== Time report
* Time report //
*/
#time-report { #time-report {
th { th {
@@ -513,9 +491,8 @@ ul.projects {
} }
/** //== Version issue list and page layout
* Version issue list and page layout //
*/
div#roadmap { div#roadmap {
.related-issues { .related-issues {
@@ -569,9 +546,8 @@ div#version-summary {
} }
/** //== Add form bottom space
* Add form bottom space //
*/
#new_document, #new_document,
#add-message, #add-message,
@@ -581,9 +557,8 @@ div#version-summary {
} }
/** //== Ajax indicator
* Ajax indicator //
*/
#ajax-indicator { #ajax-indicator {
position: fixed; position: fixed;
@@ -611,9 +586,8 @@ div#version-summary {
} }
/** //== Boards (forum)
* Boards (forum) //
*/
tr.message { tr.message {
&.locked { &.locked {
@@ -662,9 +636,8 @@ div.table-list.boards {
} }
/** //== Topic page
* Topic page //
*/
.controller-messages.action-show { .controller-messages.action-show {
h2 { h2 {
@@ -727,8 +700,8 @@ div.table-list.boards {
> h4 { > h4 {
position: relative; position: relative;
&:before, &::before,
&:after { &::after {
display: block; display: block;
position: absolute; position: absolute;
top: 9px; top: 9px;
@@ -742,14 +715,14 @@ div.table-list.boards {
pointer-events: none; pointer-events: none;
} }
&:after { &::after {
margin-top: 1px; margin-top: 1px;
margin-left: 2px; margin-left: 2px;
border-width: 6px; border-width: 6px;
border-right-color: $panel-bg; border-right-color: $panel-bg;
} }
&:before { &::before {
border-width: 7px; border-width: 7px;
border-right-color: $panel-border; border-right-color: $panel-border;
} }
@@ -769,9 +742,9 @@ div.table-list.boards {
} }
/** //== News
* News //
*/
.news-article { .news-article {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
@@ -792,9 +765,8 @@ div.table-list.boards {
} }
/** //== News comments
* News comments //
*/
#comments { #comments {
> h4 { > h4 {
@@ -812,9 +784,8 @@ div.table-list.boards {
} }
/** //== Diff
* Diff //
*/
.text-diff { .text-diff {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
@@ -842,9 +813,8 @@ div.table-list.boards {
} }
/** //== Repository view
* Repository view //
*/
.revision-info { .revision-info {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
@@ -916,12 +886,6 @@ tr.changeset {
} }
} }
.revision-graph {
circle {
// @include translate(0, $table-cell-padding - 1px);
}
}
#content #changes-legend { #content #changes-legend {
font-size: 1em; font-size: 1em;
@@ -947,22 +911,22 @@ tr.changeset {
} }
.change-A { .change-A {
&:before { color: $changeset-add-color; } &::before { color: $changeset-add-color; }
a { @include link-variant($changeset-add-color); } a { @include link-variant($changeset-add-color); }
} }
.change-M { .change-M {
&:before { color: $changeset-modified-color; } &::before { color: $changeset-modified-color; }
a { @include link-variant($changeset-modified-color); } a { @include link-variant($changeset-modified-color); }
} }
.change-C { .change-C {
&:before { color: $changeset-copied-color; } &::before { color: $changeset-copied-color; }
a { @include link-variant($changeset-copied-color); } a { @include link-variant($changeset-copied-color); }
} }
.change-R { .change-R {
&:before { color: $changeset-renamed-color; } &::before { color: $changeset-renamed-color; }
a { @include link-variant($changeset-renamed-color); } a { @include link-variant($changeset-renamed-color); }
} }

View File

@@ -17,7 +17,7 @@
@if $use-font-awesome { @if $use-font-awesome {
@extend %fa-icon; @extend %fa-icon;
&:before { &::before {
margin-left: -(8px + 16px); margin-left: -(8px + 16px);
float: left; float: left;
line-height: $line-height-computed; line-height: $line-height-computed;
@@ -38,11 +38,15 @@
border-color: $border; border-color: $border;
@if $use-font-awesome { @if $use-font-awesome {
@if $icon == "true" { $icon: $fa-var-check; } @if $icon == "true" {
@elseif $icon == "warning" { $icon: $fa-var-warning; } $icon: $fa-var-check;
@elseif $icon == "exclamation" { $icon: $fa-var-exclamation-circle; } } @elseif $icon == "warning" {
$icon: $fa-var-warning;
} @elseif $icon == "exclamation" {
$icon: $fa-var-exclamation-circle;
}
&:before { &::before {
content: $icon; content: $icon;
} }
} @else { } @else {
@@ -75,7 +79,7 @@
text-align: center; text-align: center;
@if $use-font-awesome { @if $use-font-awesome {
&:before { &::before {
margin-left: 0; margin-left: 0;
float: none; float: none;
} }

View File

@@ -33,7 +33,7 @@ input[type="week"],
input[type="number"], input[type="number"],
input[type="url"], input[type="url"],
input[type="tel"], input[type="tel"],
input[type="color"] input[type="color"],
input[type="search"], input[type="search"],
input[type="email"], input[type="email"],
input[type="text"], input[type="text"],
@@ -62,6 +62,11 @@ input[type="password"] {
textarea { textarea {
resize: vertical; resize: vertical;
height: auto; height: auto;
&.text_cf {
width: 100%;
resize: vertical;
}
} }
input[type="search"] { input[type="search"] {
@@ -84,14 +89,21 @@ input[type="range"] {
width: 100%; width: 100%;
} }
input.autocomplete { input {
padding-right: 30px; &.autocomplete {
@extend %image-aci; padding-right: 30px;
background-repeat: no-repeat; @extend %image-aci;
background-position: right center; background-repeat: no-repeat;
background-position: right center;
&.ajax-loading { &.ajax-loading {
background-image: url("../images/preloader.gif"); background-image: url("../images/preloader.gif");
}
}
&.string_cf,
&.link_cf {
width: 100%;
} }
} }
@@ -108,15 +120,24 @@ select {
option[disabled] { option[disabled] {
color: $gray-lighter; color: $gray-lighter;
} }
&.expandable {
vertical-align: top;
}
&.bool_cf {
// scss-lint:disable ImportantRule
width: auto !important;
}
} }
/** //== Browser hacks: unfortunately every browser has different capabilities when
* Browser hacks: unfortunately every browser has different capabilities when it // it comes to styling <select> and <option> tags.
* comes to styling <select> and <option> tags. //
*/
// Mozilla Firefox // Mozilla Firefox
@-moz-document url-prefix() { @-moz-document url-prefix() {
select { select {
&[multiple] { &[multiple] {
@@ -124,7 +145,7 @@ select {
} }
option, option,
optgroup:before { optgroup::before {
padding: $input-padding-vertical $input-padding-horizontal; padding: $input-padding-vertical $input-padding-horizontal;
border-bottom: 1px dotted $gray-lighter; border-bottom: 1px dotted $gray-lighter;
} }
@@ -137,6 +158,7 @@ select {
} }
// Google Chrome and Safari // Google Chrome and Safari
@supports (-webkit-appearance: none) { @supports (-webkit-appearance: none) {
select[multiple] { select[multiple] {
padding: 0; padding: 0;
@@ -154,16 +176,16 @@ select:-moz-focusring {
text-shadow: 0 0 0 #000; text-shadow: 0 0 0 #000;
} }
select.expandable {
vertical-align: top;
}
fieldset { fieldset {
min-width: 0; min-width: 0;
margin: 0; margin: 0;
padding: ($line-height-computed / 2) 0; padding: ($line-height-computed / 2) 0;
border: 0 none; border: 0 none;
border-top: 1px solid $legend-border-color; border-top: 1px solid $legend-border-color;
> p > label:first-child {
margin-right: $label-space;
}
} }
legend { legend {
@@ -172,9 +194,8 @@ legend {
} }
/** //== Required fields' asterisk
* Required fields' asterisk //
*/
span.required { span.required {
position: relative; position: relative;
@@ -187,9 +208,8 @@ span.required {
} }
/** //== Field's hint
* Field's hint //
*/
em.info { em.info {
display: block; display: block;
@@ -200,9 +220,9 @@ em.info {
} }
/** //== Wiki editor
* Wiki editor //
*/
.wiki-edit { .wiki-edit {
color: $wiki-text; color: $wiki-text;
font-family: $font-family-monospace; font-family: $font-family-monospace;
@@ -210,9 +230,8 @@ em.info {
} }
/** //== Tabular forms
* Tabular forms //
*/
.tabular { .tabular {
&.settings { &.settings {
@@ -322,14 +341,10 @@ label.block {
} }
} }
fieldset > p > label:first-child {
margin-right: $label-space;
}
//== Hack: align description edit icon with label
//
/**
* Hack: align description edit icon with label
*/
label[for=issue_description] + a { label[for=issue_description] + a {
display: inline-block; display: inline-block;
margin-top: $input-padding-vertical + 1px; margin-top: $input-padding-vertical + 1px;
@@ -340,9 +355,9 @@ label[for=issue_description] + a {
} }
/** //== Hack: better looking filter checkbox in sidebar in projects list
* Hack: better looking filter checkbox in sidebar in projects list //
*/
label[for=closed] { label[for=closed] {
display: block; display: block;
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed / 2;
@@ -350,9 +365,8 @@ label[for=closed] {
} }
/** //== Input sizes
* Input sizes //
*/
.wiki-edit, .wiki-edit,
#principal_search, #principal_search,
@@ -371,23 +385,6 @@ label[for=closed] {
width: 100%; width: 100%;
} }
textarea.text_cf {
width: 100%;
resize: vertical;
}
input {
&.string_cf,
&.link_cf {
width: 100%;
}
}
select.bool_cf {
// scss-lint:disable ImportantRule
width: auto !important;
}
@if $issue-subject-large { @if $issue-subject-large {
$input-padding-large-vertical: 8px; $input-padding-large-vertical: 8px;
$input-padding-large-horizontal: 12px; $input-padding-large-horizontal: 12px;
@@ -406,17 +403,16 @@ select.bool_cf {
} }
} }
/** //== Add space below WYSIWYG
* Add space below WYSIWYG //
*/
.jstEditor { .jstEditor {
margin-bottom: $line-height-computed / 2; margin-bottom: $line-height-computed / 2;
} }
/** //== User form
* User form //
*/
#user_form { #user_form {
@extend %clearfix; @extend %clearfix;
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
@@ -427,9 +423,8 @@ select.bool_cf {
} }
/** //== Attachments
* Attachments //
*/
#attachments_fields { #attachments_fields {
> span { > span {
@@ -441,13 +436,13 @@ select.bool_cf {
width: 21.5em; width: 21.5em;
margin-right: .5em; margin-right: .5em;
margin-bottom: $line-height-computed / 4; margin-bottom: $line-height-computed / 4;
}
input.filename { &.filename {
padding-left: $input-padding-horizontal + 16px; padding-left: $input-padding-horizontal + 16px;
background-image: url("../../../images/attachment.png"); background-image: url("../../../images/attachment.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 4px center; background-position: 4px center;
}
} }
.ajax-waiting input.filename { .ajax-waiting input.filename {
@@ -473,9 +468,8 @@ select.bool_cf {
} }
/** //== Issue form elements
* Issue form elements //
*/
#issue-form { #issue-form {
fieldset { fieldset {
@@ -487,9 +481,7 @@ select.bool_cf {
} }
} }
} }
}
#issue-form {
.splitcontentleft, .splitcontentleft,
.splitcontentright { .splitcontentright {
width: 100%; width: 100%;
@@ -526,9 +518,9 @@ select.bool_cf {
} }
/** //== #all_attributes > p[style] is targeting Redmine 2.x
* #all_attributes > p[style] is targeting Redmine 2.x //
*/
#issue_is_private_wrap, #issue_is_private_wrap,
#all_attributes > p[style] { #all_attributes > p[style] {
// scss-lint:disable ImportantRule // scss-lint:disable ImportantRule
@@ -581,9 +573,8 @@ select.bool_cf {
} }
/** //== Custom logic (boolean) field displayed as radio buttons
* Custom logic (boolean) field displayed as radio buttons //
*/
.check_box_group { .check_box_group {
display: block; display: block;
@@ -618,9 +609,8 @@ select.bool_cf {
} }
/** //== Filters
* Filters //
*/
fieldset#filters { fieldset#filters {
table { table {
@@ -629,6 +619,10 @@ fieldset#filters {
} }
} }
.add-filter {
text-align: right;
}
td { td {
&.field { &.field {
min-width: 180px; min-width: 180px;
@@ -651,15 +645,11 @@ fieldset#filters {
min-width: 130px; min-width: 130px;
} }
} }
}
.add-filter { &.add-filter {
text-align: right; padding-top: $table-condensed-cell-padding * 2;
} vertical-align: top;
}
td.add-filter {
padding-top: $table-condensed-cell-padding * 2;
vertical-align: top;
} }
div.add-filter { div.add-filter {
@@ -672,9 +662,8 @@ fieldset#filters {
} }
/** //== Reset label style for trackers selector in custom field editor
* Reset label style for trackers selector in custom field editor //
*/
label.no-css { label.no-css {
width: auto; width: auto;

View File

@@ -44,6 +44,32 @@
font-weight: $font-weight-bold; font-weight: $font-weight-bold;
} }
} }
&.parent {
height: 3px;
&.marker {
&.starting {
position: absolute;
top: -1px;
left: 0;
width: 8px;
height: 16px;
margin-left: -4px;
background: url("../../../images/task_parent_end.png") no-repeat 0 0;
}
&.ending {
position: absolute;
top: -1px;
right: 0;
width: 8px;
height: 16px;
margin-left: -4px;
background: url("../../../images/task_parent_end.png") no-repeat 0 0;
}
}
}
} }
.task_late { .task_late {
@@ -66,32 +92,6 @@
} }
} }
.task.parent {
height: 3px;
}
.task.parent.marker {
&.starting {
position: absolute;
top: -1px;
left: 0;
width: 8px;
height: 16px;
margin-left: -4px;
background: url("../../../images/task_parent_end.png") no-repeat 0 0;
}
&.ending {
position: absolute;
top: -1px;
right: 0;
width: 8px;
height: 16px;
margin-left: -4px;
background: url("../../../images/task_parent_end.png") no-repeat 0 0;
}
}
.project, .project,
.version { .version {
&.task_late, &.task_late,
@@ -126,9 +126,9 @@
color: $brand-danger; color: $brand-danger;
} }
/**
* Tooltips //== Tooltips
*/ //
.tooltip { .tooltip {
position: relative; position: relative;
@@ -136,6 +136,10 @@
&:hover { &:hover {
z-index: 25; z-index: 25;
.tip {
display: block;
}
} }
.tip { .tip {
@@ -161,10 +165,4 @@
} }
} }
} }
&:hover {
.tip {
display: block;
}
}
} }

View File

@@ -18,7 +18,8 @@ img.gravatar {
} }
// For Administration -> /users //== Administration -> /users
//
.username img.gravatar { .username img.gravatar {
position: relative; position: relative;
@@ -27,7 +28,9 @@ img.gravatar {
vertical-align: top; vertical-align: top;
} }
/* Used on 12px Gravatar img tags without the icon background */ //== Gravatar
// Used on 12px Gravatar img tags without the icon background
.icon-gravatar { .icon-gravatar {
margin-right: 5px; margin-right: 5px;
float: left; float: left;

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@
// Base64 encoded images // Base64 encoded images
// -------------------------------------------------- // --------------------------------------------------
/* ACI = AutoComplete Indicator */ // ACI = AutoComplete Indicator
%image-aci { %image-aci {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAKBAMAAAAnY0GXAAAAD1BMVEUAAACzs7Ozs7Ozs7Ozs7NJvZFvAAAABHRSTlMA5kpJG2qUMwAAABtJREFUCNdjIBMYCkMRDIg4QhBuAUUhKCIPAAAlaQNk5qF21gAAAABJRU5ErkJggg==); background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAKBAMAAAAnY0GXAAAAD1BMVEUAAACzs7Ozs7Ozs7Ozs7NJvZFvAAAABHRSTlMA5kpJG2qUMwAAABtJREFUCNdjIBMYCkMRDIg4QhBuAUUhKCIPAAAlaQNk5qF21gAAAABJRU5ErkJggg==);
} }

View File

@@ -12,8 +12,7 @@
color: $issue-text; color: $issue-text;
word-wrap: break-word; word-wrap: break-word;
@if $use-gravatars @if $use-gravatars {
{
> img.gravatar { > img.gravatar {
width: $issue-gravatar-size; width: $issue-gravatar-size;
height: $issue-gravatar-size; height: $issue-gravatar-size;
@@ -324,7 +323,7 @@ div.thumbnails {
&.hide-details { &.hide-details {
.journal, .journal,
.details, .details,
.first-of-notes:before { .first-of-notes::before {
display: none; display: none;
} }
@@ -336,7 +335,7 @@ div.thumbnails {
&.hide-notes { &.hide-notes {
.journal, .journal,
.wiki, .wiki,
.first-of-details:before { .first-of-details::before {
display: none; display: none;
} }
@@ -354,7 +353,7 @@ div.thumbnails {
margin-left: $bubble-gravatar-size + $bubble-gravatar-space; margin-left: $bubble-gravatar-size + $bubble-gravatar-space;
} }
&:before { &::before {
display: block; display: block;
position: absolute; position: absolute;
top: -($line-height-computed + 2px); top: -($line-height-computed + 2px);
@@ -366,7 +365,7 @@ div.thumbnails {
z-index: -1; z-index: -1;
} }
.tabs + &:before { .tabs + &::before {
display: none; display: none;
} }
@@ -378,7 +377,7 @@ div.thumbnails {
border-color: darken($issue-border, 25%); border-color: darken($issue-border, 25%);
@if $use-gravatars { @if $use-gravatars {
h4:before { h4::before {
border-right-color: darken($issue-border, 25%); border-right-color: darken($issue-border, 25%);
} }
} }
@@ -410,8 +409,8 @@ div.thumbnails {
h4 { h4 {
position: relative; position: relative;
&:before, &::before,
&:after { &::after {
display: block; display: block;
position: absolute; position: absolute;
top: 9px; top: 9px;
@@ -425,14 +424,14 @@ div.thumbnails {
pointer-events: none; pointer-events: none;
} }
&:after { &::after {
margin-top: 1px; margin-top: 1px;
margin-left: 2px; margin-left: 2px;
border-width: 6px; border-width: 6px;
border-right-color: $issue-bg; border-right-color: $issue-bg;
} }
&:before { &::before {
border-width: 7px; border-width: 7px;
border-right-color: $issue-border; border-right-color: $issue-border;
} }
@@ -461,7 +460,7 @@ div.thumbnails {
margin-bottom: 0; margin-bottom: 0;
} }
&:before { &::before {
display: block; display: block;
position: absolute; position: absolute;
top: 5px; top: 5px;
@@ -539,7 +538,7 @@ div.thumbnails {
> div { > div {
border-left-color: $brand-warning; border-left-color: $brand-warning;
h4:before { h4::before {
border-right-color: $brand-warning; border-right-color: $brand-warning;
} }
} }

View File

@@ -3,9 +3,8 @@
// -------------------------------------------------- // --------------------------------------------------
/** //== Component containers
* Component containers //
*/
.ui-widget { .ui-widget {
&, &,
@@ -19,9 +18,8 @@
} }
/** //== Widgets
* Widgets //
*/
.ui-widget-content { .ui-widget-content {
border: 1px solid $panel-border; border: 1px solid $panel-border;
@@ -64,9 +62,8 @@
} }
/** //== Interaction states
* Interaction states //
*/
.ui-state-default, .ui-state-default,
.ui-widget-content .ui-state-default, .ui-widget-content .ui-state-default,
@@ -134,9 +131,8 @@
} }
/** //== Menu (e.g. autocomplete)
* Menu (e.g. autocomplete) //
*/
.ui-menu { .ui-menu {
padding: 3px; padding: 3px;
@@ -149,9 +145,8 @@
} }
/** //== Dialogs
* Dialogs //
*/
.modal { .modal {
background: $body-bg; background: $body-bg;
@@ -192,9 +187,8 @@
} }
/** //== Datepicker
* Datepicker //
*/
img.ui-datepicker-trigger { img.ui-datepicker-trigger {
margin-left: 4px; margin-left: 4px;

View File

@@ -7,15 +7,7 @@
.box & { .box & {
padding: 0; padding: 0;
}
button {
margin-bottom: 5px;
box-shadow: none;
vertical-align: top;
}
.box & {
button { button {
margin-right: 2px; margin-right: 2px;
} }
@@ -42,10 +34,15 @@
} }
} }
} }
button {
margin-bottom: 5px;
box-shadow: none;
vertical-align: top;
}
} }
@if $use-font-awesome @if $use-font-awesome {
{
.jstElements { .jstElements {
%jstb-icon { %jstb-icon {
padding: 0; padding: 0;
@@ -54,7 +51,7 @@
color: $btn-default-color; color: $btn-default-color;
@include fa-icon(); @include fa-icon();
&:before { &::before {
text-align: center; text-align: center;
} }
} }
@@ -62,97 +59,97 @@
.jstb_strong { .jstb_strong {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-bold; } &::before { content: $fa-var-bold; }
} }
.jstb_em { .jstb_em {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-italic; } &::before { content: $fa-var-italic; }
} }
.jstb_ins { .jstb_ins {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-underline; } &::before { content: $fa-var-underline; }
} }
.jstb_del { .jstb_del {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-strikethrough; } &::before { content: $fa-var-strikethrough; }
} }
.jstb_code { .jstb_code {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-code; } &::before { content: $fa-var-code; }
} }
.jstb_h1 { .jstb_h1 {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-header; } &::before { content: $fa-var-header; }
} }
.jstb_h2 { .jstb_h2 {
@extend %jstb-icon; @extend %jstb-icon;
&:before { font-size: .7857em; content: $fa-var-header; } &::before { font-size: .7857em; content: $fa-var-header; }
} }
.jstb_h3 { .jstb_h3 {
@extend %jstb-icon; @extend %jstb-icon;
&:before { font-size: .6429em; content: $fa-var-header; } &::before { font-size: .6429em; content: $fa-var-header; }
} }
.jstb_ul { .jstb_ul {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-list-ul; } &::before { content: $fa-var-list-ul; }
} }
.jstb_ol { .jstb_ol {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-list-ol; } &::before { content: $fa-var-list-ol; }
} }
.jstb_bq { .jstb_bq {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-indent; } &::before { content: $fa-var-indent; }
} }
.jstb_unbq { .jstb_unbq {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-outdent; } &::before { content: $fa-var-outdent; }
} }
.jstb_pre { .jstb_pre {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-terminal; } &::before { content: $fa-var-terminal; }
} }
.jstb_link { .jstb_link {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-link; } &::before { content: $fa-var-link; }
} }
.jstb_img { .jstb_img {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-image; } &::before { content: $fa-var-image; }
} }
.jstb_cut { .jstb_cut {
@extend %jstb-icon; @extend %jstb-icon;
&:before { content: $fa-var-scissors; } &::before { content: $fa-var-scissors; }
} }
.jstb_precode, .jstb_precode,
@@ -161,7 +158,7 @@
@extend %jstb-icon; @extend %jstb-icon;
color: $brand-danger; color: $brand-danger;
&:before { content: $fa-var-code; } &::before { content: $fa-var-code; }
} }
button.jstb_help { button.jstb_help {
@@ -172,7 +169,7 @@
color: $link-hover-color; color: $link-hover-color;
} }
&:before { content: $fa-var-question-circle; } &::before { content: $fa-var-question-circle; }
} }
} }
} }

View File

@@ -7,6 +7,10 @@ table.list {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
font-size: $font-size-list; font-size: $font-size-list;
.autoscroll & {
margin-bottom: 0;
}
th, th,
.table-list-header { .table-list-header {
padding: $table-cell-padding; padding: $table-cell-padding;
@@ -23,12 +27,6 @@ table.list {
tr.ui-sortable-helper { tr.ui-sortable-helper {
background-color: $highlight-bg; background-color: $highlight-bg;
} }
}
table.list {
.autoscroll & {
margin-bottom: 0;
}
@if $table-list-highlight-rows { @if $table-list-highlight-rows {
> tbody > tr:hover { > tbody > tr:hover {
@@ -282,9 +280,9 @@ tr.entry {
} }
/** //== Priorities
* Priorities //
*/
// scss-lint:disable SpaceAfterComma // scss-lint:disable SpaceAfterComma
@if $color-priorities { @if $color-priorities {
@include priority(".priority-lowest", $priority-lowest-bg, $priority-lowest-text, $priority-lowest-link); @include priority(".priority-lowest", $priority-lowest-bg, $priority-lowest-text, $priority-lowest-link);
@@ -325,7 +323,7 @@ tr.entry {
color: mix($tracker-default-text, $tracker-default-bg, 75%); color: mix($tracker-default-text, $tracker-default-bg, 75%);
text-decoration: none; text-decoration: none;
&:after { &::after {
display: block; display: block;
position: absolute; position: absolute;
right: 5px; right: 5px;
@@ -338,7 +336,7 @@ tr.entry {
@include transition(border-color .1s); @include transition(border-color .1s);
} }
&:hover:after { &:hover::after {
border-top-color: rgba($tracker-default-text, .25); border-top-color: rgba($tracker-default-text, .25);
} }
} }
@@ -348,7 +346,7 @@ tr.entry {
display: block; display: block;
padding: $tracker-list-padding; padding: $tracker-list-padding;
&:before { &::before {
color: mix($tracker-default-text, $tracker-default-bg, 50%); color: mix($tracker-default-text, $tracker-default-bg, 50%);
content: "#"; content: "#";
} }
@@ -386,9 +384,8 @@ tr.entry {
} }
/** //== List groups
* List groups //
*/
tr.group { tr.group {
> td { > td {
@@ -429,9 +426,8 @@ tr.group {
} }
/** //== Time entry in report
* Time entry in report //
*/
tr.time-entry { tr.time-entry {
text-align: center; text-align: center;
@@ -484,9 +480,8 @@ tr.time-entry {
} }
} }
/** //== Wiki page history entry
* Wiki page history entry //
*/
tr.wiki-page-version { tr.wiki-page-version {
td.updated_on, td.updated_on,
@@ -495,9 +490,8 @@ tr.wiki-page-version {
} }
} }
/** //== Project versions list
* Project versions list //
*/
tr.version { tr.version {
&.closed { &.closed {
@@ -519,9 +513,8 @@ tr.version {
} }
/** //== Users list
* Users list //
*/
tr.user { tr.user {
td { td {
@@ -549,9 +542,8 @@ tr.user {
} }
/** //== Plugins list
* Plugins list //
*/
table.plugins { table.plugins {
.configure { .configure {
@@ -571,9 +563,8 @@ table.plugins {
} }
/** //== Files list
* Files list //
*/
table.files { table.files {
tbody th { tbody th {
@@ -593,9 +584,8 @@ table.files {
} }
/** //== Admin lists
* Admin lists //
*/
.controller-enumerations { .controller-enumerations {
td.name { td.name {
@@ -610,9 +600,8 @@ table.files {
} }
/** //== Totals
* Totals //
*/
.query-totals { .query-totals {
> span { > span {
@@ -626,4 +615,4 @@ table.files {
.value { .value {
font-weight: $font-weight-bold; font-weight: $font-weight-bold;
} }
} }

View File

@@ -62,7 +62,7 @@
color: $icon-success-color; color: $icon-success-color;
} }
&:before { &::before {
content: $fa-var-clock-o; content: $fa-var-clock-o;
} }
} }
@@ -75,7 +75,7 @@
color: $icon-danger-color; color: $icon-danger-color;
} }
&:before { &::before {
content: $fa-var-history; content: $fa-var-history;
} }
} }

View File

@@ -20,7 +20,7 @@
background-position: 0 center; background-position: 0 center;
} }
span.project:after { span.project::after {
content: " -"; content: " -";
} }

View File

@@ -24,10 +24,10 @@
display: -ms-flexbox; display: -ms-flexbox;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
height: $line-height-computed + $tab-padding-vertical * 2 + 1px;
-webkit-flex-wrap: nowrap; -webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
height: $line-height-computed + $tab-padding-vertical * 2 + 1px;
} @else { } @else {
width: 2000px; width: 2000px;
@extend %clearfix; @extend %clearfix;
@@ -114,9 +114,8 @@
} }
} }
/** //== Specific tabs content layout
* Specific tabs content layout //
*/
#tab-content-modules fieldset p { #tab-content-modules fieldset p {
margin: 3px 0 4px; margin: 3px 0 4px;

View File

@@ -42,7 +42,7 @@
@if $use-font-awesome { @if $use-font-awesome {
font-size: 14px; font-size: 14px;
&:before { &::before {
content: $fa-var-caret-square-o-down; content: $fa-var-caret-square-o-down;
} }
} @else { } @else {
@@ -54,7 +54,7 @@
color: mix($top-menu-link, $top-menu-bg, 33%); color: mix($top-menu-link, $top-menu-bg, 33%);
line-height: 1; line-height: 1;
&:before { &::before {
margin-right: 0; margin-right: 0;
} }
@@ -79,7 +79,7 @@
&.expanded { &.expanded {
@if $use-font-awesome { @if $use-font-awesome {
&:before { &::before {
content: $fa-var-caret-square-o-up; content: $fa-var-caret-square-o-up;
} }
} @else { } @else {
@@ -360,6 +360,7 @@
} }
.tabs-buttons { .tabs-buttons {
// scss-lint:disable ImportantRule
display: none !important; display: none !important;
padding-left: 0; padding-left: 0;
background-color: $main-menu-bg; background-color: $main-menu-bg;
@@ -371,6 +372,7 @@
} }
ul + .tabs-buttons { ul + .tabs-buttons {
// scss-lint:disable ImportantRule
display: block !important; display: block !important;
} }
} }

View File

@@ -3,18 +3,14 @@
font-size: $wiki-font-size; font-size: $wiki-font-size;
@if $wiki-page-more-vertical-space { @if $wiki-page-more-vertical-space {
/** // Anchors will make headers more separated,
* Anchors will make headers more separated, // and it will look better when you open page with hash in URL
* and it will look better when you open page with hash in URL
*/
a[name]:empty { a[name]:empty {
display: block; display: block;
overflow: hidden; overflow: hidden;
} }
/** // Add some space between list items
* Add some space between list items
*/
ul, ul,
ol { ol {
li { li {
@@ -55,21 +51,36 @@ div.wiki {
line-height: $headings-line-height; line-height: $headings-line-height;
} }
h1, .h1 { font-size: $font-size-h1; line-height: 1.2; } h1, .h1 {
h2, .h2 { font-size: $font-size-h2; line-height: 1.225; } padding-bottom: .3em;
h3, .h3 { font-size: $font-size-h3; line-height: 1.43; } border-bottom: 1px solid $gray-lighter;
h4, .h4 { font-size: $font-size-h4; } font-size: $font-size-h1;
h5, .h5 { font-size: $font-size-h5; } line-height: 1.2;
h6, .h6 { font-size: $font-size-h6; } }
h1, .h1,
h2, .h2 { h2, .h2 {
padding-bottom: .3em; padding-bottom: .3em;
border-bottom: 1px solid $gray-lighter; border-bottom: 1px solid $gray-lighter;
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 { h6, .h6 {
color: $gray; color: $gray;
font-size: $font-size-h6;
} }
.text-normal { .text-normal {
@@ -93,7 +104,7 @@ div.wiki {
+ h4, + h4,
+ h5, + h5,
+ h6 { + h6 {
&:before { &::before {
display: inline-block; display: inline-block;
width: .7em; width: .7em;
margin-left: -.7em; margin-left: -.7em;
@@ -336,7 +347,7 @@ h6 {
p.footnote { p.footnote {
margin-bottom: 5px; margin-bottom: 5px;
&:before { &::before {
display: block; display: block;
width: 300px; width: 300px;
margin-top: $line-height-computed; margin-top: $line-height-computed;
@@ -345,7 +356,7 @@ p.footnote {
content: ""; content: "";
} }
+ p.footnote:before { + p.footnote::before {
display: none; display: none;
} }
} }
@@ -382,10 +393,10 @@ p.footnote {
// Custom classes for Bootstrap-like features // Custom classes for Bootstrap-like features
// -------------------------------------------------- // --------------------------------------------------
/**
* Pager // Pager
* see: http://getbootstrap.com/components/#pagination-pager // see: http://getbootstrap.com/components/#pagination-pager
*/
.wiki-pager { .wiki-pager {
> a { > a {
display: inline-block; display: inline-block;
@@ -417,12 +428,13 @@ p.footnote {
} }
} }
/**
* Typographic helper classes //== Typographic helper classes
*/ //
// Lead body copy // Lead body copy
// see: http://getbootstrap.com/css/#lead-body-copy // see: http://getbootstrap.com/css/#lead-body-copy
.lead { .lead {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
font-size: floor(($font-size-base * 1.15)); font-size: floor(($font-size-base * 1.15));
@@ -434,24 +446,27 @@ p.footnote {
} }
} }
// Alignment // Alignment
// see: http://getbootstrap.com/css/#type-alignment // see: http://getbootstrap.com/css/#type-alignment
.text-left { text-align: left; } .text-left { text-align: left; }
.text-right { text-align: right; } .text-right { text-align: right; }
.text-center { text-align: center; } .text-center { text-align: center; }
.text-justify { text-align: justify; } .text-justify { text-align: justify; }
.text-nowrap { white-space: nowrap; } .text-nowrap { white-space: nowrap; }
// Transformation // Transformation
// see: http://getbootstrap.com/css/#type-transformation // see: http://getbootstrap.com/css/#type-transformation
.text-lowercase { text-transform: lowercase; } .text-lowercase { text-transform: lowercase; }
.text-uppercase { text-transform: uppercase; } .text-uppercase { text-transform: uppercase; }
.text-capitalize { text-transform: capitalize; } .text-capitalize { text-transform: capitalize; }
/**
* Other helper classes // Other helper classes
* see: http://getbootstrap.com/css/#helper-classes // see: http://getbootstrap.com/css/#helper-classes
*/
.text-muted { color: $gray-light; } .text-muted { color: $gray-light; }
.text-primary { color: $brand-primary; } .text-primary { color: $brand-primary; }

View File

@@ -44,7 +44,7 @@
color: $gray-light; color: $gray-light;
line-height: 1; line-height: 1;
&:before { &::before {
margin-right: 0; margin-right: 0;
} }
@@ -71,7 +71,7 @@
left: $toggler-position-h; left: $toggler-position-h;
@if $use-font-awesome { @if $use-font-awesome {
&:before { &::before {
content: $fa-var-caret-square-o-left; content: $fa-var-caret-square-o-left;
} }
} @else { } @else {
@@ -81,7 +81,7 @@
right: $toggler-position-h; right: $toggler-position-h;
@if $use-font-awesome { @if $use-font-awesome {
&:before { &::before {
content: $fa-var-caret-square-o-right; content: $fa-var-caret-square-o-right;
} }
} @else { } @else {
@@ -92,7 +92,7 @@
&.sidebar-hidden { &.sidebar-hidden {
@if $sidebar-position == "left" { @if $sidebar-position == "left" {
@if $use-font-awesome { @if $use-font-awesome {
&:before { &::before {
content: $fa-var-caret-square-o-right; content: $fa-var-caret-square-o-right;
} }
} @else { } @else {
@@ -100,7 +100,7 @@
} }
} @else { } @else {
@if $use-font-awesome { @if $use-font-awesome {
&:before { &::before {
content: $fa-var-caret-square-o-left; content: $fa-var-caret-square-o-left;
} }
} @else { } @else {

View File

@@ -2,7 +2,7 @@
// //
// For modern browsers // For modern browsers
// 1. The use of `table` rather than `block` is only necessary if using // 1. The use of `table` rather than `block` is only necessary if using
// `:before` to contain the top-margins of child elements. // `::before` to contain the top-margins of child elements.
// 2. The space content is one way to avoid an Opera bug when the // 2. The space content is one way to avoid an Opera bug when the
// contenteditable attribute is included anywhere else in the document. // contenteditable attribute is included anywhere else in the document.
// Otherwise it causes space to appear at the top and bottom of elements // Otherwise it causes space to appear at the top and bottom of elements
@@ -11,13 +11,13 @@
// Source: http://nicolasgallagher.com/micro-clearfix-hack/ // Source: http://nicolasgallagher.com/micro-clearfix-hack/
@mixin clearfix() { @mixin clearfix() {
&:before, &::before,
&:after { &::after {
display: table; // 1 display: table; // 1
content: " "; // 2 content: " "; // 2
} }
&:after { &::after {
clear: both; clear: both;
} }
} }
@@ -26,7 +26,7 @@
// Lighter (for output CSS) cleafix with placeholder // Lighter (for output CSS) cleafix with placeholder
%clearfix { %clearfix {
&:after { &::after {
display: table; display: table;
clear: both; clear: both;
content: ""; content: "";

View File

@@ -154,18 +154,18 @@
&.closed { &.closed {
color: mix($color, $background, 75%); color: mix($color, $background, 75%);
&:after { &::after {
border-top-color: rgba($color, .95); border-top-color: rgba($color, .95);
} }
&:hover:after { &:hover::after {
border-top-color: rgba($color, .25); border-top-color: rgba($color, .25);
} }
} }
} }
tr#{$parent} .id > a { tr#{$parent} .id > a {
&:before { &::before {
color: mix($color, $background, 50%); color: mix($color, $background, 50%);
} }
} }

View File

@@ -2,21 +2,17 @@
@mixin nice-shadow($depth: 1) { @mixin nice-shadow($depth: 1) {
$shadow: none; $shadow: none;
@if ($depth == 1) { @if ($depth == 1) {
// $shadow: 0 3px 1px -2px rgba(#000, .14), 0 2px 2px 0 rgba(#000, .098), 0 1px 5px 0 rgba(#000, .082);
$shadow: 0 1px 3px rgba(#000, .12), 0 1px 2px rgba(#000, .24); $shadow: 0 1px 3px rgba(#000, .12), 0 1px 2px rgba(#000, .24);
} @elseif ($depth == 2) { } @elseif ($depth == 2) {
// $shadow: 0 2px 4px -1px rgba(#000, .14), 0 4px 5px 0 rgba(#000, .098), 0 1px 10px 0 rgba(#000, .082)
$shadow: 0 3px 6px rgba(#000, .16), 0 3px 6px rgba(#000, .23); $shadow: 0 3px 6px rgba(#000, .16), 0 3px 6px rgba(#000, .23);
} @elseif ($depth == 3) { } @elseif ($depth == 3) {
// $shadow: 0 3px 5px -1px rgba(#000, .14), 0 6px 10px 0 rgba(#000, .098), 0 1px 18px 0 rgba(#000, .082)
$shadow: 0 10px 18px rgba(#000, .19), 0 6px 8px rgba(#000, .23); $shadow: 0 10px 18px rgba(#000, .19), 0 6px 8px rgba(#000, .23);
} @elseif ($depth == 4) { } @elseif ($depth == 4) {
// $shadow: 0 5px 5px -3px rgba(#000, .14), 0 8px 10px 1px rgba(#000, .098), 0 3px 14px 2px rgba(#000, .082)
$shadow: 0 14px 28px rgba(#000, .25), 0 10px 10px rgba(#000, .22); $shadow: 0 14px 28px rgba(#000, .25), 0 10px 10px rgba(#000, .22);
} @elseif ($depth == 5) { } @elseif ($depth == 5) {
// $shadow: 0 8px 10px -5px rgba(#000, .14), 0 16px 24px 2px rgba(#000, .098), 0 6px 30px 5px rgba(#000, .082) $shadow: 0 19px 38px rgba(#000, .3), 0 15px 12px rgba(#000, .22);
$shadow: 0 19px 38px rgba(#000, .30), 0 15px 12px rgba(#000, .22);
} }
box-shadow: $shadow; box-shadow: $shadow;

View File

@@ -43,9 +43,8 @@ a {
} }
/** //== Form elements
* Form elements //
*/
button, button,
input, input,
@@ -119,9 +118,8 @@ button.ui-multiselect {
} }
/** //== Top toolbar
* Top toolbar //
*/
#toolbar { #toolbar {
display: block; display: block;
@@ -214,9 +212,8 @@ button.ui-multiselect {
} }
/** //== Other elements
* Other elements //
*/
.clearfix { .clearfix {
@include clearfix; @include clearfix;
@@ -234,12 +231,9 @@ button.ui-multiselect {
display: none; display: none;
} }
/** // .editor is the classname for field editors of sprint,
* .editor is the classname for field editors of sprint, // story, task, impediment. These field editors get created
* story, task, impediment. These field editors get created // at runtime whenever any of the above models are edited.
* at runtime whenever any of the above models are edited.
*/
.ui-dialog .editor { .ui-dialog .editor {
display: block; display: block;
} }
@@ -248,9 +242,9 @@ ul.ui-sortable {
min-height: 20px; min-height: 20px;
} }
/** //== Story tooltip
* Story tooltip //
*/
.ui-tooltip { .ui-tooltip {
.ui-tooltip-content { .ui-tooltip-content {
hr { hr {
@@ -294,9 +288,8 @@ ul.ui-sortable {
display: none; display: none;
} }
/** //== drag-drop effect: disabled dropzones are greyed out
* drag-drop effect: disabled dropzones are greyed out //
*/
.rb-sortable-disabled, .rb-sortable-disabled,
.ui-sortable-disabled { .ui-sortable-disabled {
@@ -310,9 +303,8 @@ ul.ui-sortable {
} }
/** //== Fix jQuery-UI datepicker
* Fix jQuery-UI datepicker //
*/
body { body {
.ui-widget { .ui-widget {

View File

@@ -1,4 +1,4 @@
// scss-lint:disable ImportantRule // scss-lint:disable Comment ImportantRule
@import "../common"; @import "../common";
/* /*
@@ -32,7 +32,7 @@
.ui-helper-clearfix { .ui-helper-clearfix {
display: inline-block; display: inline-block;
&:after { &::after {
display: block; display: block;
height: 0; height: 0;
clear: both; clear: both;
@@ -521,7 +521,7 @@
.ui-widget-overlay { .ui-widget-overlay {
background: #000; background: #000;
opacity: .30; opacity: .3;
} }
.ui-widget-shadow { .ui-widget-shadow {
@@ -529,7 +529,7 @@
padding: 8px; padding: 8px;
border-radius: 8px; border-radius: 8px;
background: #aaa; background: #aaa;
opacity: .30; opacity: .3;
} }
/* Resizable /* Resizable

View File

@@ -112,8 +112,7 @@
} }
} }
/* remove label borders in IE6 because IE6 does not support transparency */ // Remove label borders in IE6 because IE6 does not support transparency
* html .ui-multiselect-checkboxes label { * html .ui-multiselect-checkboxes label {
border: 0 none; border: 0 none;
} }

View File

@@ -23,7 +23,7 @@ $story-sp-input-width: 50px;
background-color: $background; background-color: $background;
color: $color; color: $color;
&:before { &::before {
color: mix($color, $background, 50%); color: mix($color, $background, 50%);
} }
@@ -38,21 +38,18 @@ $story-sp-input-width: 50px;
} }
/** // Reserved classes are
* reserved classes are // .backlog (used in master_backlog.js to initialize all backlogs)
* .backlog (used in master_backlog.js to initialize all backlogs) // .model (used in backlog.js editable_inplace.js model.js)
* .model (used in backlog.js editable_inplace.js model.js) // .sprint (used in backlog.js
* .sprint (used in backlog.js // .stories (used in backlog.js for sortable)
* .stories (used in backlog.js for sortable) // .editor
* .editor // .editable (bind click on)
* .editable (bind click on) // .close_sprint (bind click on)
* .close_sprint (bind click on)
*/
/** //== Fluid, 2-colum layout
* fluid, 2-colum layout //
*/
#backlogs_container { #backlogs_container {
padding: ($padding-side / 2) ($padding-side / 4); padding: ($padding-side / 2) ($padding-side / 4);
@@ -92,9 +89,8 @@ $story-sp-input-width: 50px;
} }
/** //== Fixed-Fluid-Fixed layout
* Fixed-Fluid-Fixed layout //
*/
.fff-wrapmiddle { .fff-wrapmiddle {
width: 100%; width: 100%;
@@ -146,18 +142,16 @@ $story-sp-input-width: 50px;
} }
/** //== Just some space at the bottom of the page
* Just some space at the bottom of the page //
*/
#dummy_backlog_container { #dummy_backlog_container {
height: 150px; height: 150px;
} }
/** //== Base backlog container
* Base backlog container //
*/
#backlogs_container { #backlogs_container {
.closedbacklog, .closedbacklog,
@@ -176,9 +170,8 @@ $story-sp-input-width: 50px;
} }
/** //== Backlog header
* Backlog header //
*/
#backlogs_container { #backlogs_container {
.header { .header {
@@ -419,15 +412,13 @@ $story-sp-input-width: 50px;
.headertext { .headertext {
cursor: default; cursor: default;
/*we have model class here, but are not editable*/
} }
} }
} }
/** //== Backlog items
* Backlog items //
*/
#backlogs_container { #backlogs_container {
.stories { .stories {
@@ -501,7 +492,7 @@ $story-sp-input-width: 50px;
font-weight: $font-weight-bold; font-weight: $font-weight-bold;
text-align: right; text-align: right;
&:before { &::before {
margin-left: -1em; margin-left: -1em;
@if $color-trackers { @if $color-trackers {
color: mix($tracker-default-text, $tracker-default-bg, 50%); color: mix($tracker-default-text, $tracker-default-bg, 50%);
@@ -689,10 +680,7 @@ $story-sp-input-width: 50px;
cursor: default; cursor: default;
} }
/** // Override: display story subject in multiple lines
* override: display story subject in multiple lines
*/
.rb-multilinesubject & .subject { .rb-multilinesubject & .subject {
height: auto; height: auto;
white-space: normal; white-space: normal;
@@ -711,9 +699,8 @@ $story-sp-input-width: 50px;
} }
/** //== Dialog
* dialog //
*/
.ui-dialog { .ui-dialog {
.ui-dialog-titlebar-close { .ui-dialog-titlebar-close {
@@ -753,9 +740,8 @@ $story-sp-input-width: 50px;
} }
/** //== In-place Sprint Editor
* In-place Sprint Editor //
*/
#backlogs_container { #backlogs_container {
@@ -798,7 +784,9 @@ $story-sp-input-width: 50px;
} }
} }
/* In-place Story Editor */
//== In-place Story Editor
//
.debug { .debug {
.story { .story {
@@ -826,18 +814,20 @@ $story-sp-input-width: 50px;
} }
} }
/* Naive but light handling of colors by user stories tracker */
/* datepicker bugfix: hide until it opens itself */ //== Completed sprints
//
.ui-datepicker {
display: none;
}
/* show completed sprints */
#show_completed_sprints { #show_completed_sprints {
margin-left: $padding-side / 2; margin-left: $padding-side / 2;
color: $gray-darkest; color: $gray-darkest;
cursor: pointer; cursor: pointer;
} }
//== Datepicker bugfix: hide until it opens itself
//
.ui-datepicker {
display: none;
}

View File

@@ -43,14 +43,14 @@ $swimlane-width: $issue-width + 2 * ($issue-margin + $issue-paddi
} }
/** //== Swimlane
* swimlane class is used by: //
* - #board_header // Swimlane class is used by:
* - .board // - #board_header
* // - .board
* Also use by the Column Width preference to determine the unit width of the // Also use by the Column Width preference to determine the unit width of the
* swimlanes. See RB.Taskboard.initialize() // swimlanes. See RB.Taskboard.initialize()
*/ //
.swimlane { .swimlane {
width: $swimlane-width; width: $swimlane-width;
@@ -58,7 +58,9 @@ $swimlane-width: $issue-width + 2 * ($issue-margin + $issue-paddi
padding: 5px; padding: 5px;
} }
/* status labels */
//== Status labels
//
#board_header { #board_header {
position: absolute; position: absolute;
@@ -208,7 +210,9 @@ $swimlane-width: $issue-width + 2 * ($issue-margin + $issue-paddi
} }
} }
/* item styles used by .task and .impediment */
//== Item styles used by .task and .impediment
//
#taskboard { #taskboard {
.issue, .issue,
@@ -361,7 +365,9 @@ $swimlane-width: $issue-width + 2 * ($issue-margin + $issue-paddi
} }
} }
/* dialog */
//== Dialog
//
.rb_editor_dialog.ui-dialog { .rb_editor_dialog.ui-dialog {
.ui-dialog-titlebar-close { .ui-dialog-titlebar-close {
@@ -392,7 +398,9 @@ $swimlane-width: $issue-width + 2 * ($issue-margin + $issue-paddi
} }
} }
/* item editor */
//== Item editor
//
.rb_editor { .rb_editor {
label { label {
@@ -432,7 +440,9 @@ $swimlane-width: $issue-width + 2 * ($issue-margin + $issue-paddi
} }
} }
/* others */
//== Others
//
#impediment_template, #impediment_template,
#task_template { #task_template {