diff options
Diffstat (limited to 'js')
-rwxr-xr-x | js/io/system/coreioapi.js | 2 | ||||
-rw-r--r-- | js/io/ui/save-as-dialog.reel/save-as-dialog.css | 57 | ||||
-rw-r--r-- | js/io/ui/save-as-dialog.reel/save-as-dialog.html | 4 |
3 files changed, 37 insertions, 26 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js index 6dcd795e..507804fd 100755 --- a/js/io/system/coreioapi.js +++ b/js/io/system/coreioapi.js | |||
@@ -1103,7 +1103,7 @@ window.hack = function (path) { | |||
1103 | uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces | 1103 | uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces |
1104 | 1104 | ||
1105 | //for local machine folder uri | 1105 | //for local machine folder uri |
1106 | isWindowsUri = /^([a-zA-Z]:)(\\[^<>:"/\\|?*]+)*\\?$/gi.test(uri); | 1106 | isWindowsUri = /^([a-zA-Z]:)([\\/][^<>:"/\\|?*]+)*[\\/]?$/gi.test(uri); |
1107 | isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix | 1107 | isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix |
1108 | status = isWindowsUri || isUnixUri; | 1108 | status = isWindowsUri || isUnixUri; |
1109 | if(isWindowsUri && isUnixUri){status = false;} | 1109 | if(isWindowsUri && isUnixUri){status = false;} |
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.css b/js/io/ui/save-as-dialog.reel/save-as-dialog.css index 40434c25..92970706 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.css +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.css | |||
@@ -10,8 +10,12 @@ | |||
10 | height:150px; | 10 | height:150px; |
11 | padding-left: 15px; | 11 | padding-left: 15px; |
12 | padding-right: 15px; | 12 | padding-right: 15px; |
13 | background-color:#313131; | ||
14 | color: #ffffff; | 13 | color: #ffffff; |
14 | background-color:#494949; | ||
15 | font-family: 'Droid Sans', sans-serif; | ||
16 | border-radius: 8px; | ||
17 | box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); | ||
18 | text-shadow: 1px 1px 1px #000; | ||
15 | } | 19 | } |
16 | 20 | ||
17 | .saveAsDialog .title{ | 21 | .saveAsDialog .title{ |
@@ -24,7 +28,7 @@ | |||
24 | } | 28 | } |
25 | 29 | ||
26 | .saveAsDialog .locationSelection{ | 30 | .saveAsDialog .locationSelection{ |
27 | border: 1px groove #000000; | 31 | border: 1px solid #000000; |
28 | overflow: auto; | 32 | overflow: auto; |
29 | height:38%; | 33 | height:38%; |
30 | padding: 15px; | 34 | padding: 15px; |
@@ -65,31 +69,38 @@ | |||
65 | margin-left:3px; | 69 | margin-left:3px; |
66 | } | 70 | } |
67 | 71 | ||
72 | .saveAsDialog .buttons button { | ||
73 | float: left; | ||
74 | width: 100px; | ||
75 | margin-top: 3px; | ||
76 | } | ||
77 | |||
68 | .saveAsDialog .okButton{ | 78 | .saveAsDialog .okButton{ |
69 | margin-right:25px; | 79 | margin: 0px 5px 0px 5px; |
70 | -webkit-box-align: center; | 80 | /*margin-right:25px;*/ |
71 | text-align: center; | 81 | /*-webkit-box-align: center;*/ |
72 | cursor: default; | 82 | /*text-align: center;*/ |
73 | padding: 0px 6px 0px; | 83 | /*cursor: default;*/ |
74 | border:2px solid #d1d1d1; | 84 | /*padding: 0px 6px 0px;*/ |
75 | background-color: #e1e1e1; | 85 | /*border:2px solid #d1d1d1;*/ |
76 | box-sizing: border-box; | 86 | /*background-color: #e1e1e1;*/ |
77 | border-radius:10px; | 87 | /*box-sizing: border-box;*/ |
78 | background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); | 88 | /*border-radius:10px;*/ |
79 | cursor:pointer; | 89 | /*background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);*/ |
90 | /*cursor:pointer;*/ | ||
80 | } | 91 | } |
81 | 92 | ||
82 | .saveAsDialog .cancelButton{ | 93 | .saveAsDialog .cancelButton{ |
83 | -webkit-box-align: center; | 94 | /*-webkit-box-align: center;*/ |
84 | text-align: center; | 95 | /*text-align: center;*/ |
85 | cursor: default; | 96 | /*cursor: default;*/ |
86 | padding: 0px 6px 0px; | 97 | /*padding: 0px 6px 0px;*/ |
87 | border:2px solid #d1d1d1; | 98 | /*border:2px solid #d1d1d1;*/ |
88 | background-color: #e1e1e1; | 99 | /*background-color: #e1e1e1;*/ |
89 | box-sizing: border-box; | 100 | /*box-sizing: border-box;*/ |
90 | border-radius:10px; | 101 | /*border-radius:10px;*/ |
91 | background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); | 102 | /*background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%);*/ |
92 | cursor:pointer; | 103 | /*cursor:pointer;*/ |
93 | } | 104 | } |
94 | 105 | ||
95 | .saveAsDialog input[type="button"]:disabled{ | 106 | .saveAsDialog input[type="button"]:disabled{ |
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html index f2011a34..4f0d5779 100644 --- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html +++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html | |||
@@ -48,8 +48,8 @@ | |||
48 | </div> | 48 | </div> |
49 | <div class="errorMsg"><span id="error" class="error"></span></div> | 49 | <div class="errorMsg"><span id="error" class="error"></span></div> |
50 | <div class="buttons"> | 50 | <div class="buttons"> |
51 | <input id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" /> | 51 | <button id="cancelButton" type="button" value="CANCEL" class="cancelButton nj-skinned" >CANCEL</button> |
52 | <input id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" /> | 52 | <button id="okButton" disabled="true" type="button" value="OK" class="okButton nj-skinned" >OK</button> |
53 | </div> | 53 | </div> |
54 | 54 | ||
55 | </div> | 55 | </div> |