Skip to content

Commit c0df837

Browse files
committed
minor design updates.
1 parent 693385e commit c0df837

File tree

10 files changed

+76
-34
lines changed

10 files changed

+76
-34
lines changed

coder-apps/common/coder/static/css/index.css

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
top: 0px;
5151
right: 0px;
5252
padding: 12px;
53+
opacity: 0.5;
54+
font-weight: bold;
55+
}
56+
.appitem .editbutton:hover {
57+
opacity: 1;
58+
cursor: pointer;
5359
}
5460

5561
#addapp_button {
@@ -67,14 +73,14 @@
6773
margin-left: -20px;
6874
margin-top: -20px;
6975
background-color: transparent;
70-
border-radius: 4px;
76+
/*border-radius: 4px;*/
7177
position: absolute;
7278
background-image: url(/static/common/media/coder_icons.png);
7379
background-position: -167px 0px;
7480
opacity: 0.8;
7581
}
7682
#addapp_button:hover #addapp_icon {
77-
background-color: rgba(255,255,255,0.1);
83+
/*background-color: rgba(255,255,255,0.1);*/
7884
opacity: 1;
7985
cursor: pointer;
8086
}
@@ -194,6 +200,10 @@
194200
margin: 0;
195201
border: 0;
196202
background-color: #f00;
203+
cursor: pointer;
204+
}
205+
#import_file:hover {
206+
cursor: pointer;
197207
}
198208

199209

@@ -226,7 +236,7 @@
226236
}
227237
.settingsEnabled #settings_button {
228238
background-color: rgba( 255,255,255,.2 );
229-
border-color: #ffffff;
239+
border-color: rgba( 255,255,255,.4 );
230240
}
231241

232242

coder-apps/common/editor/app/meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"created": "2013-03-05",
3-
"modified": "2013-10-22",
3+
"modified": "2014-01-07",
44
"color": "#80d4ea",
55
"author": "Jason Striegel",
66
"name": "Editor",

coder-apps/common/editor/static/css/index.css

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ BODY, HTML {
132132
-o-transform: rotate(-90deg);
133133
transform: rotate(-90deg);
134134
}
135+
#coder_home a:hover {
136+
color: #C0C0C0;
137+
}
135138

136139
.previewEnabled #editcontainer {
137140
right: 50%;
@@ -157,8 +160,12 @@ BODY, HTML {
157160
bottom: 0px;
158161
position: absolute;
159162
z-index: 100;
163+
font-size: 16px;
164+
line-height: 1.4em;
160165
}
161166

167+
168+
162169
#editornav .label_divider {
163170
height: 100%;
164171
width: 1px;
@@ -260,7 +267,7 @@ BODY, HTML {
260267
.settingsEnabled #editornav #settings_button,
261268
.mediaEnabled #editornav #media_button {
262269
background-color: rgba( 255,255,255,.2 );
263-
border-color: #ffffff;
270+
border-color: rgba( 255,255,255,.5 );
264271
}
265272

266273
.previewEnabled #editornav {
@@ -280,23 +287,24 @@ BODY, HTML {
280287
#addmedia_button {
281288
height: 40px;
282289
width: 40px;
283-
margin: 24px;
290+
margin: 18px;
284291
background-color: transparent;
285-
border-radius: 4px;
292+
/*border-radius: 4px;*/
286293
position: relative;
287294
background-image: url(/static/common/media/coder_icons.png);
288295
background-position: -167px 0px;
289296
opacity: 0.4
290297
}
291298
#addmedia_button:hover {
292-
background-color: rgba(255,255,255,0.2);
299+
/*background-color: rgba(255,255,255,0.2);*/
293300
opacity: 1;
294301
cursor: pointer;
295302
}
296303
#addmedia_button input {
297304
width: 100%;
298305
height: 100%;
299306
opacity: 0;
307+
cursor: pointer;
300308
}
301309

