diff --git a/static/css/Icons/icn_arrow_left.svg b/static/css/Icons/icn_arrow_left.svg new file mode 100644 index 0000000..2c14d56 --- /dev/null +++ b/static/css/Icons/icn_arrow_left.svg @@ -0,0 +1,9 @@ + + + icn_arrow_left + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_arrow_right.svg b/static/css/Icons/icn_arrow_right.svg new file mode 100644 index 0000000..8e2c579 --- /dev/null +++ b/static/css/Icons/icn_arrow_right.svg @@ -0,0 +1,9 @@ + + + icn_arrow_right + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_audio.svg b/static/css/Icons/icn_audio.svg new file mode 100644 index 0000000..7dea799 --- /dev/null +++ b/static/css/Icons/icn_audio.svg @@ -0,0 +1,12 @@ + + + icn_audio + + + + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_close_large.svg b/static/css/Icons/icn_close_large.svg new file mode 100644 index 0000000..5b1e98f --- /dev/null +++ b/static/css/Icons/icn_close_large.svg @@ -0,0 +1,9 @@ + + + icn_close_large + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_close_small.svg b/static/css/Icons/icn_close_small.svg new file mode 100644 index 0000000..45ba334 --- /dev/null +++ b/static/css/Icons/icn_close_small.svg @@ -0,0 +1,9 @@ + + + icn_close_small + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_download.svg b/static/css/Icons/icn_download.svg new file mode 100644 index 0000000..20c4657 --- /dev/null +++ b/static/css/Icons/icn_download.svg @@ -0,0 +1,12 @@ + + + icn_download + + + + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_external_link.svg b/static/css/Icons/icn_external_link.svg new file mode 100644 index 0000000..e0bd12b --- /dev/null +++ b/static/css/Icons/icn_external_link.svg @@ -0,0 +1,12 @@ + + + icn_external_link + + + + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_image.svg b/static/css/Icons/icn_image.svg new file mode 100644 index 0000000..d70b095 --- /dev/null +++ b/static/css/Icons/icn_image.svg @@ -0,0 +1,12 @@ + + + icn_image + + + + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_navigation_dot_active.svg b/static/css/Icons/icn_navigation_dot_active.svg new file mode 100644 index 0000000..1e39983 --- /dev/null +++ b/static/css/Icons/icn_navigation_dot_active.svg @@ -0,0 +1,9 @@ + + + icn_navigation_dot_active + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_navigation_dot_inactive.svg b/static/css/Icons/icn_navigation_dot_inactive.svg new file mode 100644 index 0000000..f0fa305 --- /dev/null +++ b/static/css/Icons/icn_navigation_dot_inactive.svg @@ -0,0 +1,9 @@ + + + icn_navigation_dot_inactive + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_open_small.svg b/static/css/Icons/icn_open_small.svg new file mode 100644 index 0000000..2b8deeb --- /dev/null +++ b/static/css/Icons/icn_open_small.svg @@ -0,0 +1,9 @@ + + + icn_open_small + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_search.svg b/static/css/Icons/icn_search.svg new file mode 100644 index 0000000..74fa4f2 --- /dev/null +++ b/static/css/Icons/icn_search.svg @@ -0,0 +1,11 @@ + + + icn_search + + + + + + + + \ No newline at end of file diff --git a/static/css/Icons/icn_video.svg b/static/css/Icons/icn_video.svg new file mode 100644 index 0000000..f6059cf --- /dev/null +++ b/static/css/Icons/icn_video.svg @@ -0,0 +1,12 @@ + + + icn_video + + + + + + + + + \ No newline at end of file diff --git a/static/css/Icons/placeholder_no-image2.png b/static/css/Icons/placeholder_no-image2.png new file mode 100644 index 0000000..b13e7ea Binary files /dev/null and b/static/css/Icons/placeholder_no-image2.png differ diff --git a/static/css/style.css b/static/css/style.css index d62bb74..f3a9810 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -2,7 +2,7 @@ /************ FONTS ************/ @font-face { -font-family: 'Roboto Condensed'; +font-family: 'Roboto Condensed Bold'; src: url('webfonts/Roboto_Condensed/RobotoCondensed-Bold.ttf') format('truetype'); font-weight: bold; font-style: normal; @@ -16,6 +16,13 @@ font-style: normal; } +@font-face { +font-family: 'Roboto Regular'; +src: url('webfonts/Roboto_Regular/Roboto-Regular.ttf') format('truetype'); +font-weight: normal; +font-style: normal; +} + /***************** EMERGENCY BUTTON AND MOCKUPS****************/ div#backend-data-button{ background-color: #1B42D8; @@ -52,100 +59,182 @@ img.artwork-mockuppage{ } - /************ LAYOUT ************/ -html,body{ +:root { + --black: #000000; + --blue-blue: #1b42d8; + --white: #fdfdfd; + --brown-grey: #7f7f7f; + --very-light-pink: #e9e9e9; +} + +html { margin:0; padding:0; - height: 100%; - font-family: 'Roboto Condensed', sans-serif; + height: 100vh; + width: 100vw; + font-family: 'Roboto', sans-serif; + font-size: 16px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +*, *:before, *:after { + -webkit-box-sizing: inherit; + -moz-box-sizing: inherit; + box-sizing: inherit; } + + +body { + font-family: Roboto; + font-size: 16px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: 1.63; + letter-spacing: normal; + color: var(--black); + margin: 0; + padding: 0; } + /*Header*/ div#header{ width: 100%; - /*border:1px solid blue;*/ background-color: #FFFFFF; height: 134px; border-bottom: 3px solid #000; + display: flex; + width: 100%; +/* display: grid;*/ } div#header-top{ - display: grid; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +/* display: grid; grid-template-columns: 5% 67.5% 27.5%; grid-template-rows: 100%; grid-column-gap: 0px; grid-row-gap: 0px; align-items: center; +*/ border-bottom: 1px solid #000; - } - +#title-nav{ + width: 100%; +} div#animatedlogo{ - grid-area: 1 / 1 / 2 / 2; + display: flex; +/* grid-area: 1 / 1 / 2 / 2;*/ } div#animatedlogo img{ - height: 43px; + width: auto; + max-height: 130px; justify-self: center; } div#header-title{ - grid-area: 1 / 2 / 2 / 3; +/* grid-area: 1 / 2 / 2 / 3;*/ font-family: 'Roboto Condensed', sans-serif; font-weight: bold; - font-size: 18px; + font-size: 25px; } div#header-title a:link, div#header-title a:visited { text-decoration: none; color: #000000; } div#header-keyword-search{ - grid-area: 1 / 3 / 2 / 4; - justify-self: center; - background: yellow; - color: blue; +/* grid-area: 1 / 3 / 2 / 4;*/ } div#header-keyword-search span { font-size: 20px; font-weight: bold; padding: 2px 10px; - border: 8px solid yellow; - background: yellow; } - div#header-top div#header-keyword-search input[type=text]{ background-color: #e9e9e9; color: #7f7f7f; font-size: 18px; + line-height: 38px; + letter-spacing: 1px; font-family: 'Roboto Condensed', sans-serif; width: 257px; height: 43px; + border: none; + padding: 2px 2px 2px 12px; +} +div#header-top div#header-keyword-search:after { + display: inline-block; + content: ' '; + background-image: url('Icons/icn_search.svg'); + background-size: 16px 16px; + height: 16px; + width: 16px; + margin: 0px 16px 0px -32px; } - div#header-top, div#navigation{ width: 100%; height: 67px; + padding-right: 80px; } - div#navigation{ - display: grid; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + align-items: center; +/* display: grid; grid-template-columns: 8% repeat(2, 12%) 1fr repeat(2, 10%) 12.5%; grid-template-rows: 100%; grid-column-gap: 0px; grid-row-gap: 0px; padding-left: 5%; align-items: center; - +*/ + font-family: Roboto; + font-size: 18px; + font-weight: normal; + font-stretch: condensed; + font-style: normal; + line-height: 1.44; + letter-spacing: normal; + color: var(--black); +} +#nav-left { + display: flex; + flex-direction: row; +} +#nav-right { + display: flex; + flex-direction: row; +} +#nav-left div, #nav-right div { + padding: 0px 16px; +} +#nav-left div:first-child, #nav-right div:first-child{ + padding-left: 0px; } +#nav-right div:last-child { + padding-right: 0px; +} + div#navigation a{ font-family: 'Roboto Condensed', sans-serif; text-decoration: none; + font-weight: normal; color: black; - font-size: 16px; + font-size: 18px; + line-height: 26px; height: 67px; - } -div#nav-about { +div#navigation a:hover { + color: #1b42d8; +} +/*div#nav-about { grid-area: 1 / 1 / 2 / 2; } div#nav-browse-archive { grid-area: 1 / 2 / 2 / 3; } @@ -159,12 +248,12 @@ div#nav-upload { grid-area: 1 / 6 / 2 / 7; justify-self: center; color: lightgrey;} div#nav-login { grid-area: 1 / 7 / 2 / 8; } - +*/ /*Footer*/ div#footer{ - padding-top: 20px; - height: 229px; + padding: 55px 0px; + /*max-height: 229px;*/ width: 100%; bottom: 0; background-color: black; @@ -175,7 +264,6 @@ div#footer{ grid-column-gap: 0px; grid-row-gap: 0px; } - div#footer-title-br{ grid-area: 1 / 1 / 2 / 2; padding-left: 30%; @@ -186,18 +274,20 @@ div#footer-title-others{ div#footer-title-socials{ grid-area: 1 / 3 / 2 / 4; } - div#footer-title-contact{ grid-area: 1 / 4 / 2 / 5; } - div#footer-title-br p, div#footer-title-others p, div#footer-title-contact p, div#footer-title-socials p{ text-transform: uppercase; font-family: 'Roboto Condensed', sans-serif; - color:#7f7f7f; font-size: 16px; + font-weight: normal; + font-stretch: condensed; + font-style: normal; + line-height: 1.5; + letter-spacing: 1.5px; + color: var(--brown-grey); } - div#footer-img-br{ grid-area: 2 / 1 / 3 / 2; padding-left: 30%; @@ -226,12 +316,22 @@ div#footer-img-wiki img{ div#footer-socials-links{ grid-area: 2 / 3 / 3 / 4; } +div#footer-socials-links p{ + margin-top: 0px; + margin-bottom: 0px; +} div#footer-socials-links a{ text-decoration: none; color:#FFFFFF; - font-family: 'Roboto Condensed', sans-serif; - + font-family: 'Roboto Regular', sans-serif; + font-size: 16px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: 1.63; + letter-spacing: normal; } + div#footer-contact{ grid-area: 2 / 4 / 3 / 5; padding-top: 5%; @@ -250,9 +350,6 @@ div#footer-contact a{ color: #FFFFFF; font-weight: bold; } - - - div#footer div#footer-top div#footer-top-left, div#footer div#footer-top div#footer-top-right{ display: inline-flex; @@ -269,15 +366,11 @@ div#footer div#footer-right{ float: right; /*position: absolute;*/ } - - div#footer div#footer-left div, div#footer div#footer-right div{ display: inline-block; border:cyan 1px solid; } - - input#newslettersubs{ background-color: #000000; color:#FFFFFF; @@ -300,13 +393,13 @@ input.submitemail{ /*div#home-recent-title, div#browsethearchive-title, div#artistsindex-title, div#publishersindex-title, div#selfpublishedindex-title, div#zinesindex-title, */ div.pagetitle{ - margin-top: 60px; - margin-bottom: 30px; + margin: 60px 80px 30px 80px; font-size: 25px; font-family: 'Roboto Condensed', sans-serif; font-weight: bold; text-transform: uppercase; - margin-left: 5%; + letter-spacing: 1.88px; + line-height: 35px; } /******************************************************/ @@ -318,85 +411,248 @@ div.pagetitle{ table, th, td { border-bottom: 1px solid black; border-collapse: collapse; - padding: 10px 30px 10px 30px; + text-align: left; } +#artistsindex-table_wrapper{ overflow-x:auto; } +#artistsindex-table, #publishersindex-table, #zinesindex-table, #selfpublishedindex-table { + width: 100%; } + +thead tr th:first-child { padding: 0px 0px 0px 80px } +thead tr th:last-child { padding: 0px 80px 0px 0px } + +tr { padding: 10px 80px 10px 80px; } +th { padding: 22px; } +.idnumber { padding: 0px 0px 0px 80px } +.label { font-weight: bold;} +.altaliases {} +.description { padding: 0px 80px 0px 0px } thead tr th{ text-transform: uppercase; color:#7f7f7f; font-size: 16px; + letter-spacing: 1.5px; + line-height: 24px; font-family: 'Roboto Condensed', sans-serif; font-weight: normal; border-bottom: black 3px solid; } tbody tr th{ - font-size: 20px; + font-size: 18px; + line-height: 26px; font-family: 'Roboto Condensed', sans-serif; font-weight: normal; } -tbody tr th.label a{ - font-weight: bold; -} - tbody tr th a{ text-decoration: none; color: #000000; } -tbody tr th.description{ - font-size: 16px; +#artistsindex-table_paginate{ + background-color: #E9E9E9; +} +.dataTables_paginate { + display: flex; + flex-direction: row; + justify-content: space-between; + align-content: baseline; + margin-left: auto; + margin-right: auto; + padding-top: 42px; + padding-bottom: 52px; + font-family: Roboto Condensed; + font-size: 14px; + line-height: 48px; + font-weight: bold; + font-stretch: condensed; + min-height: 48px; + max-width: 376px; +} + +.dataTables_paginate > span { + display: flex; + flex-direction: row; + justify-content: space-around; + width: 100%; } +a.current { + height: 36px; + width: 36px; + border-radius: 6px; + background-color: #1B42D8; + display: flex; + align-content: baseline; + margin-top: 6px; + align-items: center; + justify-content: center; + cursor: pointer; +} +.paginate_button{ + cursor: pointer; +} +a.paginate_button.previous, a.paginate_button.next{ + display: flex; + flex-direction: row; +} +a.paginate_button.previous:before { + display: inline-block; + content: ' '; + background-image: url('Icons/icn_arrow_left.svg'); + background-size: 16px 16px; + height: 16px; + width: 16px; + margin: 16px 16px 0px 0px; +} +a.paginate_button.next:after { + display: inline-block; + content: ' '; + background-image: url('Icons/icn_arrow_right.svg'); + background-size: 16px 16px; + height: 16px; + width: 16px; + margin: 16px 0px 0px 16px; +} + +/************ TEXT STYLES************/ +.title { + /* width: 200px; + height: 26px;*/ + font-family: Roboto Condensed; + font-size: 18px; + font-weight: bold; + font-stretch: condensed; + font-style: normal; + line-height: 1.44; + letter-spacing: 0.9px; + color: var(--black); +} +.date { + font-family: Roboto Regular; + font-size: 16px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: 1.63; + letter-spacing: normal; + color: var(--black); +} + +/************ BUTTONS ************/ + +.primary-button { + max-width: 365px; + min-height: 48px; + font-family: Roboto; + font-size: 14px; + font-weight: bold; + font-stretch: condensed; + font-style: normal; + line-height: normal; + letter-spacing: 1.5px; + text-align: center; + color: #ffffff; + cursor: pointer; +} +.secondary-button { + width: 365px; + height: 48px; + font-family: Roboto; + font-size: 14px; + font-weight: bold; + font-stretch: condensed; + font-style: normal; + line-height: normal; + letter-spacing: 1.5px; + text-align: center; + color: var(--blue-blue); + cursor: pointer; +} + +.artwork-button { + width: 76px; + height: 24px; + font-family: Roboto; + font-size: 16px; + font-weight: normal; + font-stretch: condensed; + font-style: normal; + line-height: 1.5; + letter-spacing: 1.5px; + text-align: center; + color: var(--black); + cursor: pointer; +} -/************ RECENTLY ADDED + HOME ************/ - - +/************ HOME & Browse Archive Layout ************/ -/*Top div*/ +/*Home Top div*/ div#home-top-div{ height: 661px; border:blue solid 1px; } - -img.home-recent-imgs{ - /*max-height: 200px;*/ - width: 200px; +img.home-recent-imgs, img.browsethearchive-imgs{ + width: 100%; } -div.home-recent-items{ - display: inline-block; +div.home-recent-items, div.browsethearchive-items{ padding:10px; font-size: 16px; font-family: 'Roboto Condensed', sans-serif; - color: #7f7f7f; margin: 0 auto; - border:solid; + display: flex; + flex-direction: column; + align-content: center; + /*justify-content: space-between;*/ + height: 100%; } -div.home-recent-items a{ - font-size: 20px; - font-family: 'Roboto Condensed', sans-serif; - font-weight: bold; + +div.home-recent-items a, div.browsethearchive-items a { + font-size: 18px; + line-height: 26px; + font-family: 'Roboto Condensed Bold', sans-serif; color: #000000; text-decoration: none; } -div#home-recent-grid{ - max-width: 90%; - margin: 0 auto; + +div.home-recent-items-top, div.browsethearchive-items-top { + display: flex; + flex-direction: column; + margin: auto; +} + +div.home-recent-items-bottom, div.browsethearchive-items-bottom { + display: flex; + flex-direction: column; + flex-shrink: 0; + flex-basis: 100px; + justify-content: flex-start; +} + +div#home-recent-grid, div#browsethearchive-grid{ + width: 100%; + padding: 0px 80px; display: grid; - grid-gap: 2rem; - /*border: 1px solid blue;*/ text-align: center; + grid-gap: 2rem; } div#show-button-wrapper{ width: 100%; } +div.home-show-wrapper{ + width: 100%; + margin: 60px 0px; +} + span.home-show{ + display: flex; + margin: auto; background-color: #1b42d8; border-radius: 6px; color: #FFFFFF; @@ -405,28 +661,44 @@ span.home-show{ font-weight: bold; height: 48px; width: 365px; - + cursor: pointer; } - @media (min-width: 600px) { - #home-recent-grid { grid-template-columns: repeat(2, 1fr); } + #home-recent-grid, #browsethearchive-grid { grid-template-columns: repeat(2, 1fr); } } @media (min-width: 1000px) { - #home-recent-grid { grid-template-columns: repeat(4, 1fr); } + #home-recent-grid, #browsethearchive-grid { grid-template-columns: repeat(4, 1fr); } } @media (min-width: 1400px) { - #home-recent-grid { grid-template-columns: repeat(6, 1fr); } + #home-recent-grid, #browsethearchive-grid { grid-template-columns: repeat(6, 1fr); } } -/************ BROWSE THE ARCHIVE ************/ +/*@media (min-width: 300px) { + #browsethearchive-grid { grid-template-columns: repeat(2, 1fr); } +} -img.browsethearchive-imgs{ - width: 200px; +@media (min-width: 700px) { + #browsethearchive-grid { grid-template-columns: repeat(2, 1fr); } +} + +@media (min-width: 1200px) { + #browsethearchive-grid { grid-template-columns: repeat(4, 1fr); } +} +@media (min-width: 1600px) { + #browsethearchive-grid { grid-template-columns: repeat(6, 1fr); } } +*/ + + +/************ BROWSE THE ARCHIVE Pagination ************/ + +/*img.browsethearchive-imgs{ + width: 200px; +} div.browsethearchive-items{ display: inline-block; @@ -448,9 +720,8 @@ div#browsethearchive-grid{ margin: 0 auto 60px auto; display: grid; grid-gap: 2rem; - /*border: 1px solid blue;*/ text-align: center; -} +}*/ .current { background-color: #1b42d8; @@ -489,47 +760,35 @@ height: 139px; text-align: center; } -@media (min-width: 300px) { - #browsethearchive-grid { grid-template-columns: repeat(2, 1fr); } -} - -@media (min-width: 700px) { - #browsethearchive-grid { grid-template-columns: repeat(2, 1fr); } -} - -@media (min-width: 1200px) { - #browsethearchive-grid { grid-template-columns: repeat(4, 1fr); } -} - -@media (min-width: 1600px) { - #browsethearchive-grid { grid-template-columns: repeat(6, 1fr); } -} - - /************ BROWSE BY CATEGORY ************/ div#browsebycategory-listcategories{ - + margin: 0px 80px 60px 80px; } div.browsebycategory-categories{ - border: black 1px solid; - margin: 10px; - padding: 10px; - width: 20em; + margin: 22px 0px; + padding: 16px; + border-radius: 6px; + background-color: var(--blue-blue); + display: flex; + flex-direction: row; + flex-wrap: wrap; } - - +div.browsebycategory-categories a { + font-family: Roboto Condensed; + color: #ffffff; + text-decoration: none; + margin: auto; + display: inline-block; +} /************ SEARCH TOOLS ************/ - - - /*********************************************/ /************ PERSON AND ARTWORK ************/ /*******************************************/ diff --git a/static/css/webfonts/Roboto.zip b/static/css/webfonts/Roboto.zip new file mode 100644 index 0000000..89ae8f1 Binary files /dev/null and b/static/css/webfonts/Roboto.zip differ diff --git a/static/css/webfonts/Roboto_Regular/LICENSE.txt b/static/css/webfonts/Roboto_Regular/LICENSE.txt new file mode 100755 index 0000000..75b5248 --- /dev/null +++ b/static/css/webfonts/Roboto_Regular/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/static/css/webfonts/Roboto_Regular/Roboto-Black.ttf b/static/css/webfonts/Roboto_Regular/Roboto-Black.ttf new file mode 100755 index 0000000..2d45238 Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-Black.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-BlackItalic.ttf b/static/css/webfonts/Roboto_Regular/Roboto-BlackItalic.ttf new file mode 100755 index 0000000..29a4359 Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-BlackItalic.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-Bold.ttf b/static/css/webfonts/Roboto_Regular/Roboto-Bold.ttf new file mode 100755 index 0000000..d998cf5 Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-Bold.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-BoldItalic.ttf b/static/css/webfonts/Roboto_Regular/Roboto-BoldItalic.ttf new file mode 100755 index 0000000..b4e2210 Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-BoldItalic.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-Italic.ttf b/static/css/webfonts/Roboto_Regular/Roboto-Italic.ttf new file mode 100755 index 0000000..5b390ff Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-Italic.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-Light.ttf b/static/css/webfonts/Roboto_Regular/Roboto-Light.ttf new file mode 100755 index 0000000..3526798 Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-Light.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-LightItalic.ttf b/static/css/webfonts/Roboto_Regular/Roboto-LightItalic.ttf new file mode 100755 index 0000000..46e9bf7 Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-LightItalic.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-Medium.ttf b/static/css/webfonts/Roboto_Regular/Roboto-Medium.ttf new file mode 100755 index 0000000..f714a51 Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-Medium.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-MediumItalic.ttf b/static/css/webfonts/Roboto_Regular/Roboto-MediumItalic.ttf new file mode 100755 index 0000000..5dc6a2d Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-MediumItalic.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-Regular.ttf b/static/css/webfonts/Roboto_Regular/Roboto-Regular.ttf new file mode 100755 index 0000000..2b6392f Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-Regular.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-Thin.ttf b/static/css/webfonts/Roboto_Regular/Roboto-Thin.ttf new file mode 100755 index 0000000..4e797cf Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-Thin.ttf differ diff --git a/static/css/webfonts/Roboto_Regular/Roboto-ThinItalic.ttf b/static/css/webfonts/Roboto_Regular/Roboto-ThinItalic.ttf new file mode 100755 index 0000000..eea836f Binary files /dev/null and b/static/css/webfonts/Roboto_Regular/Roboto-ThinItalic.ttf differ diff --git a/templates/artistsindex.html b/templates/artistsindex.html index d43dcc3..c7597ec 100644 --- a/templates/artistsindex.html +++ b/templates/artistsindex.html @@ -15,9 +15,9 @@ {% for x in results['results']['bindings']%} - {{ x['creators']['value'] | replace('http://wikibase.svc/entity/', '') }} + {{ x['creators']['value'] | replace('http://wikibase.svc/entity/', '') }} {{ x["creatorsLabel"]['value'] }} - + {% if "creatorsAltLabel" in x %} {{ x["creatorsAltLabel"]["value"] }} {% endif %} diff --git a/templates/browsebycategory.html b/templates/browsebycategory.html index 3644356..c84830b 100644 --- a/templates/browsebycategory.html +++ b/templates/browsebycategory.html @@ -2,10 +2,10 @@ {% block content %}
-
BROWSE BY CREATOR/CONTRIBUTOR
-
BROWSE BY PUBLISHER
-
BROWSE ALL SELF-PUBLISHED
-
BROWSE ALL ZINES
+
BROWSE BY CREATOR/CONTRIBUTOR
+
BROWSE BY PUBLISHER
+
BROWSE ALL SELF-PUBLISHED
+
BROWSE ALL ZINES
More categories coming soon...
diff --git a/templates/browsethearchive.html b/templates/browsethearchive.html index 87787b9..bfb7d50 100644 --- a/templates/browsethearchive.html +++ b/templates/browsethearchive.html @@ -7,7 +7,8 @@
{% for x in results['results']['bindings']%} -
+
+
{% if "image" in x %} @@ -17,13 +18,20 @@
{% endif %} - - {{ x["workLabel"]["value"]}} -
- {% if "date" in x %} - {{ x["date"]["value"] | replace("T00:00:00Z", "") }}
+
+ +
+ + {{ x["workLabel"]["value"]}} +
+ + {% if "date" in x %} + {{ x["date"]["value"] | replace("T00:00:00Z", "") }} + + + {% endif %} +
- {% endif %}
{% endfor %} diff --git a/templates/home.html b/templates/home.html index 1093958..c180164 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,40 +1,45 @@ {% extends "layout.html" %} {% block content %} -
- -
+
+
RECENTLY ADDED WORKS
- - -{% for x in results['results']['bindings']%} -
- {% if "image" in x %} - - -
- {% else %} - -
- - {% endif %} - - {{ x["workLabel"]["value"]}} -
- {% if "date" in x %} - {{ x["date"]["value"] | replace("T00:00:00Z", "") }}
- - {% endif %} -
-{% endfor %} - - - -
+ {% for x in results['results']['bindings']%} +
+
+ {% if "image" in x %} + + +
+ {% else %} + +
+ + {% endif %} +
+ +
+ + {{ x["workLabel"]["value"]}} +
+ + {% if "date" in x %} + {{ x["date"]["value"] | replace("T00:00:00Z", "") }} + + + {% endif %} +
+ +
+ {% endfor %} + +
+ +
diff --git a/templates/layout.html b/templates/layout.html index b58c47b..949465c 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -12,30 +12,33 @@