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
92c65b68
Commit
92c65b68
authored
Dec 10, 2019
by
Lyza Danger Gardner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Introduce interim `$grey-semi` SASS color for migration purposes.
Migrate usages of `$gray-light` to `$grey-semi`
parent
2507d66f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
12 deletions
+15
-12
adder.scss
src/styles/annotator/adder.scss
+2
-2
annotator.scss
src/styles/annotator/annotator.scss
+2
-2
forms.scss
src/styles/mixins/forms.scss
+3
-3
annotation.scss
src/styles/sidebar/components/annotation.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
top-bar.scss
src/styles/sidebar/components/top-bar.scss
+1
-1
variables.scss
src/styles/variables.scss
+4
-1
No files found.
src/styles/annotator/adder.scss
View file @
92c65b68
...
...
@@ -98,11 +98,11 @@ $adder-transition-duration: 80ms;
}
.annotator-adder-actions
:hover
.annotator-adder-actions__button
{
color
:
var
.
$gr
ay-light
!
important
;
color
:
var
.
$gr
ey-semi
!
important
;
}
.annotator-adder-actions
:hover
.annotator-adder-actions__label
{
color
:
var
.
$gr
ay-light
!
important
;
color
:
var
.
$gr
ey-semi
!
important
;
}
.annotator-adder-actions__button
{
...
...
src/styles/annotator/annotator.scss
View file @
92c65b68
...
...
@@ -117,7 +117,7 @@ var.$base-font-size: 14px;
background
:
var
.
$white
;
border
:
solid
1px
var
.
$grey-3
;
border-radius
:
4px
;
color
:
var
.
$gr
ay-light
;
color
:
var
.
$gr
ey-semi
;
text-decoration
:
none
;
height
:
30px
;
width
:
30px
;
...
...
@@ -126,7 +126,7 @@ var.$base-font-size: 14px;
margin-bottom
:
5px
;
&
:active
{
background-color
:
var
.
$gr
ay-light
;
background-color
:
var
.
$gr
ey-semi
;
}
&
:focus
,
...
...
src/styles/mixins/forms.scss
View file @
92c65b68
...
...
@@ -67,7 +67,7 @@
color
:
var
.
$button-text-color
;
text-shadow
:
0
1px
0
#fff
;
border-radius
:
2px
;
border
:
1px
solid
var
.
$gr
ay-light
;
border
:
1px
solid
var
.
$gr
ey-semi
;
padding
:
0
.5em
0
.9em
;
}
...
...
@@ -91,7 +91,7 @@
cursor
:
default
;
background
:
#f0f0f0
;
border-color
:
#cecece
;
color
:
var
.
$gr
ay-light
;
color
:
var
.
$gr
ey-semi
;
}
@mixin
primary-action-btn
{
...
...
@@ -108,7 +108,7 @@
padding-right
:
12px
;
&
:disabled
{
color
:
var
.
$gr
ay-light
;
color
:
var
.
$gr
ey-semi
;
}
&
:hover:enabled
{
...
...
src/styles/sidebar/components/annotation.scss
View file @
92c65b68
...
...
@@ -117,7 +117,7 @@
}
.annotation-citation-domain
{
color
:
var
.
$gr
ay-light
;
color
:
var
.
$gr
ey-semi
;
font-size
:
var
.
$body1-font-size
;
}
...
...
src/styles/sidebar/components/menu-section.scss
View file @
92c65b68
...
...
@@ -5,7 +5,7 @@
}
.menu-section__heading
{
color
:
var
.
$gr
ay-light
;
color
:
var
.
$gr
ey-semi
;
font-size
:
var
.
$body1-font-size
;
line-height
:
1
;
margin
:
1px
1px
0
;
...
...
src/styles/sidebar/components/search-input.scss
View file @
92c65b68
...
...
@@ -37,7 +37,7 @@
&
:disabled
{
background
:
none
;
color
:
var
.
$gr
ay-light
;
color
:
var
.
$gr
ey-semi
;
}
// Expand the search input when focused (triggered by clicking
...
...
src/styles/sidebar/components/top-bar.scss
View file @
92c65b68
...
...
@@ -60,7 +60,7 @@
@include
buttons
.
reset-native-btn-styles
;
height
:
100%
;
color
:
var
.
$gr
ay-light
;
color
:
var
.
$gr
ey-semi
;
display
:
inline-block
;
cursor
:
pointer
;
padding
:
1px
3px
0
3px
;
...
...
src/styles/variables.scss
View file @
92c65b68
...
...
@@ -11,7 +11,10 @@ $grey-3: #dbdbdb;
$grey-4
:
#a6a6a6
;
$gray-light
:
#969696
!
default
;
// Interim color variable for migration purposes, as the step between `$grey-4`
// and `$grey-5` is large. Represents `base-semi` in proposed future palette,
// minus blue tint.
$grey-semi
:
#9c9c9c
;
$grey-5
:
#7a7a7a
;
...
...
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