diff --git a/app/models/program.py b/app/models/program.py index 02a2dfd..d7b13ea 100644 --- a/app/models/program.py +++ b/app/models/program.py @@ -24,7 +24,7 @@ class Program(Post): # Event for which the program was posted event = db.Column(db.Integer, db.ForeignKey('event.id'), nullable=True) - # TODO: Number of views and downloads + # TODO: Number of downloads # Thread with the program description (top comment) and comments thread_id = db.Column(db.Integer,db.ForeignKey('thread.id'),nullable=False) diff --git a/app/static/css/form.css b/app/static/css/form.css index 9465375..b051d2a 100644 --- a/app/static/css/form.css +++ b/app/static/css/form.css @@ -84,12 +84,6 @@ .form progress.entropy.high::-webkit-progress-bar { background: var(--ok); } -.form hr { - height: 3px; - border: var(--hr-border); - border-width: 1px 0; - margin: 24px 0; -} .form .msgerror { color: var(--error); font-weight: 400; diff --git a/app/static/css/global.css b/app/static/css/global.css index e96db7f..a37704c 100644 --- a/app/static/css/global.css +++ b/app/static/css/global.css @@ -48,6 +48,12 @@ a:focus { img.pixelated { image-rendering: pixelated; } +hr { + height: 3px; + border: var(--hr-border); + border-width: 1px 0; + margin: 24px 0; +} section p { line-height: 20px; word-wrap: anywhere; diff --git a/app/static/css/programs.css b/app/static/css/programs.css new file mode 100644 index 0000000..c4b41b3 --- /dev/null +++ b/app/static/css/programs.css @@ -0,0 +1,22 @@ +#program-banner { + background: navy; + height: 144px; + margin: 0 0 32px 0; +} +section .program-infos { + display: flex; + width: 100%; + justify-content: space-between; +} +section .program-infos span.progrank { + border-width: 0 0 1px 0; + border-color: var(--color); + border-style: dotted; +} +section .program-infos > div { + flex-shrink: 0; + margin: 0 8px; +} +section .program-infos div.program-tags { + flex-shrink: 1; +} \ No newline at end of file diff --git a/app/static/less/form.less b/app/static/less/form.less index 046b7dc..fa76a8f 100644 --- a/app/static/less/form.less +++ b/app/static/less/form.less @@ -95,13 +95,6 @@ } } - hr { - height: 3px; - border: var(--hr-border); - border-width: 1px 0; - margin: 24px 0; - } - .msgerror { color: var(--error); font-weight: 400; diff --git a/app/static/less/global.less b/app/static/less/global.less index cfbf990..6b42410 100644 --- a/app/static/less/global.less +++ b/app/static/less/global.less @@ -44,6 +44,13 @@ img.pixelated { image-rendering: pixelated; } +hr { + height: 3px; + border: var(--hr-border); + border-width: 1px 0; + margin: 24px 0; +} + section { p { line-height: 20px; diff --git a/app/static/less/programs.less b/app/static/less/programs.less new file mode 100644 index 0000000..416f937 --- /dev/null +++ b/app/static/less/programs.less @@ -0,0 +1,26 @@ +#program-banner { + background: navy; /* debugging */ + height: 144px; + margin: 0 0 32px 0; +} + +section .program-infos { + display: flex; + width: 100%; + justify-content: space-between; + + span.progrank { + border-width: 0 0 1px 0; + border-color: var(--color); /* use text color */ + border-style: dotted; + } + + & > div { + flex-shrink: 0; + margin: 0 8px; + } + + div.program-tags { + flex-shrink: 1; + } +} diff --git a/app/templates/programs/program.html b/app/templates/programs/program.html index 207ad02..1e5b5d0 100644 --- a/app/templates/programs/program.html +++ b/app/templates/programs/program.html @@ -11,19 +11,44 @@ {% endblock %} {% block content %} +
+