diff --git a/app/backlog.jade b/app/backlog.jade index bc5f0816..5b0b1a71 100644 --- a/app/backlog.jade +++ b/app/backlog.jade @@ -8,18 +8,18 @@ block content include views/components/mainTitle include views/components/summary include views/modules/burndown - div.sub-menu - a(href="", title="Move to Current Sprint") - span.ico(data-icon="") + div.backlog-menu + a.trans-button(href="", title="Move to Current Sprint") + span.icon.icon-move span.text Move to current Sprint - a(href="", title="Show Filters") - span.ico(data-icon="") + a.trans-button(href="", title="Show Filters") + span.icon.icon-filter span.text Show Filters - a(href="", title="Show Tags") - span.ico(data-icon="") + a.trans-button(href="", title="Show Tags") + span.icon.icon-tag span.text Show Tags include views/components/addnewus - include views/modules/backlog-table + include views/modules/backlog-table sidebar.menu-secondary.sidebar header h2 Sprints diff --git a/app/fonts/taiga.eot b/app/fonts/taiga.eot index 41fb462c..70b0097c 100644 Binary files a/app/fonts/taiga.eot and b/app/fonts/taiga.eot differ diff --git a/app/fonts/taiga.svg b/app/fonts/taiga.svg index b1e71d79..fa76156c 100644 --- a/app/fonts/taiga.svg +++ b/app/fonts/taiga.svg @@ -14,4 +14,8 @@ + + + + diff --git a/app/fonts/taiga.ttf b/app/fonts/taiga.ttf index 65fdb758..9954af74 100644 Binary files a/app/fonts/taiga.ttf and b/app/fonts/taiga.ttf differ diff --git a/app/fonts/taiga.woff b/app/fonts/taiga.woff index fa1c6c7c..ef70dfc3 100644 Binary files a/app/fonts/taiga.woff and b/app/fonts/taiga.woff differ diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index 3bfe4c45..d3b8a0ac 100755 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -1 +1,54 @@ /* Buttons components */ +.trans-button { + font-family: 'ostrichSans'; + @extend .large; + &:hover { + @include transition (color .3s linear); + color: $greenTaiga; + } + .icon { + margin-right: .3rem; + } +} + +.button{ + font-family: 'ostrichSans'; + @extend .large; + padding: 5px 40px; + height: 32px; + display: inline-block; + .icon { + margin-right: .3rem; + } +} + +.button-green { + @extend .button; + background: $greenTaiga; + span { + color: $white; + } + &:hover { + @include transition (background .3s linear); + background: $freshTaiga; + } +} + +.button-bulk { + @extend .button; + background: $greenTaiga; + font-size: 22px; + padding: 5px; + vertical-align: middle; + margin-left: 2px; + span { + color: $white; + } + .icon { + margin-right: 0; + } + &:hover { + @include transition (background .3s linear); + background: $freshTaiga; + } +} diff --git a/app/styles/components/summary.scss b/app/styles/components/summary.scss index 723aaa1c..d443ae22 100644 --- a/app/styles/components/summary.scss +++ b/app/styles/components/summary.scss @@ -1,7 +1,8 @@ .summary { - background: $blackish; + background: $grayer; color: $white; padding: 1em; + margin-bottom: 2rem; @include clearfix; ul { margin: 0; @@ -47,14 +48,14 @@ font-family: 'DroidSans-Bold'; @extend .xlarge; float: left; - margin-right: .2em; + margin-right: .2rem; } .description { font-family: 'DroidSans'; @extend .small; float: left; - line-height: 1em; + line-height: .9rem; position: relative; - top: -2px; + top: -6px; } diff --git a/app/styles/dependencies/colors.scss b/app/styles/dependencies/colors.scss index 6cd1975c..ec331e1a 100755 --- a/app/styles/dependencies/colors.scss +++ b/app/styles/dependencies/colors.scss @@ -3,6 +3,7 @@ $black: #000000; $blackish: #050505; $gray: #555555; +$grayer: #444444; $grayLight: #cdcdcd; $whitish: #f5f5f5; $white: #FFFFFF; diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss index 642ad82a..dbe6de08 100755 --- a/app/styles/dependencies/typography.scss +++ b/app/styles/dependencies/typography.scss @@ -111,3 +111,15 @@ a, a:visited { .icon-settings:before { content: "g"; } +.icon-move:before { + content: "i"; +} +.icon-filter:before { + content: "j"; +} +.icon-tag:before { + content: "k"; +} +.icon-bulk:before { + content: "l"; +} diff --git a/app/styles/layout/backlog.scss b/app/styles/layout/backlog.scss index 1b32ab7d..20bb4b92 100644 --- a/app/styles/layout/backlog.scss +++ b/app/styles/layout/backlog.scss @@ -1,2 +1,18 @@ .backlog { } + +.backlog-menu { + background: $whitish; + color: $blackish; + padding: 1em; + margin-bottom: 2rem; + @include clearfix; +} + +.trans-button { + margin-right: 1rem; +} + +.new-us { + float: right; +} diff --git a/app/styles/main.scss b/app/styles/main.scss index fa6701ad..256f8af5 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -28,6 +28,7 @@ $prefix-for-spec: true; //Modules @import 'modules/nav'; @import 'modules/sidebar'; +@import 'modules/burndown'; // Responsive @import 'responsive/mobile'; diff --git a/app/styles/modules/burndown.scss b/app/styles/modules/burndown.scss new file mode 100644 index 00000000..3a040ac7 --- /dev/null +++ b/app/styles/modules/burndown.scss @@ -0,0 +1,6 @@ +.burndown { + width: 100%; + height: 200px; + background: $whitish; + margin-bottom: 2rem; +} diff --git a/app/views/components/addnewus.jade b/app/views/components/addnewus.jade index 0557e1b2..cb71e179 100644 --- a/app/views/components/addnewus.jade +++ b/app/views/components/addnewus.jade @@ -1,5 +1,5 @@ div.new-us - a.button.green(href="", title="Add New US") - span.text +Add new US - a.button.bulk(href="", title="Bulk") - span.ico(data-icon="") + a.button-green(href="", title="Add New US") + span.text + Add new US + a.button-bulk(href="", title="Bulk") + span.icon.icon-bulk diff --git a/app/views/modules/burndown.jade b/app/views/modules/burndown.jade index dee66891..5e074442 100644 --- a/app/views/modules/burndown.jade +++ b/app/views/modules/burndown.jade @@ -1,2 +1,2 @@ -section.graph-container - div.graph +section.burndown-container + div.burndown