Skip to content

Commit e4cc8ae

Browse files
spelkey-ucdspelkey-ucd
authored
Merge pull request #180 from UCDavisLibrary/stage
Stage
2 parents 9d7e183 + fffffff commit e4cc8ae

37 files changed

Lines changed: 690 additions & 582 deletions

‎ucdlib-assets/includes/main.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public function __construct(){
8989
add_filter( 'timber/context', array( $this, 'addGoogleAnalytics' ) );
9090
//add_action('wp_head', [$this, 'addGoogleAnalytics']);
9191
add_action( 'admin_footer', [$this, 'highlightCustomTaxonomyPages']);
92+
add_filter('ucd-theme/admin-variable/editor-script', [$this, 'updateEditorScriptVariable' ]);
9293

9394

9495
add_action( 'after_setup_theme', array($this, 'enqueue_editor_css'));
@@ -97,6 +98,16 @@ public function __construct(){
9798

9899
}
99100

101+
public function updateEditorScriptVariable(){
102+
$file = "ucdlib-editor.js";
103+
$url = $this->config['uris']['js'] . "/editor/dist/" . $file;
104+
if ( $this->config['isDevEnv'] ){
105+
$url = $this->config['uris']['js'] . "/editor/dev/" . $file;
106+
}
107+
$url .= '?v=' . $this->config['bundleVersion'];
108+
return $url;
109+
}
110+
100111
// reads build info from a cork-build-info file
101112
public function readBuildInfo($filename) {
102113
$filePath = '/cork-build-info/' . $filename;

‎ucdlib-assets/src/public/lib/scss/directory.scss‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
.vm-teaser--person__contact {
2+
a.icon-ucdlib ucdlib-icon, span.icon-ucdlib ucdlib-icon {
3+
margin-right: .75rem;
4+
}
5+
.icon--location:before {
6+
font-size: .9em;
7+
}
8+
}
9+
.vm-teaser--person {
10+
.icon--location:before {
11+
font-size: .9em;
12+
}
13+
}
14+
.contact-info.contact-info--department {
15+
.additional-text {
16+
font-weight: 500;
17+
}
18+
}
19+
20+

‎ucdlib-assets/src/public/lib/scss/exhibits.scss‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
.curator-widget {
2+
border: 2px solid #ffdf80;
3+
padding: 1rem;
4+
5+
.subsection-label {
6+
font-style: italic;
7+
}
8+
9+
.previous-display {
10+
font-style: italic;
11+
font-size: .75rem;
12+
margin-top: 1.5rem;
13+
color: rgb(119, 119, 119);
14+
}
15+
.curation-note {
16+
font-style: italic;
17+
font-size: .75rem;
18+
margin-top: .5rem;
19+
color: rgb(119, 119, 119);
20+
}
21+
.org-link {
22+
text-decoration: none;
23+
}
24+
.org-link:hover {
25+
text-decoration: underline;
26+
}
27+
.curator-name {
28+
font-weight: 700;
29+
}
30+
}
31+
.hero-banner {
32+
.hero-banner__summary {
33+
font-size: 1.2rem;
34+
line-height: 1.3;
35+
margin-top: .5rem;
36+
}
37+
38+
&.hero-banner--no-background {
39+
background-color: #022851;
40+
}
41+
}
42+
.vm-teaser--exhibit {
43+
.vm-teaser--exhibit__curators {
44+
font-style: italic;
45+
font-size: 0.875rem;
46+
color: #4c4c4c;
47+
}
48+
}
49+
h2.exhibit-header-intro {
50+
margin-bottom: .25rem;
51+
margin-top: 0;
52+
}
53+
54+
.title-modified::after {
55+
content: '*';
56+
color: #f93549;
57+
}

‎ucdlib-assets/src/public/lib/scss/locations.scss‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
.location-address {
2+
display: flex;
3+
align-items: center;
4+
margin-bottom: 1rem;
5+
6+
ucdlib-icon {
7+
margin-right: 10px;
8+
color: #73abdd;
9+
}
10+
11+
.heading--h5 {
12+
margin-top: 0;
13+
margin-bottom: 0;
14+
}
15+
}
16+
17+
.location-alert {
18+
margin-top: .25rem;
19+
}
20+
21+
.teaser--location {
22+
margin-bottom: 2rem;
23+
--list-pipe-pipe: #4c4c4c;
24+
--o-media-gutter: var(--o-media-gutter-default, 1rem);
25+
--o-media-gutter--right: var(--o-media-gutter-default, 1rem);
26+
--o-media-gutter--left: 0;
27+
color: var(--category-brand-contrast-color, #4c4c4c);
28+
font-size: 0.875rem;
29+
line-height: 1.3;
30+
31+
.teaser--image {
32+
display: block;
33+
}
34+
35+
.icon-ucdlib {
36+
--category-brand: #c10230;
37+
color: var(--category-brand);
38+
39+
ucdlib-icon {
40+
color: var(--category-brand, #73abdd);
41+
margin-right: 0.6rem;
42+
margin-left: 0.15rem;
43+
min-width: 0.8rem;
44+
min-height: 0.8rem;
45+
width: 0.8rem;
46+
height: 0.8rem;
47+
}
48+
49+
}
50+
.icon--circle-arrow-right {
51+
--category-brand: #ffbf00;
52+
}
53+
.teaser--location--featured {
54+
background-color: #ebf3fa;
55+
padding: 1.5rem;
56+
}
57+
.vm-teaser__figure {
58+
width: 20%;
59+
max-width: 135px;
60+
}
61+
62+
}
63+
@media (min-width: 768px){
64+
.teaser--location--featured .vm-teaser__figure {
65+
margin-right: 1.5rem;
66+
}
67+
.teaser--location {
68+
font-size: 1rem;
69+
}
70+
}
71+
body.digital-sign {
72+
display: block;
73+
height: 100vh;
74+
min-height: 100vh;
75+
width: 100vw;
76+
min-width: 100vw;
77+
overflow-y: hidden;
78+
line-height: 1.3;
79+
}
80+
.digital-sign-sections {
81+
display: flex;
82+
height: 100%;
83+
flex-flow: column;
84+
justify-content: space-between;
85+
}
86+
.digital-sign-section {
87+
display: flex;
88+
flex-flow: column;
89+
}
90+
.digital-sign-text {
91+
font-size: calc(100vh/12);
92+
93+
&.digital-sign-text--xs {
94+
font-size: calc(100vh/20);
95+
}
96+
&.digital-sign-text--sm {
97+
font-size: calc(100vh/16);
98+
}
99+
&.digital-sign-text--md {
100+
font-size: calc(100vh/12);
101+
}
102+
&.digital-sign-text--lg {
103+
font-size: calc(100vh/8);
104+
}
105+
&.digital-sign-text--xl {
106+
font-size: calc(100vh/6);
107+
}
108+
}

‎ucdlib-assets/src/public/lib/scss/search.scss‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.vm-teaser.vm-teaser--search {
2+
.vm-teaser__result-type {
3+
font-style: italic;
4+
margin-bottom: .5rem;
5+
}
6+
em {
7+
font-weight: 700;
8+
font-style: normal;
9+
}
10+
}
11+
.search-results-message {
12+
font-style: italic;
13+
}

0 commit comments

Comments
 (0)