Skip to content

Commit c47d34f

Browse files
committed
실과형 새 디자인 적용.
1 parent dc0d2be commit c47d34f

File tree

9 files changed

+15
-2
lines changed

9 files changed

+15
-2
lines changed

app/css/developer.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,32 +201,44 @@ body {
201201
#entryCategoryhw_download {
202202
background-image: url('../images/categories/touch.png');
203203
background-repeat: no-repeat;
204+
background-color: #C7DCDD;
205+
border-bottom: #5494A3 solid 1px;
204206
}
205207

206208
#entryCategoryhw_sensor {
207209
background-image: url('../images/categories/others.png');
208210
background-repeat: no-repeat;
211+
background-color: #C7DCDD;
212+
border-bottom: #5494A3 solid 1px;
209213
}
210214

211215
#entryCategoryhw_led {
212216
font-size: 11px;
213217
background-image: url('../images/categories/diode.png');
214218
background-repeat: no-repeat;
219+
background-color: #C7DCDD;
220+
border-bottom: #5494A3 solid 1px;
215221
}
216222

217223
#entryCategoryhw_motor {
218224
background-image: url('../images/categories/dcmotor.png');
219225
background-repeat: no-repeat;
226+
background-color: #C7DCDD;
227+
border-bottom: #5494A3 solid 1px;
220228
}
221229

222230
#entryCategoryhw_melody {
223231
background-image: url('../images/categories/melody.png');
224232
background-repeat: no-repeat;
233+
background-color: #C7DCDD;
234+
border-bottom: #5494A3 solid 1px;
225235
}
226236

227237
#entryCategoryhw_robot {
228238
background-image: url('../images/categories/robot.png');
229239
background-repeat: no-repeat;
240+
background-color: #C7DCDD;
241+
border-bottom: #5494A3 solid 1px;
230242
}
231243

232244
.workspace_mode {

app/images/categories/dcmotor.png

-9 Bytes
Loading

app/images/categories/diode.png

10 Bytes
Loading

app/images/categories/melody.png

-15 Bytes
Loading

app/images/categories/others.png

6 Bytes
Loading

app/images/categories/robot.png

-235 Bytes
Loading

app/src/app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ angular.module('workspace', ['common']);
1818
if(systemLang != 'ko') {
1919
systemLang = 'en';
2020
}
21+
user_lang = systemLang;
2122
localStorage.setItem('lang', systemLang);
2223
}
2324
$('head').append('<script src="./lang/' + user_lang + '.js">' + '</script>')

app/src/header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ angular.module('workspace').controller('HeaderController', ['$scope', '$rootScop
7474
storage.setItem('lang', language);
7575
var isDefaultProject = sessionStorage.getItem('isDefaultProject');
7676

77-
if (Entry.stateManager.canUndo() || isDefaultProject !== 'true') {
77+
if (Entry.stateManager && (Entry.stateManager.canUndo() || isDefaultProject !== 'true')) {
7878
var project = Entry.exportProject();
7979
project.name = myProject.name;
8080
project.path = myProject.isSavedPath;

app/src/native_controll.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Entry.plugin = (function () {
204204
}
205205

206206
that.reloadApplication = function (isSkip) {
207-
if(isSkip) {
207+
if(!isSkip) {
208208
Entry.stateManager.addStamp();
209209
Entry.plugin.closeAboutPage();
210210
Entry.plugin.closeHwGuidePage();

0 commit comments

Comments
 (0)