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
f8a2ac1c
Unverified
Commit
f8a2ac1c
authored
Jul 07, 2020
by
Lyza Gardner
Committed by
GitHub
Jul 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix text variable names per conventions (#2317)
Make text-color SASS variable names match conventions
parent
c7d2ef4e
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
21 additions
and
25 deletions
+21
-25
bucket-bar.scss
src/styles/annotator/bucket-bar.scss
+1
-1
buttons.scss
src/styles/mixins/buttons.scss
+2
-2
forms.scss
src/styles/mixins/forms.scss
+2
-2
molecules.scss
src/styles/mixins/molecules.scss
+3
-3
annotation-header.scss
src/styles/sidebar/components/annotation-header.scss
+2
-2
annotation-publish-control.scss
...styles/sidebar/components/annotation-publish-control.scss
+1
-1
menu-item.scss
src/styles/sidebar/components/menu-item.scss
+1
-1
menu-section.scss
src/styles/sidebar/components/menu-section.scss
+1
-1
search-input.scss
src/styles/sidebar/components/search-input.scss
+1
-1
share-annotations-panel.scss
src/styles/sidebar/components/share-annotations-panel.scss
+1
-1
tag-list.scss
src/styles/sidebar/components/tag-list.scss
+1
-1
version-info.scss
src/styles/sidebar/components/version-info.scss
+1
-1
styled-text.scss
src/styles/sidebar/styled-text.scss
+1
-1
util.scss
src/styles/util.scss
+1
-1
variables.scss
src/styles/variables.scss
+2
-6
No files found.
src/styles/annotator/bucket-bar.scss
View file @
f8a2ac1c
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
@include
reset
.
reset-box-model
;
@include
reset
.
reset-box-model
;
@include
reset
.
reset-font
;
@include
reset
.
reset-font
;
background
:
none
;
background
:
none
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
font-weight
:
bold
;
font-weight
:
bold
;
font-family
:
var
.
$sans-font-family
;
font-family
:
var
.
$sans-font-family
;
font-size
:
var
.
$annotator-bucket-bar-font-size
;
font-size
:
var
.
$annotator-bucket-bar-font-size
;
...
...
src/styles/mixins/buttons.scss
View file @
f8a2ac1c
...
@@ -93,11 +93,11 @@
...
@@ -93,11 +93,11 @@
@mixin
button--primary
{
@mixin
button--primary
{
@include
button
;
@include
button
;
@include
button--labeled
;
@include
button--labeled
;
color
:
var
.
$
grey-1
;
color
:
var
.
$
color-text--inverted
;
background-color
:
var
.
$grey-mid
;
background-color
:
var
.
$grey-mid
;
&
:hover:not
([
disabled
])
{
&
:hover:not
([
disabled
])
{
color
:
var
.
$
grey-1
;
color
:
var
.
$
color-text--inverted
;
background-color
:
var
.
$grey-6
;
background-color
:
var
.
$grey-6
;
}
}
...
...
src/styles/mixins/forms.scss
View file @
f8a2ac1c
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
@include
focus-outline
;
@include
focus-outline
;
@include
placeholder
{
@include
placeholder
{
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
}
}
}
}
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
@include
utils
.
border
;
@include
utils
.
border
;
border-radius
:
var
.
$border-radius
;
border-radius
:
var
.
$border-radius
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
background-color
:
var
.
$grey-0
;
background-color
:
var
.
$grey-0
;
// Tighten up spacing around text in input
// Tighten up spacing around text in input
line-height
:
1
;
line-height
:
1
;
...
...
src/styles/mixins/molecules.scss
View file @
f8a2ac1c
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
*/
*/
@mixin
quoted-text
{
@mixin
quoted-text
{
border-left
:
3px
solid
var
.
$color-border
;
border-left
:
3px
solid
var
.
$color-border
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
font-style
:
italic
;
font-style
:
italic
;
padding
:
0
var
.
$layout-space
;
padding
:
0
var
.
$layout-space
;
...
@@ -154,7 +154,7 @@
...
@@ -154,7 +154,7 @@
@include
utils
.
border-right
;
@include
utils
.
border-right
;
flex
:
1
1
;
flex
:
1
1
;
text-align
:
center
;
text-align
:
center
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
&
:last-of-type
{
&
:last-of-type
{
border-right
:
none
;
border-right
:
none
;
...
@@ -162,7 +162,7 @@
...
@@ -162,7 +162,7 @@
}
}
&
__link
{
&
__link
{
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
}
}
&
__icon
{
&
__icon
{
...
...
src/styles/sidebar/components/annotation-header.scss
View file @
f8a2ac1c
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
&
__timestamp-edited
{
&
__timestamp-edited
{
@include
utils
.
font--small
;
@include
utils
.
font--small
;
font-style
:
italic
;
font-style
:
italic
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
}
}
&
__timestamp-created-link
{
&
__timestamp-created-link
{
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
&
__highlight-icon
{
&
__highlight-icon
{
@include
utils
.
icon--small
;
@include
utils
.
icon--small
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
// Pull the icon down a tad for better vertical alignment with other
// Pull the icon down a tad for better vertical alignment with other
// items in the same layout row
// items in the same layout row
margin-bottom
:
-1px
;
margin-bottom
:
-1px
;
...
...
src/styles/sidebar/components/annotation-publish-control.scss
View file @
f8a2ac1c
...
@@ -65,6 +65,6 @@
...
@@ -65,6 +65,6 @@
// dropdown arrow which reveals the associated `Menu` when clicked
// dropdown arrow which reveals the associated `Menu` when clicked
&
__menu-label
{
&
__menu-label
{
padding
:
var
.
$layout-space--small
;
padding
:
var
.
$layout-space--small
;
color
:
var
.
$color-text-inverted
;
color
:
var
.
$color-text-
-
inverted
;
}
}
}
}
src/styles/sidebar/components/menu-item.scss
View file @
f8a2ac1c
...
@@ -74,7 +74,7 @@ a.menu-item:hover {
...
@@ -74,7 +74,7 @@ a.menu-item:hover {
}
}
}
}
&
.is-disabled
{
&
.is-disabled
{
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
}
}
}
}
.menu-item__icon
{
.menu-item__icon
{
...
...
src/styles/sidebar/components/menu-section.scss
View file @
f8a2ac1c
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
}
}
.menu-section__heading
{
.menu-section__heading
{
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
line-height
:
1
;
line-height
:
1
;
margin
:
1px
1px
0
;
margin
:
1px
1px
0
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
...
...
src/styles/sidebar/components/search-input.scss
View file @
f8a2ac1c
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
&
:disabled
{
&
:disabled
{
background
:
none
;
background
:
none
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
}
}
// Expand the search input when focused (triggered by clicking
// Expand the search input when focused (triggered by clicking
...
...
src/styles/sidebar/components/share-annotations-panel.scss
View file @
f8a2ac1c
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
@use
"../../mixins/utils"
;
@use
"../../mixins/utils"
;
.share-annotations-panel
{
.share-annotations-panel
{
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
&
__intro
{
&
__intro
{
color
:
var
.
$color-text
;
color
:
var
.
$color-text
;
...
...
src/styles/sidebar/components/tag-list.scss
View file @
f8a2ac1c
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
&
__link
,
&
__link
,
&
__text
{
&
__text
{
text-decoration
:
none
;
text-decoration
:
none
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
}
}
&
__link
{
&
__link
{
...
...
src/styles/sidebar/components/version-info.scss
View file @
f8a2ac1c
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
}
}
&
__value
{
&
__value
{
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
}
}
@media
only
screen
and
(
min-width
:
20em
)
{
@media
only
screen
and
(
min-width
:
20em
)
{
...
...
src/styles/sidebar/styled-text.scss
View file @
f8a2ac1c
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
@include
utils
.
font--medium
;
@include
utils
.
font--medium
;
border-left
:
3px
solid
var
.
$grey-3
;
border-left
:
3px
solid
var
.
$grey-3
;
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
font-family
:
sans-serif
;
font-family
:
sans-serif
;
font-size
:
12px
;
font-size
:
12px
;
font-style
:
italic
;
font-style
:
italic
;
...
...
src/styles/util.scss
View file @
f8a2ac1c
...
@@ -80,5 +80,5 @@
...
@@ -80,5 +80,5 @@
// Use on elements for a de-emphasized, muted text color
// Use on elements for a de-emphasized, muted text color
.u-color-text--muted
{
.u-color-text--muted
{
color
:
var
.
$color-text-light
;
color
:
var
.
$color-text-
-
light
;
}
}
src/styles/variables.scss
View file @
f8a2ac1c
...
@@ -36,9 +36,9 @@ $grey-7: #202020;
...
@@ -36,9 +36,9 @@ $grey-7: #202020;
// Text colors
// Text colors
$color-text
:
$grey-7
;
$color-text
:
$grey-7
;
$color-text-light
:
$grey-5
;
$color-text-
-
light
:
$grey-5
;
// Text color when used on a dark background
// Text color when used on a dark background
$color-text-inverted
:
$grey-1
;
$color-text-
-
inverted
:
$grey-1
;
// Other colors
// Other colors
$color-success
:
#00a36d
;
$color-success
:
#00a36d
;
...
@@ -92,10 +92,6 @@ $layout-space--medium: $layout-space;
...
@@ -92,10 +92,6 @@ $layout-space--medium: $layout-space;
// This value originated from Apple's Human Interface Guidelines.
// This value originated from Apple's Human Interface Guidelines.
$touch-target-size
:
44px
;
$touch-target-size
:
44px
;
// Z-Index Scale
// -------------------------
$zindex-tooltip
:
20
;
// Other Variables
// Other Variables
// -------------------------
// -------------------------
$bucket-bar-width
:
22px
;
$bucket-bar-width
:
22px
;
...
...
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