aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-02 16:28:39 -0700
committerJohn Mayhew2012-04-02 16:28:39 -0700
commitb4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree3d8c802473f2395d53d599ec9d8b70b60a4db50c /scss
parent5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parentc6de22bf42be90b403491b5f87b1818d9020310c (diff)
downloadninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js js/preloader/Preloader.js
Diffstat (limited to 'scss')
-rwxr-xr-xscss/imports/scss/_MainWindow.scss41
-rwxr-xr-xscss/imports/scss/_ScrollBars.scss27
-rwxr-xr-xscss/imports/scss/_Tools.scss21
3 files changed, 54 insertions, 35 deletions
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 4c1ed592..ba9851da 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -73,7 +73,7 @@
73#topPanelContainer, 73#topPanelContainer,
74#leftPanelContainer, 74#leftPanelContainer,
75#rightPanelContainer, 75#rightPanelContainer,
76#bottomPanelContainer { 76.timelinePanel {
77 background-color: #282828; 77 background-color: #282828;
78} 78}
79#topPanelContainer { 79#topPanelContainer {
@@ -82,11 +82,11 @@
82 height:32px; 82 height:32px;
83} 83}
84 84
85#bottomPanelContainer { 85.timelinePanel {
86 //border: 1px solid #333; 86 //border: 1px solid #333;
87 background: transparent; 87 background: transparent;
88 height: 150px; 88 height: 150px;
89 min-height:80px; 89 min-height:46px;
90 max-height:50%; 90 max-height:50%;
91 overflow:auto; 91 overflow:auto;
92 92
@@ -136,6 +136,7 @@
136 display: -webkit-box; 136 display: -webkit-box;
137 -webkit-box-orient: horizontal; 137 -webkit-box-orient: horizontal;
138 margin-top:0px; 138 margin-top:0px;
139 position :relative;
139} 140}
140.mainContainerContent > section { 141.mainContainerContent > section {
141 margin-top: 2px; 142 margin-top: 2px;
@@ -200,16 +201,20 @@
200} 201}
201 202
202#mainContainer #rulerTop { 203#mainContainer #rulerTop {
204 display: none;
203 // TODO: temporary background please replace when component is implemented 205 // TODO: temporary background please replace when component is implemented
204 background:$color-stage; 206 background:$color-stage url('../images/temp/ruler-top.png');
205 height:15px; 207 height:15px;
206 margin-bottom: 0px; 208 margin-bottom: 0px;
209 border-right: 11px solid black;
207} 210}
208 211
209#rulerLeft { 212#rulerLeft {
213 display: none;
210 // TODO: temporary background please replace when component is implemented 214 // TODO: temporary background please replace when component is implemented
211 background:$color-stage; 215 background:$color-stage url('../images/temp/ruler-left.png');
212 width:16px; 216 width:16px;
217 border-bottom: 11px solid black;
213} 218}
214 219
215#stateBar { 220#stateBar {
@@ -223,11 +228,25 @@
223 position:relative; 228 position:relative;
224} 229}
225 230
231.pasteboardResizer {
232
233 position: absolute;
234 width: 11px;
235 height: 11px;
236 bottom: 0px;
237 right: 0px;
238 z-index: 20;
239 background-image:url("../images/scrollbars/scrollbar_resizer.png");
240 background-repeat: no-repeat;
241 background-color: #000;
242 cursor: se-resize;
243
244}
226.timelineResizer { 245.timelineResizer {
227 background: #000 center center no-repeat url('data:image/gif;base64,R0lGODlhGQADAMQAAD49PXx8fGppaSYmJl9fXysrKykpKW5uboqJiUxMTGlpaV9eXjo6OoeHhyUkJD09PSoqKmpqaj8/P4qKiiQkJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C1hNUCBEYXRhWE1QPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjEgNjQuMTQwOTQ5LCAyMDEwLzEyLzA3LTEwOjU3OjAxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1LjEgTWFjaW50b3NoIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdEMUI3NjM1QkQ1QTExRTBBMTJFQzE1RDk5REVFRkI4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjdEMUI3NjM2QkQ1QTExRTBBMTJFQzE1RDk5REVFRkI4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6N0QxQjc2MzNCRDVBMTFFMEExMkVDMTVEOTlERUVGQjgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6N0QxQjc2MzRCRDVBMTFFMEExMkVDMTVEOTlERUVGQjgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4B//79/Pv6+fj39vX08/Lx8O/u7ezr6uno5+bl5OPi4eDf3t3c29rZ2NfW1dTT0tHQz87NzMvKycjHxsXEw8LBwL++vby7urm4t7a1tLOysbCvrq2sq6qpqKempaSjoqGgn56dnJuamZiXlpWUk5KRkI+OjYyLiomIh4aFhIOCgYB/fn18e3p5eHd2dXRzcnFwb25tbGtqaWhnZmVkY2JhYF9eXVxbWllYV1ZVVFNSUVBPTk1MS0pJSEdGRURDQkFAPz49PDs6OTg3NjU0MzIxMC8uLSwrKikoJyYlJCMiISAfHh0cGxoZGBcWFRQTEhEQDw4NDAsKCQgHBgUEAwIBAAAh+QQAAAAAACwAAAAAGQADAAAFH6ABDVRpnujpQAXxKFIUz3JNzwKwMEcz/cCgMIgIJEIAOw=='); 246 background: #282828;
228 width:100%; 247 width:100%;
229 height:6px; 248 height:6px;
230 cursor: row-resize; 249 cursor: row-resize;
231} 250}
232.timelineResizer.collapsed { 251.timelineResizer.collapsed {
233 height:0px !important; 252 height:0px !important;
@@ -247,12 +266,12 @@
247.resizeBar { -webkit-transition: all 0.15s linear; } 266.resizeBar { -webkit-transition: all 0.15s linear; }
248 267
249// Splitters Collapsed 268// Splitters Collapsed
250.panelContainer, .panelContainer.collapsed { -webkit-transition: all 0.15s ease-in; } 269.panelContainer.collapsed { -webkit-transition: all 0.15s ease-in; }
251.panel.disableTransition { -webkit-transition: none !important; -webkit-box-flex:0.1 !important; } 270.panel.disableTransition { -webkit-transition: none !important; -webkit-box-flex:0.1 !important; }
252.disableTransition { -webkit-transition: none !important; -webkit-box-flex:0 !important; } 271.disableTransition { -webkit-transition: none !important; -webkit-box-flex:0 !important; }
253 272
254#rightPanelContainer.collapsed, #leftPanelContainer.collapsed { width:0px !important; min-width:0px !important; overflow: hidden; border: 0px; margin: 0px; padding: 0px; } 273#rightPanelContainer.collapsed, #leftPanelContainer.collapsed { width:0px !important; min-width:0px !important; overflow: hidden; border: 0px; margin: 0px; padding: 0px; }
255#topPanelContainer.collapsed, #bottomPanelContainer.collapsed { height:0px !important; min-height:0px !important; overflow: hidden; border: 0px; margin: 0px; padding: 0px; } 274#topPanelContainer.collapsed, .timelinePanel.collapsed { height:0px !important; min-height:0px !important; overflow: hidden; border: 0px; margin: 0px; padding: 0px; }
256.leftSplitter.collapsed { -webkit-transform:rotate(180deg); } 275.leftSplitter.collapsed { -webkit-transform:rotate(180deg); }
257.rightSplitter.collapsed { -webkit-transform:rotate(0deg); } 276.rightSplitter.collapsed { -webkit-transform:rotate(0deg); }
258.topSplitter.collapsed { -webkit-transform:rotate(180deg); } 277.topSplitter.collapsed { -webkit-transform:rotate(180deg); }
diff --git a/scss/imports/scss/_ScrollBars.scss b/scss/imports/scss/_ScrollBars.scss
index 1c2f30ea..2e79d9c8 100755
--- a/scss/imports/scss/_ScrollBars.scss
+++ b/scss/imports/scss/_ScrollBars.scss
@@ -110,8 +110,9 @@
110 110
111 background-color: $color-sb-border; 111 background-color: $color-sb-border;
112} 112}
113
113::-webkit-scrollbar-corner:window-inactive { 114::-webkit-scrollbar-corner:window-inactive {
114 background-color: $color-sb-border; 115 background-color: $color-sb-border;
115} 116}
116 117
117::-webkit-resizer { 118::-webkit-resizer {
@@ -150,8 +151,28 @@
150 display: none; 151 display: none;
151} 152}
152 153
153::-webkit-resizer:disabled { 154#iframeContainer::-webkit-resizer:disabled {
154 display: none; 155 display: block;
156}
157
158#iframeContainer::-webkit-scrollbar-track:vertical:disabled {
159 display: block;
160}
161
162#iframeContainer::-webkit-scrollbar-track:horizontal:disabled {
163 display: block;
164}
165
166#iframeContainer::-webkit-scrollbar-track-piece:disabled {
167 display: block;
168}
169
170#iframeContainer::-webkit-scrollbar-corner:disabled {
171 display: block;
172}
173
174#iframeContainer::-webkit-resizer:disabled {
175 display: block;
155} 176}
156 177
157// End: Scroll Bar Skinning 178// End: Scroll Bar Skinning
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index 19ede70a..55c37d02 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -116,27 +116,6 @@
116 margin-left:43px; 116 margin-left:43px;
117} 117}
118 118
119
120.LockToolUp {
121 background-image: url("../images/optionsbar/link.png");
122 background-repeat:no-repeat;
123 width:17px;
124 height:18px;
125
126 margin-right:10px;
127}
128
129.UnLockToolUp {
130 background-image: url("../images/optionsbar/unlinked.png");
131
132 background-repeat:no-repeat;
133 width:17px;
134 height:18px;
135
136 margin-right:10px;
137}
138
139
140.cornerRadius { 119.cornerRadius {
141 background-image: url("../images/optionsbar/rectangle/cornerRadius.png"); 120 background-image: url("../images/optionsbar/rectangle/cornerRadius.png");
142 background-repeat:no-repeat; 121 background-repeat:no-repeat;