Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
d2a8e581
Commit
d2a8e581
authored
Jun 11, 2019
by
Lyza Danger Gardner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add classes, styling to SVGIcon elements and help icon in top bar
parent
b62662ec
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
7 deletions
+23
-7
svg-icon.js
src/sidebar/components/svg-icon.js
+3
-1
top-bar.html
src/sidebar/templates/top-bar.html
+2
-2
svg-icon.scss
src/styles/sidebar/components/svg-icon.scss
+4
-0
top-bar.scss
src/styles/sidebar/components/top-bar.scss
+7
-1
sidebar.scss
src/styles/sidebar/sidebar.scss
+7
-3
No files found.
src/sidebar/components/svg-icon.js
View file @
d2a8e581
...
...
@@ -41,7 +41,9 @@ function SvgIcon({ name, className = '' }) {
markup
,
]);
return
<
span
dangerouslySetInnerHTML
=
{
markup
}
ref
=
{
element
}
/>
;
return
(
<
span
className
=
"svg-icon"
dangerouslySetInnerHTML
=
{
markup
}
ref
=
{
element
}
/
>
);
}
SvgIcon
.
propTypes
=
{
...
...
src/sidebar/templates/top-bar.html
View file @
d2a8e581
...
...
@@ -15,7 +15,7 @@
ng-click=
"vm.onShowHelpPanel()"
title=
"Help"
aria-label=
"Help"
>
<svg-icon
name=
"'help'"
></svg-icon>
<svg-icon
name=
"'help'"
class-name=
"'top-bar__help-icon'"
></svg-icon>
</button>
<login-control
class=
"login-control"
...
...
@@ -59,7 +59,7 @@
ng-click=
"vm.onShowHelpPanel()"
title=
"Help"
aria-label=
"Help"
>
<svg-icon
name=
"'help'"
></svg-icon>
<svg-icon
name=
"'help'"
class-name=
"'top-bar__help-icon'"
></svg-icon>
</button>
<login-control
class=
"login-control"
...
...
src/styles/sidebar/components/svg-icon.scss
0 → 100644
View file @
d2a8e581
/* Make the wrapper element's size match the contained `svg` element */
.svg-icon
{
display
:
flex
;
}
src/styles/sidebar/components/top-bar.scss
View file @
d2a8e581
...
...
@@ -14,7 +14,7 @@
// Force top-bar onto a new compositor layer so that it does not judder when
// the window is scrolled.
transform
:
translate3d
(
0
,
0
,
0
);
transform
:
translate3d
(
0
,
0
,
0
);
}
.top-bar--theme-clean
{
...
...
@@ -93,6 +93,12 @@
user-select
:
none
;
}
/* FIXME: Temporary fix to make 'help' icon align with other top-bar icons */
.top-bar__help-icon
{
width
:
15px
;
height
:
15px
;
}
.top-bar__apply-icon
{
display
:
inline-block
;
line-height
:
12px
;
...
...
src/styles/sidebar/sidebar.scss
View file @
d2a8e581
...
...
@@ -43,6 +43,7 @@ $base-line-height: 20px;
@import
'./components/share-link'
;
@import
'./components/sidebar-tutorial'
;
@import
'./components/simple-search'
;
@import
'./components/svg-icon'
;
@import
'./components/spinner'
;
@import
'./components/tags-input'
;
@import
'./components/thread-list'
;
...
...
@@ -51,7 +52,8 @@ $base-line-height: 20px;
// Top-level styles
// ----------------
html
,
body
{
html
,
body
{
height
:
100%
;
}
...
...
@@ -105,7 +107,7 @@ hypothesis-app {
border-radius
:
2px
;
font-family
:
$sans-font-family
;
font-weight
:
300
;
margin-bottom
:
.72em
;
margin-bottom
:
0
.72em
;
padding
:
1em
;
position
:
relative
;
background-color
:
$body-background
;
...
...
@@ -114,7 +116,9 @@ hypothesis-app {
border
:
1px
none
$gray-lighter
;
border-bottom-style
:
solid
;
padding
:
0
0
1
.1em
;
li
a
{
padding-bottom
:
.231em
}
li
a
{
padding-bottom
:
0
.231em
;
}
}
.close
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment