diff --git a/app/settings/about.html b/app/settings/about.html index 6563793..da64844 100644 --- a/app/settings/about.html +++ b/app/settings/about.html @@ -1,5 +1,6 @@ 設定

高度な設定

-・システム環境変数 +

システム環境変数

不必要に変更を加えるとシステムが破損する可能性があります。
diff --git a/app/settings/default.html b/app/settings/default.html index b0add0f..36788ab 100644 --- a/app/settings/default.html +++ b/app/settings/default.html @@ -1,23 +1,28 @@
+ kitについて
システム情報・ライセンス
-

システム設定

+

システム設定

+ ユーザー
ユーザー情報とセキュリティ
+ システム
アプリ管理・スタートアップ・時刻
-

デスクトップ

+

デスクトップ

+ 壁紙
デスクトップ壁紙の設定
+ テーマ
テーマ設定・フォント設定
diff --git a/app/settings/define.json b/app/settings/define.json index 1f706cd..48d254c 100644 --- a/app/settings/define.json +++ b/app/settings/define.json @@ -2,7 +2,7 @@ "id": "settings", "name": "設定", "icon": "icon.png", - "version": "2.0.0", + "version": "3.0.0", "author": "kit", "view": "default.html", diff --git a/app/settings/settings.css b/app/settings/settings.css index dfea2e9..4e5587e 100644 --- a/app/settings/settings.css +++ b/app/settings/settings.css @@ -1,7 +1,22 @@ .winc-settings{ padding: 8px; } - +.window .winc-settings .textbox{ + width: calc(100% - 70px); +} +.winc-settings h4{ + font-size: 18px; + margin: 10px 0; + border-left: 10px solid dodgerblue; + padding: 2px 6px; + font-weight: 400; + box-shadow: 0px 1px 5px 0 rgba(0,0,0,.15); +} +.winc-settings .btn .fa-chevron-right{ + float: right; + position: relative; + top: 15px; +} .settings-wallpapers{ text-align: center; display: inline-block; @@ -20,11 +35,17 @@ .settings-default{ float: left; + font-size: 18px; margin-right: 10px; } .winc-settings h3{ - padding: 5px 0px; + text-align: right; + padding: 0px; + font-size: 34px; + font-weight: 100; + border-bottom: 1px solid #909090; + margin-bottom: 20px; } .winc-settings .settings-license-area{ background: silver; diff --git a/app/settings/system.html b/app/settings/system.html index f10c934..8bc6577 100644 --- a/app/settings/system.html +++ b/app/settings/system.html @@ -7,23 +7,23 @@

システム設定

-スタートアップ
+

スタートアップ

システムの起動時に自動的に起動するアプリケーションの名前を入力します。複数の場合は半角カンマで区切ります(動作が不安定になる場合があります)。
設定
-時刻
+

時刻

時刻はSystem.timeオブジェクトに格納されています。
設定された時刻：
-アプリ管理
+

アプリ管理

アプリケーションの管理はアプリ管理から実行してください。
-セーフブート +

セーフブート

セーフモードで起動する場合は、ここをクリックまたはkitにパラメータsafe=trueを付与して再起動します。 diff --git a/app/settings/theme.html b/app/settings/theme.html index f0fa12e..3fd5216 100644 --- a/app/settings/theme.html +++ b/app/settings/theme.html @@ -4,14 +4,14 @@ $("#kit-theme-file").attr("href", "./system/theme/" + localStorage.getItem("kit-theme") ); $("#desktop-" + currentDesktop).show(); } - $("#settings-theme-path-set").on("click", function(){ - settings_theme( $("#settings-theme-path")[0].val() ); + $(".settings-theme-path-set").on("click", function(){ + settings_theme( $("#settings-theme-path").val() ); }) 設定

テーマ設定

-・テーマを選択 +

テーマを選択

標準のテーマ theme-default.css
@@ -25,7 +25,7 @@

テーマ設定

設定
-フォント設定 +

フォント設定

システムのデフォルトフォントを指定します
設定 \ No newline at end of file diff --git a/app/settings/user.html b/app/settings/user.html index 10a583d..9532182 100644 --- a/app/settings/user.html +++ b/app/settings/user.html @@ -24,23 +24,27 @@ 設定

ユーザー設定

-・ユーザー情報 +

ユーザー情報

?
ユーザーページを開く
-ユーザー名 表示される名前です
+ユーザー名
設定
-・セキュリティの設定 パスワードに関する設定
-パスワード ロック画面からの復帰に必要です
+

セキュリティの設定 パスワードに関する設定

+パスワード -
現在のパスワード：
+
：
設定 -

+
+ + + +
ユーザーカラー
設定 \ No newline at end of file diff --git a/app/settings/wallpaper.html b/app/settings/wallpaper.html index cab11a1..b60244d 100644 --- a/app/settings/wallpaper.html +++ b/app/settings/wallpaper.html @@ -1,20 +1,17 @@ 設定

壁紙の設定

-・標準の壁紙 ./system/wallpaper内 +

標準の壁紙 ./system/wallpaper内

- - 2001.png - - 11.jpg + 標準に戻す - - 2013.png + + ファイルから選択
-・任意の壁紙 パスまたはURLを指定
+

任意の壁紙 パスまたはURLを指定

設定
-・単色 色の名前またはカラーコード
+

単色 色の名前またはカラーコード

設定 \ No newline at end of file diff --git a/config/apps.json b/config/apps.json index 15db991..e7f1dc8 100644 --- a/config/apps.json +++ b/config/apps.json @@ -4,11 +4,6 @@ "icon": "./app/browser/icon.png" }, - "clock": { - "name": "時計", - "icon": "./app/clock/icon.png" - }, - "console": { "name": "コンソール", "icon": "./app/console/icon.png" diff --git a/index.html b/index.html index dd2d5d9..1d52f63 100644 --- a/index.html +++ b/index.html @@ -92,17 +92,32 @@
-
通知の履歴
+
+ 通知の履歴 +
+ + + +
+
+ + +
- Desktop - -
- - - 電源 -
-
+ Desktop + +
+ + + + 電源 +
+
もどる diff --git a/system.js b/system.js index 62ebe42..c09eb0c 100644 --- a/system.js +++ b/system.js @@ -8,9 +8,9 @@ // http://web.kitit.ml/ // https://github.com/mtsgi/kit -$( document ).ready( Load ); +$( document ).ready( Kernel ); -function Load() { +function Kernel() { S = System; if( !localStorage.getItem( "kit-pid" ) ) processID = 0; @@ -96,6 +96,12 @@ function Load() { $( "#last-notification-close" ).click( function() { $( "#last-notification" ).hide( "drop", {direction: "right"}, 300 ); } ); + $("#notifications-dnp").prop("checked", false).on("change", ()=>{ + if( $("#notifications-dnp").is(":checked") ){ + Notification.donotpush = true; + } + else Notification.donotpush = false; + }); //電源管理 $( ".power-button" ).click( function() { $( "#notifications" ).hide( "drop", {direction: "right"}, 300 ); @@ -186,6 +192,22 @@ function Load() { launch( "browser", { "url" : "https://ja.wikipedia.org/wiki/" + $( "#milp" ).val() } ); } ); + //サウンドドロップダウン + $("#dropdown-sound-slider").slider({ + min: 0, max: 100, step: 1, value: 100, + change: (e, ui) => { + System.audio.level = ui.value; + $("#dropdown-sound-level").text(ui.value); + localStorage.setItem("kit-audio-level", ui.value); + for( let i in System.audio.list ){ + System.audio.list[i].volume = System.audio.level / 100; + } + if( ui.value == 0 ) $("#kit-header-sound-icon").removeClass("fa-volume-up").addClass("fa-volume-mute"); + else $("#kit-header-sound-icon").removeClass("fa-volume-mute").addClass("fa-volume-up"); + } + }); + if( localStorage["kit-audio-level"] ) System.audio.volume( localStorage["kit-audio-level"] ); + //コンテキストメニュー $(":root section:not(#desktop-l)").on("contextmenu", function() { let _ptelem = $( document.elementFromPoint(S.mouseX, S.mouseY) ); @@ -275,7 +297,7 @@ function appData( data ) { $( "#tasks" ).append( "" + data.name + "" ); //タスクバーのクリック挙動 $( "#t" + pid ).addClass( "task" ).click( function() { - if( $(this).hasClass("t-active") ) System.min( pid ); + if( $(this).hasClass("t-active") || $(this).hasClass("task-min") ) System.min( pid ); else{ $("#w"+pid).css("z-index", KWS.windowIndex + 1); KWS.refreshWindowIndex(); @@ -288,6 +310,8 @@ function appData( data ) { $( "#task-ctx-info" ).off().on( "click", function() {appInfo( data.id )} ); $( "#task-ctx-sshot" ).off().on( "click", function() { S.screenshot(pid, true) } ); $( "#task-ctx-min" ).off().on( "click", function() { S.min( String(pid) ) } ); + if( $(this).hasClass("t-active") ) $( "#task-ctx-front" ).hide(); + else $( "#task-ctx-front" ).show(); $( "#task-ctx-front" ).off().on( "click", function() { $("#w"+pid).css("z-index", KWS.windowIndex + 1); KWS.refreshWindowIndex(); @@ -529,6 +553,53 @@ const System = new function() { $( ".os-time" ).text( Hour + ":" + Min + ":" + Sec ); let MS = DD.getMilliseconds(); S.time.ms = MS; + let circle = { + outer: { radius: .9, color: "transparent" }, + inner: { radius: .85, color: "transparent" } + } + let lines = { + long: { from: .8, to: .7, width: 2, color: "#303030" }, + short: { from: .8, to: .75, width: 1, color: "#a0a0a0" } + } + let hands = { + hour: { length: .4, width: 3, cap: "butt", color: "#303030", ratio: .2 }, + minute: { length: .67, width: 2, cap: "butt", color: "#303030", ratio: .2 }, + second: { length: .67, width: 1, cap: "butt", color: "dodgerblue", ratio: .2 } + } + let canvas = $(".dropdown-clock-canvas")[0]; + canvas.width = "200", canvas.height = "200"; + let context = canvas.getContext("2d"); + let center = { x: Math.floor(canvas.width / 2), y: Math.floor(canvas.height / 2) }; + let radius = Math.min(center.x, center.y), angle, len; + context.beginPath();context.fillStyle = circle.outer.color; + context.arc(center.x, center.y, radius * circle.outer.radius, 0, Math.PI * 2, false); + context.fill();context.beginPath();context.fillStyle = circle.inner.color; + context.arc(center.x, center.y, radius * circle.inner.radius, 0, Math.PI * 2, false); + context.fill(); + for( let i=0; i<60; i++ ){ + angle = Math.PI * i / 30; + context.beginPath(); + let line = ( i%5 == 0 ) ? lines.long : lines.short; + context.lineWidth = line.width, context.strokeStyle = line.color; + context.moveTo(center.x + Math.sin(angle) * radius * line.from, center.y - Math.cos(angle) * radius * line.from) + context.lineTo(center.x + Math.sin(angle) * radius * line.to, center.y - Math.cos(angle) * radius * line.to); + context.stroke(); + } + angle = Math.PI * ( Hour+Min/60 ) / 6, len = radius * hands.hour.length; + context.beginPath(), context.lineWidth = hands.hour.width; + context.lineCap = hands.hour.cap, context.strokeStyle = hands.hour.color; + context.moveTo(center.x - Math.sin(angle) * len * hands.hour.ratio, center.y + Math.cos(angle) * len * hands.hour.ratio); + context.lineTo(center.x + Math.sin(angle) * len, center.y - Math.cos(angle) * len), context.stroke(); + angle = Math.PI * (Min + Sec / 60) / 30, len = radius * hands.minute.length; + context.beginPath(), context.lineWidth = hands.minute.width; + context.lineCap = hands.minute.cap, context.strokeStyle = hands.minute.color; + context.moveTo(center.x - Math.sin(angle) * len * hands.minute.ratio, center.y + Math.cos(angle) * len * hands.minute.ratio); + context.lineTo(center.x + Math.sin(angle) * len, center.y - Math.cos(angle) * len), context.stroke(); + angle = Math.PI * Sec / 30, len = radius * hands.second.length; + context.beginPath(), context.lineWidth = hands.second.width; + context.lineCap = hands.second.cap, context.strokeStyle = hands.second.color; + context.moveTo(center.x - Math.sin(angle) * len * hands.second.ratio, center.y + Math.cos(angle) * len * hands.second.ratio); + context.lineTo(center.x + Math.sin(angle) * len, center.y - Math.cos(angle) * len), context.stroke(); } this.changeWallpaper = function( str ) { @@ -595,15 +666,43 @@ const System = new function() { } this.audio = new function(){ - this.level = 50; + this.level = 100; + + this.list = new Array(); + + this.volume = function( _level ){ + $("#dropdown-sound-slider").slider("value", _level); + } this.play = function( _audioid, _src ){ - $.noop(); + if( !System.audio.list[_audioid] ){ + System.audio.list[_audioid] = new Audio(_src); + System.audio.list[_audioid].volume = System.audio.level / 100; + } + System.audio.list[_audioid].play(); + } + + this.pause = function( _audioid ){ + System.audio.list[_audioid].pause(); + } + + this.stop = function( _audioid ){ + System.audio.list[_audioid].pause(); + delete System.audio.list[_audioid]; + } + + this.seek = function( _audioid, _time ){ + System.audio.list[_audioid].fastSeek(_time); + } + + this.mute = function( _audioid, _bool ){ + System.audio.list[_audioid].muted = _bool; } } } const KWS = new function(){ + this.version = "3.1.0"; this.active = null; this.min = function( _str ) { @@ -652,18 +751,19 @@ const KWS = new function(){ if( i == num-1 ){ $("#"+array[i].id).addClass("windowactive"); $("#t"+String(array[i].id).substring(1)).addClass("t-active"); + KWS.active = String(array[i].id).substring(1); } else{ $("#"+array[i].id).removeClass("windowactive"); $("#t"+String(array[i].id).substring(1)).removeClass("t-active"); - KWS.active = String(array[i].id).substring(1); } } KWS.windowIndex = num; } this.resize = function( _pid, _width, _height ){ - $("#winc"+_pid).css("width", _width).css("height", _height); + if( _width ) $("#winc"+_pid).css("width", _width) + if( _height ) $("#winc"+_pid).css("height", _height); } } diff --git a/system/theme/theme-default.css b/system/theme/theme-default.css index 1d8e5e5..4d9debe 100644 --- a/system/theme/theme-default.css +++ b/system/theme/theme-default.css @@ -182,6 +182,39 @@ header a:hover{ #kit-milp-wikipedia:before{ content: "Wikipediaで調べる" } +.dropdown{ + display: none; + position: fixed; + top: 30px; + right: 0; + background: rgba(255,255,255,.9); + box-shadow: 0 2px 8px 0 rgba(0,0,0,.3); + border-radius: 0 0 5px 5px; +} +#dropdown-clock{ + right: 58px; +} +#dropdown-sound{ + right: 152px; + padding: 6px; +} +#dropdown-sound-slider{ + margin: 10px; + width: 180px; +} +.ui-slider-horizontal{ + border-radius: 999px; + background: linear-gradient(45deg, rgba(255,135,241,1) 0%, rgba(117,239,255,1) 50%, rgba(92,242,102,1) 100%); + border: 1px solid white !important; + box-shadow: 0 1px 3px 0 rgba(0,0,0,.4); +} +.ui-slider-handle{ + outline: none; + border-radius: 999px; + border: 1px solid white !important; + box-shadow: 0 1px 3px 0 rgba(0,0,0,.5); + cursor: url(../cursor-1.png), auto !important; +} .home-icon:before{ line-height: 0px; display: block; @@ -290,6 +323,7 @@ footer .task-min:after{ border-radius: 3px; } footer .t-active{ + color: dodgerblue; border-top : 5px solid rgb(100, 245, 100) !important; } #footer-noti{ @@ -385,15 +419,17 @@ section .ui-draggable-dragging{ box-shadow: 0px 2px 10px 0px rgba(0,0,0,.5), 0px 0px 0px 8px rgba(255,30,70,.6); } .windowactive{ - box-shadow: 0 0 0 4px rgba(255,255,255,.5), 0 2px 10px 0 #000000; + box-shadow: 0 2px 15px 0 rgba(0,0,0,.7); } .wt{ display: block; + min-height: 24px; color: #000000; font-size: 17px; padding: 3px 0; border-radius: 4px 4px 0 0; - background: linear-gradient(45deg, rgba(255,201,248,1) 0%, rgba(186,239,255,1) 50%, rgba(150,255,157,1) 100%); +background : linear-gradient(#F2F2F2 0%,#D1D1D1 100%); + background: linear-gradient(45deg, rgba(194,194,194,1) 0%, rgba(235,235,235,1) 50%, rgba(194,194,194,1) 100%); } .wt:before{ color: white; @@ -406,7 +442,7 @@ section .ui-draggable-dragging{ margin: 3px; } .windowactive > .wt{ - background: linear-gradient(45deg, rgba(255,135,241,1) 0%, rgba(117,239,255,1) 50%, rgba(92,242,102,1) 100%); + background: linear-gradient(45deg, rgba(255,201,248,1) 0%, rgba(186,239,255,1) 50%, rgba(150,255,157,1) 100%); } .windowactive > span{ opacity: 1.0; @@ -415,10 +451,11 @@ section .ui-draggable-dragging{ padding: 8px 8px; position: absolute; right: 30px; + opacity: .6; } .wm:hover{ - background: #fff; - color: black; + background: dodgerblue; + color: #fff; } .wx{ cursor:url(../cursor-1.png), default; @@ -426,6 +463,7 @@ section .ui-draggable-dragging{ float: right; position: absolute; right: 0px; + opacity: .6; } .wx:hover{ background: #ff0000; @@ -452,10 +490,11 @@ section .ui-draggable-dragging{ padding: 1px 10px; margin: 1px 2px; text-decoration: none; - box-shadow: 0px 1px 3px 0px rgba(0,0,0,.3), inset 0px 0px 2px 0px rgba(255,255,255,.5); + transition: .2s all ease; + box-shadow: 0px 1px 3px 0px rgba(0,0,0,.3), inset 0px 0px 2px 0px rgba(255,255,255,.5), inset 0px -14px 1px 3px rgba(255,255,255,.2); } .kit-button:hover{ - box-shadow: 0px 1px 3px 0px rgba(0,0,0,.5), inset 0px 0px 2px 0px rgba(0,0,0,.5), inset 0px 9999px 0px 0px rgba(0,0,0,.2); + box-shadow: 0px 1px 3px 0px rgba(0,0,0,.5), inset 0px 0px 2px 0px rgba(0,0,0,.5), inset 0px 9999px 0px 0px rgba(0,0,0,.2), inset 0px -14px 1px 3px rgba(255,255,255,.2); } .kit-button:active{ box-shadow: inset 0px 9999px 0px 0px rgba(0,0,0,.2); @@ -469,6 +508,60 @@ section .ui-draggable-dragging{ background: dodgerblue; color: white; } +.kit-toggle{ + padding: 10px; + border-bottom: 1px solid #909090; +} +.kit-toggle:hover{ + background: #f0f0f0; +} +.kit-toggle input{ + position: absolute; + margin-left: -9999px; + visibility: hidden; +} +.kit-toggle input + label { + float: right; + display: inline-block; + position: relative; + cursor: pointer; + outline: none; + user-select: none; +} +.kit-toggle input + label { + padding: 1px; + width: 60px; + height: 30px; + background-color: transparent; +} +.kit-toggle input + label:before, +.kit-toggle input + label:after { + display: block; + position: absolute; + top: 0px; + left: 0px; + bottom: 5px; + content: ""; +} +.kit-toggle input + label:before { + right: 0px; + background-color: #e0e0e0; + border-radius: 60px; + transition: background 0.4s; +} +.kit-toggle input + label:after { + width: 26px; + background-color: #fff; + border-radius: 100%; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3); + transition: margin 0.4s; +} +.kit-toggle input:checked + label:before { + background-color: #8ce196; +} +.kit-toggle input:checked + label:after { + margin-left: 36px; +} #task-ctx{ z-index: 9999; display: none; @@ -536,10 +629,18 @@ h3{ padding: 2px 4px; border-radius: 5px; background: #f0f0f0; + transition: .2s all ease; + box-shadow:inset 0 1px 1px 0px #fff, inset 0 -1px 1px 0px #fff; } .btn:hover{ - border: 1px solid black; - background: #e0e0e0; + position: relative; + top: -2px; + box-shadow: 0px 1px 4px 0 rgba(0,0,0,.3); + background: #fcfcfc; +} +.btn:active{ + transition: none; + top: 1px; } .little{ font-size: 14px; @@ -550,10 +651,15 @@ h3{ border: 1px solid #000000; font-size: 16px; padding: 4px; - box-shadow: inset 1px 1px 1px 0px rgba(0,0,0,.4); + background: #ffffff; + box-shadow: inset 1px 1px 3px 0px rgba(0,0,0,.2); border-radius: 5px; font-family: 'Noto Sans JP', sans-serif; } +.textbox:focus{ + background: #ffffff; + box-shadow: 0 0 0 3px rgba(180,200,255,.8); +} .textbox::selection{ background: dodgerblue; color: white; diff --git a/system/theme/theme-light.css b/system/theme/theme-light.css index 09e3bf3..70db268 100644 --- a/system/theme/theme-light.css +++ b/system/theme/theme-light.css @@ -155,6 +155,36 @@ header a:hover{ #kit-milp-wikipedia:before{ content: "Wikipediaで調べる" } +.dropdown{ + display: none; + position: fixed; + top: 23px; + right: 0; + background: #ffffff; + border: 1px solid gray; +} +#dropdown-clock{ + right: 56px; +} +#dropdown-sound{ + right: 140px; + padding: 6px; +} +#dropdown-sound-slider{ + margin: 10px; + width: 180px; +} +.ui-slider-horizontal{ + border-radius: 0px; + background: #e0e0e0; + border: 1px solid black !important; +} +.ui-slider-handle{ + outline: none; + border-radius: 0px; + border: 1px solid black !important; + cursor: url(../cursor-1.png), auto !important; +} .home-icon:before{ line-height: 0px; display: block; @@ -228,6 +258,10 @@ footer .task img{ width : 24px; margin-right: 4px; } +footer .t-active{ + background: #6060c0; + color: #ffffff; +} footer .task-min{ font-weight: 900; } @@ -331,8 +365,14 @@ section .ui-draggable-dragging{ .win-highlight{ background: white; } +.windowactive{ + border: 1px solid black; +} +.windowactive .wt{ + background: #90a0f0; +} .wt{ - display: inline-block; + display: block; color: #000000; font-size: 16px; padding-top: 2px; diff --git a/system/theme/theme-ringo.css b/system/theme/theme-ringo.css index 3f052d1..eecd48b 100644 --- a/system/theme/theme-ringo.css +++ b/system/theme/theme-ringo.css @@ -182,6 +182,39 @@ header a:hover{ #kit-milp-wikipedia:before{ content: "Wikipediaで調べる" } +.dropdown{ + display: none; + position: fixed; + top: 25px; + right: 0; + background: rgba(245,245,245,.95); + box-shadow: 0 2px 8px 0 rgba(0,0,0,.3); + border-radius: 0 0 5px 5px; +} +#dropdown-clock{ + right: 60px; +} +#dropdown-sound{ + right: 146px; + padding: 6px; +} +#dropdown-sound-slider{ + margin: 10px; + width: 180px; +} +.ui-slider-horizontal{ + border-radius: 999px; + background: linear-gradient(45deg, rgba(255,135,241,1) 0%, rgba(117,239,255,1) 50%, rgba(92,242,102,1) 100%); + border: 1px solid white !important; + box-shadow: 0 1px 3px 0 rgba(0,0,0,.4); +} +.ui-slider-handle{ + outline: none; + border-radius: 999px; + border: 1px solid white !important; + box-shadow: 0 1px 3px 0 rgba(0,0,0,.5); + cursor: url(../cursor-1.png), auto !important; +} .home-icon:before{ line-height: 0px; display: block; @@ -364,11 +397,10 @@ footer .task-min:before{ box-shadow: 0px 2px 20px 0px rgba(0,0,0,.8); border-radius : 4px; border-top: 1px solid #fff; - background: rgba(255,255,255,.9); min-width : 200px; padding : 0px; + background: #f0f0f0; cursor:url(../cursor-1.png), default; - background : linear-gradient(#F5F5F5 0%,#d9d9d9 30px); text-align: center; } .window:after{ @@ -377,15 +409,23 @@ footer .task-min:before{ position: absolute; height: 60px; } +.windowactive{ + background-color: #f0f0f0; + background-image : linear-gradient(#F5F5F5 0%,#d9d9d9 30px); + box-shadow: 0px 8px 30px 0 rgba(0,0,0,.8); +} section .ui-draggable-dragging{ box-shadow: 0px 2px 20px 0px rgba(0,0,0,.8), 0px 0px 0px 8px rgba(30,70,255,.6); } .win-highlight{ box-shadow: 0px 2px 20px 0px rgba(0,0,0,.8), 0px 0px 0px 8px rgba(255,30,70,.6); } +.windowactive .wt{ + color: #000000; +} .wt{ + color: #909090; display: inline-block; - color: #000000; font-size: 16px; padding-top: 1px; } @@ -399,8 +439,8 @@ section .ui-draggable-dragging{ position: absolute; left: 25px; padding: 0px; - background: #38C93B; - border: 1px solid #23961D; + background: #b0b0b0; + border: 1px solid #909090; font-size: 7px; color: transparent; height: 12px; @@ -411,12 +451,16 @@ section .ui-draggable-dragging{ .wm:hover{ color: rgba(0,0,0,.9); } +.windowactive .wm{ + background: #38C93B; + border: 1px solid #23961D; +} .wx{ position: absolute; left: 5px; padding: 0px; - background: #F03E3E; - border: 1px solid #C23232; + background: #b0b0b0; + border: 1px solid #909090; font-size: 7px; line-height: 12px; color: transparent; @@ -428,6 +472,10 @@ section .ui-draggable-dragging{ .wx:hover{ color: rgba(0,0,0,.9); } +.windowactive .wx{ + background: #F03E3E; + border: 1px solid #C23232; +} .winc{ text-align: left; box-sizing: border-box; diff --git a/system/wallpaper/2001.png b/system/wallpaper/2001.png deleted file mode 100644 index bd2bd11..0000000 Binary files a/system/wallpaper/2001.png and /dev/null differ diff --git a/system/wallpaper/2004.png b/system/wallpaper/2004.png deleted file mode 100644 index 5a7f36b..0000000 Binary files a/system/wallpaper/2004.png and /dev/null differ diff --git a/system/wallpaper/2005.png b/system/wallpaper/2005.png deleted file mode 100644 index bd3b8a6..0000000 Binary files a/system/wallpaper/2005.png and /dev/null differ diff --git a/system/wallpaper/2006.png b/system/wallpaper/2006.png deleted file mode 100644 index a0dd2e0..0000000 Binary files a/system/wallpaper/2006.png and /dev/null differ diff --git a/system/wallpaper/2013.png b/system/wallpaper/2013.png deleted file mode 100644 index a03a2ee..0000000 Binary files a/system/wallpaper/2013.png and /dev/null differ diff --git a/system/wallpaper/Bg_2008.dds.png b/system/wallpaper/Bg_2008.dds.png deleted file mode 100644 index 1332537..0000000 Binary files a/system/wallpaper/Bg_2008.dds.png and /dev/null differ diff --git a/system/wallpaper/Bg_2010.dds.png b/system/wallpaper/Bg_2010.dds.png deleted file mode 100644 index 191c55e..0000000 Binary files a/system/wallpaper/Bg_2010.dds.png and /dev/null differ diff --git a/system/wallpaper/Bg_2012.dds.png b/system/wallpaper/Bg_2012.dds.png deleted file mode 100644 index 4f9d4d4..0000000 Binary files a/system/wallpaper/Bg_2012.dds.png and /dev/null differ