aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel/text-properties.css
diff options
context:
space:
mode:
authorJon Reid2012-05-22 10:40:40 -0700
committerJon Reid2012-05-22 10:40:40 -0700
commitd43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch)
tree1c78ccc588f04bac9bff4de82e527a128162cf4f /js/components/tools-properties/text-properties.reel/text-properties.css
parent1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff)
parent0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff)
downloadninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.css')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css28
1 files changed, 16 insertions, 12 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 f7bb8295..218105a7 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -5,7 +5,10 @@
5 </copyright> */ 5 </copyright> */
6 6
7.optionsTextTool { 7.optionsTextTool {
8 padding: 6px; 8}
9
10.optionsTextTool .overrideMargin{
11 margin-left: 0px;
9} 12}
10 13
11.optionsTextTool .btnGroup { 14.optionsTextTool .btnGroup {
@@ -16,26 +19,27 @@
16 margin: 2px; 19 margin: 2px;
17} 20}
18 21
19.optionsTextTool > *, .optionsTextTool .btnGroup > * { 22.optionsTextTool .btnGroup .textButton {
20 float:left; 23 width: auto;
24 padding: 4px 8px;
25 margin-left: 0px;
21} 26}
22 27
23.optionsTextTool button { 28.optionsTextTool .btnGroup .imageButton {
24 width: auto; 29 padding-top: 2px;
25 padding: 4px 8px !important; 30 height: 22px;
26 margin-left:4px;
27} 31}
28 32
29.optionsTextTool .label, .optionsTextTool .hottextunit { 33.optionsTextTool .label, .optionsTextTool .hottextunit {
30 font-size:11px; 34 font-size:11px;
35 margin-top: 1px;
31} 36}
32 37
33.optionsTextTool .fontSelection { 38.optionsTextTool .fontSelection {
34 width:100px; 39 width: 160px;
35} 40}
36 41
37.optionsTextTool .fontColor { 42.optionsTextTool .toolColorChipCtrl {
38 width: 20px; 43 margin-left: 6px;
39 height: 18px; 44 margin-right: 0px;
40 margin: 2px 6px;
41} \ No newline at end of file 45} \ No newline at end of file