aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.css
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-10 15:14:35 -0800
committerNivesh Rajbhandari2012-02-10 15:14:35 -0800
commitde65f73c0f129a26aa9007b69e8fce31d0e92d00 (patch)
treee0fd4bbc44b96909d7619593b29d9b063209a7ce /js/components/tools-properties/text-properties.reel/text-properties.css
parent9e40945a5bf4330d1088b56b8011ee625b1adab9 (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-de65f73c0f129a26aa9007b69e8fce31d0e92d00.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.css')
-rw-r--r--js/components/tools-properties/text-properties.reel/text-properties.css30
1 files changed, 17 insertions, 13 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index d581c6c3..6aa61812 100644
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -5,29 +5,33 @@
5 </copyright> */ 5 </copyright> */
6 6
7.optionsTextTool { 7.optionsTextTool {
8 display: -webkit-box; 8 padding: 6px;
9 -webkit-box-orient:horizontal;
10 -webkit-box-align: stretch;
11 padding: 5px;
12} 9}
13 10
14 11.optionsTextTool .btnGroup {
15.optionsTextTool > * { 12 padding: 0px 8px;
16 -webkit-box-flex:0;
17} 13}
18 14
19.optionsTextTool .button { 15.optionsTextTool > *, .optionsTextTool .btnGroup > * {
20 width: auto; 16 float:left;
21
22} 17}
23 18
24.optionsTextTool .hottextunit { 19.optionsTextTool button {
25 padding-top:5px; 20 width: auto;
21 padding: 4px 8px !important;
22 margin-left:4px;
26} 23}
27 24
28.optionsTextTool .label, .optionsTextTool .hottextunit { 25.optionsTextTool .label, .optionsTextTool .hottextunit {
29 float:none;
30 font-size:11px; 26 font-size:11px;
31} 27}
32 28
29.optionsTextTool .fontSelection {
30 width:100px;
31}
33 32
33.optionsTextTool .fontColor {
34 width: 20px;
35 height: 18px;
36 margin: 2px 6px;
37} \ No newline at end of file