From e8d67cdd85bd3b54695ca774c050b9145522a5e8 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Mon, 2 Oct 2017 16:45:57 -0700 Subject: [PATCH] updated /popular page --- public/assets/css/_componentStyle.css | 164 ---------------------- public/assets/css/general.css | 5 + public/assets/css/publish.css | 20 ++- views/channel.handlebars | 2 +- views/partials/contentListItem.handlebars | 23 ++- views/partials/topBar.handlebars | 1 - views/popular.handlebars | 2 - 7 files changed, 36 insertions(+), 181 deletions(-) delete mode 100644 public/assets/css/_componentStyle.css diff --git a/public/assets/css/_componentStyle.css b/public/assets/css/_componentStyle.css deleted file mode 100644 index 3cacbf44..00000000 --- a/public/assets/css/_componentStyle.css +++ /dev/null @@ -1,164 +0,0 @@ - -/* top bar */ -#logo, #title { - float: left; -} - -#logo { - -} - -#title { - -} - -/* publish */ - - - - -/* show routes */ -.show-asset { - width: 100%; - margin-bottom: 1em; - margin-top: 1em; -} - -.show-asset-lite { - margin: 0px; -} - -.panel.links { - font-size: small; -} - -input.link { - width: 80%; -} - -button.copy-button { - padding: 4px; - float: right; -} - -.share-option { - margin-bottom: 1em; -} - -.metadata-table { - font-size: small; - border-collapse: collapse; - margin-bottom: 1em; -} - -.metadata-row { - border-bottom: 1px solid lightgrey; - margin: 2px; -} - -.left-column { - width: 30%; - font-weight: bold; - vertical-align: top; -} - -/* trending claims */ -.grid-item { - width: 23%; - margin: 0px 1% 20px 1%; -} - -/* learn more */ -.learn-more { - text-align: center; - border-top: 1px solid lightgrey; -} - -/* examples */ -.example { - clear: both; - width: 100%; - margin-bottom: 15px; - overflow: auto; -} - -.example-image, .example-code { - float: left; - margin: 2%; -} - -.example-image { - width: 21%; -} - -.example-code { - float: right; - padding: 4%; - width: 62%; - background-color: lightgrey; - font-family: monospace; - color: #666; - word-wrap: break-word; -} - -/* contribute */ -#github-logo { - float: right; - height: 1em; -} - -/* content lists */ -.content-list-card { - margin-top: 2px; - padding-top: 2px; - border-top: 1px lightgrey solid; - overflow: auto; - position: relative; -} - -.content-list-card-link { - position:absolute; - width:100%; - height:100%; - top:0; - left: 0; - z-index: 1; -} - -.content-list-asset { - width: 20%; - float: left; - margin: 5px 30px 5px 0px; -} - -.content-list-title { - color: black; - font-weight: bold; -} - -.content-list-details { - word-wrap: break-word; -} - -.content-list-details > ul { - position: relative; - z-index: 2; - list-style: none; - list-style-type: none; -} - -.content-list-card:hover { - background-color: #F5F0EF; -} - -/* statistics */ -.totals-row { - border-top: 1px solid grey; - border-bottom: 1px solid grey; - font-weight: bold; -} -.stats-table-url { - word-wrap: break-word; -} - - diff --git a/public/assets/css/general.css b/public/assets/css/general.css index 928faea8..428dee7a 100644 --- a/public/assets/css/general.css +++ b/public/assets/css/general.css @@ -43,6 +43,11 @@ h2 { font-size: x-large; } +.h2--secondary { + font-weight: normal; + color: lightgrey; +} + h3 { font-size: large; font-weight: normal; diff --git a/public/assets/css/publish.css b/public/assets/css/publish.css index f3410445..f5003c90 100644 --- a/public/assets/css/publish.css +++ b/public/assets/css/publish.css @@ -5,11 +5,15 @@ } #publish-dropzone { - border: 2px dashed dodgerblue; + border: 2px dashed lightgrey; height: calc(100% - 2px); position: relative; } +#publish-dropzone:hover { + border: 2px dashed dodgerblue; +} + #publish-dropzone-instructions { position: absolute; top: 40%; @@ -31,4 +35,18 @@ .copy-input { +} + +/* item lists */ + +.content-list-item { + +} + +.content-list-item-asset { + width: 90%; +} + +.content-list-item-link { + } \ No newline at end of file diff --git a/views/channel.handlebars b/views/channel.handlebars index f1ef01be..9c1733fc 100644 --- a/views/channel.handlebars +++ b/views/channel.handlebars @@ -1,6 +1,6 @@ {{> topBar}}
-

{{this.channelName}}:{{this.longChannelId}}

+

{{this.channelName}}:{{this.longChannelId}}

Below is all the free content in this channel.

{{#each this.claims}} {{> contentListItem}} diff --git a/views/partials/contentListItem.handlebars b/views/partials/contentListItem.handlebars index 128241c5..3472285c 100644 --- a/views/partials/contentListItem.handlebars +++ b/views/partials/contentListItem.handlebars @@ -1,15 +1,14 @@ -
- - {{#ifConditional this.contentType '===' 'video/mp4'}} - - {{else}} - - {{/ifConditional}} -
- +
+
+ + {{#ifConditional this.contentType '===' 'video/mp4'}} + + {{else}} + + {{/ifConditional}} +
+

{{this.title}}

+ spee.ch{{this.directUrlShort}}
diff --git a/views/partials/topBar.handlebars b/views/partials/topBar.handlebars index b9d902c7..ae61847e 100644 --- a/views/partials/topBar.handlebars +++ b/views/partials/topBar.handlebars @@ -5,7 +5,6 @@ Upload Popular About - Source {{#if user}}