Skip to content

Commit 09ba4c2

Browse files
Dan Büschlenmatthiask
Dan Büschlen
authored and
matthiask
committed
Flatten the CSS
1 parent e87ccbe commit 09ba4c2

File tree

2 files changed

+97
-62
lines changed

2 files changed

+97
-62
lines changed

‎feincms/static/feincms/item_editor.css‎

Lines changed: 69 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,36 @@
11
.navi_tab {
22
float:left;
3-
padding: 5px 14px 5px 12px;
3+
padding: 8px 10px;
44
cursor:pointer;
5-
border: 1px solid #ccc;
6-
border-bottom:none;
7-
min-width:100px;
85
margin-top:3px;
9-
/* height:13px; */
106
font-weight: bold;
11-
font-size: 12px;
12-
background-image:none;
13-
color: #333333;
14-
background: #E1E1E1 url(img/nav-bg.gif) top repeat-x;
7+
font-size: 11px;
8+
color: #666;
9+
background: #f6f6f6;
10+
border: 1px solid #eee;
11+
text-transform: uppercase;
1512
}
1613
.tab_active {
17-
margin-top: 0;
18-
padding-top: 6px;
19-
padding-bottom: 7px;
20-
background: #7BA0C6 url('img/default-bg.gif') top repeat-x;
14+
background: #79aec8;
2115
color: white;
16+
border-color: #79aec8;
2217
}
2318

2419
#main {
2520
clear:both;
2621
padding: 10px 10px 10px 10px;
27-
border: 1px solid #ccc;
22+
border: 1px solid #eee;
2823
margin: 0 0 10px 0;
2924
}
25+
3026
.panel {
3127
display:none;
3228
position:relative;
33-
padding-bottom:50px;
34-
}
35-
36-
.order-machine {
37-
margin-bottom:10px;
29+
padding-bottom: 77px;
3830
}
3931

4032
.order-item {
41-
margin: 0 0 10px 0;
33+
margin: 0;
4234
position:relative;
4335
}
4436

@@ -54,8 +46,14 @@
5446

5547
.order-item .collapse {
5648
cursor: pointer;
57-
color: #444;
49+
/*color: #444;*/
5850
font-weight: normal;
51+
52+
border-bottom: 1px solid rgba(255, 255, 255, 0.25);
53+
}
54+
55+
.order-item .collapse:hover {
56+
opacity: 0.7;
5957
}
6058

6159
.item-delete {
@@ -65,11 +63,11 @@
6563
}
6664

6765
.highlight, .helper {
68-
height: 25px;
66+
height: 34px;
6967
margin: 0 0 10px 0;
7068
border: none;
7169
opacity: 0.3;
72-
background: url('img/item_editor_form_title.png') no-repeat left bottom;
70+
background: #79aec8;
7371
}
7472

