aboutsummaryrefslogtreecommitdiff
path: root/js/components/gradientpicker.reel/css/gradientpicker.scss
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 09:30:22 -0700
committerJonathan Duran2012-07-17 09:30:22 -0700
commit53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/components/gradientpicker.reel/css/gradientpicker.scss
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent5146f224258929415adf4a8022e492454b4e2476 (diff)
downloadninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/gradientpicker.reel/css/gradientpicker.scss')
-rwxr-xr-xjs/components/gradientpicker.reel/css/gradientpicker.scss169
1 files changed, 85 insertions, 84 deletions
diff --git a/js/components/gradientpicker.reel/css/gradientpicker.scss b/js/components/gradientpicker.reel/css/gradientpicker.scss
index cc9b4cb9..dda7d6f8 100755
--- a/js/components/gradientpicker.reel/css/gradientpicker.scss
+++ b/js/components/gradientpicker.reel/css/gradientpicker.scss
@@ -1,25 +1,26 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2/* <copyright> 2/* <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
5BSD License.
6 5
7Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met: 7modification, are permitted provided that the following conditions are met:
9 8
10 - Redistributions of source code must retain the above copyright notice, 9* Redistributions of source code must retain the above copyright notice,
11 this list of conditions and the following disclaimer. 10 this list of conditions and the following disclaimer.
12 - Redistributions in binary form must reproduce the above copyright 11
13 notice, this list of conditions and the following disclaimer in the 12* Redistributions in binary form must reproduce the above copyright notice,
14 documentation and/or other materials provided with the distribution. 13 this list of conditions and the following disclaimer in the documentation
15 - Neither the name of Motorola Mobility nor the names of its contributors 14 and/or other materials provided with the distribution.
16 may be used to endorse or promote products derived from this software 15
17 without specific prior written permission. 16* Neither the name of Motorola Mobility LLC nor the names of its
17 contributors may be used to endorse or promote products derived from this
18 software without specific prior written permission.
18 19
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -31,20 +32,20 @@ POSSIBILITY OF SUCH DAMAGE.
31 32
32input[type=radio], .gradientpicker .type .radio 33input[type=radio], .gradientpicker .type .radio
33{ 34{
34 width: 10px; 35 width: 10px;
35 height: 10px; 36 height: 10px;
36 margin: 2px; 37 margin: 2px;
37 display: block; 38 display: block;
38 float: left; 39 float: left;
39 border-radius: 5px; 40 border-radius: 5px;
40 border: 1px solid #222; 41 border: 1px solid #222;
41 background: -webkit-linear-gradient(top, #666666 0%,#333333 100%); 42 background: -webkit-linear-gradient(top, #666666 0%,#333333 100%);
42} 43}
43 44
44input[type=radio]:checked, .radio:checked, .gradientpicker .type .radio:checked 45input[type=radio]:checked, .radio:checked, .gradientpicker .type .radio:checked
45{ 46{
46 border: 1px solid #000; 47 border: 1px solid #000;
47 background: -webkit-radial-gradient(center, circle cover, rgba(255,255,255,1) 0%, rgba(255,255,255,1) 15%, rgba(204,204,204,1) 30%, rgba(204,204,204,0.01) 31%), -webkit-linear-gradient(top, #666666 0%,#333333 100%); 48 background: -webkit-radial-gradient(center, circle cover, rgba(255,255,255,1) 0%, rgba(255,255,255,1) 15%, rgba(204,204,204,1) 30%, rgba(204,204,204,0.01) 31%), -webkit-linear-gradient(top, #666666 0%,#333333 100%);
48} 49}
49 50
50.gradientpicker 51.gradientpicker
@@ -63,113 +64,113 @@ input[type=radio]:checked, .radio:checked, .gradientpicker .type .radio:checked
63 64
64.gradientpicker .type label 65.gradientpicker .type label
65{ 66{
66 display: block; 67 display: block;
67 float: left; 68 float: left;
68 margin: 0px 0px 0px 1px; 69 margin: 0px 0px 0px 1px;
69} 70}
70 71
71.gradientpicker .type :nth-child(3) 72.gradientpicker .type :nth-child(3)
72{ 73{
73 margin-left: 10px; 74 margin-left: 10px;
74} 75}
75 76
76 77
77 78
78.gradientpicker .type, .gradientpicker .cp_gp_slider 79.gradientpicker .type, .gradientpicker .cp_gp_slider
79{ 80{
80 overflow: visible; 81 overflow: visible;
81} 82}
82 83
83.gradientpicker .cp_gp_slider 84.gradientpicker .cp_gp_slider
84{ 85{
85 float: left; 86 float: left;
86 clear: both; 87 clear: both;
87} 88}
88 89
89.gradientpicker .cp_gp_slider .track_container 90.gradientpicker .cp_gp_slider .track_container
90{ 91{
91 width: 187px; 92 width: 187px;
92 height: 20px; 93 height: 20px;
93 margin: 6px 0px 0px 6px; 94 margin: 6px 0px 0px 6px;
94 border: 1px solid #333; 95 border: 1px solid #333;
95 background: url(../../../../images/colorpanel/transparent.png) repeat; 96 background: url(../../../../images/colorpanel/transparent.png) repeat;
96 float: left; 97 float: left;
97 clear: both; 98 clear: both;
98} 99}
99 100
100.gradientpicker .cp_gp_slider .track 101.gradientpicker .cp_gp_slider .track
101{ 102{
102 width: 187px; 103 width: 187px;
103 height: 20px; 104 height: 20px;
104 cursor: crosshair; 105 cursor: crosshair;
105} 106}
106 107
107.gradientpicker .cp_gp_slider .cover 108.gradientpicker .cp_gp_slider .cover
108{ 109{
109 overflow: hidden; 110 overflow: hidden;
110 width: 202px; 111 width: 202px;
111 height: 22px; 112 height: 22px;
112 float: left; 113 float: left;
113 position: absolute; 114 position: absolute;
114 bottom: 12px; 115 bottom: 12px;
115 z-index: 20; 116 z-index: 20;
116 display: none; 117 display: none;
117} 118}
118 119
119.gradientpicker .cp_gp_slider .chips 120.gradientpicker .cp_gp_slider .chips
120{ 121{
121 overflow: hidden; 122 overflow: hidden;
122 width: 202px; 123 width: 202px;
123 height: 22px; 124 height: 22px;
124 float: left; 125 float: left;
125 clear: both; 126 clear: both;
126 position: relative; 127 position: relative;
127 z-index: 1; 128 z-index: 1;
128} 129}
129 130
130.gradientpicker .cp_gp_slider .chips div 131.gradientpicker .cp_gp_slider .chips div
131{ 132{
132 width: 14px; 133 width: 14px;
133 position: absolute; 134 position: absolute;
134 top: 3px; 135 top: 3px;
135 cursor: pointer; 136 cursor: pointer;
136} 137}
137 138
138.gradientpicker .cp_gp_slider .chips span 139.gradientpicker .cp_gp_slider .chips span
139{ 140{
140 display: block; 141 display: block;
141 width: 8px; 142 width: 8px;
142 height: 8px; 143 height: 8px;
143 background: #333; 144 background: #333;
144 margin: 0px 0px -4px 3px; 145 margin: 0px 0px -4px 3px;
145 -webkit-transform: rotate(45deg); 146