Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
256 commits
Select commit Hold shift + click to select a range
791f32a
Parallax height change
SigmaMonstR Sep 16, 2015
a8432b0
Smaller logos
SigmaMonstR Sep 16, 2015
c6701bd
script loader
SigmaMonstR Sep 16, 2015
233f28a
cover repeat
SigmaMonstR Sep 17, 2015
534920e
Removing Brenda's issues
tyronegrandison Sep 18, 2015
cadd4f7
http to https for search
SigmaMonstR Sep 18, 2015
a1e24f0
https search v2
SigmaMonstR Sep 18, 2015
8e2832d
Updates
SigmaMonstR Sep 24, 2015
be02d2c
CHanges
tyronegrandison Sep 24, 2015
fdf3304
new logo
SigmaMonstR Sep 28, 2015
2f3b0e9
Update index.html
SigmaMonstR Sep 28, 2015
9ada01d
Merge pull request #16 from CommerceDataService/gh-pages
SigmaMonstR Sep 28, 2015
f8084f9
Update for F-ups.
SigmaMonstR Nov 2, 2015
f1153f9
Revamped from Drupal reboot
SigmaMonstR Nov 2, 2015
4f68dfb
Page Wrapper Removed
SigmaMonstR Nov 3, 2015
ba0a8d0
META tags updated
tyronegrandison Nov 6, 2015
2ed0de1
Merge remote-tracking branch 'CommerceGov/gh-pages' into gh-pages
tyronegrandison Nov 6, 2015
adef9dc
Added social media META tags
tyronegrandison Nov 6, 2015
aa86392
Updated
Dec 9, 2015
0bbc449
Merge pull request #1 from CommerceDataService/gh-pages
SigmaMonstR Jan 15, 2016
8e3a1e2
Merge pull request #2 from CommerceDataService/gh-pages
SigmaMonstR Jan 15, 2016
558d48f
Merge pull request #7 from CommerceDataService/develop
SigmaMonstR Jan 20, 2016
fe3838e
Fixes to Drupal CSS intergration
Jan 20, 2016
9f23a88
Merge pull request #8 from CommerceDataService/develop
SigmaMonstR Jan 20, 2016
5bb513d
Title Change
Jan 20, 2016
98c4d43
Merge pull request #9 from CommerceDataService/develop
SigmaMonstR Jan 20, 2016
263b8b7
Banner removal
Jan 20, 2016
542ca33
Merge pull request #10 from CommerceDataService/develop
SigmaMonstR Jan 20, 2016
42f9957
Revised CSS
Jan 20, 2016
090db45
Changed the CSS to the static CSS addresses
maabrown Feb 11, 2016
295d068
Changed lines 954-955
Feb 12, 2016
bfd6d38
Changed line 976
Feb 12, 2016
e50994d
Copied lines 1181 - 1244 from Office of Secretary page to fix the foo…
Feb 12, 2016
fa5734b
Changed the last of the JS files and added seach.png to our folder
Feb 12, 2016
707c1a7
Static CSS and JS files - added search icon to image folder
Feb 12, 2016
a80bdf8
Merge pull request #11 from maabrown/develop
tyronegrandison Feb 13, 2016
d9fce4b
Merge remote-tracking branch 'origin/develop' into gh-pages
tyronegrandison Feb 13, 2016
86d2853
Merge branch 'develop' into production
Feb 18, 2016
c2fb727
Changed the header tags to reflect the Commerce Data Service
Feb 18, 2016
8982bd9
Merge pull request #12 from maabrown/develop
maabrown Feb 18, 2016
021fe60
Merge branch 'develop' into production - with the updated header tags
Feb 18, 2016
b11ca98
Updated lines 100 - 122 - the greyed out coding
Feb 18, 2016
ea68a11
Changed the headers and Twitter tags - made sure the links started wi…
Feb 18, 2016
9c8ef4b
Merge pull request #13 from maabrown/production
maabrown Feb 18, 2016
0658b6a
Changed the search text so it shows upon typing
Feb 22, 2016
82d0fb8
Added pics to MixItUp folder, added bios to MixItUp html file
Feb 24, 2016
fb598ec
Added more bios, added functionality to bottom images, Changed CSS
Feb 24, 2016
fe068dd
Made Sasan's modal the example
Feb 29, 2016
214cb4e
Added custom CSS file
Feb 29, 2016
33c92c0
Added .DS_Store
Feb 29, 2016
1dada1f
Did some touches on modal CSS, fixed the MixItUp plugin
Feb 29, 2016
fc47cd7
Moving the new bios into the repo - replaced all the code except for …
Mar 3, 2016
cf31b27
Fully pushed over the entire code for the page with bios
Mar 3, 2016
f746d3d
Added all bios and functionality - fixed bug for IE and Firefox
Mar 4, 2016
971e9fb
Changed the width style between pictures on CDSCustom.CSS to improve …
Mar 4, 2016
95c09aa
Changed text to Ian's bio
Mar 4, 2016
9f0b544
Changed Ty's MixItUp tag
Mar 4, 2016
18202e5
Adding Jeff's bio information to index.html file
Mar 8, 2016
124dbdc
Attempt at fixing for IE11
Mar 8, 2016
ad77094
Trying different solution to IE11 on CSS
Mar 8, 2016
f56ea43
Trying third solution to IE 11
Mar 8, 2016
d696673
4th attempt at IE11
Mar 8, 2016
b3e2ed9
5th attempt - moving IE CSS above others
Mar 8, 2016
527a4f1
Changed order of 'active' and 'none' in CSS
Mar 8, 2016
8adcc73
Changed CSS query from media screen to media all for IE
Mar 8, 2016
7ffd17f
Added min-width property to the IE CSS query
Mar 8, 2016
68348f1
Added the keyword 'and' to the CSS for IE
Mar 8, 2016
f253175
Moved IE CSS style
Mar 8, 2016
53f45a5
Trying something else
Mar 8, 2016
a163802
Adding new class title to IE
Mar 8, 2016
59c9bd0
Trial number 10
Mar 8, 2016
2a01df6
Trying number 12
Mar 8, 2016
9b104c6
Deleted second IE class further down CSS page
Mar 8, 2016
82961e9
Added multiple IE classes to CSS
Mar 8, 2016
95baec6
Added CSS characteristic for the modal to improve IE experience in 80…
Mar 8, 2016
552bab4
Changed IE class for modals
Mar 8, 2016
b990f4c
Changed Ty's pic to a better resolution
Mar 8, 2016
ad260cd
Changed the width for the .gap for a better user experience
Mar 8, 2016
27d7919
Editorial run over profiles done
tyronegrandison Mar 10, 2016
c27b756
Changed CSS background
Mar 11, 2016
07b8ba6
Merge branch 'gh-pages' of https://github.com/maabrown/DataService_We…
Mar 11, 2016
8762642
Changed the background of the modals to white
Mar 11, 2016
a38765f
Update Ty's picture for the modal
Mar 11, 2016
40ceab9
Merge remote-tracking branch 'upstream/production' into gh-pages
Mar 11, 2016
9534aa9
Fix header and footer content
Mar 11, 2016
686463d
Merge branch 'workingBio' of https://github.com/maabrown/DataService_…
Mar 11, 2016
570e8ef
Merge branch 'maabrown-workingBio' into develop
Mar 11, 2016
51afeb8
Merge pull request #22 from maabrown/develop
dcwebmaven Mar 12, 2016
ac9b35e
Merge remote-tracking branch 'upstream/production' into production
Mar 16, 2016
bc82ff6
Merge branch 'production' into develop
Mar 16, 2016
b564a61
Merge pull request #26 from maabrown/develop
maabrown Mar 16, 2016
9081361
Merge branch 'develop' into gh-pages
Mar 16, 2016
0bafc64
Deleted DS_Store and underlying folder
Mar 16, 2016
d76a372
Deleted 'underlying' folder
Mar 16, 2016
0c93a51
Add CDS Dashboard to HTML - doesn't include folder yet
Mar 16, 2016
bdafd42
Added CDS Dashboard folder to the project
Mar 16, 2016
d6d9304
Made the chart responsive - commented out height/width in Script.js
Mar 16, 2016
f19afab
Merge pull request #1 from maabrown/develop
maabrown Mar 16, 2016
5f35f95
Added colors and changed langauge
Mar 17, 2016
aff049c
Merge pull request #2 from maabrown/develop
maabrown Mar 17, 2016
172aafa
Integrate Carousel into home page
Mar 17, 2016
a387016
First attempt at putting the carousel on the webpage
Mar 17, 2016
2382c51
Merge branch 'newCaro' into dashboard
Mar 17, 2016
c33c64a
First draft of Version 2 of Bios
Mar 18, 2016
aacbd37
Made Responsive and Updated Modals
Mar 22, 2016
5608e46
Updated index.html and script.js for the CDS Dashboard
Mar 22, 2016
4c9fd8c
Updated the Bios with the correct language
Mar 22, 2016
2ced8b8
Made the iFrame bigger on the CDS site
Mar 22, 2016
fbc1ace
Add functionality for project dashboard to move
Mar 22, 2016
44b050a
Add counter to click function
Mar 22, 2016
1b01b35
Made the charts responsive with transitions
Mar 23, 2016
233e428
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Mar 24, 2016
a64e504
Added responsiveness to the dashboard via the chart1.click attribute …
Mar 24, 2016
3ca8bc4
Change line 415 to col-lg-12
Mar 24, 2016
4b71410
Made CSS edits for responsive design
Mar 24, 2016
2f6f5de
Add bureau logos and improve responsive design for Project Dashboard
Mar 24, 2016
9721a65
Add carousel to CDS webpage with faded images
Mar 24, 2016
9301777
Add all images of bureaus into the carousel
Mar 24, 2016
ad712a6
Removed red button from top of CDS Page
Mar 24, 2016
d46c5a7
Change button from Contact Us to Projects
Mar 24, 2016
488b1cd
Moved CDS logo to image carousel div - made it center using inline st…
Mar 24, 2016
07b0572
Change background color of Contact Us section - Change text backgroun…
Mar 24, 2016
2fcce49
Darken backgrond image in header
Mar 24, 2016
5af0277
Added Contact Us button
Mar 24, 2016
da3e1d7
Change button to 'Team', Add Contact Us button, Change PD to 'Projects'
Mar 24, 2016
6e73982
Add responsive media queries in JS for different desktop sizes
Mar 25, 2016
0d51872
Add bureau logos to CDS Project Dashboard folder
Mar 25, 2016
50757f0
Add DOC logo to CDS Dashboard
Mar 25, 2016
fbdf995
Add picture to modal - no styling
Mar 25, 2016
3ec4889
Made sharp corners of modal on Dashboard
Mar 26, 2016
0078d85
Update modal with picture and new styling
Mar 26, 2016
2268fc7
Redesign the modal for desktop
Mar 26, 2016
164d8b2
Add responsive styling to modal
Mar 26, 2016
fa001e8
Change Support to Leadership and add Jeff
Mar 26, 2016
88397ae
Change some code
Apr 12, 2016
a40cc8a
edited team panel
radhikabhatt26 Apr 29, 2016
f3b18db
fixed merge conflicts
radhikabhatt26 May 9, 2016
5f8fb8b
Merge pull request #28 from radhikabhatt26/mondayEdits
tyronegrandison May 9, 2016
19cffda
I have no idea what I did here
May 10, 2016
100fb16
Revert "I have no idea what I did here"
May 10, 2016
9a0c141
Revert "Change some code"
May 10, 2016
18dd0f6
Change the language on tooltip for second chart when in mobile
May 10, 2016
1d4a0e2
Add styling to mobile modal in the project dashboard
May 10, 2016
f6f41b5
Add CSS formatting to TeamBio modals
May 10, 2016
e4f139a
Change the amount of padding between pic and text on mobile
May 11, 2016
ed5f1c6
Merge branch 'develop' of https://github.com/CommerceDataService/Data…
May 12, 2016
faf16aa
Update social media icons in mobile view to reflect Tim Wood's request
May 12, 2016
8e30c63
Adjusting width percentages for MixItUp panels
May 12, 2016
3f7c304
Delete unused images for Team modals and change tooltip language
May 12, 2016
3e65a01
Delete old index.html and scrip.js files from CDS Project Dashboard dir
May 12, 2016
b6955e2
Merge pull request #49 from maabrown/gh-pages
arowla May 13, 2016
0f7d86f
Merge branch 'develop' into gh-pages
May 13, 2016
4bc7270
Delete parallax and CustomScripts file since they aren't being used
maabrown May 16, 2016
1d752ce
Changed DOC bureau logos to be same size and higher quality
radhikabhatt26 May 16, 2016
597a3a2
Merge pull request #51 from maabrown/parallaxJS
arowla May 16, 2016
a4499de
Merge pull request #52 from radhikabhatt26/doc-new-logos
arowla May 16, 2016
0b89569
Changed services section, added new icons
radhikabhatt26 May 16, 2016
3574321
Add text to Karolina profile
maabrown May 17, 2016
81fa476
Merge branch 'develop' of https://github.com/CommerceDataService/Data…
radhikabhatt26 May 17, 2016
7ddff22
Add rounded corners to project modals
maabrown May 17, 2016
59e7243
Declare JQuery variables at the top of code
maabrown May 17, 2016
0813d48
edited services section, added correct icon images
radhikabhatt26 May 17, 2016
96b3a9a
changed size of icons
radhikabhatt26 May 17, 2016
a18c7de
moved coming soon images to end of team section
radhikabhatt26 May 17, 2016
affeb3a
Add functions to handle the drilldown build
maabrown May 17, 2016
f32e4b6
Merge pull request #55 from radhikabhatt26/coming-soon-photos
maabrown May 17, 2016
82c555e
First attempt at prototypes with charts
maabrown May 17, 2016
f5eaf7b
Add https request for Highcharts
maabrown May 17, 2016
489b2c2
Merge branch 'develop' of https://github.com/CommerceDataService/Data…
maabrown May 17, 2016
4e218fb
Merge branch 'maabrown-updatedProjects' into develop
maabrown May 17, 2016
3206f76
Revert "Add functions to handle the drilldown build"
maabrown May 17, 2016
b4c7122
Merge branch 'develop' of https://github.com/CommerceDataService/Data…
maabrown May 17, 2016
02ac316
Add Noura's bio information and pic
maabrown May 17, 2016
fb7c213
Merge pull request #56 from maabrown/updatedProjects
radhikabhatt26 May 17, 2016
24135fd
Merge pull request #57 from maabrown/addMoreBio
radhikabhatt26 May 17, 2016
ac2e5fc
Changes to landing panel (#59)
radhikabhatt26 May 19, 2016
83fac0f
Merge branch 'develop' of https://github.com/CommerceDataService/Data…
maabrown May 19, 2016
9346579
added stylesheet link back in
radhikabhatt26 May 19, 2016
15286dd
Merge pull request #61 from radhikabhatt26/develop
maabrown May 19, 2016
0c8b40c
changed font on landing panel
radhikabhatt26 May 20, 2016
4446d3f
removed extra code
radhikabhatt26 May 20, 2016
91aa5cc
Landing panel font tweaks
radhikabhatt26 May 20, 2016
b640bd1
Merge pull request #76 from CommerceDataService/develop
radhikabhatt26 May 20, 2016
6983c6f
Merge branch 'develop' of https://github.com/CommerceDataService/Data…
radhikabhatt26 May 20, 2016
e4cec7d
Correct the spelling error in Mark's profile
maabrown May 23, 2016
4c3a5f1
Change the size of bureauLogos from 200 to 130
maabrown May 23, 2016
03ab7f7
Merge pull request #87 from maabrown/markBio
radhikabhatt26 May 23, 2016
84baf39
Add smaller bureau logos to directory and deleted second set
maabrown May 23, 2016
2e0ceaf
Added smaller logos and deleted second set in CDS Dashboard folder
maabrown May 23, 2016
1560465
Change name of folder to bureauLogos
maabrown May 23, 2016
d69fe1a
Merge pull request #88 from maabrown/bureauLogos
radhikabhatt26 May 23, 2016
bc9d9e4
Merge branch 'develop' of https://github.com/CommerceDataService/Data…
radhikabhatt26 May 24, 2016
c96b6a0
Enlarge text (fixes #78, #79) (#91)
radhikabhatt26 May 24, 2016
4067abd
added approriate alt text (fixes #42) (#90)
radhikabhatt26 May 24, 2016
8f6b005
Add padding to title and px to iFrame, Fixes #72 (#92)
maabrown May 27, 2016
1e383fe
Fixes #48 (#60)
maabrown May 27, 2016
92756fe
Add Ian's new bio
maabrown Jun 1, 2016
e29d0d1
Merge pull request #94 from maabrown/ianBio
neka-io Jun 1, 2016
e9dc82c
Merge pull request #95 from CommerceDataService/develop
neka-io Jun 1, 2016
7e119d2
Add GitHub link to Contact Us, Fixes #83, Fixes #68, Fixes #73 (#93)
maabrown Jun 3, 2016
075eb34
Handlebar profiles - Fixes #29, Fixes #30, Fixes #71, Fixes #85, Fixe…
maabrown Jun 7, 2016
8f9e571
Updating paragraph
tyronegrandison Jun 9, 2016
303f422
Merge changes into production (#98)
maabrown Jun 14, 2016
f4f5209
Updating bios and changed "Life Story" to "About Me"
maabrown Jul 1, 2016
d1b62fc
Merge pull request #103 from maabrown/bios0701
radhikabhatt26 Jul 1, 2016
6b5c21f
merge develop
radhikabhatt26 Jul 12, 2016
9b537ae
First accordion
maabrown Sep 14, 2016
e377bb9
fixed responsiveness for header and services section, updated csv
radhikabhatt26 Sep 14, 2016
34a5c8f
fixed responsiveness for modals
radhikabhatt26 Sep 14, 2016
3dc37b9
Merge pull request #112 from radhikabhatt26/develop
dcwebmaven Sep 14, 2016
e9a5081
Add bootstrap and JQuery to repo
maabrown Sep 14, 2016
1d8dea5
Delete unnecessary files from DoC
maabrown Sep 15, 2016
fd53e94
Merge pull request #113 from maabrown/hiringText
dcwebmaven Sep 15, 2016
478aa5f
Merge branch 'production' of https://github.com/CommerceDataService/D…
maabrown Sep 15, 2016
49b907b
Reinserting the modal content that was removed
neka-io Sep 17, 2016
c6edcad
Cleaned up a broken line in the python script
neka-io Sep 17, 2016
9e5f12c
Ran python script to update cds_team.json
neka-io Sep 17, 2016
4ccf8de
Added URL for the DCDO position
neka-io Sep 17, 2016
bfb448a
Deletes extra code from team info
maabrown Sep 17, 2016
e5fe0b6
Merge pull request #115 from noonkay/bug-fix
dcwebmaven Sep 17, 2016
bc2ce64
deleted extra copy of modals code in mixitup/index.html
dcwebmaven Sep 19, 2016
d670f9c
Merge branch 'develop' of https://github.com/CommerceDataService/Data…
maabrown Jan 23, 2017
1c05351
Updates team section
maabrown Jan 23, 2017
8ca4eb8
Adds new people to 'Our Team' section
maabrown Jan 23, 2017
74478f0
Adds updated JSON file to repo
maabrown Jan 23, 2017
11c2ba7
Merge pull request #117 from maabrown/bioUpdate0123
radhikabhatt26 Jan 23, 2017
70bc2aa
Deletes unnecessary photos and adds new photos
maabrown Jan 23, 2017
99c753f
Adds new photos to repo
maabrown Jan 23, 2017
014ed7a
Merge pull request #118 from maabrown/bioUpdate0123
radhikabhatt26 Jan 23, 2017
a80f917
Adds lines to python script for automation
maabrown Jan 23, 2017
52454d2
Merge pull request #120 from maabrown/bioUpdate0123
radhikabhatt26 Jan 23, 2017
dea1b05
Merge pull request #121 from CommerceDataService/develop
radhikabhatt26 Jan 23, 2017
84f8d5a
Changes name from 'life_Story' to 'about_me' in MixItUp
maabrown Jan 23, 2017
b7e33b7
Merge pull request #122 from maabrown/bioUpdate0123
radhikabhatt26 Jan 23, 2017
f181138
Merge pull request #123 from CommerceDataService/develop
radhikabhatt26 Jan 23, 2017
a3fe3ef
Updates Handlebars template with 'about_me'
maabrown Jan 23, 2017
659489a
Merge pull request #124 from maabrown/bioUpdate0123
radhikabhatt26 Jan 23, 2017
4fb1227
Merge pull request #125 from CommerceDataService/develop
maabrown Jan 23, 2017
a7d7b75
Removes Burton's information from the CSV and JSON
maabrown Jan 24, 2017
8a8aedb
Removes Burton's picture from the repo
maabrown Jan 24, 2017
fdcaaf6
Merge pull request #127 from maabrown/removeBurton
radhikabhatt26 Jan 24, 2017
ef5cefb
Merge pull request #128 from CommerceDataService/develop
maabrown Jan 24, 2017
851bae1
updated team member information
radhikabhatt26 Feb 13, 2017
63dd2ad
Merge pull request #130 from radhikabhatt26/develop
maabrown Feb 13, 2017
50d5696
Merge pull request #131 from CommerceDataService/develop
maabrown Feb 13, 2017
3539220
correct csv_json.py script
radhikabhatt26 Feb 13, 2017
7bc54c9
Merge branch 'develop' of https://github.com/CommerceDataService/Data…
radhikabhatt26 Feb 13, 2017
b9d4d15
update cds_team_responses.json
radhikabhatt26 Feb 13, 2017
7bec9f6
Merge pull request #132 from radhikabhatt26/develop
maabrown Mar 17, 2017
d21dd00
Merge pull request #133 from CommerceDataService/develop
maabrown Mar 17, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_store
50 changes: 50 additions & 0 deletions CDS_Dashboard/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" href="style.css">
</head>


<body>

<div id="container">
<div id="chartContainer" style="max-width: 600px; height: 500px; margin: 0 auto"></div>

<div id="secondContainer" style="max-width: 600px; height: 500px; margin: 0 auto"></div>
<!-- <div id="modalExample"></div> -->
</div>

<div class="modal fade col-lg-8 col-md-8 col-xs-11" id="exampleModal" data-backdrop="static" tabindex="-1" role="dialog" aria-hidden="true">

<div class="modal-content">

<div class="close-modal" data-dismiss="modal">
<div class="lr">
<div class="rl">
</div>
</div>
</div>

<img id="modalPicture" src="" class="img-responsive">

<div id="bureauInfo">
<p id="modalName"></p>
<p id="modalInitiative"></p>
<p id="modalServices"></p>
<p id="modalObjective"></p>
<a href="" id="modalWebsite"></a>
</div>
</div>
</div>

<script src="https://code.jquery.com/jquery-1.12.2.min.js" integrity="sha256-lZFHibXzMHo3GGeehn1hudTAP3Sc0uKXBXAzHX1sjtk=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>

<script type="text/javascript" src='https://code.highcharts.com/highcharts.js'></script>
<script type="text/javascript" src="script.js"></script>

</body>
</html>
Loading