Skip to content

Commit 13070d0

Browse files
onokumusonokumus
committed
update dependency
1 parent ca8a3b8 commit 13070d0

7 files changed

Lines changed: 173 additions & 18 deletions

File tree

‎Gruntfile.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,17 @@ module.exports = function (grunt) {
141141

142142
watch: {
143143
scripts: {
144-
files: ['**/*.js', '**/*.less', '**/*.hbs', '**/*.html'],
145-
tasks: ['default']
146-
}
144+
files: ['**/*.js'],
145+
tasks: ['dist-js']
146+
},
147+
css: {
148+
files: ['**/*.css'],
149+
tasks: ['copy']
150+
},
151+
assemble: {
152+
files: ['**/*.hbs','**/*.html'],
153+
tasks: ['assemble']
154+
}
147155
}
148156

149157
});

‎dist/assets/css/main.css‎

Lines changed: 76 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ body.padTop53 {
235235
border-bottom: 1px solid rgba(0, 0, 0, 0.3);
236236
box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.05) inset;
237237
text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
238-
background: #404040;
239238
}
240239
.head .search-bar {
241240
margin: 0 auto;
@@ -622,12 +621,10 @@ body.padTop53 {
622621
}
623622
/* END CONTENT STYLES *//* BEGIN FOOTER */
624623
#footer {
625-
background: url("../img/pattern/px_by_Gre3g.png") repeat #444444;
624+
background-image: url("../img/pattern/px_by_Gre3g.png");
625+
background-repeat: repeat;
626626
color: #f9f9f9;
627627
margin: 0 auto;
628-
-webkit-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.05);
629-
box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.05);
630-
border-top: 1px solid #222;
631628
}
632629
#footer p {
633630
padding: 12px 0 0;
@@ -2640,3 +2637,77 @@ body.error .logo h1 {
26402637
border-radius: 0;
26412638
}
26422639
/* END LOGIN PAGE STYLES */
2640+
#menu {
2641+
border-bottom-color: rgba(125, 138, 46, 0.3);
2642+
-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.3);
2643+
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.3);
2644+
background-color: #7d8a2e;
2645+
}
2646+
#menu > li > a {
2647+
color: #ffffff;
2648+
border-top-color: #c9d787;
2649+
-webkit-box-shadow: none;
2650+
box-shadow: none;
2651+
text-shadow: none;
2652+
}
2653+
#menu > li > a:hover,
2654+
#menu > li > a:focus {
2655+
background-color: #c9d787;
2656+
color: #ffffff;
2657+
}
2658+
#menu > li.active > a {
2659+
background-color: #ffc0a9;
2660+
color: #ffffff;
2661+
-webkit-box-shadow: none;
2662+
box-shadow: none;
2663+
}
2664+
#menu ul {
2665+
border-top: 1px solid rgba(125, 138, 46, 0.3);
2666+
-webkit-box-shadow: none;
2667+
box-shadow: none;
2668+
}
2669+
#menu ul li a {
2670+
color: #ffffff;
2671+
}
2672+
#menu ul li.active a {
2673+
color: #ffffff;
2674+
}
2675+
#menu .nav-header {
2676+
color: #ffffff;
2677+
border-top: 1px solid #c9d787;
2678+
-webkit-box-shadow: none;
2679+
box-shadow: none;
2680+
text-shadow: none;
2681+
background: #7d8a2e;
2682+
}
2683+
#menu .nav-divider {
2684+
border-top-color: rgba(255, 255, 255, 0.01);
2685+
background: #383d14;
2686+
box-shadow: none;
2687+
}
2688+
#menu > li.panel.active ul > li.active > a:after {
2689+
border-right-color: #ffffff;
2690+
}
2691+
@media (min-width: 768px) {
2692+
#menu:after,
2693+
.mini-sidebar #menu:after {
2694+
-webkit-box-shadow: 97px 1px 5px 2px rgba(0, 0, 0, 0.6);
2695+
box-shadow: 97px 1px 5px 2px rgba(0, 0, 0, 0.6);
2696+
background: #333;
2697+
}
2698+
}
2699+
@media (min-width: 992px) {
2700+
#menu:after {
2701+
-webkit-box-shadow: 217px 1px 5px 2px rgba(0, 0, 0, 0.6);
2702+
box-shadow: 217px 1px 5px 2px rgba(0, 0, 0, 0.6);
2703+
}
2704+
.mini-sidebar #menu:after {
2705+
-webkit-box-shadow: 97px 1px 5px 2px rgba(0, 0, 0, 0.6);
2706+
box-shadow: 97px 1px 5px 2px rgba(0, 0, 0, 0.6);
2707+
}
2708+
}
2709+
#wrap,
2710+
#footer {
2711+
background: #5a6421;
2712+
background-image: none;
2713+
}

