Ejegg has submitted this change and it was merged.
Change subject: Make navbar px-perfect
......................................................................
Make navbar px-perfect
It was bugging me
edited to add lato.css to gulp job and tweak 1/2 pixel css
edited further to fix gulpfile relocation font folder naming structures.
Change-Id: Ie5b712ef35b4bf3e25e6f944da255e3cfa3eecde
---
M gulpfile.js
M src/components/nav-bar/nav-bar.html
M src/css/style.css
M src/index.html
4 files changed, 19 insertions(+), 8 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gulpfile.js b/gulpfile.js
index fc0d77e..32dc053 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -73,6 +73,7 @@
return gulp.src(['src/bower_modules/bootstrap/dist/css/bootstrap.css',
'src/bower_modules/nouislider/src/jquery.nouislider.css',
'src/bower_modules/fontawesome/css/font-awesome.css',
+ 'src/bower_modules/lato/css/lato.css',
'src/css/*.css'])
.pipe(concat('style.css')).pipe(rev()).pipe(gulp.dest('./dist/'))
// Add rev-manifest.json as a new src to prevent rev'ing
rev-manifest.json
@@ -82,9 +83,12 @@
});
/** Copies semantic fonts where the css expects them to be**/
+gulp.task('font', function () {
+ return gulp.src(['src/bower_modules/lato/font/*{ttf,woff,eot,svg}'])
+ .pipe(gulp.dest('./dist/font/'));
+});
gulp.task('fonts', function () {
- return
gulp.src(['src/bower_modules/fontawesome/fonts/*{ttf,woff,eot,svg,otf}',
- 'src/bower_modules/lato/font/*{ttf,woff,eot,svg}'])
+ return
gulp.src(['src/bower_modules/fontawesome/fonts/*{ttf,woff,eot,svg,otf}'])
.pipe(gulp.dest('./dist/fonts/'));
});
@@ -150,10 +154,10 @@
.pipe(clean());
});
-gulp.task('default', ['clean', 'replace', 'lint', 'fonts'], function
(callback) {
+gulp.task('default', ['clean', 'replace', 'lint', 'font', 'fonts'], function
(callback) {
callback();
console.log('\nPlaced optimized files in ' + chalk.magenta('dist/\n'));
- console.log('\nPlaced font files in ' + chalk.magenta('fonts/\n'));
+ console.log('\nPlaced font files in ' + chalk.magenta('font/\n'));
});
function logWatcher(event) {
diff --git a/src/components/nav-bar/nav-bar.html
b/src/components/nav-bar/nav-bar.html
index f6967a0..2504971 100644
--- a/src/components/nav-bar/nav-bar.html
+++ b/src/components/nav-bar/nav-bar.html
@@ -1,12 +1,12 @@
<div id="navContainer">
<div class="boxedIcon" id="showNavMenu" data-bind="click: showNav"><i
class="fa fa-th-list"></i></div>
<div class="navWrapper">
- <div class="row text-center">
+ <div class="row text-center navRow">
<h2 class='titlebrand'>Dash</h2>
</div>
- <div class="row sidebar-nav">
- <div class="col-md-12">
+ <div class="row sidebar-nav navRow">
+ <div class="col-md-12 navRow">
<div class="row-fluid">
<ul>
<li><span
id="navDefaultBoard"><i class="fa fa-dashboard"></span></i></li>
diff --git a/src/css/style.css b/src/css/style.css
index 9a0e228..c5e90d9 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -23,6 +23,12 @@
padding-top: 50px;
}
+.navRow {
+ width: 100px;
+ padding:0;
+ margin: 0;
+}
+
.navWrapper {
margin-left: -100px;
left: 100px;
@@ -47,7 +53,7 @@
.sidebar-nav li {
font-size: 24px;
display: inline-block;
- width: 48%;
+ width: 48.5px;
text-align: center;
padding: .5em;
}
diff --git a/src/index.html b/src/index.html
index 1b748da..e8c5e44 100644
--- a/src/index.html
+++ b/src/index.html
@@ -4,6 +4,7 @@
<!--build:css-->
<link rel="stylesheet" type="text/css"
href="bower_modules/bootstrap/dist/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css"
href="bower_modules/fontawesome/css/font-awesome.css"/>
+ <link rel="stylesheet" type="text/css"
href="bower_modules/lato/css/lato.css"/>
<link rel="stylesheet" type="text/css"
href="bower_modules/nouislider/src/jquery.nouislider.css"/>
<link rel="stylesheet" type="text/css" href="bower_modules/c3/c3.css"/>
<link rel="stylesheet" type="text/css" href="css/style.css"/>
--
To view, visit https://gerrit.wikimedia.org/r/173224
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5b712ef35b4bf3e25e6f944da255e3cfa3eecde
Gerrit-PatchSet: 5
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
