diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4a48538
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_store
\ No newline at end of file
diff --git a/CDS_Dashboard/index.html b/CDS_Dashboard/index.html
new file mode 100644
index 0000000..4707f71
--- /dev/null
+++ b/CDS_Dashboard/index.html
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CDS_Dashboard/script.js b/CDS_Dashboard/script.js
new file mode 100644
index 0000000..6c4b6ce
--- /dev/null
+++ b/CDS_Dashboard/script.js
@@ -0,0 +1,487 @@
+'use strict';
+
+var chart;
+var chart2;
+$('#exampleModal').modal('hide');
+
+
+$(document).ready( function() {
+ var mq = window.matchMedia("(max-width: 600px)");
+ var desktopMq = window.matchMedia("(max-width: 800px)");
+ var desktopMq2 = window.matchMedia('(max-width: 1290px)');
+ mq.addListener(widthChange);
+ desktopMq.addListener(widthChange);
+ desktopMq2.addListener(widthChange);
+ var $container = $('.container');
+ var secondChart = $('#secondContainer');
+ var firstChart = $('#chartContainer');
+ var $modalName = $('#modalName');
+ var $modalInitiative = $('#modalInitiative');
+ var $modalServices = $('#modalServices');
+ var $modalObjective = $('#modalObjective');
+ var $modalPicture = $('#modalPicture');
+ var $modalWebsite = $('#modalWebsite');
+ var $exampleModal = $('#exampleModal');
+ var $closeModal = $('.close-modal');
+ var counter = 0;
+
+ widthChange(mq, desktopMq, desktopMq2);
+
+function widthChange(mq, desktopMq, desktopMq2) {
+ if (mq.matches) {
+ $container.css('width', '550px');
+ secondChart.css("height", "250px");
+ secondChart.css('width', '300px');
+ secondChart.css('display', 'block');
+ firstChart.css("height", "250px");
+ firstChart.css("width", '300px');
+ } else if (desktopMq.matches) {
+ secondChart.css("height", "500px");
+ secondChart.css('width', '300px');
+ firstChart.css("height", "500px");
+ firstChart.css('width', '350px');
+ } else if (desktopMq2.matches) {
+ secondChart.css("height", "500px");
+ secondChart.css('width', '350px');
+ firstChart.css("height", "500px");
+ firstChart.css('width', '400px');
+ }
+ else {
+ secondChart.css('width', '500px');
+ firstChart.css('width', '500px');
+ }
+}
+
+var title = 'Projects';
+var chartType = 'pie';
+var subtitle = 'Click on a section to view more';
+var categories = ['Pre-Discovery', 'Discovery']; // category name matches 'name' property
+var name = 'Groups';
+var subtitle2 = 'Click section to Learn More';
+var data = [{
+ y: 1, // this is to determine how big the slice of the pie you want for this item
+ name: 'Pre-Discovery', // this is the top group - used in 328, 339 for tool tip and resetting
+ color: '#6bad50', // decide color for the slice
+ list: 'NOAA',
+ // THIS BEGINS THE NEXT DRILLDOWN - for deeper drilldowns you create another object in the 'data' property
+ drilldown: {
+ title: 'Pre-Discovery Clients', // title at top of drill down
+ subtitle: subtitle2, // can set subtitle here or you can use the one made above
+ name: 'Users', // Way to organize your drilldowns based on info, doesn't show up in graph
+ categories: ['NOAA'], // Line 227 uses this category to make X Axis
+ data: [{
+ y: 1, // setting this to 0 makes it disappear
+ name: 'NOAA',
+ color: '#6bad50',
+ initiative: 'Data Labs',
+ services: 'UI/UX, Back-End',
+ objective: 'Delivering Data Services',
+ modal: '#exampleModal',
+ picture: '../ImageCarousel/bureauLogos/noaa-logo.png'
+ }]
+ }},
+ {
+ y: 1,
+ name: 'Discovery',
+ color: '#dee58c',
+ list: 'DOC',
+ drilldown: {
+ title: 'Discovery Clients',
+ subtitle: subtitle2,
+ name: 'Users',
+ categories: ['DOC'],
+ data: [{
+ y: 1,
+ name: 'DOC',
+ color: '#C5CB7C',
+ initiative: 'OMG CAP Project',
+ services: 'UI/UX, Data Science',
+ objective: 'Creating Data Driven Government',
+ modal: '#exampleModal',
+ picture: '../ImageCarousel/bureauLogos/doc-logo.png'
+ }]
+ }
+ }, {
+ y: 6,
+ name: 'In-Progress',
+ color: '#006c79',
+ list: 'ITA, NIST, PTO, ESA',
+ drilldown: {
+ title: 'In-Progress Clients',
+ subtitle: subtitle2,
+ //name: 'Users',
+ categories: ['NIST', 'PTO', 'ESA', 'ITA'],
+ data: [{
+ y: 1,
+ name: 'NIST',
+ color: '#00555f',
+ initiative: 'NetZero',
+ services: 'Data Science, Back-End',
+ objective: 'Creating Data-Driven Government',
+ modal: '#exampleModal',
+ picture: '../ImageCarousel/bureauLogos/nist-logo.png'
+ }, {
+ y: 1,
+ name: 'NIST',
+ color: '#00b0c5',
+ initiative:'MEP',
+ services: 'Data Science, Back-End',
+ objective: 'Creating Data-Driven Government',
+ modal: '#exampleModal',
+ picture: '../ImageCarousel/bureauLogos/nist-logo.png'
+ }, {
+ y: 1,
+ name: 'PTO',
+ color: '#007786',
+ initiative: 'Open Data Roadmap',
+ services: 'General',
+ objective: 'Fueling Economic Growth',
+ modal: '#exampleModal',
+ picture: '../ImageCarousel/bureauLogos/uspto-logo.png'
+ }, {
+ y: 1,
+ name: 'ITA',
+ color: '#003339',
+ initiative: 'Principal Tracker',
+ services: 'UI/UX, Back-End',
+ objective: 'Delivering Data Services',
+ modal: '#exampleModal',
+ picture: '../ImageCarousel/bureauLogos/ita-logo.png'
+ }, {
+ y: 1,
+ name: 'ITA',
+ color: '#00D8F2',
+ initiative: 'New Exporters Project',
+ services: 'Data Science',
+ objective: 'Fueling Economic Growth',
+ picture: '../ImageCarousel/bureauLogos/ita-logo.png'
+ }, {
+ y: 1,
+ name: 'BEA',
+ color: '#007786',
+ initiative: 'BEA RIMS II',
+ services: 'UI/UX',
+ objective: 'Delivering Data Services',
+ modal: '#exampleModal',
+ picture: '../ImageCarousel/bureauLogos/bea-logo.png'
+ }]
+ }
+ }, {
+ y: 6,
+ name: 'Complete',
+ color: '#00305d',
+ list: 'DOC, CENSUS, ESA',
+ drilldown: {
+ title: 'Complete Projects',
+ subtitle: subtitle2,
+ name: 'Users',
+ categories: ['DOC', 'CENSUS', 'ESA'],
+ data: [{
+ y: 1,
+ name: 'CENSUS',
+ color: '#00376a',
+ initiative: 'Income Inequality',
+ services: 'General',
+ objective: 'Fueling Economic Growth',
+ picture: '../ImageCarousel/bureauLogos/census-logo.png',
+ web: 'https://midaas.commerce.gov/'
+ }, {
+ y: 1,
+ name: 'DOC',
+ color: '#0057a9',
+ initiative: 'Commerce Data Usability Project',
+ services: 'UX/UI, Data Science, Back-End',
+ objective: 'Delivering Data Services',
+ picture: '../ImageCarousel/bureauLogos/doc-logo.png',
+ web: 'https://www.commerce.gov/datausability/'
+ }, {
+ y: 1,
+ name: 'DOC',
+ color: '#0078e9',
+ initiative: 'Data.Commerce.Gov',
+ services: 'General',
+ objective: 'Fueling Economic Growth',
+ picture: '../ImageCarousel/bureauLogos/doc-logo.png',
+ web: 'https://data.commerce.gov/'
+ }, {
+ y: 1,
+ name: 'DOC',
+ color: '#0057a9',
+ initiative: 'White House Council of Women and Girls',
+ services: 'Data Science, UX/UI',
+ objective: 'Delivering Data Services',
+ picture: '../ImageCarousel/bureauLogos/doc-logo.png'
+ }, {
+ y: 1,
+ name: 'DOC',
+ color: '#293479',
+ initiative: 'Commerce Data Academy',
+ services: 'General',
+ objective: 'Creating Data Driven Government',
+ picture: '../ImageCarousel/bureauLogos/doc-logo,png',
+ web: 'https://dataacademy.commerce.gov/'
+ }, {
+ y: 1,
+ name: 'ESA',
+ color: '#5A91C5',
+ initiative: 'Commerce Data Advisory Council (CDAC)',
+ services: 'General',
+ objective: 'Fueling Economic Growth',
+ picture: '../ImageCarousel/bureauLogos/esa-logo.png',
+ web: 'http://www.esa.gov/cdac/'
+ }]
+ }
+ }]; // end of data property
+
+function moveChart() {
+ if (mq.matches) {
+ return 0;
+ } else if (desktopMq.matches) {
+ firstChart.animate({'marginLeft' : '-=200px'}, 100);
+ firstChart.css('display', 'inline-block');
+ } else if (desktopMq2) {
+ firstChart.animate({'marginLeft' : "-=250px"}, 100);
+ firstChart.css("display", "inline-block");
+ } else {
+ firstChart.animate({'marginLeft' : "-=300px"}, 100);
+ firstChart.css("display", "inline-block");
+ }
+}
+
+function setSecondChart(options) {
+ chart2.setTitle({
+ text: options.title
+ }, {
+ text: options.subtitle
+ });
+ chart2.series[0].remove(false); //boolean decides if it needs to redraw immediately, sinc we are doing more we do not set it to true, we remove the series
+ chart2.xAxis[0].setCategories(options.categories, false);
+ chart2.addSeries({
+ type: options.type,
+ name: options.name,
+ data: options.data,
+ color: options.color || 'white'
+ }, false);
+ chart2.redraw(); // redraws chart
+ secondChart.css("visibility","visible");
+}
+
+//Used to create the modals rather than
+function createModal(series) {
+ $modalName.prepend('' + "Bureau: " + series.name + '
');
+ $modalInitiative.prepend('' + "Initiative: " + series.initiative + '
');
+ $modalServices.prepend('' + "Services: " + series.services + '
');
+ $modalObjective.prepend('' + "Objective: " + series.objective + '
');
+ $modalPicture.attr('src', series.picture);
+ if (series.web) {
+ $modalWebsite.prepend('' + series.web + '
');
+ $modalWebsite.attr('href', series.web);
+ $modalWebsite.attr('target', "_blank");
+ }
+ $exampleModal.modal('show');
+ clearModal();
+}
+
+//Clears the modal so if double-clicked the information won't show up twice
+function clearModal() {
+ $closeModal.click(function() {
+ $modalName.empty();
+ $modalInitiative.empty();
+ $modalServices.empty();
+ $modalObjective.empty();
+ $modalWebsite.empty();
+ });
+}
+
+function buildOptions(drilldown) {
+ if (drilldown) { // drill down
+ var options = {
+ 'title': drilldown.title,
+ 'subtitle': drilldown.subtitle,
+ 'name': drilldown.name,
+ 'categories': drilldown.categories,
+ 'data': drilldown.data,
+ 'type': chartType
+ };
+ } else { // restore to first level
+ var options = {
+ 'title': title,
+ 'subtitle': subtitle,
+ 'name': name,
+ 'categories': categories,
+ 'data': data,
+ 'type': chartType
+ // return options;
+ };
+ }
+ return options;
+}
+
+Highcharts.setOptions({
+ credits: {
+ enabled: false
+ },
+ chart: {
+ style: {
+ fontFamily: 'SourceSansProRegular, Open Sans, Helvetica Neue, Arial, sans-serif'
+ }
+ },
+ title: {
+ text: title,
+ style: {
+ fontWeight: 'bold',
+ textTransform: 'uppercase'
+ }
+ },
+ subtitle: {
+ text: subtitle
+ },
+ plotOptions: {
+ pie: {
+ dataLabels: {
+ enabled: true,
+ color: 'black',
+ style: {
+ fontWeight: 'bold'
+ }
+ }
+ }
+ }, //end of plotOptions
+ exporting: {
+ enabled: false // can't print chart
+ }
+});
+
+ var chart1 = {
+ chart: {
+ renderTo: 'chartContainer'
+ },
+ plotOptions: {
+ series: {
+ cursor: 'pointer', // cursor set to pointer since we have 'click' events
+ point: {
+ events: {
+ click: function () {
+ // var drilldown = this.drilldown; // uses keyword 'this'
+ // var options;
+ mq.addListener(responsiveHighCharts);
+ responsiveHighCharts(mq, this.drilldown);
+
+
+ function responsiveHighCharts(mq, drilldown) {
+ var options = buildOptions(drilldown);
+ if (mq.matches) {
+ // create variable to passed into setChart function
+ setTimeout(function() {
+ setSecondChart(options);
+ },700);
+
+ } else {
+ if (counter === 0) {
+ counter++;
+ moveChart();
+ setTimeout(function() {
+ setSecondChart(options);
+ },700);
+ } else {
+ setSecondChart(options);
+ }
+ } //end of responsive else statement
+ }
+
+ } //end of click
+ } // end of events
+ } //points
+ } //series
+ }, //plot options
+ tooltip: {
+ formatter: function () {
+ var point = this.point; // sets keyword 'this' -- this.point is really series.data
+ var s = point.name + ': ' + point.list + '. '; //formats pointer
+ if (point.deepDrill) {
+ s = point.name + ' ' +
+ 'Services: ' + point.services + ' ' +
+ 'Objective: ' + point.objective + ' ' + ' ' +
+ '' + 'Click to return home' + ' ';
+ } else if (point.objective == 'Numerous Objectives') {
+ s = point.name + ' ' +
+ '' + 'Click Here to Learn More About ' + point.name + ' Projects' + ' ';
+ } else if (point.drilldown){
+ s = 'Click to view ' + point.name;
+ } else {
+ s = point.name + ' ' +
+ 'Initiative: ' + point.initiative + ' ' +
+ 'Services: ' + point.services + ' ' +
+ 'Objective: ' + point.objective + ' ' + ' ' +
+ '' + 'Click to Learn More' + ' ';
+ }
+ return s;
+ }
+ }, //end of tooltip
+ series: [{ // sets chart series here
+ type: chartType,
+ name: name,
+ data: data,
+ color: 'white' // don't know why you set this to white
+ }]
+ } //chart1
+
+ chart2 = {
+ chart: {
+ renderTo: 'secondContainer'
+ },
+ plotOptions: {
+ series: {
+ cursor: 'pointer', // cursor set to pointer since we have 'click' events
+ point: {
+ events: {
+ click: function () {
+ var drilldown = this.drilldown; // uses keyword 'this'
+ var options; // create variable to passed into setChart function
+ createModal(this);
+ $(this.modal).modal('show');
+ }
+ }
+ }
+ } //end of series
+ }, //end of plotOptions
+ tooltip: {
+ formatter: function () {
+ if (mq.matches) {
+ s = 'Please learn more from our pop-up';
+ } else {
+ var point = this.point; // sets keyword 'this' -- this.point is really series.data
+ var s = point.name + ': ' + point.list + '. '; //formats pointer
+ if (point.deepDrill) {
+ s = point.name + ' ' +
+ 'Services: ' + point.services + ' ' +
+ 'Objective: ' + point.objective + ' ' + ' ' +
+ '' + 'Click to return home' + ' ';
+ } else if (point.objective == 'Numerous Objectives') {
+ s = point.name + ' ' +
+ '' + 'Click Here to Learn More About ' + point.name + ' Projects' + ' ';
+ } else if (point.drilldown){
+ s = 'Click to view ' + point.name;
+ } else {
+ s = point.name + ' ' +
+ 'Initiative: ' + point.initiative + ' ' +
+ 'Services: ' + point.services + ' ' +
+ 'Objective: ' + point.objective + ' ' + ' ' +
+ '' + 'Click to Learn More' + ' ';
+ }
+
+ }
+ return s;
+ }
+ },
+ series: [{ // sets chart series here
+ type: chartType,
+ name: name,
+ data: [{y:1}]
+ }]
+ }
+
+chart = new Highcharts.Chart(chart1);
+chart2 = new Highcharts.Chart(chart2);
+
+}); // end of document.ready()
diff --git a/CDS_Dashboard/style.css b/CDS_Dashboard/style.css
new file mode 100644
index 0000000..438a0fb
--- /dev/null
+++ b/CDS_Dashboard/style.css
@@ -0,0 +1,224 @@
+* {
+ -webkit-border-radius: 0 !important;
+ -moz-border-radius: 0 !important;
+ border-radius: 0 !important;
+ font: 'SourceSansProRegular','Open Sans','Helvetica Neue',Arial,sans-serif;
+}
+
+
+#secondContainer {
+ display: inline-block;
+ visibility: hidden;
+ padding-top: 50px;
+ margin: 0 auto;
+}
+
+#chartContainer {
+ padding-top: 50px;
+ /*display: inline-block;*/
+ margin: 0 auto;
+}
+
+.modal-content {
+ border-radius: 6px !important;
+}
+
+/* This is the CSS for the close modal */
+div.close-modal {
+ float: left;
+ margin-right: 30px;
+ margin-bottom: 200px;
+ position: static;
+ top: 25px;
+ right: 25px;
+ width: 75px;
+ height: 75px;
+ background-color: transparent;
+ cursor: pointer;
+ padding-left: 20px;
+ padding-top: 15px;
+}
+
+/* These next two create the X for the close modal*/
+div.close-modal .lr {
+ z-index: 1051;
+ width: 1px;
+ height: 75px;
+ margin-left: 35px;
+ background-color: #222;
+ transform: rotate(45deg);
+ -webkit-transform: rotate(45deg);
+}
+
+div.close-modal .lr .rl {
+ z-index: 1052;
+ width: 1px;
+ height: 75px;
+ margin-left: 1px;
+ background-color: #222;
+ transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+}
+
+div.modal {
+ margin: auto;
+ padding-left: 30px;
+ padding-top: 30px;
+}
+
+#modalName p {
+ font-weight: bold;
+}
+
+div.modal-content {
+ padding-top: 20px;
+}
+
+#modalPicture {
+ display: inline-block;
+ vertical-align: baseline;
+ margin: 90px 21px 50px 15px;
+}
+
+div#bureauInfo {
+ position:relative;
+ display:inline-block;
+ vertical-align: top;
+ margin-top: 90px;
+ margin-bottom: 70px;
+}
+
+@media only screen
+and (min-device-width : 375px)
+and (max-device-width : 667px)
+and (orientation : portrait) {
+
+ /* This is the CSS for the close modal */
+ div.close-modal {
+ float: left;
+ margin-right: 30px;
+ margin-bottom: 20px;
+ position: static;
+ top: 25px;
+ right: 25px;
+ width: 75px;
+ height: 75px;
+ background-color: transparent;
+ cursor: pointer;
+ padding-left: 20px;
+ padding-top: 15px;
+ }
+
+ /* These next two create the X for the close modal*/
+ div.close-modal .lr {
+ z-index: 1051;
+ width: 1px;
+ height: 60px;
+ margin-left: 35px;
+ background-color: #222;
+ transform: rotate(45deg);
+ -webkit-transform: rotate(45deg);
+ }
+
+ div.close-modal .lr .rl {
+ z-index: 1052;
+ width: 1px;
+ height: 60px;
+ margin-left: 1px;
+ background-color: #222;
+ transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+ }
+
+ div.modal {
+ margin-left: 100px;
+ margin-top: 75px;
+ }
+
+ #modalName p {
+ font-size: 37px;
+ font-weight: bold;
+ }
+
+ #modalInitiative p {
+ font-size: 29px;
+ }
+
+ #modalServices p {
+ font-size: 29px;
+ }
+
+ #modalObjective p {
+ font-size: 29px;
+ }
+
+ #chartContainer {
+ height: 50%;
+ }
+
+ #modalPicture {
+ display: inline-block;
+ vertical-align: baseline;
+ margin: 10px 35px;
+ }
+
+ div#bureauInfo {
+ position:relative;
+ display:inline-block;
+ vertical-align: top;
+ margin-top: 20px;
+ margin-bottom: 10px;
+ margin-left: 25px;
+ }
+}
+
+@media only screen
+and (max-device-width : 374px)
+and (orientation : portrait) {
+
+ div.close-modal {
+ float: none;
+ margin-bottom: 10px;
+ }
+}
+
+@media only screen
+and (max-device-width : 768px)
+and (orientation : portrait) {
+ div.modal-content {
+ padding-top: 5px;
+ }
+
+ div.close-modal {
+ margin-right: 6px;
+ vertical-align: top;
+ display: inline-block;
+ height:auto;
+ padding-left: 0px;
+ margin-bottom: 3px;
+ }
+
+ img#modalPicture {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ margin-left: 5px;
+ margin-right: 5px;
+ }
+
+ div#bureauInfo {
+ margin-top: 2px;
+ margin-left: 15px;
+ margin-bottom: 10px;
+ }
+
+ div.close-modal .lr {
+ width: 2px;
+ height: 35px;
+ margin-left: 23px;
+ }
+
+ div.close-modal .lr .rl {
+ width: 2px;
+ height: 35px;
+ }
+}
\ No newline at end of file
diff --git a/ImageCarousel/bureauLogos/bea-logo.png b/ImageCarousel/bureauLogos/bea-logo.png
new file mode 100644
index 0000000..7586353
Binary files /dev/null and b/ImageCarousel/bureauLogos/bea-logo.png differ
diff --git a/ImageCarousel/bureauLogos/bis-logo.png b/ImageCarousel/bureauLogos/bis-logo.png
new file mode 100644
index 0000000..2fa0488
Binary files /dev/null and b/ImageCarousel/bureauLogos/bis-logo.png differ
diff --git a/ImageCarousel/bureauLogos/census-logo.png b/ImageCarousel/bureauLogos/census-logo.png
new file mode 100644
index 0000000..cc30674
Binary files /dev/null and b/ImageCarousel/bureauLogos/census-logo.png differ
diff --git a/ImageCarousel/bureauLogos/doc-logo.png b/ImageCarousel/bureauLogos/doc-logo.png
new file mode 100644
index 0000000..fad995d
Binary files /dev/null and b/ImageCarousel/bureauLogos/doc-logo.png differ
diff --git a/ImageCarousel/bureauLogos/eda-logo.png b/ImageCarousel/bureauLogos/eda-logo.png
new file mode 100644
index 0000000..9f73b18
Binary files /dev/null and b/ImageCarousel/bureauLogos/eda-logo.png differ
diff --git a/ImageCarousel/bureauLogos/esa-logo.png b/ImageCarousel/bureauLogos/esa-logo.png
new file mode 100644
index 0000000..b680a82
Binary files /dev/null and b/ImageCarousel/bureauLogos/esa-logo.png differ
diff --git a/ImageCarousel/bureauLogos/ita-logo.png b/ImageCarousel/bureauLogos/ita-logo.png
new file mode 100644
index 0000000..99bbac8
Binary files /dev/null and b/ImageCarousel/bureauLogos/ita-logo.png differ
diff --git a/ImageCarousel/bureauLogos/mbda-logo.png b/ImageCarousel/bureauLogos/mbda-logo.png
new file mode 100644
index 0000000..b48167e
Binary files /dev/null and b/ImageCarousel/bureauLogos/mbda-logo.png differ
diff --git a/ImageCarousel/bureauLogos/nist-logo.png b/ImageCarousel/bureauLogos/nist-logo.png
new file mode 100644
index 0000000..baeb0f6
Binary files /dev/null and b/ImageCarousel/bureauLogos/nist-logo.png differ
diff --git a/ImageCarousel/bureauLogos/noaa-logo.png b/ImageCarousel/bureauLogos/noaa-logo.png
new file mode 100644
index 0000000..d04d6dc
Binary files /dev/null and b/ImageCarousel/bureauLogos/noaa-logo.png differ
diff --git a/ImageCarousel/bureauLogos/ntia-logo.png b/ImageCarousel/bureauLogos/ntia-logo.png
new file mode 100644
index 0000000..9dbdef1
Binary files /dev/null and b/ImageCarousel/bureauLogos/ntia-logo.png differ
diff --git a/ImageCarousel/bureauLogos/ntis-logo.png b/ImageCarousel/bureauLogos/ntis-logo.png
new file mode 100644
index 0000000..f111796
Binary files /dev/null and b/ImageCarousel/bureauLogos/ntis-logo.png differ
diff --git a/ImageCarousel/bureauLogos/uspto-logo.png b/ImageCarousel/bureauLogos/uspto-logo.png
new file mode 100644
index 0000000..cb5eb5a
Binary files /dev/null and b/ImageCarousel/bureauLogos/uspto-logo.png differ
diff --git a/ImageCarousel/carousel.js b/ImageCarousel/carousel.js
new file mode 100644
index 0000000..327915e
--- /dev/null
+++ b/ImageCarousel/carousel.js
@@ -0,0 +1,47 @@
+$(document).ready( function(){
+ $('.image-carousel').slick({
+ infinite: true,
+ slidesToShow: 5,
+ slidesToScroll: 1,
+ autoplay: true,
+ autoplaySpeed: 5000,
+ centerMode: true,
+ centerPadding: '50px',
+ pauseOnHover: false,
+ initialSlide: 3,
+ responsive: [
+ {
+ breakpoint: 1024,
+ settings: {
+ slidesToShow: 3,
+ slidesToScroll: 3,
+ autoplay: true,
+ autoplaySpeed: 3000,
+ infinite: false
+ }
+ },
+ {
+ breakpoint: 600,
+ settings: {
+ slidesToShow: 2,
+ slidesToScroll: 2,
+ autoplay: true,
+ autoplaySpeed: 3000,
+ infinite: false
+ }
+ },
+ {
+ breakpoint: 480,
+ settings: {
+ slidesToShow: 1,
+ slidesToScroll: 1,
+ autoplay: true,
+ autoplaySpeed: 3000,
+ infinite: false
+ }
+ }
+ ]
+ });
+});
+
+ // $('.image-carousel').get(0).slick.setPosition();
\ No newline at end of file
diff --git a/ImageCarousel/index.html b/ImageCarousel/index.html
new file mode 100644
index 0000000..de7603e
--- /dev/null
+++ b/ImageCarousel/index.html
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ImageCarousel/style.css b/ImageCarousel/style.css
new file mode 100644
index 0000000..7085dac
--- /dev/null
+++ b/ImageCarousel/style.css
@@ -0,0 +1,14 @@
+
+div .slick-slide img {
+ opacity: 0.5;
+ transform:scale(.90);
+}
+
+div .slick-center img {
+ opacity: 2.0;
+ transform:scale(1);
+}
+
+.slick-slider {
+ margin-top: 50px;
+}
\ No newline at end of file
diff --git a/css/CDSCustomCSS.css b/css/CDSCustomCSS.css
new file mode 100644
index 0000000..58fc16a
--- /dev/null
+++ b/css/CDSCustomCSS.css
@@ -0,0 +1,110 @@
+
+@media only screen and (min-width:1025px) {
+.container {width:100%;max-width:1340px}
+#content-column,.content-column,div.sidebar {float: left; clear: none}
+.two-sidebars .content-inner {margin-left: 25%; margin-right: 25%}
+.sidebar-first .content-inner {margin-left: 25%; margin-right: 0}
+.sidebar-second .content-inner {margin-right: 25%; margin-left: 0}
+.region-sidebar-first {width: 25%; margin-left: -100%}
+.region-sidebar-second {width: 25%; margin-left: -25%}
+.at-panel .region {display:inline;float:left}.three-25-50-25 > .region,.three-25-25-50 > .region,.three-50-25-25 > .region,.three-inset-left > .region-three-inset-left-sidebar,.three-inset-right > .region-three-inset-right-sidebar,.doc-three-inset-left .region-doc-three-inset-left-sidebar,.doc-two-75-25 > .panel-inner > .region-doc-two-75-25-second,.doc-two-25-75 > .panel-inner > .region-doc-two-25-75-first {width:25%}.three-25-50-25 > div.region-three-25-50-25-second,.three-25-25-50 > div.region-three-25-25-50-third,.three-50-25-25 > div.region-three-50-25-25-first,.doc-three-inset-left > .panel-inner > .inset-wrapper > div.region-doc-three-inset-left-inset,.doc-three-inset-left > .panel-inner > .inset-wrapper > div.region-doc-three-inset-left-middle,.two-50 > .region,.two-brick > .panel-row > .region,.doc-two-50 > .region,.five-5x20 > .row-1 div.region-five-first,.five-5x20 .row-1 div.region-five-second {width:50%}.three-3x33 > .region,.three-inset-left > .inset-wrapper > div.region-three-inset-left-inset,.three-inset-right > .inset-wrapper > div.region-three-inset-right-inset,.two-33-66 > .region-two-33-66-first,.two-66-33 > .region-two-66-33-second,.doc-two-brick-alt > .panel-row > .region-doc-two-brick-alt-left-below,.doc-two-brick-alt > .panel-row > .region-doc-two-brick-alt-right-above,.five-5x20 > .panel-row > .region {width:33.333333%}.three-inset-left > .region-three-inset-left-sidebar,.three-inset-left > .inset-wrapper,.three-inset-left > .inset-wrapper > .region-three-inset-left-middle,.doc-three-inset-left > .panel-inner > .inset-wrapper > .region-doc-three-inset-left-sidebar,.doc-three-inset-left > .panel-inner > .inset-wrapper > .region-doc-three-inset-left-inset,.doc-two-25-75 > .panel-inner > .region-doc-two-25-75-second-top,.doc-two-25-75 > .panel-inner > .region-doc-two-25-75-second-bottom {float:right}.three-inset-left > .inset-wrapper,.doc-three-inset-left > .panel-inner > .inset-wrapper,.doc-two-75-25 > .panel-inner > .region-doc-two-75-25-first-top,.doc-two-75-25 > .panel-inner > .region-doc-two-75-25-first-bottom,.doc-two-25-75 > .panel-inner > .region-doc-two-25-75-second-top,.doc-two-25-75 > .panel-inner > .region-doc-two-25-75-second-bottom {width:75%}.three-inset-left > .inset-wrapper > div.region-three-inset-left-middle,.three-inset-right > .inset-wrapper > div.region-three-inset-right-middle,.two-33-66 > .region-two-33-66-second,.two-66-33 > .region-two-66-33-first,.doc-two-brick-alt > .panel-row > .region-doc-two-brick-alt-left-above,.doc-two-brick-alt > .panel-row > .region-doc-two-brick-alt-right-below {width:66.666666%}.three-inset-left > .inset-wrapper > .region,.three-inset-right > .inset-wrapper > .region,.doc-three-inset-left > .panel-inner > .inset-wrapper > .region {width:100%}.three-inset-right > .inset-wrapper {width:75%;float:left}.doc-three-inset-left > .panel-inner > .inset-wrapper > .region-doc-three-inset-left-middle, .doc-three-inset-left > .panel-inner > .inset-wrapper,.doc-two-25-75 > .panel-inner > .region-doc-two-25-75-first {float:left}.two-brick > .panel-row,.doc-two-brick-alt > .panel-row {float:none}.six-6x16 > .panel-row {width:33.333333%;float:left}.six-6x16 > .panel-row > .region,.five-5x20 > .panel-row {float:none;display:block;width:100%;clear:both}.four-4x25 > .panel-row > .region,.four-4x25 > .panel-row {width:50%;float:left}
+}
+
+.header-content-inner{
+ padding-top: 150px;
+ padding-bottom: 150px;
+}
+
+.header-content-inner > h1{
+ font-size: 75px;
+ font-family: 'Roboto', Helvetica, Arial, sans-serif;
+ font-weight: 700;
+}
+
+@media only screen and (max-width: 768px) {
+ .header-content-inner > h1 {
+ font-size: 52px;
+ }
+}
+
+#services {
+ padding-left: 75px;
+ padding-right: 75px;
+}
+
+.searchColorText {
+ color: black;
+}
+
+.setBlueBackground {
+ background-color: #002952;
+}
+
+.our-team-title{
+ color: white;
+ padding-top: 50px;
+}
+
+.darken {
+ background-image:
+ linear-gradient(
+ rgba(0, 0, 0, 0.5),
+ rgba(0, 0, 0, 0.5)
+ ),
+ url(../img/header.jpg);
+}
+
+.class-row {
+ padding-top: 30px;
+}
+
+.set-as-white {
+ color: white;
+}
+
+.font-medium {
+ font-size: medium;
+}
+
+.font-large {
+ font-size: large;
+}
+
+/* This is the for the mobile icons to show as DoC IT would like them to show
+ */
+#mobile-menu .region-mobile-menu .block-menu-engage-follow span.title {
+ display: none;
+}
+
+.region-mobile-menu .block-menu-engage-follow ul.menu {
+ text-align: center;
+}
+.region-mobile-menu .block-menu-engage-follow ul.menu li {
+ display: inline-block;
+}
+.region-mobile-menu .block-menu-engage-follow ul.menu li a {
+ border: none !important;
+ text-align: center;
+ background: none;
+}
+.region-mobile-menu .block-menu-engage-follow ul.menu li a:hover {
+ background: none;
+ color: inherit;
+}
+.region-mobile-menu .block-menu-engage-follow ul.menu li a:before, .region-mobile-menu .block-menu-engage-follow ul.menu li .polyfill-icon {
+ margin-right: 0;
+ color: green;
+}
+
+.mobileIconDiv span {
+ display: none;
+}
+
+.site_buttons a {
+ margin-top: 80px;
+}
+
+#about .panel-body {
+ color: black;
+ text-align: left;
+}
diff --git a/css/bootstrap.css b/css/bootstrap.css
index 216faa7..6af4a7e 100755
--- a/css/bootstrap.css
+++ b/css/bootstrap.css
@@ -53,10 +53,10 @@ a:hover {
abbr[title] {
border-bottom: 1px dotted;
}
-b,
+/*b,
strong {
font-weight: bold;
-}
+}*/
dfn {
font-style: italic;
}
@@ -1057,7 +1057,10 @@ th {
.glyphicon-menu-up:before {
content: "\e260";
}
-* {
+
+/*adjusted this from asterisk to be a new class*/
+/*this has an effect on the commerce logo in the banner and borders, but also effects the column/rows system*/
+div.boxer {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@@ -1397,12 +1400,17 @@ ol {
margin-top: 0;
margin-bottom: 10px;
}
+
+/*commented out to avoid conflicting with footer menu*/
+/*
ul ul,
ol ul,
ul ol,
ol ol {
margin-bottom: 0;
}
+*/
+
.list-unstyled {
padding-left: 0;
list-style: none;
@@ -1557,6 +1565,8 @@ pre code {
background-color: transparent;
border-radius: 0;
}
+
+/*remove scrolling restriction on side bar*/
.pre-scrollable {
max-height: 340px;
overflow-y: scroll;
diff --git a/css/creative.css b/css/creative.css
index 39c6075..d18fd91 100755
--- a/css/creative.css
+++ b/css/creative.css
@@ -41,7 +41,7 @@ h6 {
p {
margin-bottom: 20px;
- font-size: 16px;
+ /*font-size: 16px;*/
line-height: 1.5;
}
diff --git a/css/parallax.css b/css/parallax.css
new file mode 100644
index 0000000..6d64097
--- /dev/null
+++ b/css/parallax.css
@@ -0,0 +1,17 @@
+.scroll {
+ /*Set a css background */
+ background:url(../img/header.jpg)fixed;
+
+ /*Dont mind the rest*/
+ width:100%;
+ background-position: center;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+
+
+ text-align:center;
+ color:#fff;
+ font-family:'Open Sans' sans-serif;
+}
+
+
diff --git a/img/.picasa.ini b/img/.picasa.ini
deleted file mode 100644
index 3290476..0000000
--- a/img/.picasa.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[Picasa]
-name=img
-category=Folders on Disk
-date=42115.849676
-P2category=Folders on Disk
-[1890census_00_populationdensitymap2.jpg]
-backuphash=6233
-moddate=0000be61eed10000
-[1790-b.jpg]
-backuphash=56187
-moddate=0000ee66eed10000
-[SfcWxmap 5_21_57_at_130am.png]
-backuphash=18808
-crop=rect64(139c1390dd97c42e)
-filters=crop64=1,139c1390dd97c42e;
diff --git a/img/button-search.png b/img/button-search.png
new file mode 100644
index 0000000..38baff8
Binary files /dev/null and b/img/button-search.png differ
diff --git a/img/cdc-temp-logo-v2.png b/img/cdc-temp-logo-v2.png
index 6310906..94b9e98 100644
Binary files a/img/cdc-temp-logo-v2.png and b/img/cdc-temp-logo-v2.png differ
diff --git a/img/data-science.png b/img/data-science.png
new file mode 100644
index 0000000..0718d4a
Binary files /dev/null and b/img/data-science.png differ
diff --git a/img/development.png b/img/development.png
new file mode 100644
index 0000000..5eb1d98
Binary files /dev/null and b/img/development.png differ
diff --git a/img/education.png b/img/education.png
new file mode 100644
index 0000000..f22a20d
Binary files /dev/null and b/img/education.png differ
diff --git a/index.html b/index.html
index 884b9fe..8b6533a 100644
--- a/index.html
+++ b/index.html
@@ -1,68 +1,150 @@
-
-
-
+
+
-
-
- Data Corps
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Data Service | Department of Commerce
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-