‎dist/index.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,12 @@ <h4>For 2.0.0 version</h4>
286286
<h4>For 1.2 version</h4>
287287
<p>(not development)
288288
<a href="http://demo.onokumus.com/metis/v12">http://demo.onokumus.com/metis/v12</a></p>
289+
<h3>Release History</h3>
290+
<ul>
291+
<li>2013-10-23   v2.1.1 Adds <code>bgimage.html</code> and <code>bgcolor.html</code> pages.</li>
292+
<li>2013 [02-15, 10-22] v1.0 - v2.1 I don&#39;t remember. Whatever I did.</li>
293+
<li>2013-02-14   v1.0   First Commit.</li>
294+
</ul>
289295
<h3>Licensing</h3>
290296
<p>Bootstrap Admin template is open-sourced software licensed under the <a href="http://opensource.org/licenses/MIT">MIT License</a></p>
291297
<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=EYSUBWWDTCYKU">Donate</a></p>

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"url": "https://github.com/onokumus/Bootstrap-Admin-Template/blob/master/README.md"
2121
},
2222
"devDependencies": {
23+
"grunt-cli": "~0.1.9",
2324
"grunt": "~0.4.1",
2425
"assemble": "~0.4.13",
2526
"grunt-contrib-connect": "~0.5.0",

‎src/assets/css/main.css‎

Lines changed: 76 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ body.padTop53 {
235235
border-bottom: 1px solid rgba(0, 0, 0, 0.3);
236236
box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.05) inset;
237237
text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
238-
background: #404040;
239238
}
240239
.head .search-bar {
241240
margin: 0 auto;
@@ -622,12 +621,10 @@ body.padTop53 {
622621
}
623622
/* END CONTENT STYLES *//* BEGIN FOOTER */
624623
#footer {
625-
background: url("../img/pattern/px_by_Gre3g.png") repeat #444444;
624+
background-image: url("../img/pattern/px_by_Gre3g.png");
625+
background-repeat: repeat;
626626
color: #f9f9f9;
627627
margin: 0 auto;
628-
-webkit-box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.05);
629-
box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.05);
630-
border-top: 1px solid #222;
631628
}
632629
#footer p {
633630
padding: 12px 0 0;
@@ -2640,3 +2637,77 @@ body.error .logo h1 {
26402637
border-radius: 0;
26412638
}
26422639
/* END LOGIN PAGE STYLES */
2640+
#menu {
2641+
border-bottom-color: rgba(125, 138, 46, 0.3);
2642+
-webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.3);
2643+
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.3);
2644+
background-color: #7d8a2e;
2645+
}
2646+
#menu > li > a {
2647+
color: #ffffff;
2648+
border-top-color: #c9d787;
2649+
-webkit-box-shadow: none;
2650+
box-shadow: none;
2651+
text-shadow: none;
2652+
}
2653+
#menu > li > a:hover,
2654+
#menu > li > a:focus {
2655+
background-color: #c9d787;
2656+
color: #ffffff;
2657+
}
2658+
#menu > li.active > a {
2659+
background-color: #ffc0a9;
2660+
color: #ffffff;
2661+
-webkit-box-shadow: none;
2662+
box-shadow: none;
2663+
}
2664+
#menu ul {
2665+
border-top: 1px solid rgba(125, 138, 46, 0.3);
2666+
-webkit-box-shadow: none;
2667+
box-shadow: none;
2668+
}
2669+
#menu ul li a {
2670+
color: #ffffff;
2671+
}
2672+
#menu ul li.active a {
2673+
color: #ffffff;
2674+
}
2675+
#menu .nav-header {
2676+
color: #ffffff;
2677+
border-top: 1px solid #c9d787;
2678+
-webkit-box-shadow: none;
2679+
box-shadow: none;
2680+
text-shadow: none;
2681+
background: #7d8a2e;
2682+
}
2683+
#menu .nav-divider {
2684+
border-top-color: rgba(255, 255, 255, 0.01);
2685+
background: #383d14;
2686+
box-shadow: none;
2687+
}
2688+
#menu > li.panel.active ul > li.active > a:after {
2689+
border-right-color: #ffffff;
2690+
}
2691+
@media (min-width: 768px) {
2692+
#menu:after,
2693+
.mini-sidebar #menu:after {
2694+
-webkit-box-shadow: 97px 1px 5px 2px rgba(0, 0, 0, 0.6);
2695+
box-shadow: 97px 1px 5px 2px rgba(0, 0, 0, 0.6);
2696+
background: #333;
2697+
}
2698+
}
2699+
@media (min-width: 992px) {
2700+
#menu:after {
2701+
-webkit-box-shadow: 217px 1px 5px 2px rgba(0, 0, 0, 0.6);
2702+
box-shadow: 217px 1px 5px 2px rgba(0, 0, 0, 0.6);
2703+
}
2704+
.mini-sidebar #menu:after {
2705+
-webkit-box-shadow: 97px 1px 5px 2px rgba(0, 0, 0, 0.6);
2706+
box-shadow: 97px 1px 5px 2px rgba(0, 0, 0, 0.6);
2707+
}
2708+
}
2709+
#wrap,
2710+
#footer {
2711+
background: #5a6421;
2712+
background-image: none;
2713+
}

‎src/assets/less/main/general/footer.less‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/* BEGIN FOOTER */
22

33
#footer {
4-
background: url("../img/pattern/px_by_Gre3g.png") repeat #444;
4+
background-image: url("../img/pattern/px_by_Gre3g.png");
5+
background-repeat: repeat;
56
color: #f9f9f9;
67
margin: 0 auto;
7-
.box-shadow(0px -1px 0px 0px rgba(0, 0, 0, .05));
8-
border-top: 1px solid #222;
9-
8+
109
p {
1110
padding: 12px 0 0;
1211
text-align: center;

‎src/assets/less/main/general/head.less‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
border-bottom: 1px solid rgba(0,0,0,0.3);
55
box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.05) inset;
66
text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
7-
background: #404040;
87

98
.search-bar {
109
margin:0 auto;

0 commit comments

Comments
 (0)