Skip to content

Commit 97c3a2c

Browse files
itaymeshitaymesh
committed
update
1 parent c9fffaf commit 97c3a2c

File tree

26 files changed

+8419
-4115
lines changed

26 files changed

+8419
-4115
lines changed

‎.gitignore‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# ==================================== #
2+
# Magento Boilerplate .gitignore file. #
3+
# #
4+
# Copyright (c) 2014 Webcomm Pty Ltd #
5+
# #
6+
# This file is tested on: #
7+
# - Magento CE 1.6.2.0 #
8+
# - Magento CE 1.7.0.0 #
9+
# - Magento CE 1.7.0.1 #
10+
# - Magento CE 1.7.0.2 #
11+
# - Magento CE 1.8.0.0 #
12+
# - Magento CE 1.8.1.0 #
13+
# #
14+
# ==================================== #
15+
16+
17+
18+
# =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* #
19+
# Part A: Ignore all files that #
20+
# probably shouldn't be in #
21+
# version control #
22+
# =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* #
23+
#
24+
# You shouldn't need to edit these
25+
# files at all unless a Magento
26+
# upgrade breaks this. These files are
27+
# in alphabetical order.
28+
29+
# Numerous always-ignore extensions
30+
*.diff
31+
*.err
32+
*.orig
33+
*.log
34+
*.rej
35+
*.swo
36+
*.swp
37+
*.vi
38+
*~
39+
*.sass-cache
40+
*.iml
41+
42+
# OS or Editor folders
43+
.DS_Store
44+
Thumbs.db
45+
.cache
46+
.project
47+
.settings
48+
.tmproj
49+
*.esproj
50+
nbproject
51+
52+
# Dreamweaver added files
53+
_notes
54+
dwsync.xml
55+
56+
# Komodo
57+
*.komodoproject
58+
.komodotools
59+
60+
# Folders to ignore
61+
.hg
62+
.svn
63+
.CVS
64+
intermediate
65+
publish
66+
67+
# Phpstorm project files
68+
.idea
69+

‎.project‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎app/design/adminhtml/default/go/layout/local.xml‎

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,22 @@
22
<layout version="0.1.0">
33
<default translate="label" module="page">
44
<reference name="head">
5-
<action method="removeItem"><type>js</type><name>mage/adminhtml/sales.js</name></action>
6-
<action method="addItem"><type>skin_js</type><script>js/sales.js</script></action>
7-
8-
<!-- remove all default CSS files -->
9-
5+
<!-- remove all default CSS files -->
106
<action method="removeItem"><type>skin_css</type><name>reset.css</name></action>
117
<action method="removeItem"><type>skin_css</type><name>boxes.css</name></action>
128
<action method="removeItem"><type>skin_css</type><name>custom.css</name></action>
13-
149
<action method="removeItem"><type>skin_css</type><name>iestyles.css</name></action>
1510
<action method="removeItem"><type>skin_css</type><name>below_ie7.css</name></action>
1611
<action method="removeItem"><type>skin_css</type><name>ie7.css</name></action>
17-
1812
<action method="removeItem"><type>skin_css</type><name>print.css</name></action>
19-
20-
2113
<action method="removeItem"><type>skin_css</type><name>menu.css</name></action>
22-
2314
<action method="removeItem"><type>js_css</type><name>calendar/calendar-win2k-1.css</name></action>
24-
2515
<action method="removeItem"><type>js_css</type><name>extjs/resources/css/ext-all.css</name></action>
2616
<action method="removeItem"><type>js_css</type><name>extjs/resources/css/ytheme-magento.css</name></action>
2717

28-
29-
<!-- +++++++++++++ ADD LESS FILES -->
30-
3118
<action method="addItem"><type>skin_css</type><name>app.less</name></action>
32-
33-
<!-- RTL-LTR LESS files -->
34-
<!--
35-
<action method="addItem"><type>skin_css</type><name>bi-app/variables.less</name></action>
36-
<action method="addItem"><type>skin_css</type><name>bi-app/mixins.less</name></action>
37-
38-
<action method="addItem"><type>skin_css</type><name>reset.less</name></action>
39-
<action method="addItem"><type>skin_css</type><name>boxes.less</name></action>
40-
<action method="addItem"><type>skin_css</type><name>custom.less</name></action>
41-
42-
<action method="addItem"><type>skin_css</type><name>menu.less</name><params>media="screen, projection"</params></action>
43-
44-
45-
<action method="addItem"><type>skin_css</type><name>iestyles.less</name><params/><if>lt IE 8</if></action>
46-
<action method="addItem"><type>skin_css</type><name>below_ie7.less</name><params/><if>lt IE 7</if></action>
47-
<action method="addItem"><type>skin_css</type><name>ie7.less</name><params/><if>IE 7</if></action>
48-
49-
50-
<action method="addCss"><name>print.less</name><params>media="print"</params></action>
51-
52-
53-
<action method="addItem"><type>skin_css</type><name>calendar.less</name><params/></action>
54-
-->
55-
</reference>
56-
57-
58-
<reference name="footer">
59-
<action method="setTemplate">
60-
<!-- needed because of base/default/layout/bubbleadmintheme.xml -->
61-
<template>page/footer.phtml</template>
62-
</action>
19+
6320
</reference>
21+
6422
</default>
6523
</layout>

‎app/locale/fr_FR/Bubble_AdminTheme.csv‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎modman‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
app/code/community/Bubble/AdminTheme app/code/community/Bubble/AdminTheme
2+
app/etc/modules/Bubble_AdminTheme.xml app/etc/modules/Bubble_AdminTheme.xml
3+
app/design/adminhtml/base/default/layout/bubble/admintheme.xml app/design/adminhtml/base/default/layout/bubble/admintheme.xml
4+
app/design/adminhtml/base/default/template/bubble/admintheme app/design/adminhtml/base/default/template/bubble/admintheme
5+
skin/adminhtml/default/go skin/adminhtml/default/go

‎skin/adminhtml/default/go/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

‎skin/adminhtml/default/go/app.less‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎skin/adminhtml/default/go/below_ie7.less‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)