Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hypha
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ots
hypha
Commits
33f9e507
Unverified
Commit
33f9e507
authored
6 years ago
by
Todd Dembrey
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #464 from OpenTechFund/bugfix/projects-page
Remove project page introduction
parents
22142e8d
6cbfac43
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
opentech/public/projects/templates/projects/project_page.html
+13
-6
13 additions, 6 deletions
...tech/public/projects/templates/projects/project_page.html
opentech/static_src/src/sass/public/components/_media-box.scss
+5
-1
5 additions, 1 deletion
...ech/static_src/src/sass/public/components/_media-box.scss
with
18 additions
and
7 deletions
opentech/public/projects/templates/projects/project_page.html
+
13
−
6
View file @
33f9e507
...
@@ -5,18 +5,17 @@
...
@@ -5,18 +5,17 @@
<div
class=
"wrapper wrapper--small wrapper--inner-space-large"
>
<div
class=
"wrapper wrapper--small wrapper--inner-space-large"
>
<div
class=
"media-box media-box--reverse"
>
<div
class=
"media-box media-box--reverse"
>
{% include "utils/includes/media_box_icon.html" with page_icon=page.icon %}
{% include "utils/includes/media_box_icon.html" with page_icon=page.icon %}
{% if page.introduction %}
<div
class=
"media-box__content"
>
<div
class=
"media-box__content"
>
{% if page.introduction %}
<h4
class=
"media-box__teaser media-box__teaser--projectpage-introduction"
>
{{ page.introduction }}
</h4>
<h5
class=
"media-box__teaser"
>
{{ page.introduction }}
</h5>
{% endif %}
</div>
</div>
{% endif %}
</div>
</div>
<div
class=
"wrapper wrapper--sidebar wrapper--inner-space-small"
>
<div
class=
"wrapper wrapper--sidebar wrapper--inner-space-small"
>
<div>
<div>
{
% include "utils/includes/funding.html" %
}
{
{ page.body }
}
</div>
</div>
<div>
<div>
{% with contact_details=page.contact_details.all %}
{% with contact_details=page.contact_details.all %}
{% if contact_details %}
{% if contact_details %}
...
@@ -31,9 +30,17 @@
...
@@ -31,9 +30,17 @@
</div>
</div>
</div>
</div>
{% include "projects/includes/project_status.html" %}
{% include "projects/includes/project_status.html" %}
{{ page.body }}
<div
class=
"wrapper wrapper--inner-space-small"
>
<div>
{% include "utils/includes/funding.html" %}
</div>
</div>
{% if page.category_options.all %}
{% if page.category_options.all %}
<div
class=
"grid grid--two grid--small-gap"
>
<div
class=
"grid grid--two grid--small-gap"
>
...
...
This diff is collapsed.
Click to expand it.
opentech/static_src/src/sass/public/components/_media-box.scss
+
5
−
1
View file @
33f9e507
...
@@ -126,8 +126,12 @@
...
@@ -126,8 +126,12 @@
}
}
.media-box--reverse
&
{
.media-box--reverse
&
{
@
extend
%h5
;
@
include
responsive-font-sizes
(
15px
,
map-get
(
$font-sizes
,
epsilon
))
;
display
:
block
;
display
:
block
;
&
--projectpage-introduction
{
@include
responsive-font-sizes
(
18px
,
map-get
(
$font-sizes
,
delta
));
}
}
}
.media-box--reverse
:hover
&
{
.media-box--reverse
:hover
&
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment