From 56417df3855081d4958040a4381dcfc63d000f22 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Thu, 22 Oct 2015 17:01:00 +0200 Subject: [PATCH] Styling fixes for tabs, collapsible search box, navbar updates --- .../client/components/layout/layout.html | 7 +- .../client/components/layout/layout.styl | 19 +++ .../lesionTableContainer.styl | 6 +- LesionTracker/client/head.html | 1 + .../{client => public}/images/logo.png | Bin OHIFViewer/client/head.html | 1 + OHIFViewer/images/logo.png | Bin 5710 -> 0 bytes OHIFViewer/public/images/logo.png | Bin 0 -> 15344 bytes .../components/basic/layout/layout.html | 5 +- .../components/basic/layout/layout.styl | 25 ++++ .../studyBrowser/studyBrowser.styl | 3 +- .../thumbnailEntry/thumbnailEntry.styl | 3 + .../components/tabTitle/tabTitle.html | 2 +- .../worklist/components/tabTitle/tabTitle.js | 14 +- Packages/worklist/components/worklist.html | 2 +- Packages/worklist/components/worklist.styl | 68 ++++++--- .../worklistResult/worklistResult.styl | 17 ++- .../worklistSearch/worklistSearch.html | 134 +++++++++--------- 18 files changed, 197 insertions(+), 110 deletions(-) rename LesionTracker/{client => public}/images/logo.png (100%) delete mode 100644 OHIFViewer/images/logo.png create mode 100644 OHIFViewer/public/images/logo.png diff --git a/LesionTracker/client/components/layout/layout.html b/LesionTracker/client/components/layout/layout.html index 2b5e238ff..4bddb7db1 100644 --- a/LesionTracker/client/components/layout/layout.html +++ b/LesionTracker/client/components/layout/layout.html @@ -8,12 +8,15 @@ - Lesion Tracker + + +

OHIF Lesion Tracker

+ diff --git a/LesionTracker/client/components/layout/layout.styl b/LesionTracker/client/components/layout/layout.styl index fad80a700..dbe02362d 100644 --- a/LesionTracker/client/components/layout/layout.styl +++ b/LesionTracker/client/components/layout/layout.styl @@ -4,11 +4,30 @@ color: #888888 background-color: #060606 border: none + font-family: "Sanchez" + color: #C1C1C1 + +.navbar-form, .navbar-default .navbar-nav > li > a + color: #C1C1C1 + font-weight: bold + font-size: 12pt .navbar-form margin: 0 padding: 15px 3px +.navbar-brand + img + float: left + margin-right: 10px + margin-top: -8px + + h4.name + float: left + margin: 0 + font-family: "Sanchez" + color: #C1C1C1 + @media (min-width: 768px) .navbar border-radius: 0px \ No newline at end of file diff --git a/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl b/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl index 5cf65bb5d..5985f2192 100644 --- a/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl +++ b/LesionTracker/client/components/lesionTableContainer/lesionTableContainer.styl @@ -1,7 +1,7 @@ .lesionTableContainer - background-color: pink height: 25% max-height: 200px - background-color: white - border: 8px solid pink + color: #A0A0A0 + background-color: #2F2F2F + border: 8px solid #484848 \ No newline at end of file diff --git a/LesionTracker/client/head.html b/LesionTracker/client/head.html index ed329b9b0..a9819d223 100644 --- a/LesionTracker/client/head.html +++ b/LesionTracker/client/head.html @@ -9,4 +9,5 @@ + \ No newline at end of file diff --git a/LesionTracker/client/images/logo.png b/LesionTracker/public/images/logo.png similarity index 100% rename from LesionTracker/client/images/logo.png rename to LesionTracker/public/images/logo.png diff --git a/OHIFViewer/client/head.html b/OHIFViewer/client/head.html index b6c23bd67..979732482 100644 --- a/OHIFViewer/client/head.html +++ b/OHIFViewer/client/head.html @@ -8,4 +8,5 @@ + \ No newline at end of file diff --git a/OHIFViewer/images/logo.png b/OHIFViewer/images/logo.png deleted file mode 100644 index da8c2746f57cdc72181f757cdd8ca7a31de13d62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5710 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 diff --git a/OHIFViewer/public/images/logo.png b/OHIFViewer/public/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..fc83b135454a7d4a47fb3c29735eaefe3c7e1d34 GIT binary patch literal 15344 zcmeI3du$s;9>+In8$v>PmREVmxYw$vwRhLgc+YWhW9LQOgw!c1{6RLmlVmUU?q+wB zI025dAfTlvz^T3DCju4&Tx&n|+CjTb z5^L=@dt*#Ytpj~hh4yeaRR6w@_T^ZB_0OiYyO+h!JLvTqML}y_X9RjjZ)Jha`KI)*But19f z4H6&;Q*=myExH!9Pcam|PbmQ~*Ig2$A@!7CVfK_v11YIQn%R?1vuY~6)j?RuT%87Z zL($@jk_e^CwJke)TV0)PWsDaj*<8)_LAp?%ubR9Si0}po!K(H;SjNG+<1U6{eVm6~ z#lZ4r5Rx<1=h*qq#{eT<`a#Sp3l70{CuE!Fx@SdT4^+jb4F70&N&SEr4|%5MBl1O z@J{Cw2rF|3{~ydnERab+H#khAq{G8Af{bsj+q_xVgMqoN*^Y#CmK&4X9(bQ|ykOqh zA)SYt8>Fo}F58x$R64^PC@mwB_8K(%wQJFZTj5L}#&O8wyi`w7G8yY3{bATj%a(wgTtxeoz#+9z{#?Mo3EX zy?|Eb-XNWC%#Rt&{TJZsl!T(e>kNe4LAqEol4aiiW^qGKyj2lwke=68sP8n7eqzwl z`&|tD(5(48lZtj1rfxiQD%xF`n$PTzB_rg@j8@Q$WSRe@(lFM;2Qv`zdA)9LkS=U4 z%xIHRAki6-;BBg#XT%5BW#trh6iwV%DiP_(B&JINd4#emCEW@i(BQKnoqIT(TSU2o z`8x;s75&b}s2v#urGbqJE-WHcKyaZnura}fMT80nE|dl~Cb+POPyxY((!j<97ZwpJ zAh=K(*qGqLB0>cO7fJ&g6I@tCsDR)?X<%c53yTO95L_q?Y)o)r5upNt3#EaL2`(%m zR6uZ{G_Wzjg++u42riTcHYT{Rh)@B+h0?&r1Q!+&Dj>K}8rYcN!XiQi1Q$vJ8xveu zM5ut^LTO-Qf(wfX6%bq~4QxzsVG*GMf(xaAjR`I+B2++dp){~D!G%SH3J5Ng1~w+R zu!v9r!G+Sm#%IJ;m4Dq5$nYJ@VfZp-;EmP0;ER|xp|L$iQKQQ#YV2-``tdaU{+6N! z8HzgD1z+!+ps350M{awoo}$V=Zid|<`D~vpCUv*Dx#iY2R>bukY6+^uf zcZFuvV}Vb=wi9cfd-SdqW!0UB%KyFcxYt(R^2DnhM}(?W=iRbp8#{B0_(p%t ziGhzR#Ro4;18-(2}p!xr!JpZ;@y+xa!K$KI)5G!+|Z z9dGVh?yzhxn;KiRy2}dX<~?s88EJid?~$EL9{RQac>C3hRt;1?+5UB4>(5Pp{r-ig zc5kQ~eSNy(&b^D5TzqPF?Cr5@hYxK@PQ7 - OHIF Viewer + + +

Open Health Imaging Foundation

+