Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update with the prod tree #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ vendor/*
!vendor/composer
tree-config.php
tree-db.php
config.codekit3
1 change: 1 addition & 0 deletions _wpeprivate/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"env":{"WPENGINE_ACCOUNT":"cmetree","WPENGINE_PHPSESSIONS":"on","WPENGINE_DB_SESSIONS":"off","WPENGINE_ALLOW_FLOCK":"off","WPENGINE_MAIL_HOOK":"on"},"constants":{"WPENGINE_ACCOUNT":"cmetree","WPENGINE_SESSION_DB_HOST":"127.0.0.1","WPENGINE_SESSION_DB_USERNAME":"cmetree","WPENGINE_SESSION_DB_PASSWORD":"mqV4UipEW7jmHckKcNNe","WPENGINE_SESSION_DB_SCHEMA":"wp_cmetree","WPENGINE_SESSION_LOCKING":"on","WPENGINE_SITES_ENVIRONMENT":"unspecified"},"globals":{"wpengine_platform_config":{"content_regexs":[],"no_cdn_uris":[],"all_domains":["cmetree.wpengine.com","tree.mediaengagement.org"],"netdna_push_domains":[],"domain_mappings":[],"limit_heartbeat":true,"wpengine_apikey":"94e7eaabb19c5e485f7bddbf6152406390263f2d","locations":{"domain_base":"wpengine.com","api1":"https:\/\/api.wpengine.com\/1.2","api2":"https:\/\/api2.wpengine.com"},"wpe_php":{"7.2":"1e4d830a16ca7904f2a94cd966c2ce6b513aabe8","7.3":"b9962f060138db59f310176de7f878d0a9e94e23","7.4":"c99fb3ec2da850bc976a891f8ce448c26e946e40"}},"wpe_largefs_paths":[],"wpe_largefs_bucket":"largefs.wpengine","wpe_largefs_region":"us-east-1"},"defines":{"WPE_VENDOR":false,"WP_CACHE_KEY_SALT":"cf981144450ff6f1"}}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/js/Tree/TreeView-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/sass/_color.scss
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@

.cme-tree__history-list-link {
-webkit-tap-highlight-color: rgba(0,0,0,.15);
@include historyLink
@include historyLink;

&.is-active {
@include historyLinkActive
Expand Down
4 changes: 3 additions & 1 deletion assets/sass/structure/_end.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,14 @@

.cme-tree__state--overview {
.cme-tree__ends {
display: flex; // we don't have anything to connect them to right now, so don't worry about displaying them
// display: flex; // we don't have anything to connect them to right now, so don't worry about displaying them
display: none;
}

.cme-tree__end {
margin-right: $spacing__base;
margin-bottom: $spacing__base;
flex-direction: column;
}

.cme-tree__end-options {
Expand Down
26 changes: 18 additions & 8 deletions assets/sass/structure/_tree.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ html {

.cme-tree__stats-list {
@include no-list;
padding: 0;
display: flex;
flex-wrap: wrap;
justify-content: center;
Expand All @@ -63,14 +64,17 @@ html {
}

.cme-tree__stats-item {
text-align: center;
text-align: left;
padding: $spacing__base/2;
margin-bottom: $spacing__base/2;
width: 100%;
display: flex;
flex-direction: column;
width: calc(50% - #{$spacing__base}/4);
margin-right: $spacing__base/2;
flex: 0 1 45%;
align-items: baseline;
background: #daecf3;

&:nth-child(even) {
margin-right: 0;
Expand All @@ -84,9 +88,9 @@ html {
margin-right: $spacing__base/2;
}

&:last-child {
margin-right: 0;
}
// &:last-child {
// margin-right: 0;
// }
}
}

Expand All @@ -110,7 +114,9 @@ html {
margin-right: auto;
padding: $spacing__base $spacing__base/2;
border-radius: 5px;

.cme-tree__stats {
display: none;
}
@include breakpoint($mobile-large) {
padding: $spacing__base*2 $spacing__base $spacing__base;
max-width: 80%;
Expand Down Expand Up @@ -193,16 +199,20 @@ html {
}

.cme-tree__state--overview {

display: flex;
flex-direction: column-reverse;
.cme-tree__content-wrapper {
overflow: scroll;
overflow: hidden;
}

.cme-tree__content-window {
max-height: 700px;
overflow: scroll;
padding-left: 80px;
}
// .cme-tree__intro .cme-tree__stats {
// display: none;
// }
}

.cme-tree__ends,
Expand Down Expand Up @@ -265,7 +275,7 @@ html {
opacity: 0;
transform: scale(0.65) translate3d(0,-50px,0);
transform-origin: top left;
},
}
100% {
opacity: 1;
transform: scale(0.65) translate3d(0, 0,0);
Expand Down
Loading