From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- .../pickerNavigator.reel/pickerNavigator.css | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) mode change 100644 => 100755 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css old mode 100644 new mode 100755 index 2d9f1189..61328ce0 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css @@ -195,6 +195,36 @@ .picker .okButton{ margin-right:25px; + -webkit-box-align: center; + text-align: center; + cursor: default; + padding: 0px 6px 0px; + border:2px solid #d1d1d1; + background-color: #e1e1e1; + box-sizing: border-box; + border-radius:10px; + background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); + cursor:pointer; +} + +.picker .cancelButton{ + -webkit-box-align: center; + text-align: center; + cursor: default; + padding: 0px 6px 0px; + border:2px solid #d1d1d1; + background-color: #e1e1e1; + box-sizing: border-box; + border-radius:10px; + background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); + cursor:pointer; +} + +.picker input[type="button"]:disabled{ + background-color: #a1a1a1; + border:2px solid #a1a1a1; + background-image:none; + cursor:auto; } -- cgit v1.2.3 From 92161460a6cbbdebfd1b0263ec6eb790091920a9 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 30 Jan 2012 14:18:21 -0800 Subject: Moving changes from Gerrit, on 1/27, to the github branch: - added file existence check and validation to save as dialog - minor css fix for file picker, new file dialog Signed-off-by: Ananya Sen --- js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css | 1 + 1 file changed, 1 insertion(+) mode change 100755 => 100644 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css old mode 100755 new mode 100644 index 61328ce0..93578ec1 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css @@ -63,6 +63,7 @@ .picker .driversList:hover{ cursor:pointer; + background-color: #444444; } .picker .highlighted{ -- cgit v1.2.3 From 5b6c62b7164cbde2845a3f7af810568e5ba53a6a Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Mon, 13 Feb 2012 22:39:28 -0800 Subject: File IO UI tweaks Making minor tweaks to the UI for file IO, will need to make much more at a later time. --- .../pickerNavigator.reel/pickerNavigator.css | 32 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css index 93578ec1..9c85c6b5 100644 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css @@ -12,7 +12,11 @@ padding-left:15px; padding-bottom:15px; color:#ffffff; - background-color:#313131; + background-color:#494949; + font-family: 'Droid Sans', sans-serif; + border-radius: 8px; + box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); + text-shadow: 1px 1px 1px #000; } .picker .pickerHeader{ @@ -20,7 +24,7 @@ } .picker .container{ - border: 1px groove #000000; + border: 1px solid #000000; overflow: auto; background-color:#5f5f5f; } @@ -39,21 +43,26 @@ width:75%; height:88%; overflow: hidden; + border-left: none; } .picker .right-top{ - border: 1px groove #000000; + border-right: 1px solid #000000; overflow: auto; min-height:150px; height:75%; width:auto; + border-right: none; } .picker .right-bottom{ - border: 1px groove #000000; + border: 1px solid #000000; + border-left: none; overflow: auto; height:20%; padding: 10px; + border-bottom: none; + border-right: none; } .picker .driversList{ @@ -194,8 +203,16 @@ pointer:auto; } +.picker .buttons button { + float: left; + width: 100px; + margin-top: 3px; +} + .picker .okButton{ - margin-right:25px; + margin: 0px 22px 0px 8px; + /* +margin-right:25px; -webkit-box-align: center; text-align: center; cursor: default; @@ -206,10 +223,12 @@ border-radius:10px; background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); cursor:pointer; +*/ } .picker .cancelButton{ - -webkit-box-align: center; + /* +-webkit-box-align: center; text-align: center; cursor: default; padding: 0px 6px 0px; @@ -219,6 +238,7 @@ border-radius:10px; background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); cursor:pointer; +*/ } .picker input[type="button"]:disabled{ -- cgit v1.2.3 From 68ce64a5a2f4a71b54d33916aaf1d57161302425 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 14 Feb 2012 20:48:40 -0800 Subject: Reverting text/html document classes and setting up MVC folder structure Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers. --- js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css index 9c85c6b5..796c283f 100644 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css @@ -6,7 +6,7 @@ .picker{ font-size:12px; - width:510px; + width:523px; height:500px; padding-top:15px; padding-left:15px; @@ -53,6 +53,7 @@ height:75%; width:auto; border-right: none; + margin: 8px 0px 0px 8px; } .picker .right-bottom{ -- cgit v1.2.3 From 9048cd50bf5e0a418d1d95498bb593961f72db36 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Wed, 15 Feb 2012 09:51:12 -0800 Subject: Revert "Reverting text/html document classes and setting up MVC folder structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen --- js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css index 796c283f..9c85c6b5 100644 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css @@ -6,7 +6,7 @@ .picker{ font-size:12px; - width:523px; + width:510px; height:500px; padding-top:15px; padding-left:15px; @@ -53,7 +53,6 @@ height:75%; width:auto; border-right: none; - margin: 8px 0px 0px 8px; } .picker .right-bottom{ -- cgit v1.2.3 From e2b97c951a9a5a0c4ff831d44fdd82177cbd82ad Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Wed, 15 Feb 2012 10:54:14 -0800 Subject: Revert "Revert "Reverting text/html document classes and setting up MVC folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen --- js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css index 9c85c6b5..796c283f 100644 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css +++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css @@ -6,7 +6,7 @@ .picker{ font-size:12px; - width:510px; + width:523px; height:500px; padding-top:15px; padding-left:15px; @@ -53,6 +53,7 @@ height:75%; width:auto; border-right: none; + margin: 8px 0px 0px 8px; } .picker .right-bottom{ -- cgit v1.2.3 From a9c369c2e5d8f6fc8d936f7e1e6b84f693226ddf Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 16 Feb 2012 13:11:48 -0800 Subject: moved file picker in file io Signed-off-by: Ananya Sen --- .../pickerNavigator.reel/pickerNavigator.css | 253 --------------------- 1 file changed, 253 deletions(-) delete mode 100644 js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css (limited to 'js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css') diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css deleted file mode 100644 index 796c283f..00000000 --- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css +++ /dev/null @@ -1,253 +0,0 @@ -/* - This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. - */ - -.picker{ - font-size:12px; - width:523px; - height:500px; - padding-top:15px; - padding-left:15px; - padding-bottom:15px; - color:#ffffff; - background-color:#494949; - font-family: 'Droid Sans', sans-serif; - border-radius: 8px; - box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); - text-shadow: 1px 1px 1px #000; -} - -.picker .pickerHeader{ - margin-bottom: 10px; -} - -.picker .container{ - border: 1px solid #000000; - overflow: auto; - background-color:#5f5f5f; -} - -.picker .left-nav{ - float:left; - width:20%; - height:86%; - padding-top: 10px; - overflow-x:hidden; - overflow-y:auto -} - -.picker .right-nav{ - float:left; - width:75%; - height:88%; - overflow: hidden; - border-left: none; -} - -.picker .right-top{ - border-right: 1px solid #000000; - overflow: auto; - min-height:150px; - height:75%; - width:auto; - border-right: none; - margin: 8px 0px 0px 8px; -} - -.picker .right-bottom{ - border: 1px solid #000000; - border-left: none; - overflow: auto; - height:20%; - padding: 10px; - border-bottom: none; - border-right: none; -} - -.picker .driversList{ - padding: 3px; - text-align: center; -} - -.picker .driversList:hover{ - cursor:pointer; - background-color: #444444; -} - -.picker .highlighted{ - background-color: #343434; -} - - -.picker .buttons{ - float:right; - margin-top: 7px; -} - -.picker .historyArrows{ - width:20px; - display:inline; - border-radius: 5px; - border: 1px solid #d1d1d1; -} - -.picker .historyArrows span{ - font-size: 0.7em; - cursor: pointer; -} - -.picker .addressbar{ - display:inline; - margin-left: 2px; - border-radius: 5px; - border: 1px solid #d1d1d1; - padding: 3px; - position:relative; -} - -.picker .addressbar input{ - width:320px; -} - -.picker .dropdownArrow{ - font-size: 0.7em; - cursor: pointer; -} - -.picker .dropdown{ - position:absolute; - z-index:10000; - border: 1px solid #d1d1d1; - background-color: #444; - opacity:0.9; -} - -.picker .dropdown div{ - padding: 3px; -} - -.picker .dropdown div:hover{ - cursor: pointer; - background-color: #343434; -} - -.picker .addressbar .dropdown{ - width:331px; - min-height:50px; -} - -.picker .go{ - margin-left: 5px; - cursor: pointer; -} - -.picker .viewSwitcher{ - display:inline; - margin-left: 30px; -} - -.picker .viewSwitcher span{ - margin-left: 5px; - border-radius: 5px; - border: 1px solid #d1d1d1; - padding: 3px; - cursor: pointer; -} - -.picker .reload{ - position:relative; - margin-left: 15px; - top:4px; - cursor: pointer; -} - -.picker .filters{ - display:inline; - float:left; - margin-left: 12px; - margin-top: 7px; - border-radius: 5px; - border: 1px solid #d1d1d1; - padding: 3px; - /*width:150px;*/ - position:relative; - max-width: 65%; -} - -.picker .filters .dropdown{ - min-height:25px; - /*width:154px;*/ - bottom:21px; - left:-1px; - white-space: nowrap; -} - -.picker .filterVal{ - width:120px; - margin-left: 5px; - background-color: #444; -} - -.picker .disable{ - color:#5f5f5f; - cursor:auto; -} - -.picker .hide{ - display: none; -} - -.picker .viewSelected{ - background-color:#6f6f6f; - pointer:auto; -} - -.picker .buttons button { - float: left; - width: 100px; - margin-top: 3px; -} - -.picker .okButton{ - margin: 0px 22px 0px 8px; - /* -margin-right:25px; - -webkit-box-align: center; - text-align: center; - cursor: default; - padding: 0px 6px 0px; - border:2px solid #d1d1d1; - background-color: #e1e1e1; - box-sizing: border-box; - border-radius:10px; - background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); - cursor:pointer; -*/ -} - -.picker .cancelButton{ - /* --webkit-box-align: center; - text-align: center; - cursor: default; - padding: 0px 6px 0px; - border:2px solid #d1d1d1; - background-color: #e1e1e1; - box-sizing: border-box; - border-radius:10px; - background-image: -webkit-linear-gradient(bottom, #e1e1e1 13%, #d1d1d1 58%, #e1e1e1 40%); - cursor:pointer; -*/ -} - -.picker input[type="button"]:disabled{ - background-color: #a1a1a1; - border:2px solid #a1a1a1; - background-image:none; - cursor:auto; -} - - - -- cgit v1.2.3