diff --git a/reference/library/src/morpheus-master/sass/modules/tool/sitestats/_sitestats.scss b/reference/library/src/morpheus-master/sass/modules/tool/sitestats/_sitestats.scss new file mode 100644 index 000000000000..d82d7b03da4e --- /dev/null +++ b/reference/library/src/morpheus-master/sass/modules/tool/sitestats/_sitestats.scss @@ -0,0 +1,20 @@ +.#{$namespace}sakai-sitestats{ + .widget .ministatContainer { + display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ + display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ + display: -ms-flexbox; /* TWEENER - IE 10 */ + display: -webkit-flex; /* NEW - Chrome */ + display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */ + flex-direction: row; + + @media #{$phone}{ + flex-direction: column; + } + } + #prefsForm .halfSize{ + @media #{$phone}{ + display: block; + width:100%; + } + } +} diff --git a/reference/library/src/morpheus-master/sass/tool.scss b/reference/library/src/morpheus-master/sass/tool.scss index 8a0aa37236f5..ef0f57102bb3 100644 --- a/reference/library/src/morpheus-master/sass/tool.scss +++ b/reference/library/src/morpheus-master/sass/tool.scss @@ -38,6 +38,7 @@ @import "modules/tool/signup/signup"; @import "modules/tool/sitesetup/sitesetup"; @import "modules/tool/dropbox/dropbox"; +@import "modules/tool/sitestats/sitestats"; @import "base/rtl"; diff --git a/sitestats/sitestats-tool/src/webapp/css/sitestats.css b/sitestats/sitestats-tool/src/webapp/css/sitestats.css index 55358ba08b6d..664ee287fa6b 100644 --- a/sitestats/sitestats-tool/src/webapp/css/sitestats.css +++ b/sitestats/sitestats-tool/src/webapp/css/sitestats.css @@ -84,12 +84,6 @@ /** STAT WIDGET: Mini panels */ .widget .ministatContainer { margin-left: 100px; - display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ - display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ - display: -ms-flexbox; /* TWEENER - IE 10 */ - display: -webkit-flex; /* NEW - Chrome */ - display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */ - flex-direction: row; } .widget .ministat { padding: 0 10px; diff --git a/sitestats/sitestats-tool/src/webapp/html/components/SakaiNavigationToolBar.html b/sitestats/sitestats-tool/src/webapp/html/components/SakaiNavigationToolBar.html index 285a5e89469f..34babc4d535f 100644 --- a/sitestats/sitestats-tool/src/webapp/html/components/SakaiNavigationToolBar.html +++ b/sitestats/sitestats-tool/src/webapp/html/components/SakaiNavigationToolBar.html @@ -23,7 +23,7 @@