projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b third try
[osm/UI.git]
/
skyquake
/
framework
/
widgets
/
skyquake_container
/
skyquakeApp.scss
diff --git
a/skyquake/framework/widgets/skyquake_container/skyquakeApp.scss
b/skyquake/framework/widgets/skyquake_container/skyquakeApp.scss
index
a01f154
..
b6f688f
100644
(file)
--- a/
skyquake/framework/widgets/skyquake_container/skyquakeApp.scss
+++ b/
skyquake/framework/widgets/skyquake_container/skyquakeApp.scss
@@
-1,14
+1,24
@@
-/
/import a reset
+/
*import a reset*/
@import '../../style/_colors.scss';
html, body {
height:100%;
width:100%;
}
@import '../../style/_colors.scss';
html, body {
height:100%;
width:100%;
}
+.crouton {
+ span {
+ /* white-space: pre;*/
+ }
+}
.skyquakeApp {
.skyquakeApp {
+ display: -ms-flexbox;
+ display: -webkit-box;
display: flex;
display: flex;
- flex-direction: column;
+ -ms-flex-direction: column;
+ -webkit-box-orient: vertical;
+ -webkit-box-direction: normal;
+ flex-direction: column;
height: 100%;
background: $gray-lightest;
h1 {
height: 100%;
background: $gray-lightest;
h1 {
@@
-20,6
+30,8
@@
html, body {
color: #fff!important
}
.skyquakeNav {
color: #fff!important
}
.skyquakeNav {
+ display: -ms-flexbox;
+ display: -webkit-box;
display: flex;
color:white;
background:black;
display: flex;
color:white;
background:black;
@@
-27,17
+39,27
@@
html, body {
z-index: 10;
font-size:0.75rem;
.secondaryNav {
z-index: 10;
font-size:0.75rem;
.secondaryNav {
- flex: 1 1 auto;
+ -ms-flex: 1 1 auto;
+ -webkit-box-flex: 1;
+ flex: 1 1 auto;
+ display: -ms-flexbox;
+ display: -webkit-box;
display: flex;
display: flex;
- justify-content: flex-end;
+ -ms-flex-pack: end;
+ -webkit-box-pack: end;
+ justify-content: flex-end;
}
.app {
position:relative;
h2 {
font-size:0.75rem;
border-right: 1px solid black;
}
.app {
position:relative;
h2 {
font-size:0.75rem;
border-right: 1px solid black;
+ display: -ms-flexbox;
+ display: -webkit-box;
display: flex;
display: flex;
- align-items: center;
+ -ms-flex-align: center;
+ -webkit-box-align: center;
+ align-items: center;
.oi {
padding-right: 0.5rem;
}
.oi {
padding-right: 0.5rem;
}
@@
-47,6
+69,11
@@
html, body {
display:none;
z-index:2;
width: 100%;
display:none;
z-index:2;
width: 100%;
+ &.project {
+ a {
+ text-transform:none;
+ }
+ }
}
&:first-child{
h2 {
}
&:first-child{
h2 {
@@
-89,12
+116,13
@@
html, body {
&:before {
content: '';
height:1.85rem;
&:before {
content: '';
height:1.85rem;
- width:5.5rem;
- /*margin:0 1rem;*/
- /*padding:0 0.125rem;*/
+ width:2.5rem;
+ margin:auto 1rem;
+ padding:0 0.125rem;
+ /* background: url('../../style/img/header-logo.png') no-repeat center center white;*/
/*background: url('../../style/img/svg/riftio_logo_white.svg') no-repeat center center;*/
background: url('../../style/img/svg/osm-logo_color_rgb_white_text.svg') no-repeat center center;
/*background: url('../../style/img/svg/riftio_logo_white.svg') no-repeat center center;*/
background: url('../../style/img/svg/osm-logo_color_rgb_white_text.svg') no-repeat center center;
- background-size:
contain;
+ background-size:contain;
}
}
.skyquakeContainerWrapper {
}
}
.skyquakeContainerWrapper {
@@
-102,18
+130,20
@@
html, body {
.titleBar {
padding: 1rem 0 0;
h1 {
.titleBar {
padding: 1rem 0 0;
h1 {
- /
/ background: url('../../style/img/header-logo.png') no-repeat;
+ /
* background: url('../../style/img/header-logo.png') no-repeat;*/
background-size:contain;
height: 51px;
line-height: 51px;
margin-left: 20px;
background-size:contain;
height: 51px;
line-height: 51px;
margin-left: 20px;
- /
/ padding-left: 100px;
+ /
* padding-left: 100px;*/
left: 0;
font-size: 1.625rem;
font-weight: 400;
text-align:left;
position:relative;
left: 0;
font-size: 1.625rem;
font-weight: 400;
text-align:left;
position:relative;
- flex: 1 0 auto;
+ -ms-flex: 1 0 auto;
+ -webkit-box-flex: 1;
+ flex: 1 0 auto;
}
}
.corner-accent {
}
}
.corner-accent {