Skip to content

Commit 8ac249b

Browse files
zombieFoxzombieFox
authored
[refactor] break html up into partials
1 parent 1988a0e commit 8ac249b

21 files changed

+2264
-2169
lines changed

‎gulpfile.js‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ const{
44
parallel
55
}=require('gulp');
66

7+
constfileinclude=require('gulp-file-include');
8+
79
constcsso=require('gulp-csso');
810

911
constconcat=require('gulp-concat');
@@ -108,6 +110,10 @@ const build ={
108110
},
109111
html: function(){
110112
returnsrc(path.src+'/index.html')
113+
.pipe(fileinclude({
114+
prefix: '@@',
115+
basepath: '@file'
116+
}))
111117
.pipe(replace(/\<\!\-\-\ css\-block\ \-\-\>([\s\S]*)\<\!\-\-\ end\-css\-block\ \-\-\>/mg,'<link rel="stylesheet" href="css/'+filename.css+'">'))
112118
.pipe(replace(/\<\!\-\-\ js\-block\ \-\-\>([\s\S]*)\<\!\-\-\ end\-js\-block\ \-\-\>/mg,'<script src="js/'+filename.js+'"></script>'))
113119
.pipe(htmlmin({
@@ -156,10 +162,14 @@ const dev ={
156162
})
157163
},
158164
html: function(){
159-
watch(path.src+'/index.html',{
165+
watch(path.src+'/**/*.html',{
160166
ignoreInitial: false
161167
},function(){
162168
returnsrc(path.src+'/index.html')
169+
.pipe(fileinclude({
170+
prefix: '@@',
171+
basepath: '@file'
172+
}))
163173
.pipe(dest(path.dev))
164174
})
165175
},

‎package-lock.json‎

Lines changed: 68 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nightTab",
3-
"version": "4.33.0",
3+
"version": "4.34.0",
44
"description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
55
"main": "index.js",
66
"scripts":{
@@ -43,6 +43,7 @@
4343
"gulp-cli": "^2.2.0",
4444
"gulp-concat": "^2.6.1",
4545
"gulp-csso": "^3.0.1",
46+
"gulp-file-include": "^2.1.1",
4647
"gulp-filter": "^6.0.0",
4748
"gulp-htmlmin": "^5.0.1",
4849
"gulp-replace": "^1.0.0",

‎src/html/background.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<divclass="background">
2+
<divclass="background-image"></div>
3+
<divclass="background-accent"></div>
4+
</div>

‎src/html/layout.html‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<mainclass="layout">
2+
3+
<headerclass="header">
4+
<divclass="header-color"></div>
5+
<divclass="header-border"></div>
6+
<divclass="header-area">
7+
<divclass="header-item-grid">
8+
<divclass="header-item header-greeting">
9+
<divclass="header-greeting-body">
10+
<pclass="greeting"></p>
11+
</div>
12+
</div>
13+
<divclass="header-item header-transitional">
14+
<divclass="header-transitional-body">
15+
<pclass="transitional"></p>
16+
</div>
17+
</div>
18+
<divclass="header-item header-clock">
19+
<divclass="header-clock-body">
20+
<pclass="clock"></p>
21+
</div>
22+
</div>
23+
<divclass="header-item header-date">
24+
<divclass="header-date-body">
25+
<pclass="date"></p>
26+
</div>
27+
</div>
28+
<divclass="header-item header-search">
29+
<divclass="header-search-body">
30+
<formclass="search" action="" method="get">
31+
<inputclass="header-search-input search-input" type="text" placeholder="Find or Search" name="q" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" tabindex="1">
32+
<inputtype="submit" value="Search" class="is-hidden">
33+
</form>
34+
<buttonclass="header-search-clear search-clear button button-link" tabindex="1" disabled>
35+
<spanclass="icon-close"></span>
36+
</button>
37+
</div>
38+
</div>
39+
<divclass="header-item header-button header-edit-add">
40+
<divclass="header-button-body">
41+
<divclass="form-group form-group-nested-button">
42+
<divclass="form-input-button form-input-hide">
43+
<inputid="control-edit" class="control-edit" type="checkbox" tabindex="1">
44+
<labelfor="control-edit"><spanclass="label-icon"></span> Edit</label>
45+
</div>
46+
<divclass="form-dropdown">
47+
<buttonclass="control-add-toggle form-dropdown-toggle button" tabindex="1">
48+
<spanclass="button-text">Add</span>
49+
</button>
50+
<ulclass="list-unstyled form-dropdown-menu">
51+
<li>
52+
<buttonclass="button button-block text-left form-dropdown-menu-item control-group-add" tabindex="1"><spanclass="button-text">New Group</span></button>
53+
</li>
54+
<li>
55+
<buttonclass="button button-block text-left form-dropdown-menu-item control-link-add" tabindex="1"><spanclass="button-text">New Bookmark</span></button>
56+
</li>
57+
</ul>
58+
</div>
59+
</div>
60+
</div>
61+
</div>
62+
<divclass="header-item header-button header-accent">
63+
<divclass="header-button-body">
64+
<divclass="form-group form-group-nested-button">
65+
<divclass="form-input-button input-color-dot input-color-dot-shade">
66+
<inputid="control-theme-color-rgb-color" class="control-theme-color-rgb-color" type="color" value="#000000" tabindex="1">
67+
<labelfor="control-theme-color-rgb-color">Colour</label>
68+
</div>
69+
<divclass="form-input-button input-color-dot input-color-dot-accent">
70+
<inputid="control-theme-accent-rgb-color" class="control-theme-accent-rgb-color" type="color" value="#000000" tabindex="1">
71+
<labelfor="control-theme-accent-rgb-color">Accent</label>
72+
</div>
73+
</div>
74+
</div>
75+
</div>
76+
<divclass="header-item header-button header-menu">
77+
<divclass="header-button-body">
78+
<buttonclass="control-menu-open button" tabindex="1">
79+
<spanclass="button-text"><spanclass="icon-settings"></span></span>
80+
</button>
81+
</div>
82+
</div>
83+
</div>
84+
</div>
85+
</header>
86+
87+
<sectionclass="link"></section>
88+
89+
</main>

‎src/html/link-css.html‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!-- css-block -->
2+
<linkrel="stylesheet" href="css/reset.css">
3+
<linkrel="stylesheet" href="css/variables.css">
4+
<linkrel="stylesheet" href="css/utilities.css">
5+
<linkrel="stylesheet" href="css/base.css">
6+
<linkrel="stylesheet" href="css/layout.css">
7+
<linkrel="stylesheet" href="css/edge.css">
8+
<linkrel="stylesheet" href="css/animation.css">
9+
<linkrel="stylesheet" href="css/fonts.css">
10+
<linkrel="stylesheet" href="css/icons.css">
11+
<linkrel="stylesheet" href="css/state.css">
12+
<linkrel="stylesheet" href="css/typography.css">
13+
<linkrel="stylesheet" href="css/spacing.css">
14+
<linkrel="stylesheet" href="css/button.css">
15+
<linkrel="stylesheet" href="css/form.css">
16+
<linkrel="stylesheet" href="css/shade.css">
17+
<linkrel="stylesheet" href="css/modal.css">
18+
<linkrel="stylesheet" href="css/tip.css">
19+
<linkrel="stylesheet" href="css/menu.css">
20+
<linkrel="stylesheet" href="css/header.css">
21+
<linkrel="stylesheet" href="css/date.css">
22+
<linkrel="stylesheet" href="css/clock.css">
23+
<linkrel="stylesheet" href="css/greeting.css">
24+
<linkrel="stylesheet" href="css/transitional.css">
25+
<linkrel="stylesheet" href="css/search.css">
26+
<linkrel="stylesheet" href="css/background.css">
27+
<linkrel="stylesheet" href="css/group.css">
28+
<linkrel="stylesheet" href="css/link.css">
29+
<linkrel="stylesheet" href="css/theme.css">
30+
<linkrel="stylesheet" href="css/auto-suggest.css">
31+
<linkrel="stylesheet" href="css/fontawesome.css">
32+
<!-- end-css-block -->

‎src/html/menu.html‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<sectionclass="menu" tabindex="-1" style="display:none;">
2+
<divclass="menu-area">
3+
4+
@@include("./menu/menu-nav.html")
5+
6+
<divclass="menu-content">
7+
8+
@@include("./menu/menu-content/layout.html")
9+
10+
@@include("./menu/menu-content/header.html")
11+
12+
@@include("./menu/menu-content/groups.html")
13+
14+
@@include("./menu/menu-content/bookmarks.html")
15+
16+
@@include("./menu/menu-content/theme.html")
17+
18+
@@include("./menu/menu-content/background.html")
19+
20+
@@include("./menu/menu-content/data.html")
21+
22+
@@include("./menu/menu-content/coffee.html")
23+
24+
@@include("./menu/menu-content/nightTab.html")
25+
26+
</div>
27+
28+
</div>
29+
</section>

0 commit comments

Comments
(0)