diff options
Diffstat (limited to 'scss')
-rw-r--r-- | scss/imports/scss/_MontageOverrides.scss | 4 | ||||
-rwxr-xr-x | scss/imports/scss/_Tools.scss | 33 | ||||
-rwxr-xr-x | scss/imports/scss/_toolbar.scss | 339 |
3 files changed, 162 insertions, 214 deletions
diff --git a/scss/imports/scss/_MontageOverrides.scss b/scss/imports/scss/_MontageOverrides.scss index 65b9ede0..6e728863 100644 --- a/scss/imports/scss/_MontageOverrides.scss +++ b/scss/imports/scss/_MontageOverrides.scss | |||
@@ -16,4 +16,8 @@ | |||
16 | } | 16 | } |
17 | .montage-popup-container { | 17 | .montage-popup-container { |
18 | background: none; | 18 | background: none; |
19 | } | ||
20 | |||
21 | .montage-invisible { | ||
22 | display: none; | ||
19 | } \ No newline at end of file | 23 | } \ No newline at end of file |
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss index 935c4cd6..19ede70a 100755 --- a/scss/imports/scss/_Tools.scss +++ b/scss/imports/scss/_Tools.scss | |||
@@ -12,23 +12,15 @@ | |||
12 | // | 12 | // |
13 | 13 | ||
14 | 14 | ||
15 | // Made changes to toolButton | 15 | // Made changes to toolButton } |
16 | 16 | ||
17 | .toolButton { | 17 | .subToolHolderPanel .toolbutton { |
18 | width:26px; | ||
19 | height:23px; | ||
20 | padding: 0px; | ||
21 | margin:1px; | ||
22 | border-width: 1px; | ||
23 | border-style: solid; | ||
24 | } | ||
25 | |||
26 | .subToolButton { | ||
27 | float:left; | 18 | float:left; |
19 | -webkit-transform: scale(0.6); | ||
28 | } | 20 | } |
29 | 21 | ||
30 | #topPanelContainer .subToolButton { | 22 | .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { |
31 | 23 | -webkit-transform: scale(0.75); | |
32 | } | 24 | } |
33 | 25 | ||
34 | .subOption{ | 26 | .subOption{ |
@@ -39,21 +31,6 @@ | |||
39 | margin-right: 10px; | 31 | margin-right: 10px; |
40 | } | 32 | } |
41 | 33 | ||
42 | .toolButton:active { | ||
43 | border-top-width: 1px; | ||
44 | border-top-style: solid; | ||
45 | border-left-width: 1px; | ||
46 | border-left-style: solid; | ||
47 | } | ||
48 | |||
49 | .toolButtonSelected { | ||
50 | border-top-width: 1px; | ||
51 | border-top-style: solid; | ||
52 | border-left-width: 1px; | ||
53 | border-left-style: solid; | ||
54 | |||
55 | } | ||
56 | |||
57 | .toolSeparator { | 34 | .toolSeparator { |
58 | height:1px; | 35 | height:1px; |
59 | width:30px; | 36 | width:30px; |
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss index 048c1f88..00d8b5f0 100755 --- a/scss/imports/scss/_toolbar.scss +++ b/scss/imports/scss/_toolbar.scss | |||
@@ -11,280 +11,247 @@ | |||
11 | // _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss | 11 | // _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss |
12 | 12 | ||
13 | 13 | ||
14 | // New Tool List CSS | 14 | // New Tool List CSS |
15 | .SelectionToolPressed { | 15 | #toolsPanelContent { |
16 | @include background-pos(12,1,26px,23px); | 16 | width:40px; |
17 | @include opacity(1.0); | ||
18 | } | 17 | } |
19 | 18 | ||
20 | .SelectionToolUnpressed { | 19 | .toolsList { |
21 | @include background-pos(13,1,26px,23px); | 20 | width:29px; |
22 | @include opacity(0.7); | 21 | margin:auto; |
23 | } | 22 | } |
24 | 23 | ||
25 | .SubselectionToolPressed { | 24 | .toolsList hr { |
26 | @include background-pos(14,1,26px,23px); | 25 | border:0px; |
27 | @include opacity(1.0); | 26 | border-top: 1px solid #232323; |
27 | border-bottom: 1px solid #3A3A3A; | ||
28 | margin:2px; | ||
28 | } | 29 | } |
29 | 30 | ||
30 | .SubselectionToolUnpressed { | 31 | .toolbutton { |
31 | @include background-pos(15,1,26px,23px); | 32 | width:29px; |
32 | @include opacity(0.7); | 33 | height:29px; |
34 | background-position: center center; | ||
35 | background-repeat: no-repeat; | ||
36 | border-radius:3px; | ||
37 | opacity: 1; | ||
38 | margin-bottom: 2px; | ||
39 | -webkit-transform: scale(0.8); | ||
40 | -webkit-transition: 0.15s all cubic-bezier(.44,.19,0,.99); | ||
33 | } | 41 | } |
34 | 42 | ||
35 | .RotateTool3DPressed { | 43 | .toolbutton:hover, .toolbutton.active { |
36 | @include background-pos(0,0,26px,23px); | 44 | box-shadow: 0px 0px 2px 2px #999; |
37 | @include opacity(1.0); | ||
38 | } | ||
39 | 45 | ||
40 | .RotateTool3DUnpressed { | 46 | -webkit-transform: scale(1); |
41 | @include background-pos(1,0,26px,23px); | 47 | opacity: 1; |
42 | @include opacity(0.7); | ||
43 | } | 48 | } |
44 | 49 | ||
45 | .Translate3DPressed { | 50 | .toolbutton:active { |
46 | @include background-pos(4,0,26px,23px); | 51 | background-color: #8c8c8c; |
47 | @include opacity(1.0); | ||
48 | } | 52 | } |
49 | 53 | ||
50 | .Translate3DUnpressed { | 54 | .toolbutton.active { |
51 | @include background-pos(5,0,26px,23px); | 55 | box-shadow: inset 0px 0px 2px 2px #555; |
52 | @include opacity(0.7); | 56 | background-color:#363636; |
53 | } | 57 | } |
54 | 58 | ||
55 | .TagToolPressed { | 59 | .SelectionTool { |
56 | @include background-pos(0,2,26px,23px); | 60 | background-image:url("../images/tools/Tool-Selection.png"); |
57 | @include opacity(1.0); | ||
58 | } | 61 | } |
59 | 62 | ||
60 | .TagToolUnpressed { | 63 | .SubselectionTool { |
61 | @include background-pos(1,2,26px,23px); | 64 | background-image:url("../images/tools/Tool-Subselect.png"); |
62 | @include opacity(0.7); | ||
63 | } | 65 | } |
64 | 66 | ||
65 | .PenToolPressed { | 67 | .RotateTool3D { |
66 | @include background-pos(6,1,26px,23px); | 68 | background-image:url("../images/tools/Tool-3DRotate.png"); |
67 | @include opacity(1.0); | ||
68 | } | 69 | } |
69 | 70 | ||
70 | .PenToolUnpressed { | 71 | .Translate3D { |
71 | @include background-pos(7,1,26px,23px); | 72 | background-image:url("../images/tools/Tool-3DTranslate.png"); |
72 | @include opacity(0.7); | ||
73 | } | 73 | } |
74 | 74 | ||
75 | .TextToolPressed { | 75 | .TagTool { |
76 | @include background-pos(2,2,26px,23px); | 76 | background-image:url("../images/tools/Tool-Tag.png"); |
77 | @include opacity(1.0); | ||
78 | } | 77 | } |
79 | 78 | ||
80 | .TextToolUnpressed { | 79 | .PenTool { |
81 | @include background-pos(3,2,26px,23px); | 80 | background-image:url("../images/tools/Tool-Pen.png"); |
82 | @include opacity(0.7); | ||
83 | } | 81 | } |
84 | 82 | ||
85 | .ShapeContainerPressed { | 83 | .TextTool { |
86 | @include background-pos(4,1,26px,23px); | 84 | background-image:url("../images/tools/Tool-Text.png"); |
87 | @include opacity(1.0); | ||
88 | } | ||
89 | .ShapeContainerUnpressed { | ||
90 | @include background-pos(5,1,26px,23px); | ||
91 | @include opacity(0.7); | ||
92 | } | 85 | } |
93 | 86 | ||
94 | .OvalToolPressed { | 87 | .ShapeContainer { |
95 | @include background-pos(4,1,26px,23px); | 88 | background-image:url("../images/tools/Tool-Rectangle.png"); |
96 | @include opacity(1.0); | ||
97 | } | 89 | } |
98 | 90 | ||
99 | .OvalToolUnpressed { | 91 | .OvalTool { |
100 | @include background-pos(5,1,26px,23px); | 92 | background-image:url("../images/tools/Tool-Oval.png"); |
101 | @include opacity(0.7); | ||
102 | } | 93 | } |
103 | 94 | ||
104 | .RectangleToolPressed { | 95 | .RectangleTool { |
105 | @include background-pos(10,1,26px,23px); | 96 | background-image:url("../images/tools/Tool-Square.png"); |
106 | @include opacity(1.0); | ||
107 | } | 97 | } |
108 | 98 | ||
109 | .RectangleToolUnpressed { | 99 | .LineTool { |
110 | @include background-pos(11,1,26px,23px); | 100 | background-image:url("../images/tools/Tool-Line.png"); |
111 | @include opacity(0.7); | ||
112 | } | 101 | } |
113 | 102 | ||
114 | .LineToolPressed { | 103 | .PencilTool { |
115 | @include background-pos(2,1,26px,23px); | 104 | background-image:url("../images/tools/Tool-Pencil.png"); |
116 | @include opacity(1.0); | ||
117 | } | 105 | } |
118 | 106 | ||
119 | .LineToolUnpressed { | 107 | .BrushTool { |
120 | @include background-pos(3,1,26px,23px); | 108 | background-image:url("../images/tools/Tool-PaintBrush.png"); |
121 | @include opacity(0.7); | ||
122 | } | 109 | } |
123 | 110 | ||
124 | .PencilToolPressed { | 111 | .FillTool { |
125 | @include background-pos(8,1,26px,23px); | 112 | background-image:url("../images/tools/ |