LT-249: Fixing issue with multiple duplicated CSS imports
This commit is contained in:
parent
9beee70081
commit
cea41d09db
@ -1,7 +1,5 @@
|
|||||||
#viewer
|
#viewer
|
||||||
border-top: 1px solid #525252
|
border-top: 1px solid #525252
|
||||||
display: flex
|
|
||||||
flex-flow: row nowrap
|
|
||||||
height: 100%
|
height: 100%
|
||||||
width: 100%
|
width: 100%
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,3 @@
|
|||||||
@import "{design}/styles/webfonts"
|
@import "{design}/styles/imports/mixins"
|
||||||
@import "{design}/styles/variables"
|
@import "{design}/styles/imports/spacings"
|
||||||
@import "{design}/styles/mixins"
|
@import "{design}/styles/imports/variables"
|
||||||
@import "{design}/styles/spacings"
|
|
||||||
@import "{design}/styles/responsive"
|
|
||||||
|
|
||||||
@import "{design}/styles/global"
|
|
||||||
|
|||||||
@ -5,7 +5,6 @@ $borderColorActive = #3C8074
|
|||||||
$textColorActive = #2D2D2D
|
$textColorActive = #2D2D2D
|
||||||
|
|
||||||
.roundedButtonGroup
|
.roundedButtonGroup
|
||||||
font-family: Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif
|
|
||||||
|
|
||||||
.roundedButtonWrapper
|
.roundedButtonWrapper
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
|
|||||||
@ -15,16 +15,20 @@ Package.onUse(function(api) {
|
|||||||
// Importable colors / typography settings
|
// Importable colors / typography settings
|
||||||
api.addFiles([
|
api.addFiles([
|
||||||
'app.styl',
|
'app.styl',
|
||||||
'styles/global.styl',
|
'styles/imports/mixins.styl',
|
||||||
'styles/mixins.styl',
|
'styles/imports/spacings.styl',
|
||||||
'styles/responsive.styl',
|
'styles/imports/variables.styl'
|
||||||
'styles/spacings.styl',
|
|
||||||
'styles/variables.styl',
|
|
||||||
'styles/webfonts.styl'
|
|
||||||
], 'client', {
|
], 'client', {
|
||||||
isImport: true
|
isImport: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Common styles
|
||||||
|
api.addFiles([
|
||||||
|
'styles/common/webfonts.styl',
|
||||||
|
'styles/common/global.styl',
|
||||||
|
'styles/common/spacings.styl'
|
||||||
|
], 'client');
|
||||||
|
|
||||||
// Rounded Button Group
|
// Rounded Button Group
|
||||||
api.addFiles([
|
api.addFiles([
|
||||||
'components/roundedButtonGroup/roundedButtonGroup.html',
|
'components/roundedButtonGroup/roundedButtonGroup.html',
|
||||||
|
|||||||
@ -1,7 +1,9 @@
|
|||||||
html *
|
@import "{design}/app.styl"
|
||||||
font-family: 'Roboto', sans-serif
|
|
||||||
|
|
||||||
hr
|
html body
|
||||||
|
font-family: 'Roboto', 'OpenSans', 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif
|
||||||
|
|
||||||
|
html hr
|
||||||
border-top: 1px solid $uiBorderColor
|
border-top: 1px solid $uiBorderColor
|
||||||
|
|
||||||
.center-table
|
.center-table
|
||||||
@ -1,5 +1,10 @@
|
|||||||
@import "./spacings"
|
@import "{design}/app.styl"
|
||||||
|
|
||||||
|
generateSpacings('', $spacer-x, $spacer-y)
|
||||||
|
|
||||||
|
.m-x-auto
|
||||||
|
margin-left: auto !important
|
||||||
|
margin-right: auto !important
|
||||||
|
|
||||||
// MIN WIDTH 1920
|
// MIN WIDTH 1920
|
||||||
generateSpacings('r', $spacer-x, $spacer-y)
|
generateSpacings('r', $spacer-x, $spacer-y)
|
||||||
@ -34,9 +34,3 @@ generateSpacings($prefix, $spacerX, $spacerY)
|
|||||||
.{$prefix}{$property[0]}-{$axis[0]}-{$spacing[0]}
|
.{$prefix}{$property[0]}-{$axis[0]}-{$spacing[0]}
|
||||||
{$property[1]}-{$axis[1]} $spacing[1]*$spacerAxis[$axis[3]] !important
|
{$property[1]}-{$axis[1]} $spacing[1]*$spacerAxis[$axis[3]] !important
|
||||||
{$property[1]}-{$axis[2]} $spacing[1]*$spacerAxis[$axis[3]] !important
|
{$property[1]}-{$axis[2]} $spacing[1]*$spacerAxis[$axis[3]] !important
|
||||||
|
|
||||||
generateSpacings('', $spacer-x, $spacer-y)
|
|
||||||
|
|
||||||
.m-x-auto
|
|
||||||
margin-left: auto !important
|
|
||||||
margin-right: auto !important
|
|
||||||
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
.viewerSection
|
.viewerSection
|
||||||
display: flex
|
display: flex
|
||||||
|
flex: 1
|
||||||
flex-flow: row nowrap
|
flex-flow: row nowrap
|
||||||
align-items: stretch
|
align-items: stretch
|
||||||
height: calc(100% - 78px);
|
height: calc(100% - 78px);
|
||||||
|
|||||||
@ -29,7 +29,6 @@ $circleSize = 46px
|
|||||||
width: $circleSize
|
width: $circleSize
|
||||||
height: $circleSize
|
height: $circleSize
|
||||||
line-height: $circleSize
|
line-height: $circleSize
|
||||||
font-family: Roboto
|
|
||||||
font-weight: 700
|
font-weight: 700
|
||||||
font-size: 17px
|
font-size: 17px
|
||||||
text-align: center
|
text-align: center
|
||||||
|
|||||||
@ -5,7 +5,7 @@ $timepointButtonHeight = 55px
|
|||||||
.studyTimepointBrowser
|
.studyTimepointBrowser
|
||||||
background-color: $primaryBackgroundColor
|
background-color: $primaryBackgroundColor
|
||||||
float: left
|
float: left
|
||||||
height: calc(100% - 55px - 50px - 30px)
|
height: 100%
|
||||||
position: relative
|
position: relative
|
||||||
width: 100%
|
width: 100%
|
||||||
|
|
||||||
@ -74,7 +74,6 @@ $timepointButtonHeight = 55px
|
|||||||
|
|
||||||
.timepointFollowupTitle
|
.timepointFollowupTitle
|
||||||
color: $textPrimaryColor
|
color: $textPrimaryColor
|
||||||
font-family: Roboto
|
|
||||||
padding-top: 2px
|
padding-top: 2px
|
||||||
|
|
||||||
.studyTimepointScrollArea
|
.studyTimepointScrollArea
|
||||||
|
|||||||
@ -59,7 +59,6 @@ $spacerY = 12px
|
|||||||
border: 1px solid $boxBorderColor
|
border: 1px solid $boxBorderColor
|
||||||
border-radius: 12px
|
border-radius: 12px
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
font-family: Roboto
|
|
||||||
padding: $spacerY $spacerX ($spacerY - 1)
|
padding: $spacerY $spacerX ($spacerY - 1)
|
||||||
position: relative
|
position: relative
|
||||||
transition($sidebarTransition)
|
transition($sidebarTransition)
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
.toolbarSection
|
.toolbarSection
|
||||||
border-bottom: $uiBorderColor $uiBorderThickness solid
|
border-bottom: $uiBorderColor $uiBorderThickness solid
|
||||||
|
flex: 0 0 auto
|
||||||
height: $toolbarHeight
|
height: $toolbarHeight
|
||||||
overflow: hidden
|
overflow: hidden
|
||||||
padding-top: 6px
|
padding-top: 6px
|
||||||
|
|||||||
@ -1,12 +1,14 @@
|
|||||||
@import "{design}/app"
|
@import "{design}/app"
|
||||||
|
|
||||||
#viewer
|
#viewer
|
||||||
width: 100%
|
align-items: stretch
|
||||||
|
background-color: black
|
||||||
|
display: flex
|
||||||
|
flex-flow: column wrap
|
||||||
height: 100%
|
height: 100%
|
||||||
margin: 0
|
margin: 0
|
||||||
padding: 0
|
padding: 0
|
||||||
background-color: black
|
width: 100%
|
||||||
|
|
||||||
|
|
||||||
//font awesome icons
|
//font awesome icons
|
||||||
.fa-cr:before
|
.fa-cr:before
|
||||||
|
|||||||
@ -5,7 +5,6 @@ $seriesCountBackgroundColor = #678696
|
|||||||
.thumbnailEntry
|
.thumbnailEntry
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
display: table
|
display: table
|
||||||
font-family: Roboto
|
|
||||||
margin: 0 auto
|
margin: 0 auto
|
||||||
|
|
||||||
&.draggable
|
&.draggable
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user