diff options
author | Armen Kesablyan | 2012-03-22 14:31:12 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-03-22 14:31:12 -0700 |
commit | 49596f2a6b518ed0ee945006787d3c69e40a5757 (patch) | |
tree | 0d8e40b9fe4ca3fc0d12fa5539f02e8ff0eaaa17 /scss/imports/scss | |
parent | 60107392554fa993a16e748f7281be423055cd19 (diff) | |
download | ninja-49596f2a6b518ed0ee945006787d3c69e40a5757.tar.gz |
Updated Resizers for Panels and timeline
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'scss/imports/scss')
-rwxr-xr-x | scss/imports/scss/_MainWindow.scss | 39 | ||||
-rwxr-xr-x | scss/imports/scss/_ScrollBars.scss | 27 |
2 files changed, 52 insertions, 14 deletions
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss index 4c1ed592..eec931ab 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,15 +201,17 @@ | |||
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; |
207 | } | 209 | } |
208 | 210 | ||
209 | #rulerLeft { | 211 | #rulerLeft { |
212 | display: none; | ||
210 | // TODO: temporary background please replace when component is implemented | 213 | // TODO: temporary background please replace when component is implemented |
211 | background:$color-stage; | 214 | background:$color-stage url('../images/temp/ruler-left.png'); |
212 | width:16px; | 215 | width:16px; |
213 | } | 216 | } |
214 | 217 | ||
@@ -223,11 +226,25 @@ | |||
223 | position:relative; | 226 | position:relative; |
224 | } | 227 | } |
225 | 228 | ||
229 | .pasteboardResizer { | ||
230 | |||
231 | position: absolute; | ||
232 | width: 11px; | ||
233 | height: 11px; | ||
234 | bottom: 0px; | ||
235 | right: 0px; | ||
236 | z-index: 20; | ||
237 | background-image:url("../images/scrollbars/scrollbar_resizer.png"); | ||
238 | background-repeat: no-repeat; | ||
239 | background-color: #000; | ||
240 | cursor: se-resize; | ||
241 | |||
242 | } | ||
226 | .timelineResizer { | 243 | .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=='); | 244 | 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=='); |
228 | width:100%; | 245 | width:100%; |
229 | height:6px; | 246 | height:6px; |
230 | cursor: row-resize; | 247 | cursor: row-resize; |
231 | } | 248 | } |
232 | .timelineResizer.collapsed { | 249 | .timelineResizer.collapsed { |
233 | height:0px !important; | 250 | height:0px !important; |
@@ -247,12 +264,12 @@ | |||
247 | .resizeBar { -webkit-transition: all 0.15s linear; } | 264 | .resizeBar { -webkit-transition: all 0.15s linear; } |
248 | 265 | ||
249 | // Splitters Collapsed | 266 | // Splitters Collapsed |
250 | .panelContainer, .panelContainer.collapsed { -webkit-transition: all 0.15s ease-in; } | 267 | .panelContainer.collapsed { -webkit-transition: all 0.15s ease-in; } |
251 | .panel.disableTransition { -webkit-transition: none !important; -webkit-box-flex:0.1 !important; } | 268 | .panel.disableTransition { -webkit-transition: none !important; -webkit-box-flex:0.1 !important; } |
252 | .disableTransition { -webkit-transition: none !important; -webkit-box-flex:0 !important; } | 269 | .disableTransition { -webkit-transition: none !important; -webkit-box-flex:0 !important; } |
253 | 270 | ||
254 | #rightPanelContainer.collapsed, #leftPanelContainer.collapsed { width:0px !important; min-width:0px !important; overflow: hidden; border: 0px; margin: 0px; padding: 0px; } | 271 | #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; } | 272 | #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); } | 273 | .leftSplitter.collapsed { -webkit-transform:rotate(180deg); } |
257 | .rightSplitter.collapsed { -webkit-transform:rotate(0deg); } | 274 | .rightSplitter.collapsed { -webkit-transform:rotate(0deg); } |
258 | .topSplitter.collapsed { -webkit-transform:rotate(180deg); } | 275 | .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 |