PWV-1: Fixing merging issues
This commit is contained in:
1 parent
481bf30a14
commit
db0602def7
29 files changed
+392
-488
No files matched your search
+3
-3
@@ -1,11 +1,11 @@
|
||||
<template name="standaloneViewer">
|
||||
<div class="topBar noselect">
|
||||
<div class="clearfix p-x-1 p-t-1">
|
||||
<div class="clearfix">
|
||||
<a target='_blank'
|
||||
class="brandSection pull-left"
|
||||
href="http://ohif.org">
|
||||
<svg class="logoImage">
|
||||
<use xlink:href="/packages/viewerbase/assets/icons.svg#icon-ohif-logo"></use>
|
||||
<use xlink:href="/packages/ohif_viewerbase/assets/icons.svg#icon-ohif-logo"></use>
|
||||
</svg>
|
||||
<div class="logoText">
|
||||
Open Health Imaging Foundation
|
||||
@@ -14,4 +14,4 @@
|
||||
</div>
|
||||
</div>
|
||||
{{> viewer }}
|
||||
</template>
|
||||
</template>
|
||||
+5
-4
@@ -9,6 +9,8 @@ $expandedHeight = 160px
|
||||
|
||||
.topBar
|
||||
height: $topBarHeight
|
||||
overflow: hidden
|
||||
padding: 1rem $studyListPadding 0
|
||||
theme('color', '$textPrimaryColor')
|
||||
theme('background-color', '$primaryBackgroundColor')
|
||||
transition(all 0.5s ease)
|
||||
@@ -19,7 +21,7 @@ $expandedHeight = 160px
|
||||
text-decoration: none
|
||||
|
||||
.logoImage
|
||||
margin: 0 8px
|
||||
margin: 0 8px 0 0
|
||||
width: 30px
|
||||
|
||||
.logoText
|
||||
@@ -50,17 +52,16 @@ $expandedHeight = 160px
|
||||
.brandSection
|
||||
height: 100%
|
||||
width: 80%
|
||||
padding-left: 50px
|
||||
line-height: $expandedHeight
|
||||
|
||||
.logoImage
|
||||
width: 50px
|
||||
margin: 0 20px
|
||||
margin: 0 20px 0 0
|
||||
|
||||
.logoText
|
||||
font-size: 30px
|
||||
|
||||
#worklistTabs
|
||||
#studylistTabs
|
||||
height: "calc(100% - %s)" % $topBarHeight
|
||||
|
||||
.tab-pane
|
||||
|
||||
Reference in new issue
Block a user