302310
#medialist .mediaitem {
@@ -353,7 +361,6 @@ BODY, HTML {
353361

354362
.sidepanel .save, .sidepanel .cancel,
355363
.editpanel .save, .editpanel .cancel,
356-
.sidepanel .export_app,
357364
.sidepanel .remove_app {
358365
position: absolute;
359366
bottom: 24px;
@@ -362,7 +369,7 @@ BODY, HTML {
362369
height: 20px;
363370
text-align: center;
364371
display: inline-block;
365-
background-color: #333;
372+
background-color: #A0A0A0;
366373
border-radius: 4px;
367374
color: #fff;
368375
z-index: 101;
@@ -371,13 +378,11 @@ BODY, HTML {
371378
display:none;
372379
font-family: Arial, sans-serif;
373380
}
374-
.sidepanel .save, .sidepanel .cancel,
375-
.sidepanel .export_app {
381+
.sidepanel .save, .sidepanel .cancel {
376382
color: #333;
377383
background-color: rgba( 255,255,255, 0.8 );
378384
}
379-
.sidepanel .save:hover, .sidepanel .cancel:hover,
380-
.sidepanel .export_app:hover {
385+
.sidepanel .save:hover, .sidepanel .cancel:hover {
381386
background-color: #fff;
382387
cursor: pointer;
383388
}
@@ -388,22 +393,37 @@ BODY, HTML {
388393

389394
.sidepanel .export_app {
390395
display: block;
391-
position: relative;
392-
top: 0;
393-
left: 24px;
394-
margin-top: 12px;
396+
position: absolute;
397+
bottom: 17px;
398+
right: 18px;
399+
background-image: url(/static/common/media/coder_icons.png);
400+
background-position: -276px -1px;
401+
background-color: transparent;
402+
width: 40px;
403+
height: 40px;
404+
padding: 0;
405+
opacity: 0.8;
406+
}
407+
.sidepanel .export_app:hover {
408+
opacity: 1;
409+
cursor: pointer;
395410
}
396411

397412
.sidepanel .remove_app {
398413
display: block;
399414
color: #ddd;
400-
margin: 24px;
401-
bottom:0px;
402-
right:0px;
415+
top:24px;
416+
right:-8px;
417+
background-image: url(/static/common/media/coder_icons.png);
418+
background-position: -329px -4px;
419+
background-color: transparent;
420+
width: 32px;
421+
height: 32px;
422+
padding: 0;
423+
opacity: 0.5;
403424
}
404425
.sidepanel .remove_app:hover {
405-
background-color: rgba(231, 76, 60, 1);
406-
color: #fff;
426+
opacity: 1;
407427
}
408428
.sidepanel.changed .remove_app {
409429
display: none;
@@ -460,6 +480,7 @@ BODY, HTML {
460480
margin: 20px 24px 0 24px;
461481
border-top: 1px solid #999;
462482
color: #999;
483+
position: relative;
463484
}
464485
.sidepanel .appinfo .item {
465486
font-size: 12px;

coder-apps/common/editor/static/js/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ var setupEditor = function( panelid, editorid, data, serverid, editmode ) {
355355
readOnly: false // should not apply in readOnly mode
356356
});
357357

358-
$('#' + editorid).css('font-size', '16px');
358+
//$('#' + editorid).css('font-size', '16px');
359359
$('#' + panelid).hide();
360360

361361
return editor;

coder-apps/common/editor/views/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ <h1>Project Settings</h1>
9090
<span class="label">Last Edited:</span>
9191
<span class="value"></span>
9292
</div>
93+
<div class="remove_app"></div>
9394
</div>
9495
<div class="save">Save</div>
9596
<div class="cancel">Cancel</div>
96-
<div class="remove_app">Delete App</div>
97-
<div class="export_app">Export</div>
97+
<div class="export_app"></div>
9898
</div>
9999
<div id="editornav" class="userbgcolor">
100100
<div id="coder_home"><a href="/app/coder/">Coder</a></div>
@@ -113,22 +113,22 @@ <h1 class="application_name"></h1>
113113
<div id="csspanel" class="editpanel closed">
114114
<div id="csseditor" class="editor"></div>
115115
<div class="save userbgcolor">Save</div>
116-
<div class="cancel userbgcolor">Revert</div>
116+
<div class="cancel ">Revert</div>
117117
</div>
118118
<div id="htmlpanel" class="editpanel closed">
119119
<div id="htmleditor" class="editor"></div>
120120
<div class="save userbgcolor">Save</div>
121-
<div class="cancel userbgcolor">Revert</div>
121+
<div class="cancel ">Revert</div>
122122
</div>
123123
<div id="jspanel" class="editpanel closed">
124124
<div id="jseditor" class="editor"></div>
125125
<div class="save userbgcolor">Save</div>
126-
<div class="cancel userbgcolor">Revert</div>
126+
<div class="cancel ">Revert</div>
127127
</div>
128128
<div id="apppanel" class="editpanel closed">
129129
<div id="appeditor" class="editor"></div>
130130
<div class="save userbgcolor">Save</div>
131-
<div class="cancel userbgcolor">Revert</div>
131+
<div class="cancel ">Revert</div>
132132
</div>
133133
</div>
134134

coder-apps/pi/coder/app/meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"created": "2013-03-05",
3-
"modified": "2013-07-23",
3+
"modified": "2014-01-07",
44
"color": "#bdc3c7",
55
"author": "Jason Striegel",
66
"name": "Coder",

coder-apps/pi/coder/static/css/index.css

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
top: 0px;
5151
right: 0px;
5252
padding: 12px;
53+
opacity: 0.5;
54+
font-weight: bold;
55+
}
56+
.appitem .editbutton:hover {
57+
opacity: 1;
58+
cursor: pointer;
5359
}
5460

5561
#addapp_button {
@@ -67,14 +73,14 @@
6773
margin-left: -20px;
6874
margin-top: -20px;
6975
background-color: transparent;
70-
border-radius: 4px;
76+
/*border-radius: 4px;*/
7177
position: absolute;
7278
background-image: url(/static/common/media/coder_icons.png);
7379
background-position: -167px 0px;
7480
opacity: 0.8;
7581
}
7682
#addapp_button:hover #addapp_icon {
77-
background-color: rgba(255,255,255,0.1);
83+
/*background-color: rgba(255,255,255,0.1);*/
7884
opacity: 1;
7985
cursor: pointer;
8086
}
@@ -194,6 +200,10 @@
194200
margin: 0;
195201
border: 0;
196202
background-color: #f00;
203+
cursor: pointer;
204+
}
205+
#import_file:hover {
206+
cursor: pointer;
197207
}
198208

199209

@@ -226,7 +236,7 @@
226236
}
227237
.settingsEnabled #settings_button {
228238
background-color: rgba( 255,255,255,.2 );
229-
border-color: #ffffff;
239+
border-color: rgba( 255,255,255,.4 );
230240
}
231241

232242

coder-apps/pi/wifi/static/media/.gitignore

Whitespace-only changes.
248 Bytes
Loading
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
options 8192cu rtw_power_mgnt=0

0 commit comments

Comments
 (0)