diff --git a/assets/icons/theme.svg b/assets/icons/theme.svg new file mode 100644 index 0000000..0491670 --- /dev/null +++ b/assets/icons/theme.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/images/3dviewer_net_start_page.png b/assets/images/3dviewer_net_start_page.png index c058341..453f18c 100644 Binary files a/assets/images/3dviewer_net_start_page.png and b/assets/images/3dviewer_net_start_page.png differ diff --git a/website/o3dv/css/O3DVIcons/O3DVIcons.woff b/website/o3dv/css/O3DVIcons/O3DVIcons.woff index cd425dd..2153695 100644 Binary files a/website/o3dv/css/O3DVIcons/O3DVIcons.woff and b/website/o3dv/css/O3DVIcons/O3DVIcons.woff differ diff --git a/website/o3dv/css/icons.css b/website/o3dv/css/icons.css index e02c8cd..9918a71 100644 --- a/website/o3dv/css/icons.css +++ b/website/o3dv/css/icons.css @@ -1,6 +1,6 @@ @font-face { font-family: "O3DVIcons"; - src: url("O3DVIcons/O3DVIcons.woff?635260a48b8099b02c71a5bd51ded212") format("woff"); + src: url("O3DVIcons/O3DVIcons.woff?93f39811e559aabadab944aab78ad1e7") format("woff"); } i[class^="icon-"]:before, i[class*=" icon-"]:before { @@ -95,15 +95,18 @@ i[class^="icon-"]:before, i[class*=" icon-"]:before { .icon-share:before { content: "\f11b"; } -.icon-up_y:before { +.icon-theme:before { content: "\f11c"; } -.icon-up_z:before { +.icon-up_y:before { content: "\f11d"; } -.icon-visible:before { +.icon-up_z:before { content: "\f11e"; } -.icon-warning:before { +.icon-visible:before { content: "\f11f"; } +.icon-warning:before { + content: "\f120"; +} diff --git a/website/o3dv/css/website.css b/website/o3dv/css/website.css index a40f2b3..684f5ae 100644 --- a/website/o3dv/css/website.css +++ b/website/o3dv/css/website.css @@ -230,9 +230,13 @@ div.ov_sidebar_title div.ov_sidebar_title_img cursor: pointer; } -div.ov_sidebar_subtitle +div.ov_sidebar_subtitle_icon { - overflow: auto; + width: 30px; + height: 18px; + margin-top: 2px; + margin-right: 10px; + float: left; } div.ov_sidebar_content diff --git a/website/o3dv/js/settingssidebarpanel.js b/website/o3dv/js/settingssidebarpanel.js index 8fb2f1b..562480c 100644 --- a/website/o3dv/js/settingssidebarpanel.js +++ b/website/o3dv/js/settingssidebarpanel.js @@ -135,7 +135,9 @@ OV.SettingsSidebarPanel = class extends OV.SidebarPanel let contentDiv = $('
').addClass ('ov_sidebar_settings_content').appendTo (this.contentDiv); // TODO: icon - let titleDiv = $('
').addClass ('ov_sidebar_subtitle').html ('Appearance').appendTo (contentDiv); + let titleDiv = $('
').addClass ('ov_sidebar_subtitle').appendTo (contentDiv); + OV.CreateSvgIcon (titleDiv, 'theme', 'ov_sidebar_subtitle_icon'); + $('
').html ('Appearance').appendTo (titleDiv); let buttonsDiv = $('
').addClass ('ov_sidebar_settings_padded').appendTo (contentDiv); let result = { buttons : [],