diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 9c258fd1..fff122f6 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -70,7 +70,7 @@ gulp.task('dev:static', () => { }); gulp.task('dev:doc', () => { - return gulp.src('**/README.md') + return gulp.src('README.md') .pipe(toc()) .pipe(replace(/[^\n]*Table of Contents[^\n]*\n/g, '')) .pipe(gulp.dest('./')); diff --git a/lib/app/css/styleguide-app.css b/lib/app/css/styleguide-app.css index b90d2c84..70c7558a 100644 --- a/lib/app/css/styleguide-app.css +++ b/lib/app/css/styleguide-app.css @@ -384,6 +384,7 @@ Styleguide 3.1.1 } .sg.sg-side-nav { + display: none; float: left; display: inline-block; width: 30%; @@ -396,7 +397,6 @@ Styleguide 3.1.1 overflow: scroll; transition: opacity .4s cubic-bezier(0.000, 0.995, 0.990, 1.000); } - .sg.option { text-align: center; a { @@ -667,6 +667,7 @@ Styleguide 3.2.1 height: 100%; h1 { + min-height: 70px; font-family: var(--secondary-font); font-family: $secondary-font; font-style: normal; @@ -760,7 +761,6 @@ Styleguide 3.2.1 } .sg.side-nav-search .sg.sg-search-field { margin-top: calc(var(--header-height)/2 - 18px); - margin-top: calc($header-height/2 - 18px); box-sizing : border-box; float: right; @media (--mobile) { @@ -854,6 +854,7 @@ Styleguide 3.3.1 */ .sg.sg-top-nav { + display: none; clear: both; background-color: var(--nav-background-color); background-color: $nav-background-color; @@ -861,6 +862,10 @@ Styleguide 3.3.1 width: 100%; } +.sg.sg-nav-visible { + display: block; +} + .sg.sg-top-nav-menu { padding: 0 var(--min-content-margin) 0 var(--min-content-margin); padding: 0 $min-content-margin 0 $min-content-margin; diff --git a/lib/app/js/controllers/main.js b/lib/app/js/controllers/main.js index 54404c28..c69e5792 100644 --- a/lib/app/js/controllers/main.js +++ b/lib/app/js/controllers/main.js @@ -17,11 +17,15 @@ angular.module('sgApp') $scope.variables = Variables.variables; $scope.toggleMenu = false; - $scope.toggleBool = function(toggleMenu) { + $scope.toggleSideNav = function(toggleMenu) { $scope.toggleMenu = !toggleMenu; return $scope.toggleMenu; }; + $scope.isSideNav = function() { + return $scope.config.data.sideNav; + }; + // Bind variable to scope to wait for data to be resolved $scope.socketService = Socket; @@ -41,7 +45,7 @@ angular.module('sgApp') $scope.hasSubsections = function(parentSection) { var result = false; angular.forEach($scope.sections.data, function(section) { - if(parentSection.reference === section.parentReference) { + if (parentSection.reference === section.parentReference) { result = true; return; } diff --git a/lib/app/views/main.html b/lib/app/views/main.html index 1c07798d..5268c015 100644 --- a/lib/app/views/main.html +++ b/lib/app/views/main.html @@ -10,8 +10,8 @@

Error: {{status.error.name}}

{{status.error.message}}
-
-
+
+
@@ -28,7 +28,7 @@

Error: {{status.error.name}}

-