7573
.helper{
@@ -123,21 +121,43 @@ textarea {
123121
}
124122

125123
.item-controls {
126-
background: url('img/wrench.png') no-repeat 12px center;
127124
padding-left:27px;
128-
height: 35px;
125+
min-height: 56px;
126+
background-position: 12px 45%;
127+
}
128+
129+
/* Clearfix */
130+
.item-control-units {
131+
overflow: hidden;
129132
}
130133

131134
.item-control-unit {
132135
float:left;
133-
padding: 3px 10px 0 7px;
136+
padding: 10px;
134137
border-left: 1px solid #eee;
135-
}
136138

137139
.item-control-unit:first-child {
138140
border-left: none;
139141
}
140142

143+
144+
.item-control-unit .button,
145+
.item-controls select {
146+
margin-left: 5px;
147+
margin-right: 5px;
148+
}
149+
150+
151+
.item-control-unit .button {
152+
padding-top: 6px;
153+
padding-bottom: 6px;
154+
}
155+
156+
157+
.move-control .button {
158+
margin-left: 10px;
159+
}
160+
141161
.machine-control {
142162
height:70px;
143163
padding: 5px 10px 5px 10px;
@@ -147,13 +167,25 @@ textarea {
147167
left:-11px;
148168
bottom:-30px;
149169
width: 100%;
170+
171+
background: #f8f8f8;
172+
border: 1px solid #eee;
173+
height: 95px;
174+
}
175+
176+
.machine-control .button {
177+
padding-top: 6px;
178+
padding-bottom: 6px;
150179
}
151180

152181
.control-unit {
153182
float:left;
154183
padding-left: 5px;
155184
padding-right:20px;
156185
border-left: 1px solid #eee;
186+
187+
padding-bottom: 10px;
188+
padding-top: 12px;
157189
}
158190

159191
.control-unit:first-child {
@@ -199,39 +231,31 @@ a.audiocontent:hover { background-position: -350px -70px; }
199231
}
200232

201233
.empty-machine-msg {
202-
margin:10px 0px 5px 300px;
203-
font-style: italic;
234+
margin:10px 0px 20px 20px;
204235
font-size:14px;
205-
color:#999;
206236
}
207237

208238
td span select {
209239
width:600px;
210240
}
211241

212242

213-
/* override Django admin styles */
214-
.order-machine fieldset.module > h2{
215-
padding: 4px 5px 6px 17px;
216-
background: url(img/item_editor_form_title.png) no-repeat left bottom;
217-
}
218-
219243
.change-template-button {
220244
margin-left: 7em;
221245
padding-left: 30px;
222246
}
223247

224248
/* Allow nested lists in error items */
225249
ul.errorlist ul {
226-
margin-left: 1em;
227-
padding-left: 0;
228-
list-style-type: square;
250+
margin-left: 1em;
251+
padding-left: 0;
252+
list-style-type: square;
229253
}
230254

231255
ul.errorlist li li {
232-
/* Avoid repeating the warning image every time*/
233-
background-image:none;
234-
padding: 0;
256+
/* Avoid repeating the warning image every time*/
257+
background-image:none;
258+
padding: 0;
235259
}
236260

237261
div.order-machine div.inline-related > h3{
@@ -246,6 +270,9 @@ div.order-machine div.inline-related > h3{
246270
/* various overrides */
247271
#id_redirect_to { width: 20em; } /* raw_id_fields act-a-like for redirect_to */
248272

273+
/* overwrite flat theme default label width because of problems with the CKEditor */
274+
.aligned .text label { width: auto; }
275+
249276

250277
/* django suit hacks */
251278
/*********************/

‎feincms/static/feincms/tree_editor.css‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,58 @@
44
tr.cut { border: 2px dashed black; opacity: 0.5; }
55
.title-column { width: 400px; }
66

7-
table#result_list :focus { background-color: #ccddff !important; outline: 0px; }
7+
#result_list tbody tr:focus {
8+
background-color: #79aec8 !important;
9+
outline: 0px;
10+
color: #ffffff;
11+
}
812

13+
#result_list tbody tr:focus .field-indented_short_title a {
14+
color: white;
15+
}
916

1017
.drag_handle {
11-
width: 16px;
12-
height: 16px;
13-
background: url(img/arrow-move.png);
14-
display: inline-block;
15-
vertical-align: middle;
18+
width: 16px;
19+
height: 16px;
20+
background: url(img/arrow-move.png);
21+
display: inline-block;
22+
vertical-align: middle;
1623
}
1724

1825
.drag_handle:hover {
19-
cursor: move;
26+
cursor: move;
2027
}
2128

2229
.drag_order img {
23-
cursor: move;
30+
cursor: move;
2431
}
2532

2633
table tr.dragging {
27-
opacity: .3;
34+
opacity: .3;
2835
}
2936

3037
table tr.dragging td {
31-
color: #333;
38+
color: #333;
3239
}
3340

3441
table tr.folded {
35-
background: red;
42+
background: red;
3643
}
3744

3845
div#drag_line {
39-
position: relative;
40-
height: 3px;
41-
font-size: 0px;
42-
background-color: #800080;
46+
position: relative;
47+
height: 3px;
48+
font-size: 0px;
49+
background-color: #417690;
4350
}
4451

4552
div#drag_line div {
46-
position: absolute;
47-
height: 9px;
48-
width: 9px;
49-
background-image: url(img/drag_order_circle.png);
50-
margin: -3px 0 0 -9px;
53+
position: absolute;
54+
height: 9px;
55+
width: 9px;
56+
background: #417690;
57+
margin: -3px 0 0 -9px;
58+
border-radius: 9px;
5159
}
5260

5361
.page_marker.children {

0 commit comments

Comments
 (0)