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
58a41b4d
Commit
58a41b4d
authored
7 years ago
by
Chris Lawton
Committed by
Todd Dembrey
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
adding tabs to pop up activity feed
parent
2ca8d94f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
opentech/apply/funds/templates/funds/includes/activity-feed.html
+19
-1
19 additions, 1 deletion
...h/apply/funds/templates/funds/includes/activity-feed.html
opentech/static_src/src/sass/apply/components/_wrapper.scss
+4
-0
4 additions, 0 deletions
opentech/static_src/src/sass/apply/components/_wrapper.scss
with
23 additions
and
1 deletion
opentech/apply/funds/templates/funds/includes/activity-feed.html
+
19
−
1
View file @
58a41b4d
...
@@ -3,9 +3,27 @@
...
@@ -3,9 +3,27 @@
<div
class=
"wrapper wrapper--medium wrapper--relative"
>
<div
class=
"wrapper wrapper--medium wrapper--relative"
>
<h4
class=
"activity-feed__heading"
>
Activity Feed
<svg
class=
"icon icon--speech-bubble"
><use
xlink:href=
"#speech-bubble"
></use></svg></h4>
<h4
class=
"activity-feed__heading"
>
Activity Feed
<svg
class=
"icon icon--speech-bubble"
><use
xlink:href=
"#speech-bubble"
></use></svg></h4>
<a
href=
"#"
class=
"js-close-feed link link--close-feed"
>
Close
</a>
<a
href=
"#"
class=
"js-close-feed link link--close-feed"
>
Close
</a>
<div
class=
"tabs js-tabs"
>
<div
class=
"tabs__container"
>
<a
class=
"tab__item tab__item--active"
href=
"#"
data-tab=
"tab-1"
>
Communications
</a>
<a
class=
"tab__item"
href=
"#"
data-tab=
"tab-2"
>
Activity
</a>
<a
class=
"tab__item"
href=
"#"
data-tab=
"tab-3"
>
All
</a>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"wrapper wrapper--medium"
>
<div
class=
"wrapper wrapper--medium wrapper--activity-feed"
>
<div
class=
"tabs__content tabs__content--current"
id=
"tab-1"
>
Communications content
</div>
<div
class=
"tabs__content"
id=
"tab-2"
>
Activity content
</div>
<div
class=
"tabs__content"
id=
"tab-3"
>
All content
</div>
</div>
</div>
</div>
</div>
This diff is collapsed.
Click to expand it.
opentech/static_src/src/sass/apply/components/_wrapper.scss
+
4
−
0
View file @
58a41b4d
...
@@ -236,4 +236,8 @@
...
@@ -236,4 +236,8 @@
&
--relative
{
&
--relative
{
position
:
relative
;
position
:
relative
;
}
}
&
--activity-feed
{
margin-top
:
50px
;
}
}
}
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