Skip to content

Commit 300524a

Browse files
modularcodermodularcoder
committed
Setup bootstrap 4.0-beta
1 parent 50ebd1e commit 300524a

File tree

13 files changed

+56
-72
lines changed

13 files changed

+56
-72
lines changed

‎bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"name": "modular-admin-html",
3-
"version": "1.1.1",
3+
"version": "1.2.0",
44
"devDependencies": {},
55
"dependencies": {
66
"animate.css": "~3.4.0",
7-
"bootstrap": "v4.0.0-alpha.5",
87
"font-awesome": "~4.7.0",
98
"jquery": "~2.1.4",
109
"jquery-flot": "~0.8.3",
@@ -22,7 +21,8 @@
2221
"tinycolor": "~1.2.1",
2322
"dropzone": "~4.2.0",
2423
"jquery-touchswipe": "^1.6.18",
25-
"jquery.browser": "^0.1.0"
24+
"jquery.browser": "^0.1.0",
25+
"bootstrap": "v4.0.0-beta"
2626
},
2727
"overrides": {
2828
"bootstrap": {

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "modular-admin-html",
3-
"version": "1.1.1",
3+
"version": "1.2.0",
44
"description": "ModularAdmin: Free Dashboard Theme; html version",
55
"repository": {
66
"type": "git",

‎src/_common/_styles/layout.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.row {
22
.col {
3-
padding-left: $grid-gutter-width-base/2;
4-
padding-right: $grid-gutter-width-base/2;
5-
float: left;
3+
// padding-left: $grid-gutter-width-base/2;
4+
// padding-right: $grid-gutter-width-base/2;
5+
// float: left;
66
}
77
}
88

‎src/_main.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,800,700,600);
22

33
@import 'variables';
4+
@import 'bootstrap/scss/functions';
45
@import 'bootstrap/scss/variables';
56
@import 'bootstrap/scss/mixins';
67
@import '_common/_styles/mixins';

‎src/app/_common/header/collapse/collapse.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="header-block header-block-collapse hidden-lg-up" >
1+
<div class="header-block header-block-collapse d-lg-none d-xl-none" >
22
<button class="collapse-btn" id="sidebar-collapse-btn">
33
<i class="fa fa-bars"></i>
44
</button>

‎src/app/_common/header/search/search.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="header-block header-block-search hidden-sm-down">
1+
<div class="header-block header-block-search">
22
<form role="search">
33
<div class="input-container">
44
<i class="fa fa-search"></i>

‎src/app/_common/header/search/search.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
@include media-down(sm) {
99
padding-left: $content-padding-x-xs;
10+
display: none;
1011
}
1112

1213
@include media(md) {
@@ -17,7 +18,7 @@
1718
padding-left: $content-padding-x-md;
1819
}
1920

20-
@include media(xl) {
21+
@include media-up(xl) {
2122
padding-left: $content-padding-x-lg;
2223
}
2324

‎src/app/_common/sidebar/sidebar.hbs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{> app/_common/sidebar/header/header}}
55

66
<nav class="menu">
7-
<ul class="nav metismenu" id="sidebar-menu">
7+
<ul class="sidebar-nav metismenu" id="sidebar-menu">
88

99
<li {{#is pagename "===" "dashboard"}}class="active"{{/is}} >
1010
<a href="index.html">
@@ -20,7 +20,7 @@
2020
<i class="fa arrow"></i>
2121
</a>
2222

23-
<ul class="nav">
23+
<ul class="sidebar-nav">
2424
<li {{#is pagename "===" "items-list"}}class="active"{{/is}} >
2525
<a href="items-list.html">
2626
Items List
@@ -41,7 +41,7 @@
4141
<i class="fa arrow"></i>
4242
</a>
4343

44-
<ul class="nav">
44+
<ul class="sidebar-nav">
4545
<li {{#is pagename "===" "charts-flot"}}class="active"{{/is}} >
4646
<a href="charts-flot.html">
4747
Flot Charts
@@ -62,7 +62,7 @@
6262
<i class="fa arrow"></i>
6363
</a>
6464

65-
<ul class="nav">
65+
<ul class="sidebar-nav">
6666
<li {{#is pagename "===" "static-tables"}}class="active"{{/is}} >
6767
<a href="static-tables.html">
6868
Static Tables
@@ -92,7 +92,7 @@
9292
<i class="fa arrow"></i>
9393
</a>
9494

95-
<ul class="nav">
95+
<ul class="sidebar-nav">
9696
<li {{#is pagename "===" "buttons"}}class="active"{{/is}}>
9797
<a href="buttons.html">
9898
Buttons
@@ -134,7 +134,7 @@
134134
<i class="fa arrow"></i>
135135
</a>
136136

137-
<ul class="nav">
137+
<ul class="sidebar-nav">
138138
<li {{#is pagename "===" "login"}}class="active"{{/is}}>
139139
<a href="login.html">
140140
Login
@@ -185,15 +185,15 @@
185185
<i class="fa arrow"></i>
186186
</a>
187187

188-
<ul class="nav">
188+
<ul class="sidebar-nav">
189189

190190
<li>
191191
<a href="#">
192192
Second Level Item
193193
<i class="fa arrow"></i>
194194
</a>
195195

196-
<ul class="nav">
196+
<ul class="sidebar-nav">
197197

198198
<li>
199199
<a href="#">
@@ -222,7 +222,7 @@
222222
<i class="fa arrow"></i>
223223
</a>
224224

225-
<ul class="nav">
225+
<ul class="sidebar-nav">
226226

227227
<li>
228228
<a href="#">
@@ -242,7 +242,7 @@
242242
<i class="fa arrow"></i>
243243
</a>
244244

245-
<ul class="nav">
245+
<ul class="sidebar-nav">
246246

247247
<li>
248248
<a href="#">

‎src/app/_common/sidebar/sidebar.scss

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,12 @@
3838
}
3939
}
4040

41-
.nav {
41+
#sidebar-menu {
4242

4343
font-size: 14px;
44+
list-style: none;
45+
margin: 0;
46+
padding: 0;
4447

4548
// Common styles
4649
li {
@@ -71,6 +74,7 @@
7174
li a {
7275
color: $sidebar-color-text;
7376
text-decoration: none;
77+
display: block;
7478
}
7579

7680
// All links which are not active
@@ -136,7 +140,7 @@
136140
}
137141

138142
// Second level items
139-
& > li > .nav> li {
143+
& > li > .sidebar-nav> li {
140144

141145
// Second level and deeper items links
142146
// Have bit darker background and more padding
@@ -155,12 +159,12 @@
155159
}
156160

157161
// Third level items
158-
& > .nav > li {
162+
& > .sidebar-nav > li {
159163
a {
160164
padding-left: 60px;
161165
}
162166

163-
& > .nav > li {
167+
& > .sidebar-nav > li {
164168
a {
165169
padding-left: 70px;
166170
}

‎src/app/app.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
padding: $header-height + $padding-y $padding-x $footer-height + $padding-y $padding-x;
1919
min-height: 100vh;
2020

21-
@include media(xl) {
21+
@include media-up(xl) {
2222
$padding-x: $content-padding-x-xl;
2323
$padding-y: $content-padding-y-xl;
2424

0 commit comments

Comments
 (0)