diff --git a/app/fonts/taiga.eot b/app/fonts/taiga.eot index 7f837d60..7c1775dd 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 7ba40fbc..07f72bc7 100644 --- a/app/fonts/taiga.svg +++ b/app/fonts/taiga.svg @@ -24,4 +24,5 @@ + diff --git a/app/fonts/taiga.ttf b/app/fonts/taiga.ttf index ac83d548..b6400351 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 539ee37b..9203115f 100644 Binary files a/app/fonts/taiga.woff and b/app/fonts/taiga.woff differ diff --git a/app/styles/components/summary.scss b/app/styles/components/summary.scss index 0edcab10..8e5482a9 100644 --- a/app/styles/components/summary.scss +++ b/app/styles/components/summary.scss @@ -7,14 +7,11 @@ ul { margin: 0; padding: 0; - float: left; - margin-top: 4px; - width: 50%; + display: inline-block; } li { - float: left; - display: block; - margin-right: 4%; + display: inline-block; + margin-right: 1rem; } .data { float: left; @@ -22,27 +19,34 @@ margin-right: 1.5em; .number { color: $freshTaiga; + top: 0; } + + } + .icon{ + @extend .large; + float: left; } .number { font-family: 'DroidSans-Bold'; @extend .xlarge; float: left; - margin-right: .2rem; + margin-right: .3rem; + position: relative; + top: 5px; } .description { - font-family: 'DroidSans'; - @extend .small; - float: left; + font-family: DroidSans; line-height: .9rem; - position: relative; - top: -6px; + /* line-height: 0; */ + float: left; + @extend .small; } } .summary-progress-bar { - height: 30px; + height: 26px; margin-bottom: 0; margin-right: 10px; background: $whitish; @@ -55,6 +59,24 @@ left: 2px; width: calc(30% - 4px); background: $freshTaiga; - height: 24px; + height: 20px; + } +} + + +.large-summary{ + ul { + margin-right: 1rem; + border-right: 1px solid $whitish; + &:last-child { + margin-right: 0; + } + &:last-child { + border-right: none; + } + } + .icon { + @extend .xlarge; + margin-right: .4rem; } } diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss index a082b655..4f103e3f 100755 --- a/app/styles/dependencies/typography.scss +++ b/app/styles/dependencies/typography.scss @@ -35,12 +35,14 @@ h1 { margin-bottom: 1rem; span { @include ellipsis(250px); + margin-right: .5rem; } .green { color: $greenTaiga; } .date { color: $grayLight; + @include ellipsis(500px); } } @@ -153,3 +155,6 @@ a, a:visited { .icon-delete:before { content: "q"; } +.icon-iocaine:before { + content: "r"; +} diff --git a/app/taskboard.jade b/app/taskboard.jade index ff13afbd..473280d7 100644 --- a/app/taskboard.jade +++ b/app/taskboard.jade @@ -9,3 +9,4 @@ block content span ProjectName span.green Sprint Name span.date 02/10/2014-15/10/2014 + include views/components/large-summary diff --git a/app/views/components/large-summary.jade b/app/views/components/large-summary.jade new file mode 100644 index 00000000..2f670a48 --- /dev/null +++ b/app/views/components/large-summary.jade @@ -0,0 +1,36 @@ +div.summary.large-summary + div.summary-progress-bar + div.current-progress + div.data + span.number 30% + span.description completed + ul + li + span.number 12 + span.description project
points + li + span.number 23 + span.description defined
points + li + span.number 12 + span.description assigned
points + li + span.number 23 + span.description closed
points + + ul + li + span.icon.icon-bulk + span.number 73 + span.description created
tasks + li + span.number 72 + span.description closed
tasks + li + span.number 18 + span.description remaining
tasks + ul + li + span.icon.icon-iocaine + span.number 10 + span.description iocanie
doses