diff options
| author | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
| commit | 0681b34b506767b6caf2816b9096bc1a57a17a2d (patch) | |
| tree | 20f10c767efe8d9c5c38fbc2cdb713d093bb279d /scss | |
| parent | f4eccf3e7cb76a14a3546a646575162dbd831538 (diff) | |
| parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
| download | ninja-0681b34b506767b6caf2816b9096bc1a57a17a2d.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'scss')
| -rwxr-xr-x | scss/imports/scss/_MainWindow.scss | 2 | ||||
| -rwxr-xr-x | scss/imports/scss/_PanelUI.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss index ba9851da..f6068ddb 100755 --- a/scss/imports/scss/_MainWindow.scss +++ b/scss/imports/scss/_MainWindow.scss | |||
| @@ -89,7 +89,7 @@ | |||
| 89 | min-height:46px; | 89 | min-height:46px; |
| 90 | max-height:50%; | 90 | max-height:50%; |
| 91 | overflow:auto; | 91 | overflow:auto; |
| 92 | 92 | -webkit-transition: all 0.15s linear; | |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | .panelContainer { | 95 | .panelContainer { |
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index f76d3e20..d60dae59 100755 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss | |||
| @@ -1088,7 +1088,7 @@ button.panel-button { | |||
| 1088 | margin: -1px 8px 0px 27px; | 1088 | margin: -1px 8px 0px 27px; |
| 1089 | } | 1089 | } |
| 1090 | .pp_filllabel{ | 1090 | .pp_filllabel{ |
| 1091 | border-width: none; | 1091 | border: none; |
| 1092 | margin: -1px 8px 0px 34px; | 1092 | margin: -1px 8px 0px 34px; |
| 1093 | } | 1093 | } |
| 1094 | // End Styles for DivPIProperties | 1094 | // End Styles for DivPIProperties |