From fdc653e088aea46c26facc37a4f6eacbe2f49963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Mon, 9 Jun 2014 10:20:10 +0200 Subject: [PATCH] large-summary and key style fixes --- app/fonts/taiga.eot | Bin 3476 -> 3860 bytes app/fonts/taiga.svg | 1 + app/fonts/taiga.ttf | Bin 3320 -> 3704 bytes app/fonts/taiga.woff | Bin 2364 -> 2704 bytes app/styles/components/summary.scss | 50 +++++++++++++++++------- app/styles/dependencies/typography.scss | 5 +++ app/taskboard.jade | 1 + app/views/components/large-summary.jade | 36 +++++++++++++++++ 8 files changed, 79 insertions(+), 14 deletions(-) create mode 100644 app/views/components/large-summary.jade diff --git a/app/fonts/taiga.eot b/app/fonts/taiga.eot index 7f837d6044392aee5376bd6eab949995e6180efa..7c1775dded76649ec7c1bbaad9723c8c5808505a 100644 GIT binary patch delta 836 zcmYjPO=uit7=GUG`}W(}nc3M%_-2Rf&L-KJu&btt+u7OO29pv>wUfi0eS?`#_7l4YPUnGBLpKCpbI{l0tlQ1AR#~_;Vu0wTOg$m*$ye4 z^3U`%H}n%;W#auGl(?PkORNr#=q~+(8cyO}e1uP-0jkxbN%AMDLXj7>l6L1Lbt0K{ zs6wjPthVCz5+yYm7d@4g6;hF$rLZ0@QBtq95ASHTS>cB zYbDLt@6?C1pLCLDJVl)(_KKe3&3K8DS!yM-6jmq-hi)nglV+^Kgw`u^MojyzI-F6i zKP_gAa;fSSh`U~O_oYdfF~`ZcHe>FV5K|LeT7oQlb}pN-iJOv_%YvKI$g;VnE5H6m z2)i#ol(x8-cbpR?S~r7c%Bx+DynIFU3nIa8RD{<9MR~w3YtZzC@m`)H14niv^$QK*)AbI*k!MG@b z4tA4oz@bx@A{3 + diff --git a/app/fonts/taiga.ttf b/app/fonts/taiga.ttf index ac83d5482a8fb58f34a116e1c1a965206cde4e5a..b6400351af20e0bf0538a39a664964da6ae846df 100644 GIT binary patch delta 877 zcmX|AO=uHQ5dP-9mzT|EyWN)EtW7ty*)54$t#PwSEVd$|^-{4=6`}qRYBgwEORZ2r zOb>cc1P@#F(4(Lp1wjvWm|0j< zINJ`;Qvm+-rOA5dKJyO1j{?{}Q(v6JDLepZcl4my`pneLDt`@V*8sXWcj@v1d&8as zZJz;*#-AfVEu~+dX&?HIG(%*oFO9K(*b@b<4TiX&`~x6rVrXrI4&}Lp*)4}qSr%q59P?Syh>25?WLM0lRD+d%#`yLzdB4o zLHZfXOv)UYp6n;L=nhj*EK~y9Ehg=1*|*GO#xgy3n2Jful%87&s+B?|DEoG;7^Tgi z7L@(XR1177W0}0{4^z-jm7t&89C>cE&Gg)$?3->t(>d8EdTqn}&}SNUujo^{vw5qX zxMAg&xAho|>3YJ@7&GRD*xbcsT2NZ+-;qpc#8t_=y9HOJl4Lu|hJ5%$2(2k^NKG7X z)Aik1npT~zf|77LI!|2aa1u(P%TZGU&X4vCS?xcZfonO-)&((5P{g9=<&|vsAy@dut vTbm~*Gauy~CI|wNTq29E39F~y{EYFx%#5+WMCy;) delta 485 zcmX|+&r4KM6vsd3-q8`~%_usHghyn!P%*7QEp#zKjvhv?)<;SV~}US)0LtrkH72R0jYr$@@A_XhG_7< z0d4uh&g!F2na`jr5Puuw%uC+iG(e<376iFn6B|)2AZeg4C~jBc2Wkl95V&1fUol;o z&J^fbV6bQ^Wfs{3xfd-|GR55fo$x2L{|8wsuWxOuU&??N05i^fQ_-+uaqFv?_V+Lp? zhB%=O+okT?IrYk(s}HuS5_U=VD)?H}`*Hi)tIMb@CHrO6eoSsk+P0?#rraK3h;o`K b;95kvTGNdXbCr7+U1u*&E*xIjs~=qgoL6E8 diff --git a/app/fonts/taiga.woff b/app/fonts/taiga.woff index 539ee37bbd4a20e8640e1ffa0d6d20d9e28b5a51..9203115f8e24dae888bb44a1c1f456762094edee 100644 GIT binary patch delta 2621 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 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